diff --git a/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.bin b/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.bin index a1705bd4..36911dec 100644 Binary files a/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.bin and b/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.bin differ diff --git a/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.lock b/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.lock index 687e3ec4..ea16ace5 100644 Binary files a/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.lock and b/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.lock differ diff --git a/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.bin b/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.bin index 9c736fe1..f59dd5cc 100644 Binary files a/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.bin and b/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.bin differ diff --git a/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.lock b/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.lock index 1f90a939..f76389bc 100644 Binary files a/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.lock and b/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.lock differ diff --git a/src/Notes-master1/.gradle/7.2/fileHashes/resourceHashesCache.bin b/src/Notes-master1/.gradle/7.2/fileHashes/resourceHashesCache.bin index 137e6e77..26441a3c 100644 Binary files a/src/Notes-master1/.gradle/7.2/fileHashes/resourceHashesCache.bin and b/src/Notes-master1/.gradle/7.2/fileHashes/resourceHashesCache.bin differ diff --git a/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 74d7ec8a..1ce5aae4 100644 Binary files a/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin index fd6210fe..d9bab257 100644 Binary files a/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin and b/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/src/Notes-master1/.idea/dbnavigator.xml b/src/Notes-master1/.idea/dbnavigator.xml index dd4201fc..8567fda3 100644 --- a/src/Notes-master1/.idea/dbnavigator.xml +++ b/src/Notes-master1/.idea/dbnavigator.xml @@ -24,29 +24,28 @@ - + + + + + - + - - - - + + + - - + - - - - - + + @@ -75,7 +74,7 @@ - + @@ -162,93 +161,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Notes-master1/.idea/gradle.properties b/src/Notes-master1/.idea/gradle.properties new file mode 100644 index 00000000..e69de29b diff --git a/src/Notes-master1/.idea/misc.xml b/src/Notes-master1/.idea/misc.xml index 9431ee1c..025741e6 100644 --- a/src/Notes-master1/.idea/misc.xml +++ b/src/Notes-master1/.idea/misc.xml @@ -18,6 +18,15 @@ + + + + + + + + + diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/0/e/0e854f4195c0d44c8ada29e4ad9b0cb3970cb0e6 b/src/Notes-master1/.idea/sonarlint/issuestore/0/e/0e854f4195c0d44c8ada29e4ad9b0cb3970cb0e6 index c58e1462..54bd0128 100644 --- a/src/Notes-master1/.idea/sonarlint/issuestore/0/e/0e854f4195c0d44c8ada29e4ad9b0cb3970cb0e6 +++ b/src/Notes-master1/.idea/sonarlint/issuestore/0/e/0e854f4195c0d44c8ada29e4ad9b0cb3970cb0e6 @@ -34,44 +34,6 @@ java:S1319 T java:S1155-">Use isEmpty() to check whether the collection is empty or not.( S -java:S2589f"8Remove this expression which always evaluates to "false"(Ύ -S java:S2589>"8Remove this expression which always evaluates to "false"(Ύ -U -java:S1118&":Add a private constructor to hide the implicit public one.( -Z -java:S2147E"DCombine this catch with the one at line 67, which has the same body.(暩 -[ -java:S2147m"ECombine this catch with the one at line 107, which has the same body.(暩 -k -java:S3252"OUse static access with "net.micode.notes.data.Notes$DataColumns" for "NOTE_ID".( -m -java:S3252"QUse static access with "net.micode.notes.data.Notes$DataColumns" for "MIME_TYPE".( -f -java:S3252"OUse static access with "net.micode.notes.data.Notes$DataColumns" for "NOTE_ID".(ʹ -m -java:S3252"QUse static access with "net.micode.notes.data.Notes$DataColumns" for "MIME_TYPE".( -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 ("<>").(л -u -java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(ª -b -java:S1192D"GDefine a constant instead of duplicating this literal "%s: %s" 4 times.( -c -java:S1192y"HDefine a constant instead of duplicating this literal "=? AND " 4 times.( -J -java:S1066"/Merge this if statement with the enclosing one.(䲜 -v -java:S1319("`The type of "ids" should be an interface such as "Set" rather than the implementation "HashSet".( -{ -java:S1319S"`The type of "ids" should be an interface such as "Set" rather than the implementation "HashSet".(󆱋 - -java:S1319"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".( -T -java:S1155-">Use isEmpty() to check whether the collection is empty or not.( -S -java:S2589f"8Remove this expression which always evaluates to "false"(Ύ S -java:S2589>"8Remove this expression which always evaluates to "false"(Ύ \ No newline at end of file +java:S2589f"8Remove this expression which always evaluates to "false"(Ύ \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/1/e/1e8670b74afc171cd1cff4b54f19c5c5e2b275e2 b/src/Notes-master1/.idea/sonarlint/issuestore/1/e/1e8670b74afc171cd1cff4b54f19c5c5e2b275e2 new file mode 100644 index 00000000..e52aeadf --- /dev/null +++ b/src/Notes-master1/.idea/sonarlint/issuestore/1/e/1e8670b74afc171cd1cff4b54f19c5c5e2b275e2 @@ -0,0 +1,3 @@ + +> +java:S1604)"(Make this anonymous inner class a lambda(ʩ \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/3/2/322f2bcce3dd21425ff2a882b59142fb9d0cef8b b/src/Notes-master1/.idea/sonarlint/issuestore/3/2/322f2bcce3dd21425ff2a882b59142fb9d0cef8b new file mode 100644 index 00000000..3cdeafe7 --- /dev/null +++ b/src/Notes-master1/.idea/sonarlint/issuestore/3/2/322f2bcce3dd21425ff2a882b59142fb9d0cef8b @@ -0,0 +1,13 @@ + +U +java:S11181":Add a private constructor to hide the implicit public one.(͓ +^ +java:S1214@"CMove constants defined in this interfaces to another class or enum.(⸫ +Z +java:S1214"CMove constants defined in this interfaces to another class or enum.( +V +java:S1118":Add a private constructor to hide the implicit public one.( +Q +java:S1118":Add a private constructor to hide the implicit public one.(߀ +f +java:S11929"KDefine a constant instead of duplicating this literal "content://" 4 times.( \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/4/6/4623bd3eb8366c31819ef25a6dc50fee4400c6d6 b/src/Notes-master1/.idea/sonarlint/issuestore/4/6/4623bd3eb8366c31819ef25a6dc50fee4400c6d6 index add6a432..381fee83 100644 --- a/src/Notes-master1/.idea/sonarlint/issuestore/4/6/4623bd3eb8366c31819ef25a6dc50fee4400c6d6 +++ b/src/Notes-master1/.idea/sonarlint/issuestore/4/6/4623bd3eb8366c31819ef25a6dc50fee4400c6d6 @@ -1,23 +1,12 @@ m -java:S37766"RRefactor this method to reduce its Cognitive Complexity from 21 to the 15 allowed.( +java:S37768"RRefactor this method to reduce its Cognitive Complexity from 27 to the 15 allowed.( O -java:S1874B"9Remove this use of "setTextAppearance"; it is deprecated.( +java:S1874D"9Remove this use of "setTextAppearance"; it is deprecated.( O -java:S1874I"9Remove this use of "setTextAppearance"; it is deprecated.( +java:S1874K"9Remove this use of "setTextAppearance"; it is deprecated.( O -java:S1874S"9Remove this use of "setTextAppearance"; it is deprecated.( -f java:S117f"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -f java:S117k"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(㷔 -f java:S117l"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(Õ -m -java:S37766"RRefactor this method to reduce its Cognitive Complexity from 21 to the 15 allowed.( -O -java:S1874B"9Remove this use of "setTextAppearance"; it is deprecated.( -O -java:S1874I"9Remove this use of "setTextAppearance"; it is deprecated.( -O -java:S1874S"9Remove this use of "setTextAppearance"; it is deprecated.( -f java:S117f"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -f java:S117k"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(㷔 -f java:S117l"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(Õ \ No newline at end of file +java:S1874U"9Remove this use of "setTextAppearance"; it is deprecated.( +m java:S117s"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(8/ +m java:S117x"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(㷔8›/ +m java:S117y"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(Õ8/ \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/4/7/477514696ea40ffed472ce9039b069f29ff599fd b/src/Notes-master1/.idea/sonarlint/issuestore/4/7/477514696ea40ffed472ce9039b069f29ff599fd index 02404075..53f6aa9c 100644 --- a/src/Notes-master1/.idea/sonarlint/issuestore/4/7/477514696ea40ffed472ce9039b069f29ff599fd +++ b/src/Notes-master1/.idea/sonarlint/issuestore/4/7/477514696ea40ffed472ce9039b069f29ff599fd @@ -1,21 +1,11 @@ 3 -java:S2386A"Make this member "protected".( +java:S2386I"Make this member "protected".( 8 -java:S2386K"Make this member "protected".(㳎 +java:S2386S"Make this member "protected".(㳎 X -java:S1126"AReplace this if-then-else statement by a single return statement.( +java:S1126"AReplace this if-then-else statement by a single return statement.( ? -java:S1125"(Remove the unnecessary boolean literals.( +java:S1125"(Remove the unnecessary boolean literals.( F -java:S1066"/Merge this if statement with the enclosing one.( -3 -java:S2386A"Make this member "protected".( -8 -java:S2386K"Make this member "protected".(㳎 -X -java:S1126"AReplace this if-then-else statement by a single return statement.( -? -java:S1125"(Remove the unnecessary boolean literals.( -F -java:S1066"/Merge this if statement with the enclosing one.( \ No newline at end of file +java:S1066"/Merge this if statement with the enclosing one.( \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/5/3/53b98e6d0ece8f8c43934ef63db400be3bbe507c b/src/Notes-master1/.idea/sonarlint/issuestore/5/3/53b98e6d0ece8f8c43934ef63db400be3bbe507c new file mode 100644 index 00000000..a4843ed2 --- /dev/null +++ b/src/Notes-master1/.idea/sonarlint/issuestore/5/3/53b98e6d0ece8f8c43934ef63db400be3bbe507c @@ -0,0 +1,39 @@ + +7 +java:S1116,"Remove this empty statement.( +K +java:S1874/"5Remove this use of "CursorAdapter"; it is deprecated.( +J +java:S2864^"4Iterate over the "entrySet" instead of the "keySet".(਷ +B +java:S1125_"'Remove the unnecessary boolean literal.(ɯ +J +java:S2864n"4Iterate over the "entrySet" instead of the "keySet".(਷ +B +java:S1125o"'Remove the unnecessary boolean literal.(ɯ +A +java:S1168|"+Return an empty collection instead of null.( +C +java:S1125"'Remove the unnecessary boolean literal.( +t +java:S22930"YReplace the type specification in this constructor call with the diamond operator ("<>").(ə +o +java:S2293]"YReplace the type specification in this constructor call with the diamond operator ("<>").( +o +java:S2293m"YReplace the type specification in this constructor call with the diamond operator ("<>").(Ȫ +J +java:S1066U"/Merge this if statement with the enclosing one.(ڧ + +java:S1319\"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".( + +java:S1319l"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".( +j +java:S1104*"TMake widgetId a static final constant or non-public and provide accessors if needed.(ǎ +q +java:S1104+"VMake widgetType a static final constant or non-public and provide accessors if needed.(漬 +E +java:S5411_"*Use the primitive boolean expression here.(ɯ +E +java:S5411o"*Use the primitive boolean expression here.(ɯ +F +java:S5411"*Use the primitive boolean expression here.( \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/6/c/6c40630893054a28c13c2eb04ceb5fa51173b0b6 b/src/Notes-master1/.idea/sonarlint/issuestore/6/c/6c40630893054a28c13c2eb04ceb5fa51173b0b6 new file mode 100644 index 00000000..59add793 --- /dev/null +++ b/src/Notes-master1/.idea/sonarlint/issuestore/6/c/6c40630893054a28c13c2eb04ceb5fa51173b0b6 @@ -0,0 +1,84 @@ + +n +java:S1450"WRemove the "editText" field and declare it as a local variable in the relevant methods.( +n +java:S1450"WRemove the "mPattern" field and declare it as a local variable in the relevant methods.( +{ +java:S1149"_Replace the synchronized class "StringBuffer" by an unsynchronized one such as "StringBuilder".(᯲ +i java:S100"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( +n +java:S3776"RRefactor this method to reduce its Cognitive Complexity from 26 to the 15 allowed.(ݨ +W +java:S1874"@Remove this use of "SOFT_INPUT_ADJUST_RESIZE"; it is deprecated.(ѯ +\ +java:S1874"@Remove this use of "SOFT_INPUT_ADJUST_RESIZE"; it is deprecated.(ң +O +java:S1874"9Remove this use of "setTextAppearance"; it is deprecated.(( +K +java:S2864"4Iterate over the "entrySet" instead of the "keySet".(ԇ +N +java:S1135"2Complete the task associated to this TODO comment.( +8 +java:S1116"Remove this empty statement.( +X +java:S1126"AReplace this if-then-else statement by a single return statement.( +8 +java:S1116"Remove this empty statement.( +P +java:S1874"9Remove this use of "PreferenceManager"; it is deprecated.( +Z +java:S1874"CRemove this use of "getDefaultSharedPreferences"; it is deprecated.( +U +java:S1874"9Remove this use of "setTextAppearance"; it is deprecated.( +G +java:S1874"0Remove this use of "getColor"; it is deprecated.( +d +java:S3252"MUse static access with "android.text.Spanned" for "SPAN_INCLUSIVE_EXCLUSIVE".( +U +java:S1874"9Remove this use of "setTextAppearance"; it is deprecated.( +T +java:S1874"=Remove this use of "EXTRA_SHORTCUT_INTENT"; it is deprecated.(ð +R +java:S1874";Remove this use of "EXTRA_SHORTCUT_NAME"; it is deprecated.( +[ +java:S1874"DRemove this use of "EXTRA_SHORTCUT_ICON_RESOURCE"; it is deprecated.(Ǿ +i java:S100"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( +p java:S100"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ְ8Ԯ/ +J +java:S1068",Remove this unused "editText" private field.(8/ +t +java:S2293`"YReplace the type specification in this constructor call with the diamond operator ("<>").(ӏ +t +java:S2293i"YReplace the type specification in this constructor call with the diamond operator ("<>").( +t +java:S2293r"YReplace the type specification in this constructor call with the diamond operator ("<>").( +o +java:S2293z"YReplace the type specification in this constructor call with the diamond operator ("<>").( +p +java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥 +l java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( +l java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ӏ +? +java:S1604"(Make this anonymous inner class a lambda(ά +? +java:S1604"(Make this anonymous inner class a lambda( +? +java:S1604"(Make this anonymous inner class a lambda(ߒ +? +java:S1604"(Make this anonymous inner class a lambda( +K +java:S1604"(Make this anonymous inner class a lambda(8/ +F +java:S1604"(Make this anonymous inner class a lambda(ά8ᮼ/ +q +java:S1104U"VMake tvModified a static final constant or non-public and provide accessors if needed.(ԣ +r +java:S1104W"WMake ivAlertIcon a static final constant or non-public and provide accessors if needed.(න +r +java:S1104Y"WMake tvAlertDate a static final constant or non-public and provide accessors if needed.( +s +java:S1104["XMake ibSetBgColor a static final constant or non-public and provide accessors if needed.( +h +java:S1104]"RMake ivLock a static final constant or non-public and provide accessors if needed.(ؕ +O +java:S3516"9Refactor this method to not always return the same value.(l \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/7/b/7bccae5ecd745bba36ddfd464ec07b66de678477 b/src/Notes-master1/.idea/sonarlint/issuestore/7/b/7bccae5ecd745bba36ddfd464ec07b66de678477 index 26116a43..439ace7c 100644 --- a/src/Notes-master1/.idea/sonarlint/issuestore/7/b/7bccae5ecd745bba36ddfd464ec07b66de678477 +++ b/src/Notes-master1/.idea/sonarlint/issuestore/7/b/7bccae5ecd745bba36ddfd464ec07b66de678477 @@ -1,101 +1,106 @@ i -java:S3008^"SRename this field "VIEW_WAY" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( +java:S3008_"SRename this field "VIEW_WAY" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( 7 -java:S1116d"Remove this empty statement.( +java:S1116e"Remove this empty statement.( a -java:S1124"EReorder the modifiers to comply with the Java Language Specification.( +java:S1124"EReorder the modifiers to comply with the Java Language Specification.( [ -java:S1124"EReorder the modifiers to comply with the Java Language Specification.(Ѿk +java:S1124"EReorder the modifiers to comply with the Java Language Specification.(Ѿk n -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.( +java:S3776"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.( 2 -java:S3626"Remove this redundant jump.(݅ +java:S3626"Remove this redundant jump.(݅ 2 -java:S3626"Remove this redundant jump.(݅ +java:S3626"Remove this redundant jump.(݅ 2 -java:S3626"Remove this redundant jump.(݅ +java:S3626"Remove this redundant jump.(݅ P -java:S1874"9Remove this use of "PreferenceManager"; it is deprecated.(­ +java:S1874"9Remove this use of "PreferenceManager"; it is deprecated.(­ Z -java:S1874"CRemove this use of "getDefaultSharedPreferences"; it is deprecated.(­ +java:S1874"CRemove this use of "getDefaultSharedPreferences"; it is deprecated.(­ N -java:S1135"2Complete the task associated to this TODO comment.(̐ +java:S1135"2Complete the task associated to this TODO comment.(̐ F -java:S2093"*Change this "try" to a try-with-resources.( +java:S2093"*Change this "try" to a try-with-resources.( o -java:S1450"XRemove the "mMoveMenu" field and declare it as a local variable in the relevant methods.( +java:S1450"XRemove the "mMoveMenu" field and declare it as a local variable in the relevant methods.( n -java:S3252"RUse static access with "android.widget.AbsListView" for "MultiChoiceModeListener".( +java:S3252"RUse static access with "android.widget.AbsListView" for "MultiChoiceModeListener".( N -java:S1135"2Complete the task associated to this TODO comment.( +java:S1135"2Complete the task associated to this TODO comment.( N -java:S1135"2Complete the task associated to this TODO comment.( -\ -java:S1874"9Remove this use of "getDefaultDisplay"; it is deprecated.(ĸ8/ +java:S1135"2Complete the task associated to this TODO comment.( +U +java:S1874"9Remove this use of "getDefaultDisplay"; it is deprecated.(ĸ M -java:S1874"1Remove this use of "getHeight"; it is deprecated.( +java:S1874"1Remove this use of "getHeight"; it is deprecated.( 8 -java:S1116"Remove this empty statement.( +java:S1116"Remove this empty statement.( i -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 29 to the 15 allowed.( +java:S3776"RRefactor this method to reduce its Cognitive Complexity from 29 to the 15 allowed.( F -java:S1874"1Remove this use of "AsyncTask"; it is deprecated.(? -? java:S108")Either remove or fill this block of code.(ʥ +java:S1874"1Remove this use of "AsyncTask"; it is deprecated.(? +? java:S108")Either remove or fill this block of code.(ʥ a -java:S1874"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(Ϳ +java:S1874"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(Ϳ K -java:S1874"/Remove this use of "execute"; it is deprecated.(嫏 +java:S1874"/Remove this use of "execute"; it is deprecated.(嫏 h -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 20 to the 15 allowed.(# +java:S3776"RRefactor this method to reduce its Cognitive Complexity from 20 to the 15 allowed.(# N -java:S1135"2Complete the task associated to this TODO comment.( +java:S1135"2Complete the task associated to this TODO comment.( ^ -java:S1126"BReplace this if-then-else statement by a single method invocation.(玒 +java:S1126"BReplace this if-then-else statement by a single method invocation.(玒 N -java:S1135"2Complete the task associated to this TODO comment.( +java:S1135"2Complete the task associated to this TODO comment.( M -java:S2696"6Make the enclosing method "static" or remove this set.( +java:S2696"6Make the enclosing method "static" or remove this set.( M -java:S2696"6Make the enclosing method "static" or remove this set.( +java:S2696"6Make the enclosing method "static" or remove this set.( M -java:S1874"1Remove this use of "AsyncTask"; it is deprecated.(Ч +java:S1874"1Remove this use of "AsyncTask"; it is deprecated.(Ч f -java:S1874"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(ች +java:S1874"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(ች K -java:S1874"/Remove this use of "execute"; it is deprecated.(嫏 +java:S1874"/Remove this use of "execute"; it is deprecated.(嫏 h -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(b +java:S3776"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(b +g java:S128"LEnd this switch case with an unconditional break, return or throw statement.(δ +K +java:S3398"/Move this method into "BackgroundQueryHandler".( < -java:S3398"%Move this method into "ModeCallback".( +java:S3398"%Move this method into "ModeCallback".( A -java:S3398"%Move this method into "ModeCallback".( -K -java:S3398"/Move this method into "BackgroundQueryHandler".( +java:S3398"%Move this method into "ModeCallback".( G -java:S3398"0Move this method into "OnListItemClickListener".( +java:S3398"0Move this method into "OnListItemClickListener".( p -java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥 +java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥 b -java:S1192"FDefine a constant instead of duplicating this literal " AND " 5 times.( +java:S1192"FDefine a constant instead of duplicating this literal " AND " 5 times.( ] -java:S1192"FDefine a constant instead of duplicating this literal " DESC" 4 times.( -g java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( +java:S1192"FDefine a constant instead of duplicating this literal " DESC" 4 times.( +g java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( > -java:S1604"(Make this anonymous inner class a lambda(̺V +java:S1604"(Make this anonymous inner class a lambda(̺V +? +java:S1604"(Make this anonymous inner class a lambda(ά ? -java:S1604"(Make this anonymous inner class a lambda(ά +java:S1604"(Make this anonymous inner class a lambda(ܴ ? -java:S1604"(Make this anonymous inner class a lambda(ܴ +java:S1604"(Make this anonymous inner class a lambda( D -java:S1604"(Make this anonymous inner class a lambda( +java:S1604"(Make this anonymous inner class a lambda( +D +java:S1604"(Make this anonymous inner class a lambda( ? -java:S1604"(Make this anonymous inner class a lambda( +java:S1604"(Make this anonymous inner class a lambda( ? -java:S1604"(Make this anonymous inner class a lambda(۱ +java:S1604"(Make this anonymous inner class a lambda(۱ ? -java:S1604"(Make this anonymous inner class a lambda(ά +java:S1604"(Make this anonymous inner class a lambda(ά g -java:S1301"KReplace this "switch" statement by "if" statements to increase readability.(ד -a -java:S2583"CChange this condition so that it does not always evaluate to "true"(8/ \ No newline at end of file +java:S1301"KReplace this "switch" statement by "if" statements to increase readability.(ד +Z +java:S2583"CChange this condition so that it does not always evaluate to "true"( \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/c/1/c10e14da9454435dc446fb22e21efef63afaf7fd b/src/Notes-master1/.idea/sonarlint/issuestore/c/1/c10e14da9454435dc446fb22e21efef63afaf7fd new file mode 100644 index 00000000..aff35b7e --- /dev/null +++ b/src/Notes-master1/.idea/sonarlint/issuestore/c/1/c10e14da9454435dc446fb22e21efef63afaf7fd @@ -0,0 +1,7 @@ + +3 +java:S2386!"Make this member "protected".(Ꙗ +K +java:S1874*"5Remove this use of "CursorAdapter"; it is deprecated.(ж +M +java:S1135+"2Complete the task associated to this TODO comment.( \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/d/8/d8a02a8652b122905e3406dbc06e48f48ca280f7 b/src/Notes-master1/.idea/sonarlint/issuestore/d/8/d8a02a8652b122905e3406dbc06e48f48ca280f7 new file mode 100644 index 00000000..776619b3 --- /dev/null +++ b/src/Notes-master1/.idea/sonarlint/issuestore/d/8/d8a02a8652b122905e3406dbc06e48f48ca280f7 @@ -0,0 +1,33 @@ + +Y +java:S1214#"CMove constants defined in this interfaces to another class or enum.( +v +java:S11927"[Define a constant instead of duplicating this literal " TEXT NOT NULL DEFAULT ''," 5 times.(޿ +c +java:S1192_"HDefine a constant instead of duplicating this literal " BEGIN " 4 times.( +a +java:S1192n"FDefine a constant instead of duplicating this literal "=old." 6 times.( +c +java:S1192"GDefine a constant instead of duplicating this literal " BEGIN" 6 times.( +t +java:S11920"^Define a constant instead of duplicating this literal " INTEGER NOT NULL DEFAULT 0," 14 times.( +_ +java:S1192b"IDefine a constant instead of duplicating this literal " WHERE " 8 times.(랰 +s +java:S1192"\Define a constant instead of duplicating this literal " INTEGER NOT NULL DEFAULT 0" 3 times.( +\ +java:S1192b"FDefine a constant instead of duplicating this literal "=new." 6 times.(랰 +i +java:S1192"MDefine a constant instead of duplicating this literal " ADD COLUMN " 6 times.( +h +java:S1192"RDefine a constant instead of duplicating this literal " AFTER DELETE ON " 3 times.(B +i +java:S1192"MDefine a constant instead of duplicating this literal "ALTER TABLE " 6 times.( +c +java:S1192a"HDefine a constant instead of duplicating this literal " SET " 8 times.(˓ +` +java:S1192`"JDefine a constant instead of duplicating this literal " UPDATE " 8 times.( +o +java:S1192C"ZDefine a constant instead of duplicating this literal " TEXT NOT NULL DEFAULT ''" 4 times.(] + +java:S11923"yDefine a constant instead of duplicating this literal " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," 4 times.( \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/d/9/d92e16000f49ca8e38a8b0a8ef8d26ecfa0c30ff b/src/Notes-master1/.idea/sonarlint/issuestore/d/9/d92e16000f49ca8e38a8b0a8ef8d26ecfa0c30ff index d2e7ba01..7516209c 100644 --- a/src/Notes-master1/.idea/sonarlint/issuestore/d/9/d92e16000f49ca8e38a8b0a8ef8d26ecfa0c30ff +++ b/src/Notes-master1/.idea/sonarlint/issuestore/d/9/d92e16000f49ca8e38a8b0a8ef8d26ecfa0c30ff @@ -1,21 +1,11 @@ s -java:S4144"\Update this method so that its implementation is not identical to "getParentId" on line 185.( +java:S4144"\Update this method so that its implementation is not identical to "getParentId" on line 197.( > -java:S1125T"(Remove the unnecessary boolean literals.( +java:S1125]"(Remove the unnecessary boolean literals.( m -java:S3776p"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.( +java:S3776|"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.( C -java:S1125q"(Remove the unnecessary boolean literals.( +java:S1125}"(Remove the unnecessary boolean literals.( > -java:S1125r"(Remove the unnecessary boolean literals.( -s -java:S4144"\Update this method so that its implementation is not identical to "getParentId" on line 185.( -> -java:S1125T"(Remove the unnecessary boolean literals.( -m -java:S3776p"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.( -C -java:S1125q"(Remove the unnecessary boolean literals.( -> -java:S1125r"(Remove the unnecessary boolean literals.( \ No newline at end of file +java:S1125~"(Remove the unnecessary boolean literals.( \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/f/b/fb98ad3ee41ad2c62d8779eb8a7a0b3a8afb6645 b/src/Notes-master1/.idea/sonarlint/issuestore/f/b/fb98ad3ee41ad2c62d8779eb8a7a0b3a8afb6645 new file mode 100644 index 00000000..e2674039 --- /dev/null +++ b/src/Notes-master1/.idea/sonarlint/issuestore/f/b/fb98ad3ee41ad2c62d8779eb8a7a0b3a8afb6645 @@ -0,0 +1,15 @@ + +\ +java:S1126~"AReplace this if-then-else statement by a single return statement.(Ʒ +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 243, which has the same body.(暩 +u +java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(л +j +java:S1192@"ODefine a constant instead of duplicating this literal "Wrong note id:" 3 times.( +U +java:S1155">Use isEmpty() to check whether the collection is empty or not.( +O +java:S2589"8Remove this expression which always evaluates to "false"( \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/f/e/fef8f2c22f47dd30d58ab667a0d7228194d7051f b/src/Notes-master1/.idea/sonarlint/issuestore/f/e/fef8f2c22f47dd30d58ab667a0d7228194d7051f new file mode 100644 index 00000000..cf1a80f0 --- /dev/null +++ b/src/Notes-master1/.idea/sonarlint/issuestore/f/e/fef8f2c22f47dd30d58ab667a0d7228194d7051f @@ -0,0 +1,14 @@ + +M +java:S1135c"2Complete the task associated to this TODO comment.( +< java:S131h""Add a default case to this switch.( +^ +java:S1126"BReplace this if-then-else statement by a single method invocation.(忥 +P +java:S2864"4Iterate over the "entrySet" instead of the "keySet".(Κ +o +java:S22931"YReplace the type specification in this constructor call with the diamond operator ("<>").( +D +java:S1604"(Make this anonymous inner class a lambda( +f +java:S1301h"KReplace this "switch" statement by "if" statements to increase readability.( \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/index.pb b/src/Notes-master1/.idea/sonarlint/issuestore/index.pb index c00ecfa3..b3bcaba6 100644 --- a/src/Notes-master1/.idea/sonarlint/issuestore/index.pb +++ b/src/Notes-master1/.idea/sonarlint/issuestore/index.pb @@ -89,13 +89,29 @@ h 8app/src/main/java/net/micode/notes/ui/NotesListItem.java,5\d\5dfe6902d8ec740690f88d644e74362c3be08fad < build.gradle,f\0\f07866736216be0ee2aba49e392191aeae700a35 -d -4src/main/java/net/micode/notes/ui/NotesListItem.java,4\6\4623bd3eb8366c31819ef25a6dc50fee4400c6d6 +c +3src/main/java/net/micode/notes/ui/DropdownMenu.java,1\e\1e8670b74afc171cd1cff4b54f19c5c5e2b275e2 b 2src/main/java/net/micode/notes/tool/DataUtils.java,0\e\0e854f4195c0d44c8ada29e4ad9b0cb3970cb0e6 -c -3src/main/java/net/micode/notes/ui/NoteItemData.java,d\9\d92e16000f49ca8e38a8b0a8ef8d26ecfa0c30ff +^ +.src/main/java/net/micode/notes/model/Note.java,f\b\fb98ad3ee41ad2c62d8779eb8a7a0b3a8afb6645 +l + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -64,6 +645,7 @@ @@ -99,8 +681,9 @@ + - + @@ -109,6 +692,11 @@ + + + + + @@ -197,49 +785,44 @@ file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 149 + 150 file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 282 + 283 file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 976 + 1010 file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 834 + 868 file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 288 + 289 file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 364 + 365 file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 574 - - - file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 577 + 612 file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 640 + 675 diff --git a/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar index e05373c5..61515124 100644 Binary files a/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin index 1f8ababb..f6c4d0ec 100644 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin index ea7c2ec4..96f9420a 100644 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin index 9f265c18..91cbfdc7 100644 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin index dc48e82c..9cd66ec5 100644 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_056c9ff9f01f5b0ff60a1d0b5eaf3d3db1d0da0a2aa87fe1669a154eb7c58529_bucket_0/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5a4f98e904550470630ccd2e9184ffd356634f14ea3b6d426bb7c371337589b0_bucket_0/graph.bin similarity index 100% rename from src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_056c9ff9f01f5b0ff60a1d0b5eaf3d3db1d0da0a2aa87fe1669a154eb7c58529_bucket_0/graph.bin rename to src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5a4f98e904550470630ccd2e9184ffd356634f14ea3b6d426bb7c371337589b0_bucket_0/graph.bin diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_056c9ff9f01f5b0ff60a1d0b5eaf3d3db1d0da0a2aa87fe1669a154eb7c58529_bucket_1/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5a4f98e904550470630ccd2e9184ffd356634f14ea3b6d426bb7c371337589b0_bucket_1/graph.bin similarity index 100% rename from src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_056c9ff9f01f5b0ff60a1d0b5eaf3d3db1d0da0a2aa87fe1669a154eb7c58529_bucket_1/graph.bin rename to src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5a4f98e904550470630ccd2e9184ffd356634f14ea3b6d426bb7c371337589b0_bucket_1/graph.bin diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_056c9ff9f01f5b0ff60a1d0b5eaf3d3db1d0da0a2aa87fe1669a154eb7c58529_bucket_2/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5a4f98e904550470630ccd2e9184ffd356634f14ea3b6d426bb7c371337589b0_bucket_2/graph.bin similarity index 100% rename from src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_056c9ff9f01f5b0ff60a1d0b5eaf3d3db1d0da0a2aa87fe1669a154eb7c58529_bucket_2/graph.bin rename to src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5a4f98e904550470630ccd2e9184ffd356634f14ea3b6d426bb7c371337589b0_bucket_2/graph.bin diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_056c9ff9f01f5b0ff60a1d0b5eaf3d3db1d0da0a2aa87fe1669a154eb7c58529_bucket_3/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5a4f98e904550470630ccd2e9184ffd356634f14ea3b6d426bb7c371337589b0_bucket_3/graph.bin similarity index 100% rename from src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_056c9ff9f01f5b0ff60a1d0b5eaf3d3db1d0da0a2aa87fe1669a154eb7c58529_bucket_3/graph.bin rename to src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5a4f98e904550470630ccd2e9184ffd356634f14ea3b6d426bb7c371337589b0_bucket_3/graph.bin diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_056c9ff9f01f5b0ff60a1d0b5eaf3d3db1d0da0a2aa87fe1669a154eb7c58529_bucket_4/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5a4f98e904550470630ccd2e9184ffd356634f14ea3b6d426bb7c371337589b0_bucket_4/graph.bin similarity index 100% rename from src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_056c9ff9f01f5b0ff60a1d0b5eaf3d3db1d0da0a2aa87fe1669a154eb7c58529_bucket_4/graph.bin rename to src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5a4f98e904550470630ccd2e9184ffd356634f14ea3b6d426bb7c371337589b0_bucket_4/graph.bin diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_056c9ff9f01f5b0ff60a1d0b5eaf3d3db1d0da0a2aa87fe1669a154eb7c58529_bucket_5/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5a4f98e904550470630ccd2e9184ffd356634f14ea3b6d426bb7c371337589b0_bucket_5/graph.bin similarity index 100% rename from src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_056c9ff9f01f5b0ff60a1d0b5eaf3d3db1d0da0a2aa87fe1669a154eb7c58529_bucket_5/graph.bin rename to src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5a4f98e904550470630ccd2e9184ffd356634f14ea3b6d426bb7c371337589b0_bucket_5/graph.bin diff --git a/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index eab17f71..7ed0db12 100644 Binary files a/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index 56c56733..5c6f621e 100644 Binary files a/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index 5f73504e..d86314b8 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index 31c6a6ee..40de823c 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties index a345ff20..9e0ac62d 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties +++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties @@ -1,97 +1,100 @@ -#Thu Nov 04 15:41:45 CST 2021 -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\raw\\introduction=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\call_record.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_dropdown.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit_list_item.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_item.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable\\new_note.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_small.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_background.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\settings_header.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\raw-zh-rCN\\introduction=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_list.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_footer.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\add_account_text.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_edit_text.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_list.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\widget_4x.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\menu\\trash_folder.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_trash_folder.xml.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\datetime_picker.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\menu\\sub_folder.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\color\\primary_text_dark.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\account_dialog_title.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\xml\\widget_4x_info.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\menu\\call_note_edit.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_super.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\color\\secondary_text_dark.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\delete.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\folder_list_item.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\menu\\call_record_folder.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\xml\\widget_2x_info.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\notification.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\clock.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\xml\\searchable.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\widget_2x.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_edit.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\selected.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_options.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\xml\\preferences.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat -E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat +#Sun Nov 07 20:11:29 CST 2021 +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_edit_text.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\color\\secondary_text_dark.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_list.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_input_passwd.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_input_passwd.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\xml\\preferences.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\sub_folder.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit_list_item.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_footer.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_super.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\xml\\widget_2x_info.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_dropdown.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_add_secret.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_add_secret.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\color\\primary_text_dark.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\raw-zh-rCN\\introduction=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\widget_2x.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\settings_header.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\xml\\widget_4x_info.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\notification.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_background.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\call_record.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\trash_folder.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_trash_folder.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_options.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\add_account_text.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\call_note_edit.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_small.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\lock.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_lock.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\datetime_picker.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\delete.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable\\new_note.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\folder_list_item.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_list.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\raw\\introduction=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\account_dialog_title.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\selected.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_item.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_edit.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\widget_4x.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\xml\\searchable.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\call_record_folder.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\clock.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-af/values-af.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-af/values-af.xml deleted file mode 100644 index d8fe69b8..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-af/values-af.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "Navigeer tuis" - "Navigeer op" - "Nog opsies" - "Klaar" - "Sien alles" - "Kies \'n program" - "AF" - "AAN" - "Alt+" - "Ctrl+" - "delete" - "enter" - "Funksie+" - "Meta+" - "Shift+" - "spasiebalk" - "Simbool+" - "Kieslys+" - "Soek …" - "Vee navraag uit" - "Soeknavraag" - "Soek" - "Dien navraag in" - "Stemsoektog" - "Deel met" - "Deel met %s" - "Vou in" - "Soek" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-am/values-am.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-am/values-am.xml deleted file mode 100644 index 10291357..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-am/values-am.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "ወደ መነሻ ይዳስሱ" - "ወደ ላይ ይዳስሱ" - "ተጨማሪ አማራጮች" - "ተከናውኗል" - "ሁሉንም ይመልከቱ" - "መተግበሪያ ይምረጡ" - "ጠፍቷል" - "በርቷል" - "Alt+" - "Ctrl+" - "ሰርዝ" - "enter" - "Function+" - "Meta+" - "Shift+" - "space" - "Sym+" - "ምናሌ+" - "ፈልግ…" - "መጠይቅ አጽዳ" - "የፍለጋ ጥያቄ" - "ፍለጋ" - "መጠይቅ ያስረክቡ" - "የድምፅ ፍለጋ" - "ከሚከተለው ጋር ያጋሩ" - "ከ%s ጋር አጋራ" - "ሰብስብ" - "ፈልግ" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ar/values-ar.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ar/values-ar.xml deleted file mode 100644 index e7fb419b..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ar/values-ar.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "التنقل إلى الشاشة الرئيسية" - "التنقل إلى أعلى" - "خيارات إضافية" - "تم" - "عرض الكل" - "اختيار تطبيق" - "إيقاف" - "تشغيل" - "Alt+" - "Ctrl+" - "delete" - "enter" - "Function+" - "Meta+" - "Shift+" - "space" - "Sym+" - "القائمة+" - "بحث…" - "محو طلب البحث" - "طلب البحث" - "بحث" - "إرسال طلب البحث" - "البحث الصوتي" - "مشاركة مع" - "مشاركة مع %s" - "تصغير" - "البحث" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-as/values-as.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-as/values-as.xml deleted file mode 100644 index 2287e53b..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-as/values-as.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "গৃহ পৃষ্ঠালৈ যাওক" - "ওপৰলৈ যাওক" - "অধিক বিকল্প" - "সম্পন্ন কৰা হ\'ল" - "সকলো চাওক" - "এটা এপ্ বাছনি কৰক" - "অফ কৰক" - "অন কৰক" - "Alt+" - "CTRL+" - "মচক" - "এণ্টাৰ" - "ফাংশ্বন+" - "মেটা+" - "শ্বিফ্ট+" - "স্পেচ" - "Sym+" - "মেনু+" - "অনুসন্ধান কৰক…" - "প্ৰশ্ন মচক" - "সন্ধান কৰিব খোজা প্ৰশ্ন" - "সন্ধান কৰক" - "প্ৰশ্ন দাখিল কৰক" - "কণ্ঠধ্বনিৰ যোগেৰে সন্ধান কৰক" - "ইয়াৰ জৰিয়তে শ্বেয়াৰ কৰক" - "%sৰ জৰিয়তে শ্বেয়াৰ কৰক" - "সংকুচিত কৰক" - "অনুসন্ধান কৰক" - "৯৯৯+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-az/values-az.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-az/values-az.xml deleted file mode 100644 index 8bbbd5bf..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-az/values-az.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "Evə naviqasiya et" - "Yuxarı get" - "Digər variantlar" - "Hazırdır" - "Hamısına baxın" - "Tətbiq seçin" - "DEAKTİV" - "AKTİV" - "Alt+" - "Ctrl+" - "silin" - "daxil olun" - "Funksiya+" - "Meta+" - "Shift+" - "kosmos" - "Sym+" - "Menyu+" - "Axtarış..." - "Sorğunu təmizlə" - "Axtarış sorğusu" - "Axtarış" - "Sorğunu göndərin" - "Səsli axtarış" - "Bununla paylaşın" - "%s ilə paylaşın" - "Yığışdırın" - "Axtarış" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-b+sr+Latn/values-b+sr+Latn.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-b+sr+Latn/values-b+sr+Latn.xml deleted file mode 100644 index 77f07c21..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-b+sr+Latn/values-b+sr+Latn.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "Odlazak na Početnu" - "Kretanje nagore" - "Još opcija" - "Gotovo" - "Prikaži sve" - "Izbor aplikacije" - "ISKLJUČI" - "UKLJUČI" - "Alt+" - "Ctrl+" - "delete" - "enter" - "Function+" - "Meta+" - "Shift+" - "taster za razmak" - "Sym+" - "Menu+" - "Pretražite..." - "Brisanje upita" - "Upit za pretragu" - "Pretraga" - "Slanje upita" - "Glasovna pretraga" - "Deli sa" - "Deljenje sa aplikacijom %s" - "Skupi" - "Pretraži" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-be/values-be.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-be/values-be.xml deleted file mode 100644 index a0019be8..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-be/values-be.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "Перайсці на галоўную старонку" - "Перайсці ўверх" - "Дадатковыя параметры" - "Гатова" - "Прагледзець усё" - "Выбраць праграму" - "ВЫКЛ." - "УКЛ." - "Alt +" - "Ctrl +" - "Delete" - "Enter" - "Fn +" - "Meta +" - "Shift +" - "Прабел" - "Sym +" - "Меню +" - "Пошук..." - "Выдалiць запыт" - "Запыт на пошук" - "Пошук" - "Адправіць запыт" - "Галасавы пошук" - "Абагуліць з" - "Абагуліць праз праграму %s" - "Згарнуць" - "Пошук" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-bg/values-bg.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-bg/values-bg.xml deleted file mode 100644 index ce1cb44f..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-bg/values-bg.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "Придвижване към „Начало“" - "Придвижване нагоре" - "Още опции" - "Готово" - "Вижте всички" - "Изберете приложение" - "ИЗКЛ." - "ВКЛ." - "Alt+" - "Ctrl+" - "delete" - "enter" - "Function+" - "Meta+" - "Shift+" - "клавиша за интервал" - "Sym+" - "Menu+" - "Търсете…" - "Изчистване на заявката" - "Заявка за търсене" - "Търсене" - "Изпращане на заявката" - "Гласово търсене" - "Споделяне със:" - "Споделяне със: %s" - "Свиване" - "Търсене" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-bn/values-bn.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-bn/values-bn.xml deleted file mode 100644 index b9e182a2..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-bn/values-bn.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "হোম এ নেভিগেট করুন" - "উপরের দিকে নেভিগেট করুন" - "আরও বিকল্প" - "সম্পন্ন হয়েছে" - "সবগুলো দেখুন" - "একটি অ্যাপ্লিকেশান বেছে নিন" - "বন্ধ" - "চালু" - "Alt+" - "Ctrl+" - "মুছুন" - "enter" - "Function+" - "Meta+" - "Shift+" - "স্পেস" - "Sym+" - "মেনু+" - "অনুসন্ধান..." - "ক্যোয়ারী সাফ করুন" - "ক্যোয়ারী খুঁজুন" - "খুঁজুন" - "ক্যোয়ারী জমা দিন" - "ভয়েস অনুসন্ধান" - "এর সাথে শেয়ার করুন" - "%s এর সাথে শেয়ার করুন" - "সঙ্কুচিত করুন" - "খুঁজুন" - "৯৯৯+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-bs/values-bs.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-bs/values-bs.xml deleted file mode 100644 index bc8630d8..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-bs/values-bs.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "Vrati se na početnu stranicu" - "Navigiraj prema gore" - "Više opcija" - "Gotovo" - "Prikaži sve" - "Odaberite aplikaciju" - "ISKLJUČI" - "UKLJUČI" - "Alt+" - "Ctrl+" - "delete" - "enter" - "Function+" - "Meta+" - "Shift+" - "razmaknica" - "Sym+" - "Menu+" - "Pretraži..." - "Obriši upit" - "Pretraži upit" - "Traži" - "Pošalji upit" - "Glasovno pretraživanje" - "Dijeli sa" - "Dijeli koristeći aplikaciju %s" - "Skupi" - "Pretraži" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ca/values-ca.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ca/values-ca.xml deleted file mode 100644 index 833039e1..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ca/values-ca.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "Navega a la pàgina d\'inici" - "Navega cap a dalt" - "Més opcions" - "Fet" - "Mostra\'ls tots" - "Selecciona una aplicació" - "DESACTIVAT" - "ACTIVAT" - "Alt+" - "Ctrl+" - "Supr" - "Retorn" - "Funció+" - "Meta+" - "Maj+" - "Espai" - "Sym+" - "Menú+" - "Cerca..." - "Esborra la consulta" - "Consulta de cerca" - "Cerca" - "Envia la consulta" - "Cerca per veu" - "Comparteix amb" - "Comparteix amb %s" - "Replega" - "Cerca" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-cs/values-cs.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-cs/values-cs.xml deleted file mode 100644 index a5878ca6..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-cs/values-cs.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "Přejít na plochu" - "Přejít nahoru" - "Více možností" - "Hotovo" - "Zobrazit vše" - "Vybrat aplikaci" - "VYPNUTO" - "ZAPNUTO" - "Alt+" - "Ctrl+" - "delete" - "enter" - "Fn+" - "Meta+" - "Shift+" - "mezerník" - "Sym+" - "Menu+" - "Vyhledat…" - "Smazat dotaz" - "Vyhledávací dotaz" - "Hledat" - "Odeslat dotaz" - "Hlasové vyhledávání" - "Sdílet pomocí" - "Sdílet s aplikací %s" - "Sbalit" - "Hledat" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-da/values-da.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-da/values-da.xml deleted file mode 100644 index 7ae28b44..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-da/values-da.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "Naviger hjem" - "Naviger op" - "Flere muligheder" - "Luk" - "Se alle" - "Vælg en app" - "FRA" - "TIL" - "Alt+" - "Ctrl+" - "delete" - "enter" - "Fn+" - "Meta+" - "Shift+" - "mellemrum" - "Sym+" - "Menu+" - "Søg…" - "Ryd forespørgslen" - "Søgeforespørgsel" - "Søg" - "Indsend forespørgslen" - "Talesøgning" - "Del med" - "Del med %s" - "Skjul" - "Søg" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-de/values-de.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-de/values-de.xml deleted file mode 100644 index d2f85104..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-de/values-de.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "Zur Startseite" - "Nach oben" - "Weitere Optionen" - "Fertig" - "Alle ansehen" - "App auswählen" - "Aus" - "An" - "Alt +" - "Strg +" - "Löschen" - "Eingabetaste" - "Funktionstaste +" - "Meta-Taste +" - "Umschalttaste +" - "Leertaste +" - "Sym-Taste +" - "Menütaste +" - "Suchen…" - "Suchanfrage löschen" - "Suchanfrage" - "Suchen" - "Suchanfrage senden" - "Sprachsuche" - "Freigeben für" - "Mit %s teilen" - "Minimieren" - "Suchen" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-el/values-el.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-el/values-el.xml deleted file mode 100644 index de7398c3..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-el/values-el.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "Πλοήγηση στην αρχική σελίδα" - "Πλοήγηση προς τα επάνω" - "Περισσότερες επιλογές" - "Τέλος" - "Προβολή όλων" - "Επιλέξτε κάποια εφαρμογή" - "ΑΠΕΝΕΡΓΟΠΟΙΗΣΗ" - "ΕΝΕΡΓΟΠΟΙΗΣΗ" - "Alt+" - "Ctrl+" - "delete" - "enter" - "Function+" - "Meta+" - "Shift+" - "διάστημα" - "Sym+" - "Menu+" - "Αναζήτηση…" - "Διαγραφή ερωτήματος" - "Ερώτημα αναζήτησης" - "Αναζήτηση" - "Υποβολή ερωτήματος" - "Φωνητική αναζήτηση" - "Κοινή χρήση με" - "Κοινή χρήση με %s" - "Σύμπτυξη" - "Αναζήτηση" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rAU/values-en-rAU.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rAU/values-en-rAU.xml deleted file mode 100644 index 0b21ff79..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rAU/values-en-rAU.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "Navigate home" - "Navigate up" - "More options" - "Done" - "See all" - "Choose an app" - "OFF" - "ON" - "Alt+" - "Ctrl+" - "delete" - "enter" - "Function+" - "Meta+" - "Shift+" - "space" - "Sym+" - "Menu+" - "Search…" - "Clear query" - "Search query" - "Search" - "Submit query" - "Voice search" - "Share with" - "Share with %s" - "Collapse" - "Search" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rCA/values-en-rCA.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rCA/values-en-rCA.xml deleted file mode 100644 index 0b21ff79..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rCA/values-en-rCA.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "Navigate home" - "Navigate up" - "More options" - "Done" - "See all" - "Choose an app" - "OFF" - "ON" - "Alt+" - "Ctrl+" - "delete" - "enter" - "Function+" - "Meta+" - "Shift+" - "space" - "Sym+" - "Menu+" - "Search…" - "Clear query" - "Search query" - "Search" - "Submit query" - "Voice search" - "Share with" - "Share with %s" - "Collapse" - "Search" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rGB/values-en-rGB.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rGB/values-en-rGB.xml deleted file mode 100644 index 0b21ff79..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rGB/values-en-rGB.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "Navigate home" - "Navigate up" - "More options" - "Done" - "See all" - "Choose an app" - "OFF" - "ON" - "Alt+" - "Ctrl+" - "delete" - "enter" - "Function+" - "Meta+" - "Shift+" - "space" - "Sym+" - "Menu+" - "Search…" - "Clear query" - "Search query" - "Search" - "Submit query" - "Voice search" - "Share with" - "Share with %s" - "Collapse" - "Search" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rIN/values-en-rIN.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rIN/values-en-rIN.xml deleted file mode 100644 index 0b21ff79..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rIN/values-en-rIN.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "Navigate home" - "Navigate up" - "More options" - "Done" - "See all" - "Choose an app" - "OFF" - "ON" - "Alt+" - "Ctrl+" - "delete" - "enter" - "Function+" - "Meta+" - "Shift+" - "space" - "Sym+" - "Menu+" - "Search…" - "Clear query" - "Search query" - "Search" - "Submit query" - "Voice search" - "Share with" - "Share with %s" - "Collapse" - "Search" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rXC/values-en-rXC.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rXC/values-en-rXC.xml deleted file mode 100644 index 52e1a7d7..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-en-rXC/values-en-rXC.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‎‏‏‎‏‏‏‎‎‏‎‎‎‏‏‎‏‏‏‎‎‏‏‏‎‎‏‎‎‏‏‎‎‎‏‎Navigate home‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‎‎‎‎‎‏‏‏‎‏‎‎‎‎‎‏‏‎‏‏‎‎‏‎‏‎‏‏‏‏‏‎‎Navigate up‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‎‎‏‏‏‎‎‎‏‎‎‏‏‏‎‏‎‎‏‏‎‎‏‎‎‏‎‏‎‏‎‎‎‏‏‏‎‏‎‎‎‏‏‎‏‎‎‎‏‎‎‏‏‎‎More options‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‏‏‏‎‏‎‎‎‏‏‏‎‎‏‎‎‏‏‏‎‎‏‎‎‎‏‏‎‏‎‎‏‎‎‎‎‏‎‎‏‎‏‏‏‏‎‏‏‎Done‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‎‎‏‏‎‏‎‏‏‎‏‏‏‏‏‎‎‏‏‏‎‎‏‏‏‏‎‏‎‎‏‎‎‎‎‏‏‎‎‎‎‏‏‎‏‎‎‏‏‏‏‎‏‎See all‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‏‎‎‏‎‎‏‏‏‎‎‎‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‎‎‎‏‏‎‏‎‏‏‎‎‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎Choose an app‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‎‏‏‏‎‏‎‏‏‏‎‎‏‎‏‏‎‏‎‏‏‎‏‎‏‏‎‎‏‎‏‏‎‎‏‏‎‎‎‏‏‎‎‎‎‏‏‏‎‏‎‎‎‎‎‏‎‎‏‎OFF‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‎‎‎‏‏‏‏‎‏‎‎‎‎‏‏‏‏‏‏‎‎‏‎‎‎‏‎‏‎‎‏‎‎‎‏‎‎‎‎‎‎‎‎‏‏‏‎‏‏‏‎‏‏‎ON‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‏‎‎‏‎‏‎‏‎‎‎‎‏‎‎‏‎‏‎‎‏‏‏‏‏‏‎‏‏‏‎‎‎‎‏‏‏‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎Alt+‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‏‎‎‎‏‎‏‎‏‏‏‏‏‏‎‏‎‎‎‏‎‎‏‎‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‎‏‎‎‎‎‎Ctrl+‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‎‎‏‎‎‎‎‏‏‎‎‎‎‏‏‏‎‎‎‏‎‎‏‏‎‎‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎‎‎‎‎‎‎‏‏‎‎delete‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‎‎‎‏‏‏‎‏‎‎‏‏‎‏‏‎‎‎‎‎‎‎‏‏‏‏‏‏‎‎‏‎‎‏‏‏‏‎‎‏‎‏‏‎‎‎‎‏‏‏‎‎‎enter‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‎‎‎‎‏‎‎‎‎‏‏‏‏‎‎‎‏‎‎‎‏‏‏‎‏‎‎‎‎‎‏‏‎‏‏‏‎‎‏‏‎‏‏‎‎‎‎‏‎‏‎‎‏‏‎Function+‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‎‎‏‏‎‏‎‎‏‎‏‏‎‏‎‎‎‎‎‏‏‎‎‎‎‎‎‏‏‎‎‏‎‏‎‎‏‏‎‎‎‎‏‏‎‏‎‏‎‏‎‏‎Meta+‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‎‏‏‎‎‏‏‎‎‏‏‏‎‏‎‎‏‏‎‎‎‎‎‏‏‎‏‎‏‏‎‎‎‎‎‎‎‎‏‎‎‏‎‎‎‏‏‏‎‏‎‎‎Shift+‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‎‎‎‎‏‎‎‏‎‎‏‏‏‏‎‏‏‎‎‎‏‏‏‏‎‏‏‏‏‎‎‎‏‏‏‏‎‏‏‎‏‎‏‏‎‏‏‏‏‎‏‎‏‎‎space‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‎‎‏‎‏‎‏‎‏‎‎‏‎‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‎‎‏‎‎‎‎‎‎‏‎Sym+‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‏‎‏‏‎‎‎‎‏‎‎‏‏‎‏‏‎‏‎‎‏‏‎‏‎‏‏‏‎‏‎‎‏‏‏‏‏‏‎‎‏‎‏‎‏‎‎‎‎‏‏‎‎‎‏‏‎‏‎Menu+‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‎‎‎‎‏‎‎‎‏‎‏‎‎‎‎‎‏‏‏‏‏‎‎‏‎‏‏‏‏‎‎‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‎Search…‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎‏‏‏‎‏‏‏‏‏‏‎‏‏‏‏‏‎‏‎‏‎‏‎‎‏‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‎‎‎‎‎‎‎‎‎‎‏‎‎‏‎Clear query‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‏‎‎‏‎‏‎‎‎‏‏‏‏‏‎‎‏‎‏‎‏‎‎‏‎‏‏‎‎‎‏‎‎‎‎‎‏‎‏‎‏‏‏‏‎‎‎‏‎‎‏‎‎‎‎Search query‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‎‎‏‎‏‏‏‎‏‎‎‏‎‏‎‎‏‎‎‎‏‏‎‏‎‏‎‏‎‏‎‎‎‏‎‏‎‎‎‎‎‎‏‎‏‏‎‎‎‏‎‏‎Search‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‏‏‏‎‏‏‎‎‏‎‎‏‎‏‎‎‏‎‏‎‏‎‏‎‏‎‎‎‎‎‏‏‎‎‎‎‎‏‏‎‎‎‏‏‎‎‎‎‎‎‎‎Submit query‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‏‎‎‎‏‏‎‎‏‏‎‎‎‎‏‎‎‎‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‏‎‎‎‏‎‏‎‎‏‏‎‏‏‎‎‏‎‎‎‏‏‎‎Voice search‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‎‏‏‏‏‎‏‎‎‎‏‎‏‎‏‏‏‎‎‏‏‎‎‎‎‎‏‎‏‎‏‎‏‏‎‏‎‏‏‎‏‎‎‎Share with‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‎‏‏‏‎‎‏‏‎‎‏‎‎‏‎‏‎‏‎‏‎‏‏‎‎‎‎‎‎‎‎‏‎‏‎‏‎‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‏‎Share with ‎‏‎‎‏‏‎%s‎‏‎‎‏‏‏‎‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‏‏‎‎‏‎‎‎‎‎‎‏‏‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‏‎‎‎‏‏‏‎‎‎‏‏‎‎‏‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎Collapse‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‏‎‏‎‎‎‎‎‎‏‏‏‎‏‏‎‎‏‏‏‎‎‏‎‎‎‏‏‎‎‏‎‏‎‎‎‏‎‎‏‎‏‎‏‏‏‏‎‎‎‎‎‎‎‎‎‎‏‏‎‎Search‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‏‎‏‏‎‎‎‎‏‎‏‎‎‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‏‏‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎999+‎‏‎‎‏‎" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-es-rUS/values-es-rUS.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-es-rUS/values-es-rUS.xml deleted file mode 100644 index edb85240..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-es-rUS/values-es-rUS.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "Navegar a la página principal" - "Navegar hacia arriba" - "Más opciones" - "Listo" - "Ver todo" - "Elige una aplicación." - "DESACTIVADO" - "ACTIVADO" - "Alt+" - "Ctrl+" - "borrar" - "intro" - "Función+" - "Meta+" - "Mayúscula+" - "espacio" - "Sym+" - "Menú+" - "Buscar…" - "Eliminar la consulta" - "Búsqueda" - "Búsqueda" - "Enviar consulta" - "Búsqueda por voz" - "Compartir con" - "Compartir con %s" - "Contraer" - "Buscar" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-es/values-es.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-es/values-es.xml deleted file mode 100644 index d2265adf..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-es/values-es.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "Ir a la pantalla de inicio" - "Desplazarse hacia arriba" - "Más opciones" - "Listo" - "Ver todo" - "Seleccionar una aplicación" - "DESACTIVADO" - "ACTIVADO" - "Alt +" - "Ctrl +" - "Eliminar" - "Intro" - "Función +" - "Meta +" - "Mayús +" - "Espacio" - "Sym +" - "Menú +" - "Buscar…" - "Borrar consulta" - "Consulta" - "Buscar" - "Enviar consulta" - "Búsqueda por voz" - "Compartir con" - "Compartir con %s" - "Contraer" - "Buscar" - "+999" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-et/values-et.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-et/values-et.xml deleted file mode 100644 index 05be6e99..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-et/values-et.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "Navigeerimine avaekraanile" - "Navigeerimine üles" - "Rohkem valikuid" - "Valmis" - "Kuva kõik" - "Valige rakendus" - "VÄLJAS" - "SEES" - "Alt +" - "Ctrl +" - "kustutamisklahv" - "sisestusklahv" - "Funktsiooniklahv +" - "Meta +" - "Tõstuklahv +" - "tühik" - "Sym +" - "Menüü +" - "Otsige …" - "Päringu tühistamine" - "Otsingupäring" - "Otsing" - "Päringu esitamine" - "Häälotsing" - "Jagamine:" - "Jagamine rakendusega %s" - "Ahendamine" - "Otsing" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-eu/values-eu.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-eu/values-eu.xml deleted file mode 100644 index 8c098750..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-eu/values-eu.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "Joan orri nagusira" - "Joan gora" - "Aukera gehiago" - "Eginda" - "Ikusi guztiak" - "Aukeratu aplikazio bat" - "DESAKTIBATUTA" - "AKTIBATUTA" - "Alt +" - "Ktrl +" - "Ezabatu" - "Sartu" - "Funtzioa +" - "Meta +" - "Maius +" - "Zuriunea" - "Sym +" - "Menua +" - "Bilatu…" - "Garbitu kontsulta" - "Bilaketa-kontsulta" - "Bilatu" - "Bidali kontsulta" - "Ahozko bilaketa" - "Partekatu hauekin" - "Partekatu %s aplikazioarekin" - "Tolestu" - "Bilatu" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fa/values-fa.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fa/values-fa.xml deleted file mode 100644 index 90b28980..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fa/values-fa.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "پیمایش به صفحه اصلی" - "پیمایش به بالا" - "گزینه‌های بیشتر" - "تمام" - "مشاهده همه" - "انتخاب برنامه" - "خاموش" - "روشن" - "‎Alt+‎" - "‎Ctrl+‎" - "delete" - "enter" - "‎Function+‎" - "‎Meta+‎" - "‎Shift+‎" - "کلید فاصله" - "‎Sym+‎" - "منو+" - "جستجو…" - "پاک کردن عبارت جستجو" - "عبارت جستجو" - "جستجو" - "ارسال عبارت جستجو" - "جستجوی گفتاری" - "اشتراک‌گذاری با" - "اشتراک‌گذاری با %s" - "کوچک کردن" - "جستجو" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fi/values-fi.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fi/values-fi.xml deleted file mode 100644 index 75b02bb8..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fi/values-fi.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "Siirry etusivulle" - "Siirry ylös" - "Lisää" - "Valmis" - "Näytä kaikki" - "Valitse sovellus" - "POIS KÄYTÖSTÄ" - "KÄYTÖSSÄ" - "Alt+" - "Ctrl+" - "delete" - "enter" - "Fn+" - "Meta+" - "Vaihto+" - "välilyönti" - "Sym+" - "Valikko+" - "Haku…" - "Tyhjennä kysely" - "Hakulauseke" - "Haku" - "Lähetä kysely" - "Puhehaku" - "Jakaminen:" - "Jaa sovelluksessa %s" - "Kutista" - "Haku" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fr-rCA/values-fr-rCA.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fr-rCA/values-fr-rCA.xml deleted file mode 100644 index f71cf031..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fr-rCA/values-fr-rCA.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "Revenir à l\'accueil" - "Revenir en haut de la page" - "Plus d\'options" - "Terminé" - "Voir toutes les chaînes" - "Sélectionnez une application" - "DÉSACTIVÉ" - "ACTIVÉ" - "Alt+" - "Ctrl+" - "supprimer" - "entrée" - "Fonction+" - "Méta+" - "Maj+" - "espace" - "Sym+" - "Menu+" - "Recherche en cours..." - "Effacer la requête" - "Requête de recherche" - "Rechercher" - "Envoyer la requête" - "Recherche vocale" - "Partager" - "Partager avec %s" - "Réduire" - "Rechercher" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fr/values-fr.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fr/values-fr.xml deleted file mode 100644 index 2aee3976..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-fr/values-fr.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "Revenir à l\'accueil" - "Revenir en haut de la page" - "Plus d\'options" - "OK" - "Tout afficher" - "Sélectionner une application" - "DÉSACTIVÉ" - "ACTIVÉ" - "Alt+" - "Ctrl+" - "supprimer" - "entrée" - "Fonction+" - "Méta+" - "Maj+" - "espace" - "Sym+" - "Menu+" - "Rechercher…" - "Effacer la requête" - "Requête de recherche" - "Rechercher" - "Envoyer la requête" - "Recherche vocale" - "Partager avec" - "Partager avec %s" - "Réduire" - "Rechercher" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-gl/values-gl.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-gl/values-gl.xml deleted file mode 100644 index d0081c60..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-gl/values-gl.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "Ir á páxina de inicio" - "Desprazarse cara arriba" - "Máis opcións" - "Feito" - "Ver todas" - "Escoller unha aplicación" - "DESACTIVAR" - "ACTIVAR" - "Alt +" - "Ctrl +" - "eliminar" - "Intro" - "Función +" - "Meta +" - "Maiús +" - "espazo" - "Sim +" - "Menú +" - "Buscar…" - "Borrar consulta" - "Consulta de busca" - "Buscar" - "Enviar consulta" - "Busca por voz" - "Compartir con" - "Compartir con %s" - "Contraer" - "Buscar" - ">999" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-gu/values-gu.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-gu/values-gu.xml deleted file mode 100644 index 0a3b83b4..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-gu/values-gu.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "હોમ પર નેવિગેટ કરો" - "ઉપર નૅવિગેટ કરો" - "વધુ વિકલ્પો" - "થઈ ગયું" - "બધું જુઓ" - "એક ઍપ્લિકેશન પસંદ કરો" - "બંધ" - "ચાલુ" - "Alt+" - "Ctrl+" - "ડિલીટ કરો" - "Enter" - "Function+" - "Meta+" - "Shift+" - "Spacebar" - "Sym+" - "મેનૂ+" - "શોધો…" - "ક્વેરી સાફ કરો" - "શોધ ક્વેરી" - "શોધો" - "ક્વેરી સબમિટ કરો" - "વૉઇસ શોધ" - "આની સાથે શેર કરો" - "%sની સાથે શેર કરો" - "સંકુચિત કરો" - "શોધો" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-h720dp-v13/values-h720dp-v13.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-h720dp-v13/values-h720dp-v13.xml deleted file mode 100644 index e38bb90b..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-h720dp-v13/values-h720dp-v13.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - 54dip - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hdpi-v4/values-hdpi-v4.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hdpi-v4/values-hdpi-v4.xml deleted file mode 100644 index d5a138ef..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hdpi-v4/values-hdpi-v4.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hi/values-hi.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hi/values-hi.xml deleted file mode 100644 index 6576cb74..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hi/values-hi.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "होम पेज पर जाएं" - "ऊपर जाएं" - "ज़्यादा विकल्प" - "हो गया" - "सभी देखें" - "कोई एप्‍लिकेशन चुनें" - "बंद" - "चालू" - "Alt+" - "Ctrl+" - "delete" - "enter" - "Function+" - "Meta+" - "Shift+" - "space" - "Sym+" - "Menu+" - "खोजा जा रहा है…" - "क्‍वेरी साफ़ करें" - "सर्च क्वेरी" - "सर्च करें" - "क्वेरी सबमिट करें" - "आवाज़ सर्च" - "इसके साथ शेयर करें" - "%s के साथ शेयर करें" - "छोटा करें" - "सर्च" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hr/values-hr.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hr/values-hr.xml deleted file mode 100644 index 2c3e6ae8..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hr/values-hr.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "Idi na početnu" - "Idi gore" - "Dodatne opcije" - "Gotovo" - "Prikaži sve" - "Odabir aplikacije" - "ISKLJUČENO" - "UKLJUČENO" - "Alt+" - "Ctrl+" - "delete" - "enter" - "Function+" - "Meta+" - "Shift+" - "razmaknica" - "Sym+" - "Menu+" - "Pretražite…" - "Izbriši upit" - "Upit za pretraživanje" - "Pretraživanje" - "Pošalji upit" - "Glasovno pretraživanje" - "Dijeljenje sa" - "Dijeli putem aplikacije %s" - "Sažmi" - "Pretraživanje" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hu/values-hu.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hu/values-hu.xml deleted file mode 100644 index f980defe..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hu/values-hu.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "Ugrás a főoldalra" - "Felfelé mozgatás" - "További lehetőségek" - "Kész" - "Összes megtekintése" - "Válasszon ki egy alkalmazást" - "KI" - "BE" - "Alt+" - "Ctrl+" - "Delete" - "Enter" - "Function+" - "Meta+" - "Shift+" - "Szóköz" - "Sym+" - "Menu+" - "Keresés…" - "Lekérdezés törlése" - "Keresési lekérdezés" - "Keresés" - "Lekérdezés küldése" - "Hangalapú keresés" - "Megosztás a következővel:" - "Megosztás a következő alkalmazással: %s" - "Összecsukás" - "Keresés" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hy/values-hy.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hy/values-hy.xml deleted file mode 100644 index 3247f9af..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-hy/values-hy.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "Ուղղվել տուն" - "Ուղղվել վերև" - "Այլ ընտրանքներ" - "Պատրաստ է" - "Տեսնել բոլորը" - "Ընտրել ծրագիր" - "ԱՆՋԱՏՎԱԾ" - "ՄԻԱՑՎԱԾ" - "Alt+" - "Ctrl+" - "Delete" - "Enter" - "Function+" - "Meta+" - "Shift+" - "բացատ" - "Sym+" - "Menu+" - "Որոնում..." - "Մաքրել հարցումը" - "Որոնման հարցում" - "Որոնել" - "Ուղարկել հարցումը" - "Ձայնային որոնում" - "Կիսվել" - "Ուղարկել %s-ին" - "Թաքցնել" - "Որոնել" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-in/values-in.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-in/values-in.xml deleted file mode 100644 index 314af7ef..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-in/values-in.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "Navigasi ke beranda" - "Navigasi naik" - "Opsi lain" - "Selesai" - "Lihat semua" - "Pilih aplikasi" - "NONAKTIF" - "AKTIF" - "Alt+" - "Ctrl+" - "delete" - "enter" - "Function+" - "Meta+" - "Shift+" - "spasi" - "Sym+" - "Menu+" - "Telusuri..." - "Hapus kueri" - "Kueri penelusuran" - "Telusuri" - "Kirim kueri" - "Penelusuran suara" - "Bagikan dengan" - "Bagikan ke %s" - "Ciutkan" - "Telusuri" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-is/values-is.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-is/values-is.xml deleted file mode 100644 index 58321f7b..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-is/values-is.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "Fara heim" - "Fara upp" - "Fleiri valkostir" - "Lokið" - "Sjá allt" - "Veldu forrit" - "SLÖKKT" - "KVEIKT" - "Alt+" - "Ctrl+" - "delete" - "enter" - "Aðgerðarlykill+" - "Meta+" - "Shift+" - "bilslá" - "Sym+" - "Valmynd+" - "Leita…" - "Hreinsa fyrirspurn" - "Leitarfyrirspurn" - "Leita" - "Senda fyrirspurn" - "Raddleit" - "Deila með" - "Deila með %s" - "Minnka" - "Leita" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-it/values-it.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-it/values-it.xml deleted file mode 100644 index 48842b37..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-it/values-it.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "Vai alla home page" - "Vai in alto" - "Altre opzioni" - "Fine" - "Visualizza tutte" - "Scegli un\'applicazione" - "OFF" - "ON" - "ALT +" - "CTRL +" - "CANC" - "INVIO" - "FUNZIONE +" - "META +" - "MAIUSC +" - "barra spaziatrice" - "SYM +" - "MENU +" - "Cerca…" - "Cancella query" - "Query di ricerca" - "Cerca" - "Invia query" - "Ricerca vocale" - "Condividi con" - "Condividi tramite %s" - "Comprimi" - "Ricerca" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-iw/values-iw.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-iw/values-iw.xml deleted file mode 100644 index ed74d571..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-iw/values-iw.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "נווט לדף הבית" - "נווט למעלה" - "עוד אפשרויות" - "בוצע" - "ראה הכל" - "בחר אפליקציה" - "כבוי" - "פועל" - "Alt+" - "Ctrl+‎" - "delete" - "Enter" - "Function+" - "Meta+" - "Shift+" - "מקש רווח" - "Sym+" - "תפריט+" - "חיפוש…" - "מחק שאילתה" - "שאילתת חיפוש" - "חיפוש" - "שלח שאילתה" - "חיפוש קולי" - "שתף עם" - "שתף עם %s" - "כווץ" - "חיפוש" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ja/values-ja.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ja/values-ja.xml deleted file mode 100644 index 6be45810..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ja/values-ja.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "ホームへ移動" - "上へ移動" - "その他のオプション" - "完了" - "すべて表示" - "アプリの選択" - "OFF" - "ON" - "Alt+" - "Ctrl+" - "Delete" - "Enter" - "Function+" - "Meta+" - "Shift+" - "Space" - "Sym+" - "Menu+" - "検索…" - "検索キーワードを削除" - "検索キーワード" - "検索" - "検索キーワードを送信" - "音声検索" - "共有" - "%sと共有" - "折りたたむ" - "検索" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ka/values-ka.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ka/values-ka.xml deleted file mode 100644 index 8e91c0ac..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ka/values-ka.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "მთავარზე ნავიგაცია" - "ზემოთ ნავიგაცია" - "მეტი ვარიანტები" - "დასრულდა" - "ყველას ნახვა" - "აპის არჩევა" - "გამორთულია" - "ჩართულია" - "Alt+" - "Ctrl+" - "წაშლა" - "შეყვანა" - "Function+" - "Meta+" - "Shift+" - "space" - "Sym+" - "Menu+" - "ძიება..." - "მოთხოვნის გასუფთავება" - "ძიების მოთხოვნა" - "ძიება" - "მოთხოვნის გადაგზავნა" - "ხმოვანი ძიება" - "გაზიარება:" - "გაუზიარეთ %s-ს" - "აკეცვა" - "ძიება" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-kk/values-kk.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-kk/values-kk.xml deleted file mode 100644 index d9596d09..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-kk/values-kk.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "Негізгі бетте қозғалу" - "Жоғары қозғалу" - "Басқа опциялар" - "Дайын" - "Барлығын көру" - "Қолданбаны таңдау" - "ӨШІРУЛІ" - "ҚОСУЛЫ" - "Alt+" - "Ctrl+" - "delete" - "enter" - "Function+" - "Meta+" - "Shift+" - "бос орын" - "Sym+" - "Mәзір+" - "Іздеу…" - "Сұрақты жою" - "Сұрақты іздеу" - "Іздеу" - "Сұрақты жіберу" - "Дауыс арқылы іздеу" - "Бөлісу" - "%s қолданбасымен бөлісу" - "Тасалау" - "Іздеу" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-km/values-km.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-km/values-km.xml deleted file mode 100644 index 57735d23..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-km/values-km.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "រកមើល​ទៅ​ដើម" - "រកមើល​ឡើងលើ" - "ជម្រើស​ច្រើន​ទៀត" - "រួចរាល់" - "មើល​ទាំងអស់" - "ជ្រើស​កម្មវិធី​​" - "បិទ" - "បើក" - "Alt+" - "Ctrl+" - "delete" - "enter" - "Function+" - "Meta+" - "Shift+" - "space" - "Sym+" - "Menu+" - "ស្វែងរក…" - "សម្អាត​សំណួរ" - "ស្វែងរក​សំណួរ" - "ស្វែងរក" - "ដាក់​​​ស្នើ​សំណួរ" - "ការស្វែងរក​សំឡេង" - "ចែករំលែក​ជាមួយ" - "ចែក​រំលែក​ជា​មួយ %s" - "បង្រួម" - "ស្វែងរក" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-kn/values-kn.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-kn/values-kn.xml deleted file mode 100644 index 1e2402bd..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-kn/values-kn.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "ಮುಖಪುಟವನ್ನು ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ" - "ಮೇಲಕ್ಕೆ ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ" - "ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳು" - "ಮುಗಿದಿದೆ" - "ಎಲ್ಲವನ್ನೂ ನೋಡಿ" - "ಒಂದು ಅಪ್ಲಿಕೇಶನ್ ಆಯ್ಕೆಮಾಡಿ" - "ಆಫ್" - "ಆನ್" - "Alt+" - "Ctrl+" - "delete" - "enter" - "Function+" - "Meta+" - "Shift+" - "space" - "Sym+" - "Menu+" - "ಹುಡುಕಿ…" - "ಪ್ರಶ್ನೆಯನ್ನು ತೆರವುಗೊಳಿಸು" - "ಪ್ರಶ್ನೆಯನ್ನು ಹುಡುಕಿ" - "ಹುಡುಕಿ" - "ಪ್ರಶ್ನೆಯನ್ನು ಸಲ್ಲಿಸು" - "ಧ್ವನಿ ಹುಡುಕಾಟ" - "ಇವರೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಿ" - "%s ನೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಿ" - "ಸಂಕುಚಿಸು" - "ಹುಡುಕಿ" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ko/values-ko.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ko/values-ko.xml deleted file mode 100644 index 5e0d052f..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ko/values-ko.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "홈 탐색" - "위로 탐색" - "옵션 더보기" - "완료" - "전체 보기" - "앱 선택" - "사용 안함" - "사용" - "Alt+" - "Ctrl+" - "삭제" - "입력" - "Function+" - "Meta+" - "Shift+" - "스페이스바" - "Sym+" - "Menu+" - "검색..." - "검색어 삭제" - "검색어" - "검색" - "검색어 보내기" - "음성 검색" - "공유 대상" - "%s와(과) 공유" - "접기" - "검색" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ky/values-ky.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ky/values-ky.xml deleted file mode 100644 index 7a8bb7f4..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-ky/values-ky.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "Үйгө багыттоо" - "Жогору" - "Көбүрөөк мүмкүнчүлүктөр" - "Даяр" - "Бардыгын көрүү" - "Колдонмо тандоо" - "ӨЧҮК" - "КҮЙҮК" - "Alt+" - "Ctrl+" - "Delete" - "Enter" - "Function+" - "Meta+" - "Shift+" - "боштук" - "Sym+" - "Menu+" - "Издөө…" - "Талаптарды тазалоо" - "Издөө талаптары" - "Издөө" - "Талап жөнөтүү" - "Үн аркылуу издөө" - "Бөлүшүү" - "%s аркылуу бөлүшүү" - "Жыйнап коюу" - "Издөө" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-land/values-land.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-land/values-land.xml deleted file mode 100644 index a12899f9..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-land/values-land.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - 48dp - 12dp - 14dp - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-large-v4/values-large-v4.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-large-v4/values-large-v4.xml deleted file mode 100644 index cc236ebd..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-large-v4/values-large-v4.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - 440dp - 60% - 90% - 60% - 90% - 55% - 80% - - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v17/values-v17.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v17/values-v17.xml deleted file mode 100644 index f85a197a..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v17/values-v17.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v18/values-v18.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v18/values-v18.xml deleted file mode 100644 index 7dad77f9..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v18/values-v18.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - 0px - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v21/values-v21.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v21/values-v21.xml deleted file mode 100644 index 3691890f..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v21/values-v21.xml +++ /dev/null @@ -1,276 +0,0 @@ - - - @color/secondary_text_default_material_light - 0dp - 0dp - 12dp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v22/values-v22.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v22/values-v22.xml deleted file mode 100644 index d4a514a5..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v22/values-v22.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v23/values-v23.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v23/values-v23.xml deleted file mode 100644 index d807aaee..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v23/values-v23.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v26/values-v26.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v26/values-v26.xml deleted file mode 100644 index 8b28a465..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-v26/values-v26.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-vi/values-vi.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-vi/values-vi.xml deleted file mode 100644 index 1eabc087..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-vi/values-vi.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "Điều hướng về trang chủ" - "Điều hướng lên trên" - "Tùy chọn khác" - "Xong" - "Xem tất cả" - "Chọn một ứng dụng" - "TẮT" - "BẬT" - "Alt+" - "Ctrl+" - "delete" - "enter" - "Function+" - "Meta+" - "Shift+" - "phím cách" - "Sym+" - "Menu+" - "Tìm kiếm…" - "Xóa truy vấn" - "Tìm kiếm truy vấn" - "Tìm kiếm" - "Gửi truy vấn" - "Tìm kiếm bằng giọng nói" - "Chia sẻ với" - "Chia sẻ với %s" - "Thu gọn" - "Tìm kiếm" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-watch-v20/values-watch-v20.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-watch-v20/values-watch-v20.xml deleted file mode 100644 index 2d85812e..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-watch-v20/values-watch-v20.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-watch-v21/values-watch-v21.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-watch-v21/values-watch-v21.xml deleted file mode 100644 index deecc9e8..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-watch-v21/values-watch-v21.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-xlarge-v4/values-xlarge-v4.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-xlarge-v4/values-xlarge-v4.xml deleted file mode 100644 index b499d2cf..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-xlarge-v4/values-xlarge-v4.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - 60% - 90% - 50% - 70% - 45% - 72% - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml deleted file mode 100644 index 40d0f3bd..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml +++ /dev/null @@ -1,138 +0,0 @@ - - - - 短信 - 邮件 - - - %1$s 条符合“%2$s”的搜索结果 - - "转到主屏幕" - "转到上一层级" - "更多选项" - "完成" - "查看全部" - "选择应用" - "关闭" - "开启" - "Alt+" - "Ctrl+" - "Delete 键" - "Enter 键" - "Fn+" - "Meta+" - "Shift+" - "空格键" - "Sym+" - "Menu+" - "搜索…" - "清除查询" - "搜索查询" - "搜索" - "提交查询" - "语音搜索" - "分享方式" - "使用%s分享" - "收起" - 确认删除文件夹及所包含的便签吗？ - 确认要删除该条便签吗? - 确认要删除所选的 %d 条便签吗? - 删除 - 便签 - 便签2x2 - 便签4x4 - 删除 - 通话便签 - 取消 - 设置 - 成功删除提醒 - 不能为空便签设置闹钟提醒 - 不能将空便签发送到桌面 - 要查看的便签不存在 - 导出文本时发生错误，请检查SD卡 - SD卡被占用，不能操作 - 同步已取消 - 同步失败，发生内部错误 - 同步失败，请检查网络和帐号设置 - 导出失败 - 文件夹 %1$s 已存在，请重新命名 - yyyyMMdd - MM月dd日 kk:mm - 已将文本文件(%1$s)输出至SD卡(%2$s)目录 - 已将所选 %1$d 条便签移到 %2$s 文件夹 - 请输入名称 - 已添加到桌面 - 提醒我 - 新建文件夹 - 删除 - 取消全选 - 导出文本 - 修改文件夹名称 - 刪除文件夹 - 查看文件夹 - 大 - 正常 - 文字大小 - 小 - 超大 - 进入清单模式 - 移动到文件夹 - 上一级文件夹 - 退出清单模式 - 删除提醒 - 搜索 - 全选 - 没有选中项，操作无效 - 选中了 %d 项 - 发送到桌面 - 设置 - 分享 - 同步 - 取消同步 - 选择文件夹 - 已过期 - 字数 - 发送邮件 - 打开地图 - 呼叫电话 - 浏览网页 - 查看 - 知道了 - 新建便签 - ... - 与google task同步便签记录 - 同步账号 - 添加账号 - 新建便签背景颜色随机 - 取消同步 - 立即同步 - 当前帐号 %1$s - 如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复 - 请选择google帐号，便签将与该帐号的google task内容同步。 - 同步便签 - 上次同步于 %1$s - 取消 - 更换账号 - 删除账号 - 设置 - 正在同步中，不能修改同步帐号 - 同步帐号已设置为%1$s - 便签 - 搜索便签 - 正在搜索便签 - "搜索" - 便签中的文字 - 创建提醒 - "999+" - 导出成功 - 与%1$s同步成功 - 正在获取服务器便签列表... - 登录%1$s... - 正在同步本地便签... - 同步已取消 - 同步失败 - 同步成功 - 同步便签... - 没有关联内容，点击新建便签。 - 访客模式下，便签内容不可见 - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rHK/values-zh-rHK.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rHK/values-zh-rHK.xml deleted file mode 100644 index f533663f..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rHK/values-zh-rHK.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "瀏覽主頁" - "向上瀏覽" - "更多選項" - "完成" - "顯示全部" - "選擇應用程式" - "關閉" - "開啟" - "Alt +" - "Ctrl +" - "刪除" - "Enter 鍵" - "Fn +" - "Meta +" - "Shift +" - "空白鍵" - "Sym +" - "Menu +" - "搜尋…" - "清除查詢" - "搜尋查詢" - "搜尋" - "提交查詢" - "語音搜尋" - "分享對象" - "使用「%s」分享" - "收合" - "搜尋" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml deleted file mode 100644 index 3cf1a7a1..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml +++ /dev/null @@ -1,138 +0,0 @@ - - - - 短信 - 郵件 - - - %1$s 條符合”%2$s“的搜尋結果 - - "瀏覽首頁" - "向上瀏覽" - "更多選項" - "完成" - "查看全部" - "選擇應用程式" - "關閉" - "開啟" - "Alt +" - "Ctrl +" - "Delete 鍵" - "Enter 鍵" - "Fn +" - "Meta +" - "Shift +" - "空格鍵" - "Sym +" - "Menu +" - "搜尋…" - "清除查詢" - "搜尋查詢" - "搜尋" - "提交查詢" - "語音搜尋" - "選擇分享對象" - "與「%s」分享" - "收合" - 確認刪除檔夾及所包含的便簽嗎？ - 确认要删除該條便籤嗎? - 确认要刪除所選的 %d 條便籤嗎? - 刪除 - 便簽 - 便簽2x2 - 便簽4x4 - 刪除 - 通話便籤 - 取消 - 設置 - 成功刪除提醒 - 不能爲空便籤設置鬧鐘提醒 - 不能將空便籤發送到桌面 - 要查看的便籤不存在 - 導出TXT時發生錯誤，請檢查SD卡 - SD卡被佔用，不能操作 - 同步已取消 - 同步失敗，發生內部錯誤 - 同步失敗，請檢查網絡和帳號設置 - 導出失敗 - 文件夾 %1$s 已存在，請重新命名 - yyyyMMdd - MM月dd日 kk:mm - 已將文本文件(%1$s)導出至SD(%2$s)目錄 - 已將所選 %1$d 便籤移到 %2$s 文件夾 - 請輸入名稱 - 已添加到桌面 - 提醒我 - 新建文件夾 - 刪除 - 取消全選 - 導出文本 - 修改文件夾名稱 - 刪除文件夾 - 查看文件夾 - 大 - 正常 - 文字大小 - 小 - 超大 - 進入清單模式 - 移動到文件夾 - 上一級文件夾 - 退出清單模式 - 刪除提醒 - 搜尋 - 全選 - 沒有選中項，操作無效 - 選中了 %d 項 - 發送到桌面 - 設置 - 分享 - 同步 - 取消同步 - 選擇文件夾 - 已過期 - 字數 - 發送郵件 - 打開地圖 - 呼叫電話 - 浏覽網頁 - 查看 - 知道了 - 新建便簽 - ... - 与google task同步便簽記錄 - 同步賬號 - 添加賬號 - 新建便籤背景顏色隨機 - 取消同步 - 立即同步 - 當前帳號 %1$s - 如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復 - 請選擇google帳號，便簽將與該帳號的google task內容同步。 - 同步便簽 - 上次同步于 %1$s - 取消 - 更換賬號 - 刪除賬號 - 設置 - 正在同步中，不能修改同步帳號 - 同步帳號已設置為%1$s - 便籤 - 搜索便籤 - 正在搜索便籤 - "搜尋" - 便籤中的文字 - 創建提醒 - "999+" - 導出成功 - 與%1$s同步成功 - 正在獲取服務器便籤列表... - 登陸%1$s... - 正在同步本地便籤... - 同步已取消 - 同步失敗 - 同步成功 - 同步便簽... - 沒有關聯內容，點擊新建便簽。 - 訪客模式下，便籤內容不可見 - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zu/values-zu.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zu/values-zu.xml deleted file mode 100644 index 31e318dd..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zu/values-zu.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - "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" - "999+" - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml index 5d0f69c1..faa7fbbc 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml +++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml @@ -1,10 +1,10 @@ - -%s - --%s - --%s - --%s + -%s + --%s + --%s + --%s Messaging @@ -268,9 +268,12 @@ Share with Share with %s Collapse + Input describe + Input password Confirm to delete folder and its notes? Confirm to delete this note? Confirm to delete the selected %d notes? + Confirm to delete secret of this note? Delete selected notes Notes Notes 2x2 @@ -299,6 +302,8 @@ Have moved selected %1$d notes to %2$s folder Input name Note added to home + Input password + Add secret Remind me Change view New Folder @@ -319,6 +324,7 @@ Parent folder Leave check list Delete reminder + Delete secret Restore Search Select all @@ -613,7 +619,7 @@ @null @style/ThemeOverlay.AppCompat.Dark.ActionBar - + @drawable/abc_list_selector_holo_dark @color/primary_dark_material_dark @@ -664,7 +670,7 @@ @color/button_material_dark @color/switch_thumb_material_dark - + false @@ -1590,7 +1594,7 @@ @style/Widget.AppCompat.Light.Spinner.DropDown.ActionBar @drawable/abc_item_background_holo_light - + @style/Widget.AppCompat.Light.AutoCompleteTextView @style/Widget.AppCompat.DropDownItem.Spinner @@ -1887,16 +1891,16 @@ #000000 - + - + - + - + - + @@ -1906,67 +1910,59 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1976,31 +1972,26 @@ - + - + - + - + - + - + - + - + - + @@ -2014,104 +2005,80 @@ - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2125,647 +2092,547 @@ - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - - + + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - - - + + + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2773,83 +2640,66 @@ - + - + - + - + - - + + - - + + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2859,64 +2709,56 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2926,12 +2768,10 @@ - + - + @@ -2941,274 +2781,227 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -3232,26 +3025,17 @@ - + - + - + - + - + - + @@ -3261,87 +3045,68 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merger.xml index 5d8d052c..8ce4cf83 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merger.xml +++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merger.xml @@ -2600,7 +2600,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 @@ -2608,11 +2608,11 @@ Messaging Email - #335b5b5b33sp26sp20sp17sp14spLengthNotesNotes 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 syncingSettingsSearchRestoreChange viewTime OrderInit OrderDeleteMove 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 + #335b5b5b33sp26sp20sp17sp14spLengthNotesNotes 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 syncingSettingsSearchRestoreChange viewTime OrderInit OrderDeleteMove 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 reminderAdd secretDelete secretSelect 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 nameInput describeInput passwordSearching NotesSearch notesText in your notesNotessetcancel %1$s result for \"%2$s\" %1$s results for \"%2$s\" - + 短信 邮件 - 字数便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 + 字数便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 %1$s 条符合“%2$s”的搜索结果 - + 短信 郵件 - 字數便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 + 字數便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 %1$s 條符合”%2$s“的搜尋結果 - + diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml index 3ca953af..c95d575a 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 8a644df3..2a201ab0 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Thu Nov 04 15:41:57 CST 2021 -base.0=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex +#Sun Nov 07 20:23:18 CST 2021 +base.0=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex renamed.0=classes.dex path.0=classes.dex diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index 24bd1cbf..b0e274b1 100644 Binary files a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class index 89d31944..a241307d 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class index db96b8b1..28b9210a 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class index 7640e9fe..a31e5fcb 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class index eeaf53c1..080b84b5 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class index 4f0dff5c..c0e4f8a9 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class index a1e8381e..f62c20ca 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class index b140e43f..5299986b 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class index e9f5b68f..6470fda0 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class index 8094c83c..e8476cf8 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class index c8e5c2ce..06422502 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class index 3734bd0e..8ad65bf0 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class index e114a4ea..11993536 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class index 4b323e97..969a0bdf 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class index 7e21a809..11c8aa02 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class index 1735e5a3..1d4761b6 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class index 696c2fe0..9b4a92a0 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class index 20066d76..9acf1def 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class index 470d0ec1..691ae975 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class index 1aec7442..535d9f63 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class index 73edd9cf..12f7e655 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class new file mode 100644 index 00000000..7654f976 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$6.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$6.class new file mode 100644 index 00000000..3ceba11a Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$6.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$7.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$7.class new file mode 100644 index 00000000..e7c4f194 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$7.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class index 407cd912..8a91aa23 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class index 26f0a8a6..b746fd81 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class index deb00a22..ae56742f 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class index fea6568c..d7a0eb63 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class index 94a2be5e..6a51fd88 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class new file mode 100644 index 00000000..674e23cf Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class new file mode 100644 index 00000000..4fff4229 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class index 13079ff2..cfae9511 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class index 032b935d..3607e50d 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class index dab6d63b..6549d9dc 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class index bf0b1cd6..6d79e21a 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class index 734fa22d..1868ab0b 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class index ce136f7f..f646eaf8 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class index bfe50d6d..abbb86c5 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class index d64b851e..c1d312ae 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class index b5a42ed5..a722ad17 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class index b40ced99..407a222a 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class index 587f2f1e..615b4218 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class index cf3960ec..1a1774aa 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class index 0b9a77b6..1f9b93b6 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class index bb562d4e..90ccbb80 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class index dc16eced..24a749b3 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class index f7542104..e557b3dd 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class index 2da7cc03..fc1b6667 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class index 84165e8f..0b4f8f82 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class index 66bdcb32..754d6811 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class index 285972a2..16b0a49a 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class index 30b3f1bc..7e120325 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class index d0b0f816..40905326 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class index b4abaa84..2310a0f7 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class differ diff --git a/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index 5599e55e..4be1b4e2 100644 --- a/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -21,254 +21,254 @@ 21 22 E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml +23-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml 24 android:targetSdkVersion="14" /> -24-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml +24-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml 25 26 -26-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81 -26-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:25:22-78 +26-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81 +26-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:25:22-78 27 -27-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88 -27-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:26:22-85 +27-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88 +27-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:26:22-85 28 -28-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67 -28-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:27:22-64 +28-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67 +28-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:27:22-64 29 -29-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72 -29-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:28:22-69 +29-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72 +29-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:28:22-69 30 -30-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74 -30-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:29:22-71 +30-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74 +30-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:29:22-71 31 -31-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80 -31-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:30:22-77 +31-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80 +31-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:30:22-77 32 -32-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71 -32-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:31:22-68 +32-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71 +32-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:31:22-68 33 -33-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74 -33-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:32:22-71 +33-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74 +33-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:32:22-71 34 -34-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81 -34-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78 +34-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81 +34-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78 35 36 E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:35:5-149:19 +36-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:35:5-149:19 37 android:appComponentFactory="android.support.v4.app.CoreComponentFactory" 37-->[com.android.support:support-compat:28.0.0] C:\Users\小超人\.gradle\caches\transforms-3\2b9474e47639de47b19dc72cadc6eaea\transformed\support-compat-28.0.0\AndroidManifest.xml:22:18-91 38 android:debuggable="true" 39 android:icon="@drawable/icon_app" -39-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42 +39-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42 40 android:label="@string/app_name" -40-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41 +40-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41 41 android:testOnly="true" > 42 E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:38:9-51:20 +42-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:38:9-51:20 43 android:name="net.micode.notes.ui.NotesListActivity" -43-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:39:13-49 +43-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:39:13-49 44 android:configChanges="keyboardHidden|orientation|screenSize" -44-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74 +44-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74 45 android:label="@string/app_name" -45-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45 +45-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45 46 android:launchMode="singleTop" -46-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43 +46-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43 47 android:theme="@style/Theme.AppCompat.Light.DarkActionBar" -47-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:43:13-71 +47-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:43:13-71 48 android:uiOptions="splitActionBarWhenNarrow" -48-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:44:13-57 +48-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:44:13-57 49 android:windowSoftInputMode="adjustPan" > -49-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:45:13-52 +49-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:45:13-52 50 -50-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:47:13-50:29 +50-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:47:13-50:29 51 -51-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:48:17-69 -51-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:48:25-66 +51-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:48:17-69 +51-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:48:25-66 52 53 -53-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:49:17-77 -53-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:49:27-74 +53-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:49:17-77 +53-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:49:27-74 54 55 56 E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:53:9-81:20 +56-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:53:9-81:20 57 android:name="net.micode.notes.ui.NoteEditActivity" -57-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:54:13-48 +57-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:54:13-48 58 android:configChanges="keyboardHidden|orientation|screenSize" -58-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:55:13-74 +58-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:55:13-74 59 android:launchMode="singleTop" -59-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:56:13-43 +59-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:56:13-43 60 android:theme="@style/Theme.AppCompat.Light.DarkActionBar" > -60-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:57:13-71 +60-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:57:13-71 61 -61-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:59:13-64:29 +61-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:59:13-64:29 62 -62-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:60:17-69 -62-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:60:25-66 +62-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:60:17-69 +62-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:60:25-66 63 64 -64-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 -64-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 +64-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 +64-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 65 66 -66-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 -66-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 +66-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 +66-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 67 -67-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 -67-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 +67-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 +67-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 68 69 -69-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:66:13-71:29 +69-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:66:13-71:29 70 -70-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:67:17-79 -70-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:67:25-76 +70-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:67:17-79 +70-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:67:25-76 71 72 -72-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 -72-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 +72-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 +72-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 73 74 -74-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 -74-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 +74-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 +74-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 75 -75-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 -75-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 +75-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 +75-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 76 77 -77-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:73:13-76:29 +77-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:73:13-76:29 78 -78-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:74:17-71 -78-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:74:25-68 +78-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:74:17-71 +78-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:74:25-68 79 80 -80-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 -80-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 +80-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 +80-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 81 82 83 E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:78:13-80:54 +83-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:78:13-80:54 84 android:name="android.app.searchable" -84-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:79:17-54 +84-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:79:17-54 85 android:resource="@xml/searchable" /> -85-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:80:17-51 +85-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:80:17-51 86 87 88 E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:83:9-86:43 +88-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:83:9-86:43 89 android:name="net.micode.notes.data.NotesProvider" -89-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:84:13-63 +89-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:84:13-63 90 android:authorities="micode_notes" -90-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:85:13-47 +90-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:85:13-47 91 android:multiprocess="true" /> -91-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:86:13-40 +91-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:86:13-40 92 93 E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:88:9-100:20 +93-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:88:9-100:20 94 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -94-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:89:13-57 +94-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:89:13-57 95 android:label="@string/app_widget2x2" > -95-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:90:13-50 +95-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:90:13-50 96 -96-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29 +96-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29 97 -97-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84 -97-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81 +97-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84 +97-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81 98 -98-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85 -98-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82 +98-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85 +98-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82 99 -99-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 -99-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 +99-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 +99-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 100 101 102 E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58 +102-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58 103 android:name="android.appwidget.provider" -103-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58 +103-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58 104 android:resource="@xml/widget_2x_info" /> -104-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55 +104-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55 105 106 E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:101:9-114:20 +106-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:101:9-114:20 107 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -107-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:102:13-57 +107-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:102:13-57 108 android:label="@string/app_widget4x4" > -108-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:103:13-50 +108-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:103:13-50 109 -109-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29 +109-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29 110 -110-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84 -110-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81 +110-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84 +110-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81 111 -111-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85 -111-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82 +111-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85 +111-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82 112 -112-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 -112-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 +112-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 +112-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 113 114 115 E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58 +115-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58 116 android:name="android.appwidget.provider" -116-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58 +116-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58 117 android:resource="@xml/widget_4x_info" /> -117-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55 +117-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55 118 119 -119-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:116:9-120:20 -119-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:116:19-55 +119-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:116:9-120:20 +119-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:116:19-55 120 -120-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:117:13-119:29 +120-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:117:13-119:29 121 -121-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:118:17-79 -121-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:118:25-76 +121-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:118:17-79 +121-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:118:25-76 122 123 124 E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:122:9-125:20 +124-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:122:9-125:20 125 android:name="net.micode.notes.ui.AlarmReceiver" -125-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:123:13-61 +125-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:123:13-61 126 android:process=":remote" > -126-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:124:13-38 +126-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:124:13-38 127 128 129 E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:127:9-132:20 +129-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:127:9-132:20 130 android:name="net.micode.notes.ui.AlarmAlertActivity" -130-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:128:13-50 +130-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:128:13-50 131 android:label="@string/app_name" -131-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:129:13-45 +131-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:129:13-45 132 android:launchMode="singleInstance" -132-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:130:13-48 +132-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:130:13-48 133 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -133-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:131:13-75 +133-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:131:13-75 134 135 E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:134:9-139:20 +135-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:134:9-139:20 136 android:name="net.micode.notes.ui.NotesPreferenceActivity" -136-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:135:13-71 +136-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:135:13-71 137 android:label="@string/preferences_title" -137-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:136:13-54 +137-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:136:13-54 138 android:launchMode="singleTop" -138-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:137:13-43 +138-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:137:13-43 139 android:theme="@android:style/Theme.Holo.Light" > -139-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:138:13-60 +139-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:138:13-60 140 141 142 E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:141:9-144:19 +142-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:141:9-144:19 143 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -143-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:142:13-74 +143-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:142:13-74 144 android:exported="false" > -144-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:143:13-37 +144-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:143:13-37 145 146 147 E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:146:9-148:52 +147-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:146:9-148:52 148 android:name="android.app.default_searchable" -148-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:147:13-58 +148-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:147:13-58 149 android:value=".ui.NoteEditActivity" /> -149-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:148:13-49 +149-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:148:13-49 150 151 152 diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat index 968732bd..7ee9470c 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat index dd330cc7..1ef1a874 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat index 215c37ef..a1e6dc99 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat index ecbc67d8..7114b2a6 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat index 2fcc62d8..9c16d510 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat index ac6f7cac..bcf90867 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat index 5f7a73f4..f5980f42 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat index 1d443dc4..95a47f32 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat index c745b4a3..d2a55eda 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat index 4ecc5766..4f12701d 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat index fd767069..34d2fd33 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat index d1705cc2..f5637f02 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat index c13c8efa..06a903a1 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat index 475c2a77..6cef1dc9 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat index 21a8ddf9..c4252653 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat index 6d0518e9..f1c8d45a 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat index 13df9810..b0d73c1d 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat index b7935542..8fe07065 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat index 318fe69e..4bf1e1ec 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat index a1f5f9a9..b321a368 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat index d5cee69b..2aae04a3 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat index 47dac417..292de1b5 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat index ac662de2..09779659 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat index 34d4a363..866c7724 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat index 20484bbd..ae247e77 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat index 498f1c36..e0cae200 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat index 6eb4e49f..a09d977f 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat index ae094c75..caa35a7d 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat index 2d817053..ed5987f9 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat index 1f5416b2..196bf9b3 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat index 88fa717a..885d9430 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat index 91b7fc29..c88d1ed4 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat index 36c3394b..7c3bfd7d 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat index 6019cd9c..a81463df 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat index e500ba42..0c1a2401 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat index 529196d2..a1483200 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat index ba18f8e5..cd1e49c2 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat index ac1aedb8..a65cc8e6 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat index 80912d09..ed02ff22 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat index 88cf1fd6..95e0965b 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat index 334ced54..d188b5db 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat index 78ad71e2..8a713dda 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat index ad2f34d2..7b3fb436 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat index 3abb3b1d..d949d679 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat index 0bf239f1..a8533897 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat index 72c14da1..41caa8d8 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat index 7da2ded3..b64468e5 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_lock.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_lock.png.flat new file mode 100644 index 00000000..c2be9135 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_lock.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat index 9f0768a9..bb4a3270 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat index 9dd95fe8..b60fe70b 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat index f3d63475..562e0377 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat index 1752956d..b1f87d06 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat index 55fec61a..8ccce64e 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat index 13066922..90c51d71 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat index 3858c123..6ea0886b 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat index fa2dd654..2b11b104 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat index f406855d..c7c8e652 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat index aed69bd3..99fba2d2 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat index 5598bddd..9b97ee39 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat index 1db2cc86..a8ea428f 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat index 397a45c8..beb29da5 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat index 5d3d7654..ef913947 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat index 91ace7a9..b0d701b5 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat index 935fc57e..89c73eed 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat index 821824ae..09abdb67 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat index 439cd107..c13ab022 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat index dcad4f00..c991a5fa 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat index 55f944ee..bfc5250a 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat index a3b1b665..5cd64cc9 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat index a6b57d49..9c934297 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat index 4c7e282c..69d6e227 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat index 9a6d1c0b..7f2585e8 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_add_secret.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_add_secret.xml.flat new file mode 100644 index 00000000..26db054e Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_add_secret.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat index 8cdf8201..19b597fa 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_input_passwd.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_input_passwd.xml.flat new file mode 100644 index 00000000..72d2be3a Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_input_passwd.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat index a34b57f9..91f24183 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat index 728c102b..c190b5c6 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat index e84505bf..c16752be 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat index 1f3059e2..11ab20a8 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat index 2764534b..75c9f0c3 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat index 75e95375..84ca8fd4 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat index 20112655..b4b3e95c 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat index 2bdea2a1..75bedd80 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat index ebd0db56..4a2cf06c 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat index 4da9c8a2..1d99b5b0 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat index c73d3e38..7201eb05 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat index e9fad498..a319138e 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat index 047fcb0d..58122324 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat index f71f11a8..abc2ba59 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat index 7cac9ec1..de681f70 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat index 4b3778a4..d28a82e4 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat index 1f0c8b44..f3d8e74c 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_trash_folder.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_trash_folder.xml.flat index f248448f..05c0f748 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_trash_folder.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_trash_folder.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat index 410fbd00..2f4826f9 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/raw_introduction.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/raw_introduction.flat index da162d08..6b43b0f7 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/raw_introduction.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/raw_introduction.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-af_values-af.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-af_values-af.arsc.flat index 8c0737a2..bd001cc1 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-af_values-af.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-af_values-af.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-am_values-am.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-am_values-am.arsc.flat index 7dc8cf51..302d42e5 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-am_values-am.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-am_values-am.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ar_values-ar.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ar_values-ar.arsc.flat index 8acb8e8c..b05be8ed 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ar_values-ar.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ar_values-ar.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-as_values-as.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-as_values-as.arsc.flat index fbd38472..1f40eb50 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-as_values-as.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-as_values-as.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-az_values-az.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-az_values-az.arsc.flat index 17091eb5..f25ee4a9 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-az_values-az.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-az_values-az.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-b+sr+Latn_values-b+sr+Latn.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-b+sr+Latn_values-b+sr+Latn.arsc.flat index e5bcc181..33a76ef4 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-b+sr+Latn_values-b+sr+Latn.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-b+sr+Latn_values-b+sr+Latn.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-be_values-be.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-be_values-be.arsc.flat index 80954b2a..21ec179e 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-be_values-be.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-be_values-be.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-bg_values-bg.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-bg_values-bg.arsc.flat index 14fd6a16..f8702d65 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-bg_values-bg.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-bg_values-bg.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-bn_values-bn.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-bn_values-bn.arsc.flat index 16ac9701..b2edfdf4 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-bn_values-bn.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-bn_values-bn.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-bs_values-bs.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-bs_values-bs.arsc.flat index 580be395..a22dc679 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-bs_values-bs.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-bs_values-bs.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ca_values-ca.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ca_values-ca.arsc.flat index 27f972e9..391824c8 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ca_values-ca.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ca_values-ca.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-cs_values-cs.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-cs_values-cs.arsc.flat index a5cb5c95..2cb41486 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-cs_values-cs.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-cs_values-cs.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-da_values-da.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-da_values-da.arsc.flat index 7c7e3955..e34c2845 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-da_values-da.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-da_values-da.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-de_values-de.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-de_values-de.arsc.flat index 97df133f..3f011e9c 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-de_values-de.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-de_values-de.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-el_values-el.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-el_values-el.arsc.flat index f9d1cd5b..f3bb787a 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-el_values-el.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-el_values-el.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rAU_values-en-rAU.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rAU_values-en-rAU.arsc.flat index 8032ad5a..9dd4c64f 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rAU_values-en-rAU.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rAU_values-en-rAU.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rCA_values-en-rCA.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rCA_values-en-rCA.arsc.flat index 34d7a6d7..3c881185 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rCA_values-en-rCA.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rCA_values-en-rCA.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rGB_values-en-rGB.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rGB_values-en-rGB.arsc.flat index ef05392d..75697d3e 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rGB_values-en-rGB.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rGB_values-en-rGB.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rIN_values-en-rIN.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rIN_values-en-rIN.arsc.flat index 5ad5f4d2..91d753c3 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rIN_values-en-rIN.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rIN_values-en-rIN.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rXC_values-en-rXC.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rXC_values-en-rXC.arsc.flat index 98f5c848..50a38c89 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rXC_values-en-rXC.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rXC_values-en-rXC.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-es-rUS_values-es-rUS.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-es-rUS_values-es-rUS.arsc.flat index 1292d0d2..3a5dfa9d 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-es-rUS_values-es-rUS.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-es-rUS_values-es-rUS.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-es_values-es.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-es_values-es.arsc.flat index 0a750333..295c7c61 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-es_values-es.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-es_values-es.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-et_values-et.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-et_values-et.arsc.flat index d04ed3c0..f8057a2a 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-et_values-et.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-et_values-et.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-eu_values-eu.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-eu_values-eu.arsc.flat index c2d8604f..24109af1 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-eu_values-eu.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-eu_values-eu.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fa_values-fa.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fa_values-fa.arsc.flat index 1e0a888c..a402c25b 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fa_values-fa.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fa_values-fa.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fi_values-fi.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fi_values-fi.arsc.flat index 8a785466..a4d3281c 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fi_values-fi.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fi_values-fi.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fr-rCA_values-fr-rCA.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fr-rCA_values-fr-rCA.arsc.flat index d34bfa45..c0a97bd7 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fr-rCA_values-fr-rCA.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fr-rCA_values-fr-rCA.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fr_values-fr.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fr_values-fr.arsc.flat index 3b5b79b4..884cefaf 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fr_values-fr.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fr_values-fr.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-gl_values-gl.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-gl_values-gl.arsc.flat index 4fe2d18f..f3d781f2 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-gl_values-gl.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-gl_values-gl.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-gu_values-gu.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-gu_values-gu.arsc.flat index f4aab326..b37a1232 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-gu_values-gu.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-gu_values-gu.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-h720dp-v13_values-h720dp-v13.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-h720dp-v13_values-h720dp-v13.arsc.flat index 2d0ef76c..bb0e38c0 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-h720dp-v13_values-h720dp-v13.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-h720dp-v13_values-h720dp-v13.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hdpi-v4_values-hdpi-v4.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hdpi-v4_values-hdpi-v4.arsc.flat index a4926a5b..cfdcbc3a 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hdpi-v4_values-hdpi-v4.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hdpi-v4_values-hdpi-v4.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hi_values-hi.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hi_values-hi.arsc.flat index 65bb7efb..65431aa5 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hi_values-hi.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hi_values-hi.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hr_values-hr.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hr_values-hr.arsc.flat index f4009aae..49edb15c 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hr_values-hr.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hr_values-hr.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hu_values-hu.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hu_values-hu.arsc.flat index e78d5dfc..6f252e8e 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hu_values-hu.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hu_values-hu.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hy_values-hy.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hy_values-hy.arsc.flat index 01f0cbc3..2bcd17d4 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hy_values-hy.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hy_values-hy.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-in_values-in.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-in_values-in.arsc.flat index fc1d34fe..8241cac3 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-in_values-in.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-in_values-in.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-is_values-is.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-is_values-is.arsc.flat index 686b55a6..36b2129a 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-is_values-is.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-is_values-is.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-it_values-it.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-it_values-it.arsc.flat index 7867ace3..f4da1d4f 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-it_values-it.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-it_values-it.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-iw_values-iw.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-iw_values-iw.arsc.flat index 01d13a60..ca9958e4 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-iw_values-iw.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-iw_values-iw.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ja_values-ja.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ja_values-ja.arsc.flat index c07702cd..9d488011 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ja_values-ja.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ja_values-ja.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ka_values-ka.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ka_values-ka.arsc.flat index 253c1226..a94a1c97 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ka_values-ka.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ka_values-ka.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-kk_values-kk.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-kk_values-kk.arsc.flat index c6ecbf2a..d35c486d 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-kk_values-kk.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-kk_values-kk.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-km_values-km.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-km_values-km.arsc.flat index 97a2d713..11327fea 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-km_values-km.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-km_values-km.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-kn_values-kn.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-kn_values-kn.arsc.flat index dc13ab1f..1df23e9d 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-kn_values-kn.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-kn_values-kn.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ko_values-ko.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ko_values-ko.arsc.flat index 09a214af..16f670f8 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ko_values-ko.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ko_values-ko.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ky_values-ky.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ky_values-ky.arsc.flat index c7f4dfa6..e078c8f8 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ky_values-ky.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ky_values-ky.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-land_values-land.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-land_values-land.arsc.flat index 76d79b90..1810749f 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-land_values-land.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-land_values-land.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-large-v4_values-large-v4.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-large-v4_values-large-v4.arsc.flat index 81259964..f1b27a37 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-large-v4_values-large-v4.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-large-v4_values-large-v4.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ldltr-v21_values-ldltr-v21.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ldltr-v21_values-ldltr-v21.arsc.flat index 5b078346..1c7c33e7 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ldltr-v21_values-ldltr-v21.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ldltr-v21_values-ldltr-v21.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-lo_values-lo.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-lo_values-lo.arsc.flat index 5ed5125c..768416db 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-lo_values-lo.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-lo_values-lo.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-lt_values-lt.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-lt_values-lt.arsc.flat index 6fcf4d35..c3a79051 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-lt_values-lt.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-lt_values-lt.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-lv_values-lv.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-lv_values-lv.arsc.flat index 93f778c2..41ad5412 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-lv_values-lv.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-lv_values-lv.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-mk_values-mk.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-mk_values-mk.arsc.flat index bfd18a46..68e836fe 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-mk_values-mk.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-mk_values-mk.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ml_values-ml.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ml_values-ml.arsc.flat index c5c43bdc..998fe9b6 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ml_values-ml.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ml_values-ml.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-mn_values-mn.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-mn_values-mn.arsc.flat index 4ea41c31..1627b523 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-mn_values-mn.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-mn_values-mn.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-mr_values-mr.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-mr_values-mr.arsc.flat index e14ada07..2d292998 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-mr_values-mr.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-mr_values-mr.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ms_values-ms.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ms_values-ms.arsc.flat index f9453322..85d0bde2 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ms_values-ms.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ms_values-ms.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-my_values-my.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-my_values-my.arsc.flat index 38551a49..5ffc9a31 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-my_values-my.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-my_values-my.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-nb_values-nb.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-nb_values-nb.arsc.flat index 35cdeb82..014f10ff 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-nb_values-nb.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-nb_values-nb.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ne_values-ne.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ne_values-ne.arsc.flat index 3a1e437f..4a74b9fc 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ne_values-ne.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ne_values-ne.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-night-v8_values-night-v8.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-night-v8_values-night-v8.arsc.flat index 917d65a8..b4a5e4be 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-night-v8_values-night-v8.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-night-v8_values-night-v8.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-nl_values-nl.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-nl_values-nl.arsc.flat index b1ddad28..3029b3ab 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-nl_values-nl.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-nl_values-nl.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-or_values-or.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-or_values-or.arsc.flat index c326e2ed..6fc1f58f 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-or_values-or.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-or_values-or.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pa_values-pa.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pa_values-pa.arsc.flat index c9e4e305..9755817d 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pa_values-pa.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pa_values-pa.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pl_values-pl.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pl_values-pl.arsc.flat index 11b89603..57f386db 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pl_values-pl.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pl_values-pl.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-port_values-port.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-port_values-port.arsc.flat index 01051c52..94ac650a 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-port_values-port.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-port_values-port.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pt-rBR_values-pt-rBR.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pt-rBR_values-pt-rBR.arsc.flat index 6482f30f..cd79f1af 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pt-rBR_values-pt-rBR.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pt-rBR_values-pt-rBR.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pt-rPT_values-pt-rPT.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pt-rPT_values-pt-rPT.arsc.flat index 5573d51a..b2c05da2 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pt-rPT_values-pt-rPT.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pt-rPT_values-pt-rPT.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pt_values-pt.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pt_values-pt.arsc.flat index b94d3758..4e716d50 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pt_values-pt.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pt_values-pt.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ro_values-ro.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ro_values-ro.arsc.flat index ca58d0da..96897f05 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ro_values-ro.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ro_values-ro.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ru_values-ru.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ru_values-ru.arsc.flat index 948caf92..6b7b1fc8 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ru_values-ru.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ru_values-ru.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-si_values-si.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-si_values-si.arsc.flat index 68767a68..5b396aa1 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-si_values-si.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-si_values-si.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sk_values-sk.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sk_values-sk.arsc.flat index 5b48fd1c..05c53c59 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sk_values-sk.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sk_values-sk.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sl_values-sl.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sl_values-sl.arsc.flat index 53a960db..e910f7a6 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sl_values-sl.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sl_values-sl.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sq_values-sq.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sq_values-sq.arsc.flat index b8a02449..513adfa1 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sq_values-sq.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sq_values-sq.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sr_values-sr.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sr_values-sr.arsc.flat index d22896da..63301b30 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sr_values-sr.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sr_values-sr.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sv_values-sv.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sv_values-sv.arsc.flat index e7817141..f93d8286 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sv_values-sv.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sv_values-sv.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sw600dp-v13_values-sw600dp-v13.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sw600dp-v13_values-sw600dp-v13.arsc.flat index ce7c65c4..e738644e 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sw600dp-v13_values-sw600dp-v13.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sw600dp-v13_values-sw600dp-v13.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sw_values-sw.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sw_values-sw.arsc.flat index 052269ae..d3dc9ccb 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sw_values-sw.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sw_values-sw.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ta_values-ta.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ta_values-ta.arsc.flat index d9870db8..943fe20d 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ta_values-ta.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ta_values-ta.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-te_values-te.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-te_values-te.arsc.flat index cd51a5c4..cccccc7b 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-te_values-te.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-te_values-te.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-th_values-th.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-th_values-th.arsc.flat index 60a6c1a2..a208705a 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-th_values-th.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-th_values-th.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-tl_values-tl.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-tl_values-tl.arsc.flat index a2c6fe8a..d6682bdb 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-tl_values-tl.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-tl_values-tl.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-tr_values-tr.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-tr_values-tr.arsc.flat index ebbcaba1..77b4cd82 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-tr_values-tr.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-tr_values-tr.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-uk_values-uk.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-uk_values-uk.arsc.flat index 056bc1e9..e74483e1 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-uk_values-uk.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-uk_values-uk.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ur_values-ur.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ur_values-ur.arsc.flat index 57eefba7..bb28252c 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ur_values-ur.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ur_values-ur.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-uz_values-uz.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-uz_values-uz.arsc.flat index f74a8662..be8e0864 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-uz_values-uz.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-uz_values-uz.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v16_values-v16.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v16_values-v16.arsc.flat index dbbf8b62..bf93468a 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v16_values-v16.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v16_values-v16.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v17_values-v17.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v17_values-v17.arsc.flat index 38ff51ef..47e67e1f 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v17_values-v17.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v17_values-v17.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v18_values-v18.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v18_values-v18.arsc.flat index 35180ce2..d955c045 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v18_values-v18.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v18_values-v18.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v21_values-v21.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v21_values-v21.arsc.flat index 6dfd0138..d2cbe5c3 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v21_values-v21.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v21_values-v21.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v22_values-v22.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v22_values-v22.arsc.flat index 94bb7c6b..e8f5c549 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v22_values-v22.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v22_values-v22.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v23_values-v23.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v23_values-v23.arsc.flat index 6eea51e0..03b35311 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v23_values-v23.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v23_values-v23.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v24_values-v24.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v24_values-v24.arsc.flat index 9db25c3c..d311532a 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v24_values-v24.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v24_values-v24.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v25_values-v25.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v25_values-v25.arsc.flat index 35ee9c81..0d3e18c3 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v25_values-v25.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v25_values-v25.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v26_values-v26.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v26_values-v26.arsc.flat index eea84e61..e1382096 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v26_values-v26.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v26_values-v26.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v28_values-v28.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v28_values-v28.arsc.flat index 457cbd5d..bc457d47 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v28_values-v28.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v28_values-v28.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-vi_values-vi.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-vi_values-vi.arsc.flat index 390f6fdf..7525b452 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-vi_values-vi.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-vi_values-vi.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-watch-v20_values-watch-v20.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-watch-v20_values-watch-v20.arsc.flat index f2605bb6..22d48e0a 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-watch-v20_values-watch-v20.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-watch-v20_values-watch-v20.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-watch-v21_values-watch-v21.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-watch-v21_values-watch-v21.arsc.flat index c98e8cd0..741d2793 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-watch-v21_values-watch-v21.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-watch-v21_values-watch-v21.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-xlarge-v4_values-xlarge-v4.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-xlarge-v4_values-xlarge-v4.arsc.flat index 96f72519..52da35b6 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-xlarge-v4_values-xlarge-v4.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-xlarge-v4_values-xlarge-v4.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat index 78614c79..d9ad8d27 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rHK_values-zh-rHK.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rHK_values-zh-rHK.arsc.flat index 6de61903..ccbca9ae 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rHK_values-zh-rHK.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rHK_values-zh-rHK.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat index d3c4baca..876340f0 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zu_values-zu.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zu_values-zu.arsc.flat index 35518315..69c3485a 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zu_values-zu.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zu_values-zu.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat index 132b77c6..819385f3 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat index 876c9f30..f9805a26 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat index 329a8d9a..b2d4d4cc 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat index 742de1ec..f7633074 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat index 94b5ddb9..cf7f6ab4 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json index 28269982..94dc553a 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-es-rUS_values-es-rUS.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sr_values-sr.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-es-rUS\\values-es-rUS.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-sr\\values-sr.xml", "from": { "startLines": "2", "startColumns": "4", @@ -15,60 +15,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2920", + "startOffsets": "2905", "endColumns": "100", - "endOffsets": "3016" + "endOffsets": "3001" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-es-rUS\\values-es-rUS.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,225,334,442,527,628,751,836,918,1009,1102,1198,1292,1392,1485,1584,1680,1771,1862,1944,2056,2156,2257,2365,2472,2579,2738,2838", - "endColumns": "119,108,107,84,100,122,84,81,90,92,95,93,99,92,98,95,90,90,81,111,99,100,107,106,106,158,99,81", - "endOffsets": "220,329,437,522,623,746,831,913,1004,1097,1193,1287,1387,1480,1579,1675,1766,1857,1939,2051,2151,2252,2360,2467,2574,2733,2833,2915" - } - } - ] - }, - { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ar_values-ar.arsc.flat", - "map": [ - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ar\\values-ar.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-sr\\values-sr.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,222,326,435,517,618,732,811,890,981,1074,1170,1264,1365,1458,1553,1647,1738,1832,1911,2016,2117,2213,2321,2424,2527,2682,2779", - "endColumns": "116,103,108,81,100,113,78,78,90,92,95,93,100,92,94,93,90,93,78,104,100,95,107,102,102,154,96,80", - "endOffsets": "217,321,430,512,613,727,806,885,976,1069,1165,1259,1360,1453,1548,1642,1733,1827,1906,2011,2112,2208,2316,2419,2522,2677,2774,2855" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ar\\values-ar.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2860", - "endColumns": "100", - "endOffsets": "2956" + "startOffsets": "105,214,317,423,509,613,731,812,892,983,1076,1172,1266,1367,1460,1555,1660,1751,1842,1930,2035,2143,2244,2348,2456,2557,2724,2821", + "endColumns": "108,102,105,85,103,117,80,79,90,92,95,93,100,92,94,104,90,90,87,104,107,100,103,107,100,166,96,83", + "endOffsets": "209,312,418,504,608,726,807,887,978,1071,1167,1261,1362,1455,1550,1655,1746,1837,1925,2030,2138,2239,2343,2451,2552,2719,2816,2900" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-tr_values-tr.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-es-rUS_values-es-rUS.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-tr\\values-tr.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-es-rUS\\values-es-rUS.xml", "from": { "startLines": "2", "startColumns": "4", @@ -79,41 +47,40 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2865", + "startOffsets": "2920", "endColumns": "100", - "endOffsets": "2961" + "endOffsets": "3016" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-tr\\values-tr.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-es-rUS\\values-es-rUS.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,210,309,421,506,612,732,811,887,978,1071,1164,1258,1356,1449,1551,1646,1737,1828,1907,2014,2119,2215,2322,2424,2532,2688,2786", - "endColumns": "104,98,111,84,105,119,78,75,90,92,92,93,97,92,101,94,90,90,78,106,104,95,106,101,107,155,97,78", - "endOffsets": "205,304,416,501,607,727,806,882,973,1066,1159,1253,1351,1444,1546,1641,1732,1823,1902,2009,2114,2210,2317,2419,2527,2683,2781,2860" + "startOffsets": "105,225,334,442,527,628,751,836,918,1009,1102,1198,1292,1392,1485,1584,1680,1771,1862,1944,2056,2156,2257,2365,2472,2579,2738,2838", + "endColumns": "119,108,107,84,100,122,84,81,90,92,95,93,99,92,98,95,90,90,81,111,99,100,107,106,106,158,99,81", + "endOffsets": "220,329,437,522,623,746,831,913,1004,1097,1193,1287,1387,1480,1579,1675,1766,1857,1939,2051,2151,2252,2360,2467,2574,2733,2833,2915" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v17_values-v17.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-night-v8_values-night-v8.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v17\\values-v17.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-night-v8\\values-night-v8.xml", "from": { - "startLines": "2,5,9,12,15,18,22,25,29,33,37,40,43,46,50,53,57", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "55,228,456,614,764,936,1161,1331,1559,1783,2025,2196,2370,2539,2812,3012,3216", - "endLines": "4,8,11,14,17,21,24,28,32,36,39,42,45,49,52,56,60", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "223,451,609,759,931,1156,1326,1554,1778,2020,2191,2365,2534,2807,3007,3211,3540" + "startLines": "2,3,4,5,6,7,8", + "startColumns": "4,4,4,4,4,4,4", + "startOffsets": "55,125,209,293,389,491,593", + "endColumns": "69,83,83,95,101,101,93", + "endOffsets": "120,204,288,384,486,588,682" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-be_values-be.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-be_values-be.arsc.flat", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-be\\values-be.xml", @@ -145,7 +112,7 @@ ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-it_values-it.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-it_values-it.arsc.flat", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-it\\values-it.xml", @@ -177,20 +144,20 @@ ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-my_values-my.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ca_values-ca.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-my\\values-my.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ca\\values-ca.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,214,319,436,529,641,769,847,926,1017,1110,1206,1300,1401,1494,1589,1683,1774,1865,1951,2074,2186,2288,2414,2525,2635,2795,2895", - "endColumns": "108,104,116,92,111,127,77,78,90,92,95,93,100,92,94,93,90,90,85,122,111,101,125,110,109,159,99,83", - "endOffsets": "209,314,431,524,636,764,842,921,1012,1105,1201,1295,1396,1489,1584,1678,1769,1860,1946,2069,2181,2283,2409,2520,2630,2790,2890,2974" + "startOffsets": "105,223,329,436,519,627,753,837,918,1009,1102,1196,1291,1390,1483,1576,1670,1761,1852,1935,2046,2155,2253,2363,2467,2575,2735,2834", + "endColumns": "117,105,106,82,107,125,83,80,90,92,93,94,98,92,92,93,90,90,82,110,108,97,109,103,107,159,98,80", + "endOffsets": "218,324,431,514,622,748,832,913,1004,1097,1191,1286,1385,1478,1571,1665,1756,1847,1930,2041,2150,2248,2358,2462,2570,2730,2829,2910" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-my\\values-my.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ca\\values-ca.xml", "from": { "startLines": "2", "startColumns": "4", @@ -201,28 +168,43 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2979", + "startOffsets": "2915", "endColumns": "100", - "endOffsets": "3075" + "endOffsets": "3011" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-nl_values-nl.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ldltr-v21_values-ldltr-v21.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-nl\\values-nl.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ldltr-v21\\values-ldltr-v21.xml", + "from": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "112", + "endOffsets": "163" + } + } + ] + }, + { + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-bn_values-bn.arsc.flat", + "map": [ + { + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-bn\\values-bn.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,223,328,435,521,629,749,826,903,995,1089,1190,1284,1385,1479,1575,1670,1762,1854,1936,2047,2151,2250,2365,2478,2581,2736,2839", - "endColumns": "117,104,106,85,107,119,76,76,91,93,100,93,100,93,95,94,91,91,81,110,103,98,114,112,102,154,102,81", - "endOffsets": "218,323,430,516,624,744,821,898,990,1084,1185,1279,1380,1474,1570,1665,1757,1849,1931,2042,2146,2245,2360,2473,2576,2731,2834,2916" + "startOffsets": "105,214,326,432,526,631,760,838,916,1007,1100,1195,1289,1390,1483,1578,1672,1763,1854,1941,2051,2159,2258,2368,2474,2587,2752,2857", + "endColumns": "108,111,105,93,104,128,77,77,90,92,94,93,100,92,94,93,90,90,86,109,107,98,109,105,112,164,104,81", + "endOffsets": "209,321,427,521,626,755,833,911,1002,1095,1190,1284,1385,1478,1573,1667,1758,1849,1936,2046,2154,2253,2363,2469,2582,2747,2852,2934" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-nl\\values-nl.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-bn\\values-bn.xml", "from": { "startLines": "2", "startColumns": "4", @@ -233,18 +215,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2921", + "startOffsets": "2939", "endColumns": "100", - "endOffsets": "3017" + "endOffsets": "3035" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ur_values-ur.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-cs_values-cs.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ur\\values-ur.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-cs\\values-cs.xml", "from": { "startLines": "2", "startColumns": "4", @@ -255,64 +237,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2904", + "startOffsets": "2891", "endColumns": "100", - "endOffsets": "3000" + "endOffsets": "2987" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ur\\values-ur.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-cs\\values-cs.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,215,321,430,516,620,740,816,892,984,1078,1174,1268,1370,1464,1560,1654,1746,1838,1923,2031,2140,2242,2353,2453,2561,2726,2824", - "endColumns": "109,105,108,85,103,119,75,75,91,93,95,93,101,93,95,93,91,91,84,107,108,101,110,99,107,164,97,79", - "endOffsets": "210,316,425,511,615,735,811,887,979,1073,1169,1263,1365,1459,1555,1649,1741,1833,1918,2026,2135,2237,2348,2448,2556,2721,2819,2899" + "startOffsets": "105,212,314,423,509,614,731,812,893,984,1077,1173,1267,1362,1455,1550,1647,1738,1829,1913,2017,2126,2225,2331,2441,2548,2711,2809", + "endColumns": "106,101,108,85,104,116,80,80,90,92,95,93,94,92,94,96,90,90,83,103,108,98,105,109,106,162,97,81", + "endOffsets": "207,309,418,504,609,726,807,888,979,1072,1168,1262,1357,1450,1545,1642,1733,1824,1908,2012,2121,2220,2326,2436,2543,2706,2804,2886" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-zh-rTW_values-zh-rTW.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-tr_values-tr.arsc.flat", "map": [ { - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", - "from": { - "startLines": "123,73,72,71,70,20,21,22,113,114,122,121,27,77,78,76,75,74,90,89,88,80,62,30,31,81,38,115,69,65,40,46,51,41,61,60,59,55,54,52,53,56,57,47,68,58,66,45,50,49,48,64,44,63,42,43,67,29,19,35,37,34,36,33,32,26,25,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,120,118,117,119,28,79,87,92,91,93,86,85,84,83,23,24", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6673,3691,3624,3550,3499,890,931,980,6213,6259,6618,6567,1269,3955,4024,3895,3828,3764,4698,4637,4573,4158,3062,1442,1496,4213,1849,6317,3439,3222,1961,2248,2499,2015,3001,2947,2895,2696,2647,2551,2600,2743,2791,2292,3379,2842,3266,2204,2451,2394,2338,3166,2159,3123,2066,2108,3319,1390,846,1701,1799,1653,1751,1605,1559,1217,1163,5080,5020,5223,6136,5539,5469,5604,5683,5868,5794,5156,5413,5281,5347,4970,5973,6057,6528,6419,6370,6465,1332,4102,4513,4813,4754,4881,4464,4418,4369,4317,1029,1096", - "endLines": "125,73,72,71,70,20,21,22,113,114,122,121,27,77,78,76,75,74,90,89,88,80,62,30,31,81,38,115,69,65,40,46,51,41,61,60,59,55,54,52,53,56,57,47,68,58,66,45,50,49,48,64,44,63,42,43,67,29,19,35,37,34,36,33,32,26,25,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,120,118,117,119,28,79,87,92,91,93,86,85,84,83,23,24", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,42,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6847,3758,3685,3618,3544,925,974,1023,6253,6311,6667,6612,1326,4018,4096,3949,3889,3822,4748,4692,4631,4207,3117,1490,1553,4292,1924,6362,3493,3260,2009,2286,2545,2060,3056,2995,2941,2737,2690,2594,2641,2785,2836,2332,3433,2889,3313,2242,2493,2445,2388,3216,2198,3160,2102,2153,3373,1436,884,1745,1843,1695,1793,1647,1599,1263,1211,5150,5074,5275,6205,5598,5533,5677,5788,5967,5862,5217,5463,5341,5407,5014,6051,6130,6561,6459,6413,6522,1384,4152,4567,4875,4807,4938,4507,4458,4412,4363,1090,1157" - }, - "to": { - "startLines": "6,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,123,124,126,127,128,129,130,131,132,133,134,135,136", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,2954,3026,3092,3165,3215,3255,3303,3351,3396,3453,3507,3557,3619,3687,3764,3823,3889,3952,4007,4067,4130,4184,4244,4297,4359,4443,4523,4573,4632,4675,4728,4771,4822,4872,4932,4985,5036,5082,5130,5178,5224,5271,5321,5366,5425,5477,5529,5572,5619,5675,5730,5785,5829,5871,5912,5962,6021,6072,6115,6164,6213,6260,6307,6354,6399,6450,6503,6578,6637,6694,6768,6832,6901,6979,7089,7193,7266,7332,7387,7452,7517,7566,7649,7727,7765,7810,7936,7998,8156,8211,8270,8337,8395,8457,8505,8550,8598,8649,8715", - "endLines": "8,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,123,124,126,127,128,129,130,131,132,133,134,135,136", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,42,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,3021,3087,3160,3210,3250,3298,3346,3391,3448,3502,3552,3614,3682,3759,3818,3884,3947,4002,4062,4125,4179,4239,4292,4354,4438,4518,4568,4627,4670,4723,4766,4817,4867,4927,4980,5031,5077,5125,5173,5219,5266,5316,5361,5420,5472,5524,5567,5614,5670,5725,5780,5824,5866,5907,5957,6016,6067,6110,6159,6208,6255,6302,6349,6394,6445,6498,6573,6632,6689,6763,6827,6896,6974,7084,7188,7261,7327,7382,7447,7512,7561,7644,7722,7760,7805,7853,7993,8050,8206,8265,8332,8390,8452,8500,8545,8593,8644,8710,8776" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rTW\\values-zh-rTW.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,200,293,393,475,572,680,756,832,924,1018,1116,1212,1308,1402,1498,1590,1682,1774,1852,1948,2044,2139,2236,2331,2431,2581,2675", - "endColumns": "94,92,99,81,96,107,75,75,91,93,97,95,95,93,95,91,91,91,77,95,95,94,96,94,99,149,93,77", - "endOffsets": "195,288,388,470,567,675,751,827,919,1013,1111,1207,1303,1397,1493,1585,1677,1769,1847,1943,2039,2134,2231,2326,2426,2576,2670,2748" - }, - "to": { - "startLines": "9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,122", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "384,479,572,672,754,851,959,1035,1111,1203,1297,1395,1491,1587,1681,1777,1869,1961,2053,2131,2227,2323,2418,2515,2610,2710,2860,7858", - "endColumns": "94,92,99,81,96,107,75,75,91,93,97,95,95,93,95,91,91,91,77,95,95,94,96,94,99,149,93,77", - "endOffsets": "474,567,667,749,846,954,1030,1106,1198,1292,1390,1486,1582,1676,1772,1864,1956,2048,2126,2222,2318,2413,2510,2605,2705,2855,2949,7931" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-zh-rTW\\values-zh-rTW.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-tr\\values-tr.xml", "from": { "startLines": "2", "startColumns": "4", @@ -321,71 +267,45 @@ "endOffsets": "151" }, "to": { - "startLines": "125", + "startLines": "30", "startColumns": "4", - "startOffsets": "8055", + "startOffsets": "2865", "endColumns": "100", - "endOffsets": "8151" + "endOffsets": "2961" } }, { - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-tr\\values-tr.xml", "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "730", - "endLines": "21", - "endColumns": "19", - "endOffsets": "838" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "105,210,309,421,506,612,732,811,887,978,1071,1164,1258,1356,1449,1551,1646,1737,1828,1907,2014,2119,2215,2322,2424,2532,2688,2786", + "endColumns": "104,98,111,84,105,119,78,75,90,92,92,93,97,92,101,94,90,90,78,106,104,95,106,101,107,155,97,78", + "endOffsets": "205,304,416,501,607,727,806,882,973,1066,1159,1253,1351,1444,1546,1641,1732,1823,1902,2009,2114,2210,2317,2419,2527,2683,2781,2860" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-bn_values-bn.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-land_values-land.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-bn\\values-bn.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,214,326,432,526,631,760,838,916,1007,1100,1195,1289,1390,1483,1578,1672,1763,1854,1941,2051,2159,2258,2368,2474,2587,2752,2857", - "endColumns": "108,111,105,93,104,128,77,77,90,92,94,93,100,92,94,93,90,90,86,109,107,98,109,105,112,164,104,81", - "endOffsets": "209,321,427,521,626,755,833,911,1002,1095,1190,1284,1385,1478,1573,1667,1758,1849,1936,2046,2154,2253,2363,2469,2582,2747,2852,2934" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-bn\\values-bn.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-land\\values-land.xml", "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2939", - "endColumns": "100", - "endOffsets": "3035" + "startLines": "2,3,4", + "startColumns": "4,4,4", + "startOffsets": "55,125,196", + "endColumns": "69,70,67", + "endOffsets": "120,191,259" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-fa_values-fa.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-es_values-es.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-fa\\values-fa.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-es\\values-es.xml", "from": { "startLines": "2", "startColumns": "4", @@ -396,54 +316,53 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2903", + "startOffsets": "2924", "endColumns": "100", - "endOffsets": "2999" + "endOffsets": "3020" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-fa\\values-fa.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-es\\values-es.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,215,318,429,513,616,731,810,888,981,1076,1172,1266,1369,1464,1561,1660,1753,1843,1924,2036,2139,2237,2347,2451,2560,2721,2822", - "endColumns": "109,102,110,83,102,114,78,77,92,94,95,93,102,94,96,98,92,89,80,111,102,97,109,103,108,160,100,80", - "endOffsets": "210,313,424,508,611,726,805,883,976,1071,1167,1261,1364,1459,1556,1655,1748,1838,1919,2031,2134,2232,2342,2446,2555,2716,2817,2898" + "startOffsets": "105,222,335,443,528,629,757,842,924,1016,1110,1208,1302,1403,1497,1593,1689,1781,1873,1955,2062,2162,2261,2369,2476,2583,2742,2842", + "endColumns": "116,112,107,84,100,127,84,81,91,93,97,93,100,93,95,95,91,91,81,106,99,98,107,106,106,158,99,81", + "endOffsets": "217,330,438,523,624,752,837,919,1011,1105,1203,1297,1398,1492,1588,1684,1776,1868,1950,2057,2157,2256,2364,2471,2578,2737,2837,2919" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-watch-v21_values-watch-v21.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sw600dp-v13_values-sw600dp-v13.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-watch-v21\\values-watch-v21.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-sw600dp-v13\\values-sw600dp-v13.xml", "from": { - "startLines": "2,6,10", - "startColumns": "4,4,4", - "startOffsets": "55,271,499", - "endLines": "5,9,13", - "endColumns": "12,12,12", - "endOffsets": "266,494,724" + "startLines": "2,3,4,5,6,7,8,9", + "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": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-en-rCA_values-en-rCA.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-da_values-da.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rCA\\values-en-rCA.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-da\\values-da.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764", - "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81", - "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841" + "startOffsets": "105,208,307,419,502,602,715,792,869,960,1053,1149,1243,1338,1431,1526,1624,1715,1806,1885,1994,2102,2198,2312,2414,2515,2668,2765", + "endColumns": "102,98,111,82,99,112,76,76,90,92,95,93,94,92,94,97,90,90,78,108,107,95,113,101,100,152,96,78", + "endOffsets": "203,302,414,497,597,710,787,864,955,1048,1144,1238,1333,1426,1521,1619,1710,1801,1880,1989,2097,2193,2307,2409,2510,2663,2760,2839" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-en-rCA\\values-en-rCA.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-da\\values-da.xml", "from": { "startLines": "2", "startColumns": "4", @@ -454,15 +373,15 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2846", + "startOffsets": "2844", "endColumns": "100", - "endOffsets": "2942" + "endOffsets": "2940" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ky_values-ky.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ky_values-ky.arsc.flat", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ky\\values-ky.xml", @@ -494,10 +413,10 @@ ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sr_values-sr.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-te_values-te.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-sr\\values-sr.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-te\\values-te.xml", "from": { "startLines": "2", "startColumns": "4", @@ -508,38 +427,38 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2905", + "startOffsets": "2946", "endColumns": "100", - "endOffsets": "3001" + "endOffsets": "3042" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-sr\\values-sr.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-te\\values-te.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,214,317,423,509,613,731,812,892,983,1076,1172,1266,1367,1460,1555,1660,1751,1842,1930,2035,2143,2244,2348,2456,2557,2724,2821", - "endColumns": "108,102,105,85,103,117,80,79,90,92,95,93,100,92,94,104,90,90,87,104,107,100,103,107,100,166,96,83", - "endOffsets": "209,312,418,504,608,726,807,887,978,1071,1167,1261,1362,1455,1550,1655,1746,1837,1925,2030,2138,2239,2343,2451,2552,2719,2816,2900" + "startOffsets": "105,219,328,439,529,634,759,841,923,1014,1107,1203,1297,1398,1491,1586,1681,1772,1863,1947,2060,2168,2267,2378,2480,2597,2763,2864", + "endColumns": "113,108,110,89,104,124,81,81,90,92,95,93,100,92,94,94,90,90,83,112,107,98,110,101,116,165,100,81", + "endOffsets": "214,323,434,524,629,754,836,918,1009,1102,1198,1292,1393,1486,1581,1676,1767,1858,1942,2055,2163,2262,2373,2475,2592,2758,2859,2941" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-da_values-da.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ml_values-ml.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-da\\values-da.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ml\\values-ml.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,208,307,419,502,602,715,792,869,960,1053,1149,1243,1338,1431,1526,1624,1715,1806,1885,1994,2102,2198,2312,2414,2515,2668,2765", - "endColumns": "102,98,111,82,99,112,76,76,90,92,95,93,94,92,94,97,90,90,78,108,107,95,113,101,100,152,96,78", - "endOffsets": "203,302,414,497,597,710,787,864,955,1048,1144,1238,1333,1426,1521,1619,1710,1801,1880,1989,2097,2193,2307,2409,2510,2663,2760,2839" + "startOffsets": "105,224,342,457,550,655,787,864,940,1031,1124,1226,1320,1421,1515,1610,1709,1800,1891,1973,2084,2190,2288,2402,2502,2613,2772,2873", + "endColumns": "118,117,114,92,104,131,76,75,90,92,101,93,100,93,94,98,90,90,81,110,105,97,113,99,110,158,100,81", + "endOffsets": "219,337,452,545,650,782,859,935,1026,1119,1221,1315,1416,1510,1605,1704,1795,1886,1968,2079,2185,2283,2397,2497,2608,2767,2868,2950" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-da\\values-da.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ml\\values-ml.xml", "from": { "startLines": "2", "startColumns": "4", @@ -550,18 +469,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2844", + "startOffsets": "2955", "endColumns": "100", - "endOffsets": "2940" + "endOffsets": "3051" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-te_values-te.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-my_values-my.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-te\\values-te.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-my\\values-my.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "105,214,319,436,529,641,769,847,926,1017,1110,1206,1300,1401,1494,1589,1683,1774,1865,1951,2074,2186,2288,2414,2525,2635,2795,2895", + "endColumns": "108,104,116,92,111,127,77,78,90,92,95,93,100,92,94,93,90,90,85,122,111,101,125,110,109,159,99,83", + "endOffsets": "209,314,431,524,636,764,842,921,1012,1105,1201,1295,1396,1489,1584,1678,1769,1860,1946,2069,2181,2283,2409,2520,2630,2790,2890,2974" + } + }, + { + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-my\\values-my.xml", "from": { "startLines": "2", "startColumns": "4", @@ -572,38 +501,90 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2946", + "startOffsets": "2979", "endColumns": "100", - "endOffsets": "3042" + "endOffsets": "3075" } - }, + } + ] + }, + { + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-en-rXC_values-en-rXC.arsc.flat", + "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-te\\values-te.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rXC\\values-en-rXC.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,219,328,439,529,634,759,841,923,1014,1107,1203,1297,1398,1491,1586,1681,1772,1863,1947,2060,2168,2267,2378,2480,2597,2763,2864", - "endColumns": "113,108,110,89,104,124,81,81,90,92,95,93,100,92,94,94,90,90,83,112,107,98,110,101,116,165,100,81", - "endOffsets": "214,323,434,524,629,754,836,918,1009,1102,1198,1292,1393,1486,1581,1676,1767,1858,1942,2055,2163,2262,2373,2475,2592,2758,2859,2941" + "startOffsets": "105,310,510,719,904,1106,1321,1494,1671,1862,2055,2253,2449,2652,2847,3044,3239,3432,3623,3807,4011,4216,4417,4624,4826,5031,5303,5503", + "endColumns": "204,199,208,184,201,214,172,176,190,192,197,195,202,194,196,194,192,190,183,203,204,200,206,201,204,271,199,178", + "endOffsets": "305,505,714,899,1101,1316,1489,1666,1857,2050,2248,2444,2647,2842,3039,3234,3427,3618,3802,4006,4211,4412,4619,4821,5026,5298,5498,5677" + } + }, + { + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-en-rXC\\values-en-rXC.xml", + "from": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "202", + "endOffsets": "253" + }, + "to": { + "startLines": "30", + "startColumns": "4", + "startOffsets": "5682", + "endColumns": "202", + "endOffsets": "5880" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ml_values-ml.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-large-v4_values-large-v4.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ml\\values-ml.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-large-v4\\values-large-v4.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10", + "startColumns": "4,4,4,4,4,4,4,4,4", + "startOffsets": "55,114,185,256,326,396,464,532,636", + "endColumns": "58,70,70,69,69,67,67,103,115", + "endOffsets": "109,180,251,321,391,459,527,631,747" + } + } + ] + }, + { + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v24_values-v24.arsc.flat", + "map": [ + { + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v24\\values-v24.xml", + "from": { + "startLines": "2,3", + "startColumns": "4,4", + "startOffsets": "55,212", + "endColumns": "156,134", + "endOffsets": "207,342" + } + } + ] + }, + { + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sw_values-sw.arsc.flat", + "map": [ + { + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-sw\\values-sw.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,224,342,457,550,655,787,864,940,1031,1124,1226,1320,1421,1515,1610,1709,1800,1891,1973,2084,2190,2288,2402,2502,2613,2772,2873", - "endColumns": "118,117,114,92,104,131,76,75,90,92,101,93,100,93,94,98,90,90,81,110,105,97,113,99,110,158,100,81", - "endOffsets": "219,337,452,545,650,782,859,935,1026,1119,1221,1315,1416,1510,1605,1704,1795,1886,1968,2079,2185,2283,2397,2497,2608,2767,2868,2950" + "startOffsets": "105,208,306,414,504,609,726,808,891,982,1075,1169,1263,1364,1457,1552,1647,1738,1830,1912,2013,2122,2221,2328,2437,2542,2704,2801", + "endColumns": "102,97,107,89,104,116,81,82,90,92,93,93,100,92,94,94,90,91,81,100,108,98,106,108,104,161,96,81", + "endOffsets": "203,301,409,499,604,721,803,886,977,1070,1164,1258,1359,1452,1547,1642,1733,1825,1907,2008,2117,2216,2323,2432,2537,2699,2796,2878" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ml\\values-ml.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-sw\\values-sw.xml", "from": { "startLines": "2", "startColumns": "4", @@ -614,18 +595,61 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2955", + "startOffsets": "2883", "endColumns": "100", - "endOffsets": "3051" + "endOffsets": "2979" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-es_values-es.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v21_values-v21.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-es\\values-es.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-v21\\values-v21.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,13", + "startColumns": "4,4,4,4,4,4,4,4,4,4", + "startOffsets": "55,159,223,290,354,470,596,722,850,1022", + "endLines": "2,3,4,5,6,7,8,9,12,17", + "endColumns": "103,63,66,63,115,125,125,127,12,12", + "endOffsets": "154,218,285,349,465,591,717,845,1017,1355" + }, + "to": { + "startLines": "2,3,4,5,263,264,265,266,267,270", + "startColumns": "4,4,4,4,4,4,4,4,4,4", + "startOffsets": "55,159,223,290,19262,19378,19504,19630,19758,19930", + "endLines": "2,3,4,5,263,264,265,266,269,274", + "endColumns": "103,63,66,63,115,125,125,127,12,12", + "endOffsets": "154,218,285,349,19373,19499,19625,19753,19925,20263" + } + }, + { + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v21\\values-v21.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,17,19,20,21,22,24,26,27,28,29,30,32,34,36,38,40,42,43,48,50,52,53,54,56,58,59,60,61,62,63,107,110,154,157,160,162,164,166,169,171,174,175,176,179,180,181,182,183,184,187,188,190,192,194,196,200,202,203,204,205,207,211,213,215,216,217,218,219,221,222,223,233,234,235,247", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "55,146,249,352,457,564,673,782,891,1000,1109,1216,1319,1438,1593,1748,1853,1974,2075,2222,2363,2466,2585,2692,2795,2950,3121,3270,3435,3592,3743,3862,4234,4383,4532,4644,4791,4944,5091,5166,5255,5342,5443,5546,8614,8799,11879,12076,12275,12398,12521,12634,12817,12948,13149,13238,13349,13582,13683,13778,13901,14030,14147,14324,14423,14558,14701,14836,14955,15156,15275,15368,15479,15535,15642,15837,15948,16081,16176,16267,16358,16475,16614,16685,16768,17448,17505,17563,18257", + "endLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,16,18,19,20,21,23,25,26,27,28,29,31,33,35,37,39,41,42,47,49,51,52,53,55,57,58,59,60,61,62,106,109,153,156,159,161,163,165,168,170,173,174,175,178,179,180,181,182,183,186,187,189,191,193,195,199,201,202,203,204,206,210,212,214,215,216,217,218,220,221,222,232,233,234,246,258", + "endColumns": "90,102,102,104,106,108,108,108,108,108,106,102,118,12,12,104,120,100,12,12,102,118,106,102,12,12,12,12,12,12,118,12,12,12,111,146,12,12,74,88,86,100,102,12,12,12,12,12,12,12,12,12,12,12,88,110,12,100,94,122,128,116,12,98,12,12,12,12,12,12,92,110,55,12,12,12,12,94,90,90,116,12,70,82,12,56,57,12,12", + "endOffsets": "141,244,347,452,559,668,777,886,995,1104,1211,1314,1433,1588,1743,1848,1969,2070,2217,2358,2461,2580,2687,2790,2945,3116,3265,3430,3587,3738,3857,4229,4378,4527,4639,4786,4939,5086,5161,5250,5337,5438,5541,8609,8794,11874,12071,12270,12393,12516,12629,12812,12943,13144,13233,13344,13577,13678,13773,13896,14025,14142,14319,14418,14553,14696,14831,14950,15151,15270,15363,15474,15530,15637,15832,15943,16076,16171,16262,16353,16470,16609,16680,16763,17443,17500,17558,18252,18958" + }, + "to": { + "startLines": "6,7,8,9,10,11,12,13,14,15,16,17,18,19,21,23,24,25,26,28,30,31,32,33,34,36,38,40,42,44,46,47,52,54,56,57,58,60,62,63,64,65,66,67,111,114,158,161,164,166,168,170,173,175,178,179,180,183,184,185,186,187,188,191,192,194,196,198,200,204,206,207,208,209,211,215,217,219,220,221,222,223,225,226,227,237,238,239,251", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "354,445,548,651,756,863,972,1081,1190,1299,1408,1515,1618,1737,1892,2047,2152,2273,2374,2521,2662,2765,2884,2991,3094,3249,3420,3569,3734,3891,4042,4161,4533,4682,4831,4943,5090,5243,5390,5465,5554,5641,5742,5845,8913,9098,12178,12375,12574,12697,12820,12933,13116,13247,13448,13537,13648,13881,13982,14077,14200,14329,14446,14623,14722,14857,15000,15135,15254,15455,15574,15667,15778,15834,15941,16136,16247,16380,16475,16566,16657,16774,16913,16984,17067,17747,17804,17862,18556", + "endLines": "6,7,8,9,10,11,12,13,14,15,16,17,18,20,22,23,24,25,27,29,30,31,32,33,35,37,39,41,43,45,46,51,53,55,56,57,59,61,62,63,64,65,66,110,113,157,160,163,165,167,169,172,174,177,178,179,182,183,184,185,186,187,190,191,193,195,197,199,203,205,206,207,208,210,214,216,218,219,220,221,222,224,225,226,236,237,238,250,262", + "endColumns": "90,102,102,104,106,108,108,108,108,108,106,102,118,12,12,104,120,100,12,12,102,118,106,102,12,12,12,12,12,12,118,12,12,12,111,146,12,12,74,88,86,100,102,12,12,12,12,12,12,12,12,12,12,12,88,110,12,100,94,122,128,116,12,98,12,12,12,12,12,12,92,110,55,12,12,12,12,94,90,90,116,12,70,82,12,56,57,12,12", + "endOffsets": "440,543,646,751,858,967,1076,1185,1294,1403,1510,1613,1732,1887,2042,2147,2268,2369,2516,2657,2760,2879,2986,3089,3244,3415,3564,3729,3886,4037,4156,4528,4677,4826,4938,5085,5238,5385,5460,5549,5636,5737,5840,8908,9093,12173,12370,12569,12692,12815,12928,13111,13242,13443,13532,13643,13876,13977,14072,14195,14324,14441,14618,14717,14852,14995,15130,15249,15450,15569,15662,15773,15829,15936,16131,16242,16375,16470,16561,16652,16769,16908,16979,17062,17742,17799,17857,18551,19257" + } + } + ] + }, + { + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-b+sr+Latn_values-b+sr+Latn.arsc.flat", + "map": [ + { + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml", "from": { "startLines": "2", "startColumns": "4", @@ -636,28 +660,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2924", + "startOffsets": "2912", "endColumns": "100", - "endOffsets": "3020" + "endOffsets": "3008" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-es\\values-es.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,222,335,443,528,629,757,842,924,1016,1110,1208,1302,1403,1497,1593,1689,1781,1873,1955,2062,2162,2261,2369,2476,2583,2742,2842", - "endColumns": "116,112,107,84,100,127,84,81,91,93,97,93,100,93,95,95,91,91,81,106,99,98,107,106,106,158,99,81", - "endOffsets": "217,330,438,523,624,752,837,919,1011,1105,1203,1297,1398,1492,1588,1684,1776,1868,1950,2057,2157,2256,2364,2471,2578,2737,2837,2919" + "startOffsets": "105,214,318,424,510,614,732,814,895,986,1079,1175,1269,1370,1463,1558,1663,1754,1845,1933,2039,2147,2248,2353,2461,2562,2731,2828", + "endColumns": "108,103,105,85,103,117,81,80,90,92,95,93,100,92,94,104,90,90,87,105,107,100,104,107,100,168,96,83", + "endOffsets": "209,313,419,505,609,727,809,890,981,1074,1170,1264,1365,1458,1553,1658,1749,1840,1928,2034,2142,2243,2348,2456,2557,2726,2823,2907" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-cs_values-cs.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-am_values-am.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-cs\\values-cs.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-am\\values-am.xml", "from": { "startLines": "2", "startColumns": "4", @@ -668,54 +692,54 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2891", + "startOffsets": "2817", "endColumns": "100", - "endOffsets": "2987" + "endOffsets": "2913" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-cs\\values-cs.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-am\\values-am.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,212,314,423,509,614,731,812,893,984,1077,1173,1267,1362,1455,1550,1647,1738,1829,1913,2017,2126,2225,2331,2441,2548,2711,2809", - "endColumns": "106,101,108,85,104,116,80,80,90,92,95,93,94,92,94,96,90,90,83,103,108,98,105,109,106,162,97,81", - "endOffsets": "207,309,418,504,609,726,807,888,979,1072,1168,1262,1357,1450,1545,1642,1733,1824,1908,2012,2121,2220,2326,2436,2543,2706,2804,2886" + "startOffsets": "105,207,306,412,498,601,714,792,870,961,1054,1147,1241,1342,1435,1530,1624,1715,1805,1884,1984,2084,2180,2283,2382,2489,2642,2738", + "endColumns": "101,98,105,85,102,112,77,77,90,92,92,93,100,92,94,93,90,89,78,99,99,95,102,98,106,152,95,78", + "endOffsets": "202,301,407,493,596,709,787,865,956,1049,1142,1236,1337,1430,1525,1619,1710,1800,1879,1979,2079,2175,2278,2377,2484,2637,2733,2812" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v26_values-v26.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v28_values-v28.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v26\\values-v26.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v28\\values-v28.xml", "from": { - "startLines": "2,3,4,8,12,16", - "startColumns": "4,4,4,4,4,4", - "startOffsets": "55,130,217,431,657,896", - "endLines": "2,3,7,11,15,16", - "endColumns": "74,86,12,12,12,92", - "endOffsets": "125,212,426,652,891,984" + "startLines": "2,3,4,8", + "startColumns": "4,4,4,4", + "startOffsets": "55,130,217,447", + "endLines": "2,3,7,11", + "endColumns": "74,86,12,12", + "endOffsets": "125,212,442,684" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-en-rIN_values-en-rIN.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ar_values-ar.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rIN\\values-en-rIN.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ar\\values-ar.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764", - "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81", - "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841" + "startOffsets": "105,222,326,435,517,618,732,811,890,981,1074,1170,1264,1365,1458,1553,1647,1738,1832,1911,2016,2117,2213,2321,2424,2527,2682,2779", + "endColumns": "116,103,108,81,100,113,78,78,90,92,95,93,100,92,94,93,90,93,78,104,100,95,107,102,102,154,96,80", + "endOffsets": "217,321,430,512,613,727,806,885,976,1069,1165,1259,1360,1453,1548,1642,1733,1827,1906,2011,2112,2208,2316,2419,2522,2677,2774,2855" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-en-rIN\\values-en-rIN.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ar\\values-ar.xml", "from": { "startLines": "2", "startColumns": "4", @@ -726,28 +750,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2846", + "startOffsets": "2860", "endColumns": "100", - "endOffsets": "2942" + "endOffsets": "2956" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sq_values-sq.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-or_values-or.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-sq\\values-sq.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-or\\values-or.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,219,319,431,518,628,751,832,911,1002,1095,1191,1285,1387,1480,1575,1672,1763,1856,1939,2045,2150,2248,2354,2457,2573,2727,2826", - "endColumns": "113,99,111,86,109,122,80,78,90,92,95,93,101,92,94,96,90,92,82,105,104,97,105,102,115,153,98,80", - "endOffsets": "214,314,426,513,623,746,827,906,997,1090,1186,1280,1382,1475,1570,1667,1758,1851,1934,2040,2145,2243,2349,2452,2568,2722,2821,2902" + "startOffsets": "105,224,334,441,527,631,751,828,905,996,1089,1186,1281,1382,1475,1570,1666,1757,1847,1929,2039,2144,2250,2361,2464,2582,2745,2847", + "endColumns": "118,109,106,85,103,119,76,76,90,92,96,94,100,92,94,95,90,89,81,109,104,105,110,102,117,162,101,88", + "endOffsets": "219,329,436,522,626,746,823,900,991,1084,1181,1276,1377,1470,1565,1661,1752,1842,1924,2034,2139,2245,2356,2459,2577,2740,2842,2931" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-sq\\values-sq.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-or\\values-or.xml", "from": { "startLines": "2", "startColumns": "4", @@ -758,50 +782,34 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2907", + "startOffsets": "2936", "endColumns": "100", - "endOffsets": "3003" + "endOffsets": "3032" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v23_values-v23.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v25_values-v25.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v23\\values-v23.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v25\\values-v25.xml", "from": { - "startLines": "2,3,4,5,6,19,32,33,34,35,36", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "55,190,325,400,487,1277,2079,2206,2311,2426,2533", - "endLines": "2,3,4,5,18,31,32,33,34,35,36", - "endColumns": "134,134,74,86,12,12,126,104,114,106,112", - "endOffsets": "185,320,395,482,1272,2074,2201,2306,2421,2528,2641" + "startLines": "2,3,4,6", + "startColumns": "4,4,4,4", + "startOffsets": "55,126,209,308", + "endLines": "2,3,5,7", + "endColumns": "70,82,12,12", + "endOffsets": "121,204,303,414" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v22_values-v22.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-si_values-si.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v22\\values-v22.xml", - "from": { - "startLines": "2,3,4,9", - "startColumns": "4,4,4,4", - "startOffsets": "55,130,217,553", - "endLines": "2,3,8,13", - "endColumns": "74,86,12,12", - "endOffsets": "125,212,548,896" - } - } - ] - }, - { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-de_values-de.arsc.flat", - "map": [ - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-de\\values-de.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-si\\values-si.xml", "from": { "startLines": "2", "startColumns": "4", @@ -812,54 +820,64 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2925", + "startOffsets": "2903", "endColumns": "100", - "endOffsets": "3021" + "endOffsets": "2999" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-de\\values-de.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-si\\values-si.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,210,308,420,506,611,726,803,879,971,1065,1162,1263,1371,1471,1575,1675,1773,1870,1952,2063,2166,2265,2376,2478,2585,2741,2843", - "endColumns": "104,97,111,85,104,114,76,75,91,93,96,100,107,99,103,99,97,96,81,110,102,98,110,101,106,155,101,81", - "endOffsets": "205,303,415,501,606,721,798,874,966,1060,1157,1258,1366,1466,1570,1670,1768,1865,1947,2058,2161,2260,2371,2473,2580,2736,2838,2920" + "startOffsets": "105,215,322,429,517,622,738,827,914,1005,1098,1193,1287,1388,1481,1576,1670,1761,1852,1936,2045,2150,2248,2358,2457,2563,2722,2821", + "endColumns": "109,106,106,87,104,115,88,86,90,92,94,93,100,92,94,93,90,90,83,108,104,97,109,98,105,158,98,81", + "endOffsets": "210,317,424,512,617,733,822,909,1000,1093,1188,1282,1383,1476,1571,1665,1756,1847,1931,2040,2145,2243,2353,2452,2558,2717,2816,2898" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-watch-v20_values-watch-v20.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-zh-rTW_values-zh-rTW.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-watch-v20\\values-watch-v20.xml", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "from": { - "startLines": "2,5,8", - "startColumns": "4,4,4", - "startOffsets": "55,214,385", - "endLines": "4,7,10", - "endColumns": "12,12,12", - "endOffsets": "209,380,553" + "startLines": "123,73,72,71,70,20,21,22,113,114,122,121,27,77,78,76,75,74,90,89,88,80,62,30,31,81,38,115,69,65,40,46,51,41,61,60,59,55,54,52,53,56,57,47,68,58,66,45,50,49,48,64,44,63,42,43,67,29,19,35,37,34,36,33,32,26,25,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,120,118,117,119,28,79,87,92,91,93,86,85,84,83,23,24", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6673,3691,3624,3550,3499,890,931,980,6213,6259,6618,6567,1269,3955,4024,3895,3828,3764,4698,4637,4573,4158,3062,1442,1496,4213,1849,6317,3439,3222,1961,2248,2499,2015,3001,2947,2895,2696,2647,2551,2600,2743,2791,2292,3379,2842,3266,2204,2451,2394,2338,3166,2159,3123,2066,2108,3319,1390,846,1701,1799,1653,1751,1605,1559,1217,1163,5080,5020,5223,6136,5539,5469,5604,5683,5868,5794,5156,5413,5281,5347,4970,5973,6057,6528,6419,6370,6465,1332,4102,4513,4813,4754,4881,4464,4418,4369,4317,1029,1096", + "endLines": "125,73,72,71,70,20,21,22,113,114,122,121,27,77,78,76,75,74,90,89,88,80,62,30,31,81,38,115,69,65,40,46,51,41,61,60,59,55,54,52,53,56,57,47,68,58,66,45,50,49,48,64,44,63,42,43,67,29,19,35,37,34,36,33,32,26,25,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,120,118,117,119,28,79,87,92,91,93,86,85,84,83,23,24", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,42,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6847,3758,3685,3618,3544,925,974,1023,6253,6311,6667,6612,1326,4018,4096,3949,3889,3822,4748,4692,4631,4207,3117,1490,1553,4292,1924,6362,3493,3260,2009,2286,2545,2060,3056,2995,2941,2737,2690,2594,2641,2785,2836,2332,3433,2889,3313,2242,2493,2445,2388,3216,2198,3160,2102,2153,3373,1436,884,1745,1843,1695,1793,1647,1599,1263,1211,5150,5074,5275,6205,5598,5533,5677,5788,5967,5862,5217,5463,5341,5407,5014,6051,6130,6561,6459,6413,6522,1384,4152,4567,4875,4807,4938,4507,4458,4412,4363,1090,1157" + }, + "to": { + "startLines": "6,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,123,124,126,127,128,129,130,131,132,133,134,135,136", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,2954,3026,3092,3165,3215,3255,3303,3351,3396,3453,3507,3557,3619,3687,3764,3823,3889,3952,4007,4067,4130,4184,4244,4297,4359,4443,4523,4573,4632,4675,4728,4771,4822,4872,4932,4985,5036,5082,5130,5178,5224,5271,5321,5366,5425,5477,5529,5572,5619,5675,5730,5785,5829,5871,5912,5962,6021,6072,6115,6164,6213,6260,6307,6354,6399,6450,6503,6578,6637,6694,6768,6832,6901,6979,7089,7193,7266,7332,7387,7452,7517,7566,7649,7727,7765,7810,7936,7998,8156,8211,8270,8337,8395,8457,8505,8550,8598,8649,8715", + "endLines": "8,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,123,124,126,127,128,129,130,131,132,133,134,135,136", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,42,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,3021,3087,3160,3210,3250,3298,3346,3391,3448,3502,3552,3614,3682,3759,3818,3884,3947,4002,4062,4125,4179,4239,4292,4354,4438,4518,4568,4627,4670,4723,4766,4817,4867,4927,4980,5031,5077,5125,5173,5219,5266,5316,5361,5420,5472,5524,5567,5614,5670,5725,5780,5824,5866,5907,5957,6016,6067,6110,6159,6208,6255,6302,6349,6394,6445,6498,6573,6632,6689,6763,6827,6896,6974,7084,7188,7261,7327,7382,7447,7512,7561,7644,7722,7760,7805,7853,7993,8050,8206,8265,8332,8390,8452,8500,8545,8593,8644,8710,8776" } - } - ] - }, - { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-en-rAU_values-en-rAU.arsc.flat", - "map": [ + }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rAU\\values-en-rAU.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rTW\\values-zh-rTW.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764", - "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81", - "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841" + "startOffsets": "105,200,293,393,475,572,680,756,832,924,1018,1116,1212,1308,1402,1498,1590,1682,1774,1852,1948,2044,2139,2236,2331,2431,2581,2675", + "endColumns": "94,92,99,81,96,107,75,75,91,93,97,95,95,93,95,91,91,91,77,95,95,94,96,94,99,149,93,77", + "endOffsets": "195,288,388,470,567,675,751,827,919,1013,1111,1207,1303,1397,1493,1585,1677,1769,1847,1943,2039,2134,2231,2326,2426,2576,2670,2748" + }, + "to": { + "startLines": "9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,122", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "384,479,572,672,754,851,959,1035,1111,1203,1297,1395,1491,1587,1681,1777,1869,1961,2053,2131,2227,2323,2418,2515,2610,2710,2860,7858", + "endColumns": "94,92,99,81,96,107,75,75,91,93,97,95,95,93,95,91,91,91,77,95,95,94,96,94,99,149,93,77", + "endOffsets": "474,567,667,749,846,954,1030,1106,1198,1292,1390,1486,1582,1676,1772,1864,1956,2048,2126,2222,2318,2413,2510,2605,2705,2855,2949,7931" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-en-rAU\\values-en-rAU.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-zh-rTW\\values-zh-rTW.xml", "from": { "startLines": "2", "startColumns": "4", @@ -868,30 +886,49 @@ "endOffsets": "151" }, "to": { - "startLines": "30", + "startLines": "125", "startColumns": "4", - "startOffsets": "2846", + "startOffsets": "8055", "endColumns": "100", - "endOffsets": "2942" + "endOffsets": "8151" + } + }, + { + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endLines": "21", + "endColumns": "19", + "endOffsets": "838" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-az_values-az.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-af_values-af.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-az\\values-az.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-af\\values-af.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,213,312,424,512,619,733,814,893,984,1077,1172,1271,1372,1465,1560,1655,1746,1838,1923,2030,2137,2237,2346,2450,2560,2718,2820", - "endColumns": "107,98,111,87,106,113,80,78,90,92,94,98,100,92,94,94,90,91,84,106,106,99,108,103,109,157,101,82", - "endOffsets": "208,307,419,507,614,728,809,888,979,1072,1167,1266,1367,1460,1555,1650,1741,1833,1918,2025,2132,2232,2341,2445,2555,2713,2815,2898" + "startOffsets": "105,209,309,415,500,603,721,797,874,965,1058,1154,1248,1348,1441,1536,1635,1730,1824,1905,2012,2115,2212,2320,2422,2524,2678,2776", + "endColumns": "103,99,105,84,102,117,75,76,90,92,95,93,99,92,94,98,94,93,80,106,102,96,107,101,101,153,97,79", + "endOffsets": "204,304,410,495,598,716,792,869,960,1053,1149,1243,1343,1436,1531,1630,1725,1819,1900,2007,2110,2207,2315,2417,2519,2673,2771,2851" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-az\\values-az.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-af\\values-af.xml", "from": { "startLines": "2", "startColumns": "4", @@ -902,18 +939,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2903", + "startOffsets": "2856", "endColumns": "100", - "endOffsets": "2999" + "endOffsets": "2952" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-kk_values-kk.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-hu_values-hu.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-kk\\values-kk.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-hu\\values-hu.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "105,213,318,433,517,629,759,835,911,1002,1095,1191,1285,1386,1479,1574,1669,1760,1851,1934,2044,2155,2255,2366,2474,2593,2775,2878", + "endColumns": "107,104,114,83,111,129,75,75,90,92,95,93,100,92,94,94,90,90,82,109,110,99,110,107,118,181,102,82", + "endOffsets": "208,313,428,512,624,754,830,906,997,1090,1186,1280,1381,1474,1569,1664,1755,1846,1929,2039,2150,2250,2361,2469,2588,2770,2873,2956" + } + }, + { + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-hu\\values-hu.xml", "from": { "startLines": "2", "startColumns": "4", @@ -924,28 +971,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2893", + "startOffsets": "2961", "endColumns": "100", - "endOffsets": "2989" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-kk\\values-kk.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,217,320,430,515,621,740,821,901,992,1085,1181,1275,1376,1469,1564,1661,1752,1844,1925,2028,2133,2231,2338,2447,2547,2713,2812", - "endColumns": "111,102,109,84,105,118,80,79,90,92,95,93,100,92,94,96,90,91,80,102,104,97,106,108,99,165,98,80", - "endOffsets": "212,315,425,510,616,735,816,896,987,1080,1176,1270,1371,1464,1559,1656,1747,1839,1920,2023,2128,2226,2333,2442,2542,2708,2807,2888" + "endOffsets": "3057" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sv_values-sv.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-lv_values-lv.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-sv\\values-sv.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-lv\\values-lv.xml", "from": { "startLines": "2", "startColumns": "4", @@ -956,60 +993,38 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2863", + "startOffsets": "3076", "endColumns": "100", - "endOffsets": "2959" + "endOffsets": "3172" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-sv\\values-sv.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-lv\\values-lv.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,211,314,425,510,612,725,801,877,970,1065,1161,1255,1358,1453,1550,1648,1744,1837,1917,2023,2123,2219,2324,2426,2528,2682,2784", - "endColumns": "105,102,110,84,101,112,75,75,92,94,95,93,102,94,96,97,95,92,79,105,99,95,104,101,101,153,101,78", - "endOffsets": "206,309,420,505,607,720,796,872,965,1060,1156,1250,1353,1448,1545,1643,1739,1832,1912,2018,2118,2214,2319,2421,2523,2677,2779,2858" + "startOffsets": "105,225,333,442,528,632,754,836,918,1028,1136,1243,1352,1464,1567,1679,1786,1891,1991,2076,2185,2297,2396,2507,2616,2721,2895,2994", + "endColumns": "119,107,108,85,103,121,81,81,109,107,106,108,111,102,111,106,104,99,84,108,111,98,110,108,104,173,98,81", + "endOffsets": "220,328,437,523,627,749,831,913,1023,1131,1238,1347,1459,1562,1674,1781,1886,1986,2071,2180,2292,2391,2502,2611,2716,2890,2989,3071" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-bs_values-bs.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-is_values-is.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-bs\\values-bs.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-is\\values-is.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,224,333,440,526,630,752,834,915,1006,1099,1195,1289,1390,1483,1578,1677,1768,1859,1945,2048,2153,2251,2356,2469,2572,2745,2842", - "endColumns": "118,108,106,85,103,121,81,80,90,92,95,93,100,92,94,98,90,90,85,102,104,97,104,112,102,172,96,83", - "endOffsets": "219,328,435,521,625,747,829,910,1001,1094,1190,1284,1385,1478,1573,1672,1763,1854,1940,2043,2148,2246,2351,2464,2567,2740,2837,2921" + "startOffsets": "105,205,302,414,499,600,714,794,874,965,1058,1154,1248,1355,1448,1543,1638,1729,1823,1904,2014,2122,2220,2329,2428,2531,2686,2784", + "endColumns": "99,96,111,84,100,113,79,79,90,92,95,93,106,92,94,94,90,93,80,109,107,97,108,98,102,154,97,80", + "endOffsets": "200,297,409,494,595,709,789,869,960,1053,1149,1243,1350,1443,1538,1633,1724,1818,1899,2009,2117,2215,2324,2423,2526,2681,2779,2860" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.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": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-th_values-th.arsc.flat", - "map": [ - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-th\\values-th.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-is\\values-is.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1020,38 +1035,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2845", + "startOffsets": "2865", "endColumns": "100", - "endOffsets": "2941" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-th\\values-th.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,210,308,416,505,607,717,794,872,963,1056,1152,1246,1347,1440,1535,1629,1720,1811,1892,2000,2104,2202,2310,2415,2516,2669,2764", - "endColumns": "104,97,107,88,101,109,76,77,90,92,95,93,100,92,94,93,90,90,80,107,103,97,107,104,100,152,94,80", - "endOffsets": "205,303,411,500,602,712,789,867,958,1051,1147,1241,1342,1435,1530,1624,1715,1806,1887,1995,2099,2197,2305,2410,2511,2664,2759,2840" + "endOffsets": "2961" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-as_values-as.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-az_values-az.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-as\\values-as.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-az\\values-az.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,213,312,419,515,617,736,816,896,987,1080,1173,1268,1368,1461,1558,1652,1743,1834,1923,2025,2140,2243,2352,2471,2591,2758,2861", - "endColumns": "107,98,106,95,101,118,79,79,90,92,92,94,99,92,96,93,90,90,88,101,114,102,108,118,119,166,102,88", - "endOffsets": "208,307,414,510,612,731,811,891,982,1075,1168,1263,1363,1456,1553,1647,1738,1829,1918,2020,2135,2238,2347,2466,2586,2753,2856,2945" + "startOffsets": "105,213,312,424,512,619,733,814,893,984,1077,1172,1271,1372,1465,1560,1655,1746,1838,1923,2030,2137,2237,2346,2450,2560,2718,2820", + "endColumns": "107,98,111,87,106,113,80,78,90,92,94,98,100,92,94,94,90,91,84,106,106,99,108,103,109,157,101,82", + "endOffsets": "208,307,419,507,614,728,809,888,979,1072,1167,1266,1367,1460,1555,1650,1741,1833,1918,2025,2132,2232,2341,2445,2555,2713,2815,2898" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-as\\values-as.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-az\\values-az.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1062,28 +1067,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2950", + "startOffsets": "2903", "endColumns": "100", - "endOffsets": "3046" + "endOffsets": "2999" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-hy_values-hy.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ru_values-ru.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-hy\\values-hy.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ru\\values-ru.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,208,309,419,508,614,729,811,892,983,1076,1172,1266,1367,1460,1555,1649,1740,1831,1916,2023,2130,2229,2339,2446,2546,2703,2802", - "endColumns": "102,100,109,88,105,114,81,80,90,92,95,93,100,92,94,93,90,90,84,106,106,98,109,106,99,156,98,81", - "endOffsets": "203,304,414,503,609,724,806,887,978,1071,1167,1261,1362,1455,1550,1644,1735,1826,1911,2018,2125,2224,2334,2441,2541,2698,2797,2879" + "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" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-hy\\values-hy.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ru\\values-ru.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1094,18 +1099,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2884", + "startOffsets": "2913", "endColumns": "100", - "endOffsets": "2980" + "endOffsets": "3009" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-pl_values-pl.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-gl_values-gl.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-pl\\values-pl.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-gl\\values-gl.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1116,38 +1121,38 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2909", + "startOffsets": "2920", "endColumns": "100", - "endOffsets": "3005" + "endOffsets": "3016" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-pl\\values-pl.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-gl\\values-gl.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,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,217,329,437,522,624,750,834,915,1007,1101,1199,1293,1394,1488,1584,1679,1771,1863,1945,2052,2161,2260,2368,2472,2579,2738,2838", + "endColumns": "111,111,107,84,101,125,83,80,91,93,97,93,100,93,95,94,91,91,81,106,108,98,107,103,106,158,99,81", + "endOffsets": "212,324,432,517,619,745,829,910,1002,1096,1194,1288,1389,1483,1579,1674,1766,1858,1940,2047,2156,2255,2363,2467,2574,2733,2833,2915" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-uz_values-uz.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-lt_values-lt.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-uz\\values-uz.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-lt\\values-lt.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,210,314,428,514,614,730,810,889,980,1073,1169,1263,1358,1451,1546,1641,1732,1824,1908,2017,2124,2225,2333,2438,2545,2706,2805", - "endColumns": "104,103,113,85,99,115,79,78,90,92,95,93,94,92,94,94,90,91,83,108,106,100,107,104,106,160,98,83", - "endOffsets": "205,309,423,509,609,725,805,884,975,1068,1164,1258,1353,1446,1541,1636,1727,1819,1903,2012,2119,2220,2328,2433,2540,2701,2800,2884" + "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\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-uz\\values-uz.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-lt\\values-lt.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1158,18 +1163,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2889", + "startOffsets": "2978", "endColumns": "100", - "endOffsets": "2985" + "endOffsets": "3074" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-iw_values-iw.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-mr_values-mr.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-iw\\values-iw.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-mr\\values-mr.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1180,38 +1185,70 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2832", + "startOffsets": "2887", "endColumns": "100", - "endOffsets": "2928" + "endOffsets": "2983" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-iw\\values-iw.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-mr\\values-mr.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,209,308,416,500,600,714,792,870,961,1055,1151,1245,1346,1439,1534,1631,1722,1814,1895,1997,2101,2199,2302,2403,2503,2655,2751", - "endColumns": "103,98,107,83,99,113,77,77,90,93,95,93,100,92,94,96,90,91,80,101,103,97,102,100,99,151,95,80", - "endOffsets": "204,303,411,495,595,709,787,865,956,1050,1146,1240,1341,1434,1529,1626,1717,1809,1890,1992,2096,2194,2297,2398,2498,2650,2746,2827" - } + "startOffsets": "105,216,322,429,519,620,735,812,890,981,1074,1168,1265,1366,1459,1554,1651,1742,1833,1913,2025,2127,2223,2332,2433,2545,2702,2807", + "endColumns": "110,105,106,89,100,114,76,77,90,92,93,96,100,92,94,96,90,90,79,111,101,95,108,100,111,156,104,79", + "endOffsets": "211,317,424,514,615,730,807,885,976,1069,1163,1260,1361,1454,1549,1646,1737,1828,1908,2020,2122,2218,2327,2428,2540,2697,2802,2882" + } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-hu_values-hu.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-uk_values-uk.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-hu\\values-hu.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-uk\\values-uk.xml", + "from": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "100", + "endOffsets": "151" + }, + "to": { + "startLines": "30", + "startColumns": "4", + "startOffsets": "2900", + "endColumns": "100", + "endOffsets": "2996" + } + }, + { + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-uk\\values-uk.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,213,318,433,517,629,759,835,911,1002,1095,1191,1285,1386,1479,1574,1669,1760,1851,1934,2044,2155,2255,2366,2474,2593,2775,2878", - "endColumns": "107,104,114,83,111,129,75,75,90,92,95,93,100,92,94,94,90,90,82,109,110,99,110,107,118,181,102,82", - "endOffsets": "208,313,428,512,624,754,830,906,997,1090,1186,1280,1381,1474,1569,1664,1755,1846,1929,2039,2150,2250,2361,2469,2588,2770,2873,2956" + "startOffsets": "105,215,317,423,509,617,735,814,894,985,1078,1174,1268,1369,1462,1557,1652,1743,1834,1915,2021,2128,2226,2334,2440,2549,2719,2819", + "endColumns": "109,101,105,85,107,117,78,79,90,92,95,93,100,92,94,94,90,90,80,105,106,97,107,105,108,169,99,80", + "endOffsets": "210,312,418,504,612,730,809,889,980,1073,1169,1263,1364,1457,1552,1647,1738,1829,1910,2016,2123,2221,2329,2435,2544,2714,2814,2895" + } + } + ] + }, + { + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-vi_values-vi.arsc.flat", + "map": [ + { + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-vi\\values-vi.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "105,219,327,436,520,623,742,819,896,987,1080,1176,1270,1371,1464,1559,1657,1748,1839,1923,2027,2136,2237,2342,2456,2561,2718,2817", + "endColumns": "113,107,108,83,102,118,76,76,90,92,95,93,100,92,94,97,90,90,83,103,108,100,104,113,104,156,98,83", + "endOffsets": "214,322,431,515,618,737,814,891,982,1075,1171,1265,1366,1459,1554,1652,1743,1834,1918,2022,2131,2232,2337,2451,2556,2713,2812,2896" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-hu\\values-hu.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-vi\\values-vi.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1222,18 +1259,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2961", + "startOffsets": "2901", "endColumns": "100", - "endOffsets": "3057" + "endOffsets": "2997" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-mk_values-mk.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-km_values-km.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-mk\\values-mk.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-km\\values-km.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1244,38 +1281,38 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2945", + "startOffsets": "2882", "endColumns": "100", - "endOffsets": "3041" + "endOffsets": "2978" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-mk\\values-mk.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-km\\values-km.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,213,317,425,511,616,735,818,900,997,1096,1193,1293,1400,1499,1600,1696,1793,1884,1971,2077,2184,2285,2392,2503,2607,2763,2861", - "endColumns": "107,103,107,85,104,118,82,81,96,98,96,99,106,98,100,95,96,90,86,105,106,100,106,110,103,155,97,83", - "endOffsets": "208,312,420,506,611,730,813,895,992,1091,1188,1288,1395,1494,1595,1691,1788,1879,1966,2072,2179,2280,2387,2498,2602,2758,2856,2940" + "startOffsets": "105,208,308,420,507,611,729,806,883,974,1067,1163,1257,1358,1451,1546,1640,1731,1822,1905,2009,2114,2214,2324,2431,2539,2701,2799", + "endColumns": "102,99,111,86,103,117,76,76,90,92,95,93,100,92,94,93,90,90,82,103,104,99,109,106,107,161,97,82", + "endOffsets": "203,303,415,502,606,724,801,878,969,1062,1158,1252,1353,1446,1541,1635,1726,1817,1900,2004,2109,2209,2319,2426,2534,2696,2794,2877" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-in_values-in.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-el_values-el.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-in\\values-in.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-el\\values-el.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,215,317,422,509,613,729,811,890,981,1074,1170,1264,1365,1458,1553,1647,1738,1829,1915,2018,2127,2228,2332,2440,2548,2704,2803", - "endColumns": "109,101,104,86,103,115,81,78,90,92,95,93,100,92,94,93,90,90,85,102,108,100,103,107,107,155,98,83", - "endOffsets": "210,312,417,504,608,724,806,885,976,1069,1165,1259,1360,1453,1548,1642,1733,1824,1910,2013,2122,2223,2327,2435,2543,2699,2798,2882" + "startOffsets": "105,223,334,451,536,641,767,855,941,1032,1125,1221,1315,1416,1509,1604,1701,1792,1883,1968,2079,2189,2291,2402,2511,2619,2779,2879", + "endColumns": "117,110,116,84,104,125,87,85,90,92,95,93,100,92,94,96,90,90,84,110,109,101,110,108,107,159,99,84", + "endOffsets": "218,329,446,531,636,762,850,936,1027,1120,1216,1310,1411,1504,1599,1696,1787,1878,1963,2074,2184,2286,2397,2506,2614,2774,2874,2959" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-in\\values-in.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-el\\values-el.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1286,33 +1323,65 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2887", + "startOffsets": "2964", "endColumns": "100", - "endOffsets": "2983" + "endOffsets": "3060" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sw600dp-v13_values-sw600dp-v13.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-iw_values-iw.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-sw600dp-v13\\values-sw600dp-v13.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-iw\\values-iw.xml", "from": { - "startLines": "2,3,4,5,6,7,8,9", - "startColumns": "4,4,4,4,4,4,4,4", - "startOffsets": "55,124,193,263,337,413,472,543", - "endColumns": "68,68,69,73,75,58,70,67", - "endOffsets": "119,188,258,332,408,467,538,606" + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "100", + "endOffsets": "151" + }, + "to": { + "startLines": "30", + "startColumns": "4", + "startOffsets": "2832", + "endColumns": "100", + "endOffsets": "2928" + } + }, + { + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-iw\\values-iw.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "105,209,308,416,500,600,714,792,870,961,1055,1151,1245,1346,1439,1534,1631,1722,1814,1895,1997,2101,2199,2302,2403,2503,2655,2751", + "endColumns": "103,98,107,83,99,113,77,77,90,93,95,93,100,92,94,96,90,91,80,101,103,97,102,100,99,151,95,80", + "endOffsets": "204,303,411,495,595,709,787,865,956,1050,1146,1240,1341,1434,1529,1626,1717,1809,1890,1992,2096,2194,2297,2398,2498,2650,2746,2827" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sl_values-sl.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-h720dp-v13_values-h720dp-v13.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-sl\\values-sl.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-h720dp-v13\\values-h720dp-v13.xml", + "from": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "66", + "endOffsets": "117" + } + } + ] + }, + { + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-de_values-de.arsc.flat", + "map": [ + { + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-de\\values-de.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1323,53 +1392,86 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2936", + "startOffsets": "2925", "endColumns": "100", - "endOffsets": "3032" + "endOffsets": "3021" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-sl\\values-sl.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-de\\values-de.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,212,319,427,514,617,736,821,905,997,1091,1187,1281,1377,1471,1567,1667,1759,1851,1935,2043,2152,2252,2365,2472,2576,2756,2853", - "endColumns": "106,106,107,86,102,118,84,83,91,93,95,93,95,93,95,99,91,91,83,107,108,99,112,106,103,179,96,82", - "endOffsets": "207,314,422,509,612,731,816,900,992,1086,1182,1276,1372,1466,1562,1662,1754,1846,1930,2038,2147,2247,2360,2467,2571,2751,2848,2931" + "startOffsets": "105,210,308,420,506,611,726,803,879,971,1065,1162,1263,1371,1471,1575,1675,1773,1870,1952,2063,2166,2265,2376,2478,2585,2741,2843", + "endColumns": "104,97,111,85,104,114,76,75,91,93,96,100,107,99,103,99,97,96,81,110,102,98,110,101,106,155,101,81", + "endOffsets": "205,303,415,501,606,721,798,874,966,1060,1157,1258,1366,1466,1570,1670,1768,1865,1947,2058,2161,2260,2371,2473,2580,2736,2838,2920" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-land_values-land.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-bs_values-bs.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-land\\values-land.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-bs\\values-bs.xml", "from": { - "startLines": "2,3,4", - "startColumns": "4,4,4", - "startOffsets": "55,125,196", - "endColumns": "69,70,67", - "endOffsets": "120,191,259" + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "105,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\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.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": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ka_values-ka.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-hdpi-v4_values-hdpi-v4.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ka\\values-ka.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-hdpi-v4\\values-hdpi-v4.xml", + "from": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endLines": "6", + "endColumns": "13", + "endOffsets": "327" + } + } + ] + }, + { + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-nl_values-nl.arsc.flat", + "map": [ + { + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-nl\\values-nl.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,214,318,429,517,622,735,819,901,992,1085,1180,1276,1377,1470,1565,1659,1750,1841,1924,2037,2144,2242,2355,2459,2563,2720,2818", - "endColumns": "108,103,110,87,104,112,83,81,90,92,94,95,100,92,94,93,90,90,82,112,106,97,112,103,103,156,97,80", - "endOffsets": "209,313,424,512,617,730,814,896,987,1080,1175,1271,1372,1465,1560,1654,1745,1836,1919,2032,2139,2237,2350,2454,2558,2715,2813,2894" + "startOffsets": "105,223,328,435,521,629,749,826,903,995,1089,1190,1284,1385,1479,1575,1670,1762,1854,1936,2047,2151,2250,2365,2478,2581,2736,2839", + "endColumns": "117,104,106,85,107,119,76,76,91,93,100,93,100,93,95,94,91,91,81,110,103,98,114,112,102,154,102,81", + "endOffsets": "218,323,430,516,624,744,821,898,990,1084,1185,1279,1380,1474,1570,1665,1757,1849,1931,2042,2146,2245,2360,2473,2576,2731,2834,2916" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ka\\values-ka.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-nl\\values-nl.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1380,28 +1482,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2899", + "startOffsets": "2921", "endColumns": "100", - "endOffsets": "2995" + "endOffsets": "3017" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-fr-rCA_values-fr-rCA.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ja_values-ja.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-fr-rCA\\values-fr-rCA.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ja\\values-ja.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,216,331,442,529,645,775,858,938,1029,1122,1221,1316,1417,1510,1603,1698,1789,1880,1976,2086,2198,2301,2412,2519,2621,2780,2879", - "endColumns": "110,114,110,86,115,129,82,79,90,92,98,94,100,92,92,94,90,90,95,109,111,102,110,106,101,158,98,85", - "endOffsets": "211,326,437,524,640,770,853,933,1024,1117,1216,1311,1412,1505,1598,1693,1784,1875,1971,2081,2193,2296,2407,2514,2616,2775,2874,2960" + "startOffsets": "105,202,295,400,482,580,688,765,841,932,1025,1121,1215,1316,1409,1504,1598,1689,1780,1858,1960,2059,2154,2257,2352,2448,2596,2693", + "endColumns": "96,92,104,81,97,107,76,75,90,92,95,93,100,92,94,93,90,90,77,101,98,94,102,94,95,147,96,77", + "endOffsets": "197,290,395,477,575,683,760,836,927,1020,1116,1210,1311,1404,1499,1593,1684,1775,1853,1955,2054,2149,2252,2347,2443,2591,2688,2766" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-fr-rCA\\values-fr-rCA.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ja\\values-ja.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1412,28 +1514,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2965", + "startOffsets": "2771", "endColumns": "100", - "endOffsets": "3061" + "endOffsets": "2867" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-vi_values-vi.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-fa_values-fa.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-vi\\values-vi.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,219,327,436,520,623,742,819,896,987,1080,1176,1270,1371,1464,1559,1657,1748,1839,1923,2027,2136,2237,2342,2456,2561,2718,2817", - "endColumns": "113,107,108,83,102,118,76,76,90,92,95,93,100,92,94,97,90,90,83,103,108,100,104,113,104,156,98,83", - "endOffsets": "214,322,431,515,618,737,814,891,982,1075,1171,1265,1366,1459,1554,1652,1743,1834,1918,2022,2131,2232,2337,2451,2556,2713,2812,2896" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-vi\\values-vi.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-fa\\values-fa.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1444,15 +1536,25 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2901", + "startOffsets": "2903", "endColumns": "100", - "endOffsets": "2997" + "endOffsets": "2999" + } + }, + { + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-fa\\values-fa.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "105,215,318,429,513,616,731,810,888,981,1076,1172,1266,1369,1464,1561,1660,1753,1843,1924,2036,2139,2237,2347,2451,2560,2721,2822", + "endColumns": "109,102,110,83,102,114,78,77,92,94,95,93,102,94,96,98,92,89,80,111,102,97,109,103,108,160,100,80", + "endOffsets": "210,313,424,508,611,726,805,883,976,1071,1167,1261,1364,1459,1556,1655,1748,1838,1919,2031,2134,2232,2342,2446,2555,2716,2817,2898" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-port_values-port.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-port_values-port.arsc.flat", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-port\\values-port.xml", @@ -1467,205 +1569,161 @@ ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values_values.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-th_values-th.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values\\values.xml", - "from": { - "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,6,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,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,319,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,12,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,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,612,3518,5583,7343,7720" - }, - "to": { - "startLines": "60,61,158,159,160,161,162,163,164,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,202,203,209,210,214,215,216,217,218,219,225,367,1708,1709,1713,1714,1718,1883,1884,2549,2699,2742,2774,2811", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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,10432,10502,10570,10642,10712,10773,10847,11704,11765,11826,11888,11952,12014,12075,12143,12243,12303,12369,12442,12511,12568,12620,13397,13469,13784,13819,13996,14046,14107,14164,14198,14233,14543,24279,113531,113648,113849,113959,114160,126461,126533,162412,170954,173860,175925,177685", - "endLines": "60,61,158,159,160,161,162,163,164,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,202,203,209,210,214,215,216,217,218,219,225,367,1708,1712,1713,1717,1718,1883,1884,2555,2741,2773,2810,2817", - "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,24", - "endOffsets": "3784,3847,10497,10565,10637,10707,10768,10842,10915,11760,11821,11883,11947,12009,12070,12138,12238,12298,12364,12437,12506,12563,12615,12677,13464,13540,13814,13849,14041,14102,14159,14193,14228,14263,14608,24345,113643,113844,113954,114155,114284,126528,126595,162705,173855,175920,177680,178057" - } - }, - { - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-th\\values-th.xml", "from": { - "startLines": "19,20,21,22,18", - "startColumns": "4,4,4,4,4", - "startOffsets": "783,836,890,944,730", - "endColumns": "51,52,52,51,51", - "endOffsets": "830,884,938,991,777" + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "100", + "endOffsets": "151" }, "to": { - "startLines": "189,190,191,192,193", - "startColumns": "4,4,4,4,4", - "startOffsets": "12682,12734,12787,12840,12892", - "endColumns": "51,52,52,51,51", - "endOffsets": "12729,12782,12835,12887,12939" + "startLines": "30", + "startColumns": "4", + "startOffsets": "2845", + "endColumns": "100", + "endOffsets": "2941" } }, { - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-th\\values-th.xml", "from": { - "startLines": "50,55,64,60,22,26,30,35,40,18,45", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905", - "endLines": "53,58,67,62,25,29,33,38,43,21,48", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104" - }, - "to": { - "startLines": "1444,1448,1452,1456,1725,1729,1733,1737,1741,1745,1749", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "93552,93756,93967,94174,114717,114900,115085,115270,115473,115679,115862", - "endLines": "1447,1451,1455,1458,1728,1732,1736,1740,1744,1748,1752", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "93751,93962,94169,94329,114895,115080,115265,115468,115674,115857,116058" - } - }, - { - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml", - "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "758,1073", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1065,1191" - }, - "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,412", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "407,527" + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "105,210,308,416,505,607,717,794,872,963,1056,1152,1246,1347,1440,1535,1629,1720,1811,1892,2000,2104,2202,2310,2415,2516,2669,2764", + "endColumns": "104,97,107,88,101,109,76,77,90,92,95,93,100,92,94,93,90,90,80,107,103,97,107,104,100,152,94,80", + "endOffsets": "205,303,411,500,602,712,789,867,958,1051,1147,1241,1342,1435,1530,1624,1715,1806,1887,1995,2099,2197,2305,2410,2511,2664,2759,2840" } - }, + } + ] + }, + { + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-zh-rCN_values-zh-rCN.arsc.flat", + "map": [ { - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", "startOffsets": "730", - "endColumns": "56", - "endOffsets": "782" + "endLines": "21", + "endColumns": "19", + "endOffsets": "838" }, "to": { - "startLines": "82", + "startLines": "2", "startColumns": "4", - "startOffsets": "5258", - "endColumns": "56", - "endOffsets": "5310" + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" } }, { - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", "from": { - "startLines": "133,77,80,79,78,20,21,22,123,124,132,131,27,86,87,85,84,83,99,98,97,89,40,39,69,30,31,90,42,81,125,76,72,50,43,53,58,44,68,67,66,62,61,59,60,63,52,64,54,75,65,73,49,48,57,56,55,71,47,70,45,46,51,74,29,19,35,37,34,36,33,32,26,25,106,105,109,121,114,113,115,116,118,117,107,108,112,110,111,104,119,120,130,128,127,129,28,88,96,101,100,102,95,94,93,92,23,24", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8404,4238,4502,4405,4335,894,938,991,7892,7942,8345,8293,1356,4962,5057,4890,4805,4721,5936,5852,5749,5235,2091,2039,3729,1563,1617,5297,2186,4586,8006,4166,3917,2617,2246,2787,3093,2305,3657,3595,3537,3311,3258,3153,3207,3362,2731,3413,2835,4099,3474,3967,2567,2519,3037,2948,2889,3854,2468,3808,2363,2407,2675,4031,1507,846,1832,1942,1784,1888,1727,1678,1300,1246,6399,6331,6643,7793,7012,6930,7087,7177,7421,7341,6484,6560,6870,6708,6789,6275,7566,7689,8251,8122,8064,8176,1441,5166,5662,6073,6003,6154,5602,5546,5483,5422,1044,1155", - "endLines": "137,77,80,79,78,20,21,22,123,124,132,131,27,86,87,85,84,83,99,98,97,89,40,39,69,30,31,90,42,81,125,76,72,50,43,53,58,44,68,67,66,62,61,59,60,63,52,64,54,75,65,73,49,48,57,56,55,71,47,70,45,46,51,74,29,19,35,37,34,36,33,32,26,25,106,105,109,121,114,113,115,116,118,117,107,108,112,110,111,104,119,120,130,128,127,129,28,88,96,101,100,102,95,94,93,92,23,24", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,56,57,46,58,56,70,60,56,49,51,52,49,49,54,59,52,65,61,62,48,46,54,87,57,61,49,44,42,59,54,66,54,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "8812,4329,4580,4496,4399,932,985,1038,7936,8000,8398,8339,1435,5051,5160,4956,4884,4799,5997,5930,5846,5291,2148,2085,3802,1611,1672,5397,2240,4683,8056,4232,3961,2669,2299,2829,3147,2357,3723,3651,3589,3356,3305,3201,3252,3407,2781,3468,2883,4160,3531,4025,2611,2561,3087,3031,2942,3911,2513,3848,2401,2462,2725,4093,1557,888,1882,1990,1826,1936,1778,1721,1350,1294,6478,6393,6702,7884,7081,7006,7171,7335,7560,7415,6554,6637,6924,6783,6864,6325,7683,7787,8287,8170,8116,8245,1501,5229,5743,6148,6067,6243,5656,5596,5540,5477,1149,1240" + "startLines": "122,72,71,70,69,20,21,22,113,114,121,120,27,78,79,77,76,75,91,90,89,81,61,30,31,82,73,115,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,29,19,35,37,34,36,33,32,26,25,98,97,100,112,105,104,106,107,109,108,99,103,101,102,96,110,111,119,117,116,118,28,80,88,93,92,94,87,86,85,84,23,24", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6697,3610,3543,3469,3418,890,931,980,6239,6285,6642,6591,1269,3982,4051,3922,3856,3792,4726,4665,4601,4185,2981,1442,1496,4240,3684,6343,3358,3141,1880,2167,2418,1934,2920,2866,2814,2615,2566,2470,2519,2662,2710,2211,3298,2761,3185,2123,2370,2313,2257,3085,2078,3042,1985,2027,3238,1390,846,1701,1799,1653,1751,1605,1559,1217,1163,5108,5048,5251,6164,5567,5497,5632,5711,5896,5822,5184,5441,5309,5375,4998,6001,6085,6552,6443,6394,6489,1332,4129,4541,4841,4782,4909,4492,4446,4397,4345,1029,1096", + "endLines": "124,72,71,70,69,20,21,22,113,114,121,120,27,78,79,77,76,75,91,90,89,81,61,30,31,82,73,115,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,29,19,35,37,34,36,33,32,26,25,98,97,100,112,105,104,106,107,109,108,99,103,101,102,96,110,111,119,117,116,118,28,80,88,93,92,94,87,86,85,84,23,24", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,42,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6871,3678,3604,3537,3463,925,974,1023,6279,6337,6691,6636,1326,4045,4123,3976,3916,3850,4776,4720,4659,4234,3036,1490,1553,4320,3760,6388,3412,3179,1928,2205,2464,1979,2975,2914,2860,2656,2609,2513,2560,2704,2755,2251,3352,2808,3232,2161,2412,2364,2307,3135,2117,3079,2021,2072,3292,1436,884,1745,1843,1695,1793,1647,1599,1263,1211,5178,5102,5303,6233,5626,5561,5705,5816,5995,5890,5245,5491,5369,5435,5042,6079,6158,6585,6483,6437,6546,1384,4179,4595,4903,4835,4966,4535,4486,4440,4391,1090,1157" }, "to": { - "startLines": "226,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,365,366,368,369,370,371,372,373,374,375,376,377,378", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "14613,17764,17860,17943,18039,18108,18151,18203,18255,18304,18367,18425,18476,18560,18654,18762,18833,18917,19000,19066,19149,19251,19312,19374,19425,19503,19556,19616,19721,19780,19882,19937,20008,20057,20114,20172,20219,20278,20335,20406,20467,20524,20574,20626,20679,20729,20779,20834,20894,20947,21013,21075,21138,21187,21234,21289,21377,21435,21497,21547,21592,21635,21695,21750,21817,21872,21919,21974,22027,22074,22127,22183,22231,22286,22339,22423,22490,22554,22650,22724,22805,22894,23057,23201,23280,23355,23437,23496,23576,23656,23711,23833,23936,23977,24030,24140,24214,24350,24418,24504,24584,24653,24747,24806,24861,24923,24983,25093", - "endLines": "230,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,365,366,368,369,370,371,372,373,374,375,376,377,378", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,56,57,46,58,56,70,60,56,49,51,52,49,49,54,59,52,65,61,62,48,46,54,87,57,61,49,44,42,59,54,66,54,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "15001,17855,17938,18034,18103,18146,18198,18250,18299,18362,18420,18471,18555,18649,18757,18828,18912,18995,19061,19144,19246,19307,19369,19420,19498,19551,19611,19716,19775,19877,19932,20003,20052,20109,20167,20214,20273,20330,20401,20462,20519,20569,20621,20674,20724,20774,20829,20889,20942,21008,21070,21133,21182,21229,21284,21372,21430,21492,21542,21587,21630,21690,21745,21812,21867,21914,21969,22022,22069,22122,22178,22226,22281,22334,22418,22485,22549,22645,22719,22800,22889,23052,23196,23275,23350,23432,23491,23571,23651,23706,23828,23931,23972,24025,24082,24209,24274,24413,24499,24579,24648,24742,24801,24856,24918,24978,25088,25178" + "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,123,124,126,127,128,129,130,131,132,133,134,135,136", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,2945,3018,3084,3157,3207,3247,3295,3343,3388,3445,3499,3549,3611,3679,3756,3815,3880,3943,3998,4058,4121,4175,4235,4288,4350,4435,4516,4566,4625,4668,4721,4764,4815,4865,4925,4978,5029,5075,5123,5171,5217,5264,5314,5359,5418,5470,5522,5565,5612,5668,5723,5778,5822,5864,5905,5955,6014,6065,6108,6157,6206,6253,6300,6347,6392,6443,6496,6571,6630,6687,6761,6825,6894,6972,7082,7186,7259,7325,7380,7445,7510,7559,7642,7720,7758,7803,7929,7991,8149,8204,8263,8330,8388,8450,8498,8543,8591,8642,8708", + "endLines": "8,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,123,124,126,127,128,129,130,131,132,133,134,135,136", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,42,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,3013,3079,3152,3202,3242,3290,3338,3383,3440,3494,3544,3606,3674,3751,3810,3875,3938,3993,4053,4116,4170,4230,4283,4345,4430,4511,4561,4620,4663,4716,4759,4810,4860,4920,4973,5024,5070,5118,5166,5212,5259,5309,5354,5413,5465,5517,5560,5607,5663,5718,5773,5817,5859,5900,5950,6009,6060,6103,6152,6201,6248,6295,6342,6387,6438,6491,6566,6625,6682,6756,6820,6889,6967,7077,7181,7254,7320,7375,7440,7505,7554,7637,7715,7753,7798,7846,7986,8043,8199,8258,8325,8383,8445,8493,8538,8586,8637,8703,8769" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\4433a4478073ef0c67208fcc6161f90b\\transformed\\coordinatorlayout-28.0.0\\res\\values\\values.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml", "from": { - "startLines": "2,102,3,13", - "startColumns": "4,4,4,4", - "startOffsets": "55,5935,116,724", - "endLines": "2,104,12,101", - "endColumns": "60,12,24,24", - "endOffsets": "111,6075,719,5930" + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "100", + "endOffsets": "151" }, "to": { - "startLines": "12,1885,2582,2592", - "startColumns": "4,4,4,4", - "startOffsets": "532,126600,164102,164710", - "endLines": "12,1887,2591,2680", - "endColumns": "60,12,24,24", - "endOffsets": "588,126740,164705,169916" + "startLines": "125", + "startColumns": "4", + "startOffsets": "8048", + "endColumns": "100", + "endOffsets": "8144" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values\\values.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml", "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,1303,1304,1305,1306,1307,1308,1309,1310,1311,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325,1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,1360,1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1390,1391,1392,1393,1394,1395,1396,1397,1398,1399,1400,1401,1402,1403,1404,1405,1406,1407,1408,1409,1410,1411,1412,1413,1414,1415,1416,1417,1418,1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1453,1461,1462,1466,1470,1474,1479,1485,1492,1496,1500,1505,1509,1513,1517,1521,1525,1529,1535,1539,1545,1549,1555,1559,1564,1568,1571,1575,1581,1585,1591,1595,1601,1604,1608,1612,1616,1620,1624,1625,1626,1627,1630,1633,1636,1639,1643,1644,1645,1646,1647,1650,1652,1654,1656,1661,1662,1666,1672,1676,1677,1679,1690,1691,1695,1701,1705,1706,1707,1711,1738,1742,1743,1747,1775,1943,1969,2138,2164,2195,2203,2209,2223,2245,2250,2255,2265,2274,2283,2287,2294,2302,2309,2310,2319,2322,2325,2329,2333,2337,2340,2341,2345,2349,2359,2364,2371,2377,2378,2381,2385,2390,2392,2394,2397,2400,2402,2406,2409,2416,2419,2422,2426,2428,2432,2434,2436,2438,2442,2450,2458,2470,2476,2485,2488,2499,2502,2507,2508,2513,2571,2630,2631,2641,2650,2651,2653,2657,2660,2663,2666,2669,2672,2675,2678,2682,2685,2688,2691,2695,2698,2702,2706,2707,2708,2709,2710,2711,2712,2713,2714,2715,2716,2717,2718,2719,2720,2721,2722,2723,2724,2725,2726,2728,2730,2731,2732,2733,2734,2735,2736,2737,2739,2740,2742,2743,2745,2747,2748,2750,2751,2752,2753,2754,2755,2757,2758,2759,2760,2761,2762,2764,2766,2768,2769,2770,2771,2772,2773,2774,2775,2776,2777,2778,2779,2780,2782,2783,2784,2785,2786,2787,2789,2793,2797,2798,2799,2800,2801,2802,2803,2804,2806,2808,2810,2812,2814,2815,2816,2817,2819,2821,2823,2824,2825,2826,2827,2828,2829,2830,2831,2832,2833,2834,2837,2838,2839,2840,2842,2844,2845,2847,2848,2850,2852,2854,2855,2856,2857,2858,2859,2860,2861,2862,2863,2864,2865,2867,2868,2869,2870,2872,2873,2874,2875,2876,2878,2880,2882,2884,2885,2886,2887,2888,2889,2890,2891,2892,2893,2894,2895,2896,2897,69,152,155,158,161,175,186,196,223,230,241,271,298,307,344,725,730,756,774,810,816,822,845,986,1006,1012,1016,1022,1059,1071,1098,1103,1169,1184,1249,1268,1294", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,160,205,254,295,350,409,471,552,613,688,764,841,919,1004,1086,1162,1238,1315,1393,1499,1605,1684,1764,1821,1879,1953,2028,2093,2159,2219,2280,2352,2425,2492,2560,2619,2678,2737,2796,2855,2909,2963,3016,3070,3124,3178,3232,3306,3385,3458,3532,3603,3675,3747,3820,3877,3935,4008,4082,4156,4231,4303,4376,4446,4517,4577,70911,70980,71049,71119,71193,71269,71333,71410,71486,71563,71628,71697,71774,71849,71918,71986,72063,72129,72190,72287,72352,72421,72520,72591,72650,72708,72765,72824,72888,72959,73031,73103,73175,73247,73314,73382,73450,73509,73572,73636,73726,73817,73877,73943,74010,74076,74146,74210,74263,74376,74434,74497,74562,74627,74702,74775,74847,74896,74957,75018,75079,75141,75205,75269,75333,75398,75461,75521,75582,75648,75707,75767,75829,75900,75960,76028,76114,76201,76291,76378,76466,76548,76631,76721,76812,76864,76922,76967,77033,77097,77154,77211,77265,77322,77370,77419,77470,77504,77551,77600,77646,77678,77742,77804,77864,77921,77995,78065,78143,78197,78267,78352,78400,78446,78517,78595,78673,78745,78819,78893,78967,79047,79120,79189,79261,79338,79399,79462,79528,79592,79663,79726,79791,79855,79916,79977,80029,80102,80176,80245,80320,80394,80468,80609,80679,80732,80810,80900,80988,81084,81174,81756,81845,82092,82373,82625,82910,83303,83780,84002,84224,84500,84727,84957,85187,85417,85647,85874,86293,86519,86944,87174,87602,87821,88104,88312,88443,88670,89096,89321,89748,89969,90394,90514,90790,91091,91415,91706,92020,92157,92288,92393,92635,92802,93006,93214,93485,93597,93709,93814,93931,94145,94291,94431,94517,94865,94953,95199,95617,95866,95948,96046,96663,96763,97015,97439,97694,97788,97877,98114,100166,100408,100510,100763,102947,113668,115184,126004,127532,129289,129915,130335,131396,132661,132917,133153,133700,134194,134799,134997,135577,136141,136516,136634,137172,137329,137525,137798,138054,138224,138365,138429,138711,138997,139673,139937,140275,140628,140722,140908,141214,141476,141601,141728,141967,142178,142297,142490,142667,143122,143303,143425,143684,143797,143984,144086,144193,144322,144597,145105,145601,146478,146772,147342,147491,148223,148395,148731,148823,149101,153445,157932,157994,158624,159238,159329,159442,159671,159831,159983,160154,160320,160489,160656,160819,161062,161232,161405,161576,161850,162049,162254,162584,162668,162764,162860,162958,163058,163160,163262,163364,163466,163568,163668,163764,163876,164005,164128,164259,164390,164488,164602,164696,164836,164970,165066,165178,165278,165394,165490,165602,165702,165842,165978,166142,166272,166430,166580,166721,166865,167000,167112,167262,167390,167518,167654,167786,167916,168046,168158,168298,168444,168588,168726,168792,168882,168958,169062,169152,169254,169362,169470,169570,169650,169742,169840,169950,170028,170134,170226,170330,170440,170562,170725,170882,170962,171062,171152,171262,171356,171462,171554,171654,171766,171880,171996,172112,172206,172320,172432,172534,172654,172776,172858,172962,173082,173208,173306,173400,173488,173600,173716,173838,173950,174125,174241,174327,174419,174531,174655,174722,174848,174916,175044,175188,175316,175385,175480,175595,175708,175807,175916,176027,176138,176239,176344,176444,176574,176665,176788,176882,176994,177080,177184,177280,177368,177486,177590,177694,177820,177908,178016,178116,178206,178316,178400,178502,178586,178640,178704,178810,178920,179004,4638,9782,9900,10015,10147,10862,11554,12071,13718,14103,14700,16299,17832,18220,20527,40045,40305,41697,42730,44743,45005,45361,46191,52973,54107,54401,54624,54951,57001,57649,59282,59552,63403,64004,67813,69028,70437", - "endLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,1303,1304,1305,1306,1307,1308,1309,1310,1311,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325,1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,1360,1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1390,1391,1392,1393,1394,1395,1396,1397,1398,1399,1400,1401,1402,1403,1404,1405,1406,1407,1408,1409,1410,1411,1412,1413,1414,1415,1416,1417,1418,1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1460,1461,1465,1469,1473,1478,1484,1491,1495,1499,1504,1508,1512,1516,1520,1524,1528,1534,1538,1544,1548,1554,1558,1563,1567,1570,1574,1580,1584,1590,1594,1600,1603,1607,1611,1615,1619,1623,1624,1625,1626,1629,1632,1635,1638,1642,1643,1644,1645,1646,1649,1651,1653,1655,1660,1661,1665,1671,1675,1676,1678,1689,1690,1694,1700,1704,1705,1706,1710,1737,1741,1742,1746,1774,1942,1968,2137,2163,2194,2202,2208,2222,2244,2249,2254,2264,2273,2282,2286,2293,2301,2308,2309,2318,2321,2324,2328,2332,2336,2339,2340,2344,2348,2358,2363,2370,2376,2377,2380,2384,2389,2391,2393,2396,2399,2401,2405,2408,2415,2418,2421,2425,2427,2431,2433,2435,2437,2441,2449,2457,2469,2475,2484,2487,2498,2501,2506,2507,2512,2570,2629,2630,2640,2649,2650,2652,2656,2659,2662,2665,2668,2671,2674,2677,2681,2684,2687,2690,2694,2697,2701,2705,2706,2707,2708,2709,2710,2711,2712,2713,2714,2715,2716,2717,2718,2719,2720,2721,2722,2723,2724,2725,2727,2729,2730,2731,2732,2733,2734,2735,2736,2738,2739,2741,2742,2744,2746,2747,2749,2750,2751,2752,2753,2754,2756,2757,2758,2759,2760,2761,2763,2765,2767,2768,2769,2770,2771,2772,2773,2774,2775,2776,2777,2778,2779,2781,2782,2783,2784,2785,2786,2788,2792,2796,2797,2798,2799,2800,2801,2802,2803,2805,2807,2809,2811,2813,2814,2815,2816,2818,2820,2822,2823,2824,2825,2826,2827,2828,2829,2830,2831,2832,2833,2836,2837,2838,2839,2841,2843,2844,2846,2847,2849,2851,2853,2854,2855,2856,2857,2858,2859,2860,2861,2862,2863,2864,2866,2867,2868,2869,2871,2872,2873,2874,2875,2877,2879,2881,2883,2884,2885,2886,2887,2888,2889,2890,2891,2892,2893,2894,2895,2896,2897,151,154,157,160,174,185,195,222,229,240,270,297,306,343,724,729,755,773,809,815,821,844,985,1005,1011,1015,1021,1058,1070,1097,1102,1168,1183,1248,1267,1293,1302", - "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,63,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,91,12,12,12,61,12,12,90,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24", - "endOffsets": "155,200,249,290,345,404,466,547,608,683,759,836,914,999,1081,1157,1233,1310,1388,1494,1600,1679,1759,1816,1874,1948,2023,2088,2154,2214,2275,2347,2420,2487,2555,2614,2673,2732,2791,2850,2904,2958,3011,3065,3119,3173,3227,3301,3380,3453,3527,3598,3670,3742,3815,3872,3930,4003,4077,4151,4226,4298,4371,4441,4512,4572,4633,70975,71044,71114,71188,71264,71328,71405,71481,71558,71623,71692,71769,71844,71913,71981,72058,72124,72185,72282,72347,72416,72515,72586,72645,72703,72760,72819,72883,72954,73026,73098,73170,73242,73309,73377,73445,73504,73567,73631,73721,73812,73872,73938,74005,74071,74141,74205,74258,74371,74429,74492,74557,74622,74697,74770,74842,74891,74952,75013,75074,75136,75200,75264,75328,75393,75456,75516,75577,75643,75702,75762,75824,75895,75955,76023,76109,76196,76286,76373,76461,76543,76626,76716,76807,76859,76917,76962,77028,77092,77149,77206,77260,77317,77365,77414,77465,77499,77546,77595,77641,77673,77737,77799,77859,77916,77990,78060,78138,78192,78262,78347,78395,78441,78512,78590,78668,78740,78814,78888,78962,79042,79115,79184,79256,79333,79394,79457,79523,79587,79658,79721,79786,79850,79911,79972,80024,80097,80171,80240,80315,80389,80463,80604,80674,80727,80805,80895,80983,81079,81169,81751,81840,82087,82368,82620,82905,83298,83775,83997,84219,84495,84722,84952,85182,85412,85642,85869,86288,86514,86939,87169,87597,87816,88099,88307,88438,88665,89091,89316,89743,89964,90389,90509,90785,91086,91410,91701,92015,92152,92283,92388,92630,92797,93001,93209,93480,93592,93704,93809,93926,94140,94286,94426,94512,94860,94948,95194,95612,95861,95943,96041,96658,96758,97010,97434,97689,97783,97872,98109,100161,100403,100505,100758,102942,113663,115179,125999,127527,129284,129910,130330,131391,132656,132912,133148,133695,134189,134794,134992,135572,136136,136511,136629,137167,137324,137520,137793,138049,138219,138360,138424,138706,138992,139668,139932,140270,140623,140717,140903,141209,141471,141596,141723,141962,142173,142292,142485,142662,143117,143298,143420,143679,143792,143979,144081,144188,144317,144592,145100,145596,146473,146767,147337,147486,148218,148390,148726,148818,149096,153440,157927,157989,158619,159233,159324,159437,159666,159826,159978,160149,160315,160484,160651,160814,161057,161227,161400,161571,161845,162044,162249,162579,162663,162759,162855,162953,163053,163155,163257,163359,163461,163563,163663,163759,163871,164000,164123,164254,164385,164483,164597,164691,164831,164965,165061,165173,165273,165389,165485,165597,165697,165837,165973,166137,166267,166425,166575,166716,166860,166995,167107,167257,167385,167513,167649,167781,167911,168041,168153,168293,168439,168583,168721,168787,168877,168953,169057,169147,169249,169357,169465,169565,169645,169737,169835,169945,170023,170129,170221,170325,170435,170557,170720,170877,170957,171057,171147,171257,171351,171457,171549,171649,171761,171875,171991,172107,172201,172315,172427,172529,172649,172771,172853,172957,173077,173203,173301,173395,173483,173595,173711,173833,173945,174120,174236,174322,174414,174526,174650,174717,174843,174911,175039,175183,175311,175380,175475,175590,175703,175802,175911,176022,176133,176234,176339,176439,176569,176660,176783,176877,176989,177075,177179,177275,177363,177481,177585,177689,177815,177903,178011,178111,178201,178311,178395,178497,178581,178635,178699,178805,178915,178999,179119,9777,9895,10010,10142,10857,11549,12066,13713,14098,14695,16294,17827,18215,20522,40040,40300,41692,42725,44738,45000,45356,46186,52968,54102,54396,54619,54946,56996,57644,59277,59547,63398,63999,67808,69023,70432,70906" + "startLines": "2,3,4,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": "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,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,165,166,167,168,169,170,171,172,173,194,195,196,197,198,199,200,201,204,205,206,207,208,211,212,213,220,221,222,223,224,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,364,379,380,381,382,383,384,392,393,397,401,405,410,416,423,427,431,436,440,444,448,452,456,460,466,470,476,480,486,490,495,499,502,506,512,516,522,526,532,535,539,543,547,551,555,556,557,558,561,564,567,570,574,575,576,577,578,581,583,585,587,592,593,597,603,607,608,610,621,622,626,632,636,637,638,642,669,673,674,678,706,874,900,1069,1095,1126,1134,1140,1154,1176,1181,1186,1196,1205,1214,1218,1225,1233,1240,1241,1250,1253,1256,1260,1264,1268,1271,1272,1276,1280,1290,1295,1302,1308,1309,1312,1316,1321,1323,1325,1328,1331,1333,1337,1340,1347,1350,1353,1357,1359,1363,1365,1367,1369,1373,1381,1389,1401,1407,1416,1419,1430,1433,1438,1439,1459,1517,1576,1577,1587,1596,1597,1599,1603,1606,1609,1612,1615,1618,1621,1624,1628,1631,1634,1637,1641,1644,1648,1652,1653,1654,1655,1656,1657,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1674,1676,1677,1678,1679,1680,1681,1682,1683,1685,1686,1688,1689,1691,1693,1694,1696,1697,1698,1699,1700,1701,1703,1704,1705,1706,1707,1719,1721,1723,1753,1754,1755,1756,1757,1758,1759,1760,1761,1762,1763,1764,1765,1767,1768,1769,1770,1771,1772,1774,1778,1782,1783,1784,1785,1786,1787,1788,1789,1791,1793,1795,1797,1799,1800,1801,1802,1804,1806,1808,1809,1810,1811,1812,1813,1814,1815,1816,1817,1818,1819,1822,1823,1824,1825,1827,1829,1830,1832,1833,1835,1837,1839,1840,1841,1842,1843,1844,1845,1846,1847,1848,1849,1850,1852,1853,1854,1855,1857,1858,1859,1860,1861,1863,1865,1867,1869,1870,1871,1872,1873,1874,1875,1876,1877,1878,1879,1880,1881,1882,1888,1971,1974,1977,1980,1994,2005,2015,2042,2049,2060,2090,2117,2126,2163,2544,2556,2681,2818,2854,2860,2866,2889,3030,3050,3056,3060,3066,3103,3115,3142,3147,3213,3228,3293,3312,3338", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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,3852,3926,4005,4078,4152,4223,4295,4367,4440,4497,4555,4628,4702,4776,4851,4923,4996,5066,5137,5197,5315,5384,5453,5523,5597,5673,5737,5814,5890,5967,6032,6101,6178,6253,6322,6390,6467,6533,6594,6691,6756,6825,6924,6995,7054,7112,7169,7228,7292,7363,7435,7507,7579,7651,7718,7786,7854,7913,7976,8040,8130,8221,8281,8347,8414,8480,8550,8614,8667,8780,8838,8901,8966,9031,9106,9179,9251,9300,9361,9422,9483,9545,9609,9673,9737,9802,9865,9925,9986,10052,10111,10171,10233,10304,10364,10920,11006,11093,11183,11270,11358,11440,11523,11613,12944,12996,13054,13099,13165,13229,13286,13343,13545,13602,13650,13699,13750,13854,13901,13950,14268,14300,14364,14426,14486,15006,15080,15150,15228,15282,15352,15437,15485,15531,15602,15680,15758,15830,15904,15978,16052,16132,16205,16274,16346,16423,16484,16547,16613,16677,16748,16811,16876,16940,17001,17062,17114,17187,17261,17330,17405,17479,17553,17694,24087,25183,25261,25351,25439,25535,25625,26207,26296,26543,26824,27076,27361,27754,28231,28453,28675,28951,29178,29408,29638,29868,30098,30325,30744,30970,31395,31625,32053,32272,32555,32763,32894,33121,33547,33772,34199,34420,34845,34965,35241,35542,35866,36157,36471,36608,36739,36844,37086,37253,37457,37665,37936,38048,38160,38265,38382,38596,38742,38882,38968,39316,39404,39650,40068,40317,40399,40497,41114,41214,41466,41890,42145,42239,42328,42565,44617,44859,44961,45214,47398,58119,59635,70455,71983,73740,74366,74786,75847,77112,77368,77604,78151,78645,79250,79448,80028,80592,80967,81085,81623,81780,81976,82249,82505,82675,82816,82880,83162,83448,84124,84388,84726,85079,85173,85359,85665,85927,86052,86179,86418,86629,86748,86941,87118,87573,87754,87876,88135,88248,88435,88537,88644,88773,89048,89556,90052,90929,91223,91793,91942,92674,92846,93182,93274,94334,98678,103165,103227,103857,104471,104562,104675,104904,105064,105216,105387,105553,105722,105889,106052,106295,106465,106638,106809,107083,107282,107487,107817,107901,107997,108093,108191,108291,108393,108495,108597,108699,108801,108901,108997,109109,109238,109361,109492,109623,109721,109835,109929,110069,110203,110299,110411,110511,110627,110723,110835,110935,111075,111211,111375,111505,111663,111813,111954,112098,112233,112345,112495,112623,112751,112887,113019,113149,113279,113391,114289,114435,114579,116063,116129,116219,116295,116399,116489,116591,116699,116807,116907,116987,117079,117177,117287,117365,117471,117563,117667,117777,117899,118062,118219,118299,118399,118489,118599,118693,118799,118891,118991,119103,119217,119333,119449,119543,119657,119769,119871,119991,120113,120195,120299,120419,120545,120643,120737,120825,120937,121053,121175,121287,121462,121578,121664,121756,121868,121992,122059,122185,122253,122381,122525,122653,122722,122817,122932,123045,123144,123253,123364,123475,123576,123681,123781,123911,124002,124125,124219,124331,124417,124521,124617,124705,124823,124927,125031,125157,125245,125353,125453,125543,125653,125737,125839,125923,125977,126041,126147,126257,126341,126745,131889,132007,132122,132254,132969,133661,134178,135825,136210,136807,138406,139939,140327,142634,162152,162710,169921,178062,180075,180337,180693,181523,188305,189439,189733,189956,190283,192333,192981,194614,194884,198735,199336,203145,204360,205769", - "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,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,165,166,167,168,169,170,171,172,173,194,195,196,197,198,199,200,201,204,205,206,207,208,211,212,213,220,221,222,223,224,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,364,379,380,381,382,383,391,392,396,400,404,409,415,422,426,430,435,439,443,447,451,455,459,465,469,475,479,485,489,494,498,501,505,511,515,521,525,531,534,538,542,546,550,554,555,556,557,560,563,566,569,573,574,575,576,577,580,582,584,586,591,592,596,602,606,607,609,620,621,625,631,635,636,637,641,668,672,673,677,705,873,899,1068,1094,1125,1133,1139,1153,1175,1180,1185,1195,1204,1213,1217,1224,1232,1239,1240,1249,1252,1255,1259,1263,1267,1270,1271,1275,1279,1289,1294,1301,1307,1308,1311,1315,1320,1322,1324,1327,1330,1332,1336,1339,1346,1349,1352,1356,1358,1362,1364,1366,1368,1372,1380,1388,1400,1406,1415,1418,1429,1432,1437,1438,1443,1516,1575,1576,1586,1595,1596,1598,1602,1605,1608,1611,1614,1617,1620,1623,1627,1630,1633,1636,1640,1643,1647,1651,1652,1653,1654,1655,1656,1657,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1673,1675,1676,1677,1678,1679,1680,1681,1682,1684,1685,1687,1688,1690,1692,1693,1695,1696,1697,1698,1699,1700,1702,1703,1704,1705,1706,1707,1720,1722,1724,1753,1754,1755,1756,1757,1758,1759,1760,1761,1762,1763,1764,1766,1767,1768,1769,1770,1771,1773,1777,1781,1782,1783,1784,1785,1786,1787,1788,1790,1792,1794,1796,1798,1799,1800,1801,1803,1805,1807,1808,1809,1810,1811,1812,1813,1814,1815,1816,1817,1818,1821,1822,1823,1824,1826,1828,1829,1831,1832,1834,1836,1838,1839,1840,1841,1842,1843,1844,1845,1846,1847,1848,1849,1851,1852,1853,1854,1856,1857,1858,1859,1860,1862,1864,1866,1868,1869,1870,1871,1872,1873,1874,1875,1876,1877,1878,1879,1880,1881,1882,1970,1973,1976,1979,1993,2004,2014,2041,2048,2059,2089,2116,2125,2162,2543,2548,2581,2698,2853,2859,2865,2888,3029,3049,3055,3059,3065,3102,3114,3141,3146,3212,3227,3292,3311,3337,3346", - "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,63,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,91,12,12,12,61,12,12,90,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24", - "endOffsets": "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,3921,4000,4073,4147,4218,4290,4362,4435,4492,4550,4623,4697,4771,4846,4918,4991,5061,5132,5192,5253,5379,5448,5518,5592,5668,5732,5809,5885,5962,6027,6096,6173,6248,6317,6385,6462,6528,6589,6686,6751,6820,6919,6990,7049,7107,7164,7223,7287,7358,7430,7502,7574,7646,7713,7781,7849,7908,7971,8035,8125,8216,8276,8342,8409,8475,8545,8609,8662,8775,8833,8896,8961,9026,9101,9174,9246,9295,9356,9417,9478,9540,9604,9668,9732,9797,9860,9920,9981,10047,10106,10166,10228,10299,10359,10427,11001,11088,11178,11265,11353,11435,11518,11608,11699,12991,13049,13094,13160,13224,13281,13338,13392,13597,13645,13694,13745,13779,13896,13945,13991,14295,14359,14421,14481,14538,15075,15145,15223,15277,15347,15432,15480,15526,15597,15675,15753,15825,15899,15973,16047,16127,16200,16269,16341,16418,16479,16542,16608,16672,16743,16806,16871,16935,16996,17057,17109,17182,17256,17325,17400,17474,17548,17689,17759,24135,25256,25346,25434,25530,25620,26202,26291,26538,26819,27071,27356,27749,28226,28448,28670,28946,29173,29403,29633,29863,30093,30320,30739,30965,31390,31620,32048,32267,32550,32758,32889,33116,33542,33767,34194,34415,34840,34960,35236,35537,35861,36152,36466,36603,36734,36839,37081,37248,37452,37660,37931,38043,38155,38260,38377,38591,38737,38877,38963,39311,39399,39645,40063,40312,40394,40492,41109,41209,41461,41885,42140,42234,42323,42560,44612,44854,44956,45209,47393,58114,59630,70450,71978,73735,74361,74781,75842,77107,77363,77599,78146,78640,79245,79443,80023,80587,80962,81080,81618,81775,81971,82244,82500,82670,82811,82875,83157,83443,84119,84383,84721,85074,85168,85354,85660,85922,86047,86174,86413,86624,86743,86936,87113,87568,87749,87871,88130,88243,88430,88532,88639,88768,89043,89551,90047,90924,91218,91788,91937,92669,92841,93177,93269,93547,98673,103160,103222,103852,104466,104557,104670,104899,105059,105211,105382,105548,105717,105884,106047,106290,106460,106633,106804,107078,107277,107482,107812,107896,107992,108088,108186,108286,108388,108490,108592,108694,108796,108896,108992,109104,109233,109356,109487,109618,109716,109830,109924,110064,110198,110294,110406,110506,110622,110718,110830,110930,111070,111206,111370,111500,111658,111808,111949,112093,112228,112340,112490,112618,112746,112882,113014,113144,113274,113386,113526,114430,114574,114712,116124,116214,116290,116394,116484,116586,116694,116802,116902,116982,117074,117172,117282,117360,117466,117558,117662,117772,117894,118057,118214,118294,118394,118484,118594,118688,118794,118886,118986,119098,119212,119328,119444,119538,119652,119764,119866,119986,120108,120190,120294,120414,120540,120638,120732,120820,120932,121048,121170,121282,121457,121573,121659,121751,121863,121987,122054,122180,122248,122376,122520,122648,122717,122812,122927,123040,123139,123248,123359,123470,123571,123676,123776,123906,123997,124120,124214,124326,124412,124516,124612,124700,124818,124922,125026,125152,125240,125348,125448,125538,125648,125732,125834,125918,125972,126036,126142,126252,126336,126456,131884,132002,132117,132249,132964,133656,134173,135820,136205,136802,138401,139934,140322,142629,162147,162407,164097,170949,180070,180332,180688,181518,188300,189434,189728,189951,190278,192328,192976,194609,194879,198730,199331,203140,204355,205764,206238" + "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,122", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "384,480,575,675,757,854,960,1036,1112,1203,1296,1394,1490,1585,1678,1773,1865,1956,2047,2125,2221,2317,2412,2509,2604,2702,2851,7851", + "endColumns": "95,94,99,81,96,105,75,75,90,92,97,95,94,92,94,91,90,90,77,95,95,94,96,94,97,148,93,77", + "endOffsets": "475,570,670,752,849,955,1031,1107,1198,1291,1389,1485,1580,1673,1768,1860,1951,2042,2120,2216,2312,2407,2504,2599,2697,2846,2940,7924" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-en-rXC_values-en-rXC.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-mn_values-mn.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rXC\\values-en-rXC.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-mn\\values-mn.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,310,510,719,904,1106,1321,1494,1671,1862,2055,2253,2449,2652,2847,3044,3239,3432,3623,3807,4011,4216,4417,4624,4826,5031,5303,5503", - "endColumns": "204,199,208,184,201,214,172,176,190,192,197,195,202,194,196,194,192,190,183,203,204,200,206,201,204,271,199,178", - "endOffsets": "305,505,714,899,1101,1316,1489,1666,1857,2050,2248,2444,2647,2842,3039,3234,3427,3618,3802,4006,4211,4412,4619,4821,5026,5298,5498,5677" + "startOffsets": "105,218,318,431,518,624,736,818,900,991,1084,1180,1276,1374,1467,1562,1654,1745,1835,1917,2026,2130,2227,2335,2436,2539,2698,2795", + "endColumns": "112,99,112,86,105,111,81,81,90,92,95,95,97,92,94,91,90,89,81,108,103,96,107,100,102,158,96,80", + "endOffsets": "213,313,426,513,619,731,813,895,986,1079,1175,1271,1369,1462,1557,1649,1740,1830,1912,2021,2125,2222,2330,2431,2534,2693,2790,2871" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-en-rXC\\values-en-rXC.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-mn\\values-mn.xml", "from": { "startLines": "2", "startColumns": "4", "startOffsets": "55", - "endColumns": "202", - "endOffsets": "253" + "endColumns": "100", + "endOffsets": "151" }, "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "5682", - "endColumns": "202", - "endOffsets": "5880" + "startOffsets": "2876", + "endColumns": "100", + "endOffsets": "2972" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-is_values-is.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-nb_values-nb.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-is\\values-is.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-nb\\values-nb.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,205,302,414,499,600,714,794,874,965,1058,1154,1248,1355,1448,1543,1638,1729,1823,1904,2014,2122,2220,2329,2428,2531,2686,2784", - "endColumns": "99,96,111,84,100,113,79,79,90,92,95,93,106,92,94,94,90,93,80,109,107,97,108,98,102,154,97,80", - "endOffsets": "200,297,409,494,595,709,789,869,960,1053,1149,1243,1350,1443,1538,1633,1724,1818,1899,2009,2117,2215,2324,2423,2526,2681,2779,2860" + "startOffsets": "105,213,308,422,508,608,721,797,873,964,1057,1153,1247,1348,1441,1536,1634,1725,1816,1896,1999,2098,2194,2298,2396,2497,2650,2747", + "endColumns": "107,94,113,85,99,112,75,75,90,92,95,93,100,92,94,97,90,90,79,102,98,95,103,97,100,152,96,78", + "endOffsets": "208,303,417,503,603,716,792,868,959,1052,1148,1242,1343,1436,1531,1629,1720,1811,1891,1994,2093,2189,2293,2391,2492,2645,2742,2821" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-is\\values-is.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-nb\\values-nb.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1676,50 +1734,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2865", + "startOffsets": "2826", "endColumns": "100", - "endOffsets": "2961" + "endOffsets": "2922" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ko_values-ko.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-en-rAU_values-en-rAU.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ko\\values-ko.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2756", - "endColumns": "100", - "endOffsets": "2852" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ko\\values-ko.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rAU\\values-en-rAU.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,200,294,396,478,576,682,761,837,928,1021,1113,1204,1305,1398,1493,1587,1678,1769,1849,1947,2042,2137,2237,2333,2432,2584,2678", - "endColumns": "94,93,101,81,97,105,78,75,90,92,91,90,100,92,94,93,90,90,79,97,94,94,99,95,98,151,93,77", - "endOffsets": "195,289,391,473,571,677,756,832,923,1016,1108,1199,1300,1393,1488,1582,1673,1764,1844,1942,2037,2132,2232,2328,2427,2579,2673,2751" + "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764", + "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81", + "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841" } - } - ] - }, - { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-lv_values-lv.arsc.flat", - "map": [ + }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-lv\\values-lv.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-en-rAU\\values-en-rAU.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1730,43 +1766,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "3076", + "startOffsets": "2846", "endColumns": "100", - "endOffsets": "3172" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-lv\\values-lv.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,225,333,442,528,632,754,836,918,1028,1136,1243,1352,1464,1567,1679,1786,1891,1991,2076,2185,2297,2396,2507,2616,2721,2895,2994", - "endColumns": "119,107,108,85,103,121,81,81,109,107,106,108,111,102,111,106,104,99,84,108,111,98,110,108,104,173,98,81", - "endOffsets": "220,328,437,523,627,749,831,913,1023,1131,1238,1347,1459,1562,1674,1781,1886,1986,2071,2180,2292,2391,2502,2611,2716,2890,2989,3071" + "endOffsets": "2942" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-large-v4_values-large-v4.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-hy_values-hy.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-large-v4\\values-large-v4.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-hy\\values-hy.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,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "105,208,309,419,508,614,729,811,892,983,1076,1172,1266,1367,1460,1555,1649,1740,1831,1916,2023,2130,2229,2339,2446,2546,2703,2802", + "endColumns": "102,100,109,88,105,114,81,80,90,92,95,93,100,92,94,93,90,90,84,106,106,98,109,106,99,156,98,81", + "endOffsets": "203,304,414,503,609,724,806,887,978,1071,1167,1261,1362,1455,1550,1644,1735,1826,1911,2018,2125,2224,2334,2441,2541,2698,2797,2879" } - } - ] - }, - { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-am_values-am.arsc.flat", - "map": [ + }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-am\\values-am.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-hy\\values-hy.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1777,28 +1798,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2817", + "startOffsets": "2884", "endColumns": "100", - "endOffsets": "2913" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-am\\values-am.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,207,306,412,498,601,714,792,870,961,1054,1147,1241,1342,1435,1530,1624,1715,1805,1884,1984,2084,2180,2283,2382,2489,2642,2738", - "endColumns": "101,98,105,85,102,112,77,77,90,92,92,93,100,92,94,93,90,89,78,99,99,95,102,98,106,152,95,78", - "endOffsets": "202,301,407,493,596,709,787,865,956,1049,1142,1236,1337,1430,1525,1619,1710,1800,1879,1979,2079,2175,2278,2377,2484,2637,2733,2812" + "endOffsets": "2980" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sk_values-sk.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-pl_values-pl.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-sk\\values-sk.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-pl\\values-pl.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1809,25 +1820,25 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2918", + "startOffsets": "2909", "endColumns": "100", - "endOffsets": "3014" + "endOffsets": "3005" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-sk\\values-sk.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-pl\\values-pl.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,212,312,423,509,617,735,816,897,988,1081,1180,1274,1375,1468,1563,1661,1752,1843,1927,2032,2141,2240,2346,2457,2566,2732,2830", - "endColumns": "106,99,110,85,107,117,80,80,90,92,98,93,100,92,94,97,90,90,83,104,108,98,105,110,108,165,97,87", - "endOffsets": "207,307,418,504,612,730,811,892,983,1076,1175,1269,1370,1463,1558,1656,1747,1838,1922,2027,2136,2235,2341,2452,2561,2727,2825,2913" + "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" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-zh-rHK_values-zh-rHK.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-zh-rHK_values-zh-rHK.arsc.flat", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-zh-rHK\\values-zh-rHK.xml", @@ -1859,35 +1870,20 @@ ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-xlarge-v4_values-xlarge-v4.arsc.flat", - "map": [ - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-xlarge-v4\\values-xlarge-v4.xml", - "from": { - "startLines": "2,3,4,5,6,7", - "startColumns": "4,4,4,4,4,4", - "startOffsets": "55,126,197,267,337,405", - "endColumns": "70,70,69,69,67,67", - "endOffsets": "121,192,262,332,400,468" - } - } - ] - }, - { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-mn_values-mn.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-kn_values-kn.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-mn\\values-mn.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-kn\\values-kn.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,218,318,431,518,624,736,818,900,991,1084,1180,1276,1374,1467,1562,1654,1745,1835,1917,2026,2130,2227,2335,2436,2539,2698,2795", - "endColumns": "112,99,112,86,105,111,81,81,90,92,95,95,97,92,94,91,90,89,81,108,103,96,107,100,102,158,96,80", - "endOffsets": "213,313,426,513,619,731,813,895,986,1079,1175,1271,1369,1462,1557,1649,1740,1830,1912,2021,2125,2222,2330,2431,2534,2693,2790,2871" + "startOffsets": "105,223,335,448,536,643,770,847,924,1015,1108,1204,1298,1399,1492,1587,1681,1772,1863,1945,2061,2172,2271,2384,2488,2602,2766,2866", + "endColumns": "117,111,112,87,106,126,76,76,90,92,95,93,100,92,94,93,90,90,81,115,110,98,112,103,113,163,99,81", + "endOffsets": "218,330,443,531,638,765,842,919,1010,1103,1199,1293,1394,1487,1582,1676,1767,1858,1940,2056,2167,2266,2379,2483,2597,2761,2861,2943" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-mn\\values-mn.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-kn\\values-kn.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1898,28 +1894,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2876", + "startOffsets": "2948", "endColumns": "100", - "endOffsets": "2972" + "endOffsets": "3044" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-bg_values-bg.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ms_values-ms.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-bg\\values-bg.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,220,327,432,518,623,744,823,901,992,1085,1181,1275,1376,1469,1564,1672,1763,1854,1937,2051,2160,2260,2374,2480,2588,2748,2847", - "endColumns": "114,106,104,85,104,120,78,77,90,92,95,93,100,92,94,107,90,90,82,113,108,99,113,105,107,159,98,82", - "endOffsets": "215,322,427,513,618,739,818,896,987,1080,1176,1270,1371,1464,1559,1667,1758,1849,1932,2046,2155,2255,2369,2475,2583,2743,2842,2925" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-bg\\values-bg.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ms\\values-ms.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1930,43 +1916,38 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2930", + "startOffsets": "2881", "endColumns": "100", - "endOffsets": "3026" + "endOffsets": "2977" } - } - ] - }, - { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-h720dp-v13_values-h720dp-v13.arsc.flat", - "map": [ + }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-h720dp-v13\\values-h720dp-v13.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ms\\values-ms.xml", "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "66", - "endOffsets": "117" + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "105,216,321,429,516,620,731,809,888,979,1072,1167,1261,1360,1453,1548,1642,1733,1824,1904,2016,2125,2222,2331,2434,2541,2700,2801", + "endColumns": "110,104,107,86,103,110,77,78,90,92,94,93,98,92,94,93,90,90,79,111,108,96,108,102,106,158,100,79", + "endOffsets": "211,316,424,511,615,726,804,883,974,1067,1162,1256,1355,1448,1543,1637,1728,1819,1899,2011,2120,2217,2326,2429,2536,2695,2796,2876" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-el_values-el.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-hi_values-hi.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-el\\values-el.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-hi\\values-hi.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,223,334,451,536,641,767,855,941,1032,1125,1221,1315,1416,1509,1604,1701,1792,1883,1968,2079,2189,2291,2402,2511,2619,2779,2879", - "endColumns": "117,110,116,84,104,125,87,85,90,92,95,93,100,92,94,96,90,90,84,110,109,101,110,108,107,159,99,84", - "endOffsets": "218,329,446,531,636,762,850,936,1027,1120,1216,1310,1411,1504,1599,1696,1787,1878,1963,2074,2184,2286,2397,2506,2614,2774,2874,2959" + "startOffsets": "105,211,308,418,504,606,728,805,883,974,1067,1163,1257,1358,1451,1546,1640,1731,1822,1912,2021,2124,2226,2336,2437,2549,2711,2812", + "endColumns": "105,96,109,85,101,121,76,77,90,92,95,93,100,92,94,93,90,90,89,108,102,101,109,100,111,161,100,79", + "endOffsets": "206,303,413,499,601,723,800,878,969,1062,1158,1252,1353,1446,1541,1635,1726,1817,1907,2016,2119,2221,2331,2432,2544,2706,2807,2887" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-el\\values-el.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-hi\\values-hi.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1977,60 +1958,162 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2964", + "startOffsets": "2892", "endColumns": "100", - "endOffsets": "3060" + "endOffsets": "2988" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-kn_values-kn.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values_values.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-kn\\values-kn.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values\\values.xml", "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,223,335,448,536,643,770,847,924,1015,1108,1204,1298,1399,1492,1587,1681,1772,1863,1945,2061,2172,2271,2384,2488,2602,2766,2866", - "endColumns": "117,111,112,87,106,126,76,76,90,92,95,93,100,92,94,93,90,90,81,115,110,98,112,103,113,163,99,81", - "endOffsets": "218,330,443,531,638,765,842,919,1010,1103,1199,1293,1394,1487,1582,1676,1767,1858,1940,2056,2167,2266,2379,2483,2597,2761,2861,2943" + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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" + }, + "to": { + "startLines": "60,61,158,159,160,161,162,163,164,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,202,203,209,210,214,215,216,217,218,219,225,373,1712,1713,1717,1718,1722,1887,1888", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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,10320,10390,10458,10530,10600,10661,10735,11592,11653,11714,11776,11840,11902,11963,12031,12131,12191,12257,12330,12399,12456,12508,13285,13357,13672,13707,13884,13934,13995,14052,14086,14121,14431,24546,112327,112444,112645,112755,112956,125257,125329", + "endLines": "60,61,158,159,160,161,162,163,164,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,202,203,209,210,214,215,216,217,218,219,225,373,1712,1716,1717,1721,1722,1887,1888", + "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,10385,10453,10525,10595,10656,10730,10803,11648,11709,11771,11835,11897,11958,12026,12126,12186,12252,12325,12394,12451,12503,12565,13352,13428,13702,13737,13929,13990,14047,14081,14116,14151,14496,24612,112439,112640,112750,112951,113080,125324,125391" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-kn\\values-kn.xml", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml", "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" + "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" }, "to": { - "startLines": "30", + "startLines": "1448,1452,1456,1460,1729,1733,1737,1741,1745,1749,1753", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "92554,92758,92969,93176,113513,113696,113881,114066,114269,114475,114658", + "endLines": "1451,1455,1459,1462,1732,1736,1740,1744,1748,1752,1756", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "92753,92964,93171,93331,113691,113876,114061,114264,114470,114653,114854" + } + }, + { + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "startLines": "-1,-1", + "startColumns": "-1,-1", + "startOffsets": "-1,-1" + }, + "to": { + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" + } + }, + { + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml", + "from": { + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-1" + }, + "to": { + "startLines": "82", "startColumns": "4", - "startOffsets": "2948", - "endColumns": "100", - "endOffsets": "3044" + "startOffsets": "5146", + "endColumns": "56", + "endOffsets": "5198" + } + }, + { + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\4433a4478073ef0c67208fcc6161f90b\\transformed\\coordinatorlayout-28.0.0\\res\\values\\values.xml", + "from": { + "startLines": "-1,-1", + "startColumns": "-1,-1", + "startOffsets": "-1,-1" + }, + "to": { + "startLines": "12,1889", + "startColumns": "4,4", + "startOffsets": "420,125396", + "endLines": "12,1891", + "endColumns": "60,12", + "endOffsets": "476,125536" + } + }, + { + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "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,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,165,166,167,168,169,170,171,172,173,194,195,196,197,198,199,200,201,204,205,206,207,208,211,212,213,220,221,222,223,224,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,370,385,386,387,388,389,390,398,399,403,407,411,416,422,429,433,437,442,446,450,454,458,462,466,472,476,482,486,492,496,501,505,508,512,518,522,528,532,538,541,545,549,553,557,561,562,563,564,567,570,573,576,580,581,582,583,584,587,589,591,593,598,599,603,609,613,614,616,627,628,632,638,642,643,644,648,675,679,680,684,712,879,905,1073,1099,1130,1138,1144,1158,1180,1185,1190,1200,1209,1218,1222,1229,1237,1244,1245,1254,1257,1260,1264,1268,1272,1275,1276,1280,1284,1294,1299,1306,1312,1313,1316,1320,1325,1327,1329,1332,1335,1337,1341,1344,1351,1354,1357,1361,1363,1367,1369,1371,1373,1377,1385,1393,1405,1411,1420,1423,1434,1437,1442,1443,1463,1521,1580,1581,1591,1600,1601,1603,1607,1610,1613,1616,1619,1622,1625,1628,1632,1635,1638,1641,1645,1648,1652,1656,1657,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1678,1680,1681,1682,1683,1684,1685,1686,1687,1689,1690,1692,1693,1695,1697,1698,1700,1701,1702,1703,1704,1705,1707,1708,1709,1710,1711,1723,1725,1727,1757,1758,1759,1760,1761,1762,1763,1764,1765,1766,1767,1768,1769,1771,1772,1773,1774,1775,1776,1778,1782,1786,1787,1788,1789,1790,1791,1792,1793,1795,1797,1799,1801,1803,1804,1805,1806,1808,1810,1812,1813,1814,1815,1816,1817,1818,1819,1820,1821,1822,1823,1826,1827,1828,1829,1831,1833,1834,1836,1837,1839,1841,1843,1844,1845,1846,1847,1848,1849,1850,1851,1852,1853,1854,1856,1857,1858,1859,1861,1862,1863,1864,1865,1867,1869,1871,1873,1874,1875,1876,1877,1878,1879,1880,1881,1882,1883,1884,1885,1886", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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,3740,3814,3893,3966,4040,4111,4183,4255,4328,4385,4443,4516,4590,4664,4739,4811,4884,4954,5025,5085,5203,5272,5341,5411,5485,5561,5625,5702,5778,5855,5920,5989,6066,6141,6210,6278,6355,6421,6482,6579,6644,6713,6812,6883,6942,7000,7057,7116,7180,7251,7323,7395,7467,7539,7606,7674,7742,7801,7864,7928,8018,8109,8169,8235,8302,8368,8438,8502,8555,8668,8726,8789,8854,8919,8994,9067,9139,9188,9249,9310,9371,9433,9497,9561,9625,9690,9753,9813,9874,9940,9999,10059,10121,10192,10252,10808,10894,10981,11071,11158,11246,11328,11411,11501,12832,12884,12942,12987,13053,13117,13174,13231,13433,13490,13538,13587,13638,13742,13789,13838,14156,14188,14252,14314,14374,14894,14968,15038,15116,15170,15240,15325,15373,15419,15490,15568,15646,15718,15792,15866,15940,16020,16093,16162,16234,16311,16372,16435,16501,16565,16636,16699,16764,16828,16889,16950,17002,17075,17149,17218,17293,17367,17441,17582,24354,25450,25528,25618,25706,25802,25892,26474,26563,26810,27091,27343,27628,28021,28498,28720,28942,29218,29445,29675,29905,30135,30365,30592,31011,31237,31662,31892,32320,32539,32822,33030,33161,33388,33814,34039,34466,34687,35112,35232,35508,35809,36133,36424,36738,36875,37006,37111,37353,37520,37724,37932,38203,38315,38427,38532,38649,38863,39009,39149,39235,39583,39671,39917,40335,40584,40666,40764,41356,41456,41708,42132,42387,42481,42570,42807,44831,45073,45175,45428,47584,57713,59229,69457,70985,72742,73368,73788,74849,76114,76370,76606,77153,77647,78252,78450,79030,79594,79969,80087,80625,80782,80978,81251,81507,81677,81818,81882,82164,82450,83126,83390,83728,84081,84175,84361,84667,84929,85054,85181,85420,85631,85750,85943,86120,86575,86756,86878,87137,87250,87437,87539,87646,87775,88050,88558,89054,89931,90225,90795,90944,91676,91848,92184,92276,93336,97618,102043,102105,102683,103267,103358,103471,103700,103860,104012,104183,104349,104518,104685,104848,105091,105261,105434,105605,105879,106078,106283,106613,106697,106793,106889,106987,107087,107189,107291,107393,107495,107597,107697,107793,107905,108034,108157,108288,108419,108517,108631,108725,108865,108999,109095,109207,109307,109423,109519,109631,109731,109871,110007,110171,110301,110459,110609,110750,110894,111029,111141,111291,111419,111547,111683,111815,111945,112075,112187,113085,113231,113375,114859,114925,115015,115091,115195,115285,115387,115495,115603,115703,115783,115875,115973,116083,116161,116267,116359,116463,116573,116695,116858,117015,117095,117195,117285,117395,117489,117595,117687,117787,117899,118013,118129,118245,118339,118453,118565,118667,118787,118909,118991,119095,119215,119341,119439,119533,119621,119733,119849,119971,120083,120258,120374,120460,120552,120664,120788,120855,120981,121049,121177,121321,121449,121518,121613,121728,121841,121940,122049,122160,122271,122372,122477,122577,122707,122798,122921,123015,123127,123213,123317,123413,123501,123619,123723,123827,123953,124041,124149,124249,124339,124449,124533,124635,124719,124773,124837,124943,125053,125137", + "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,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,165,166,167,168,169,170,171,172,173,194,195,196,197,198,199,200,201,204,205,206,207,208,211,212,213,220,221,222,223,224,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,370,385,386,387,388,389,397,398,402,406,410,415,421,428,432,436,441,445,449,453,457,461,465,471,475,481,485,491,495,500,504,507,511,517,521,527,531,537,540,544,548,552,556,560,561,562,563,566,569,572,575,579,580,581,582,583,586,588,590,592,597,598,602,608,612,613,615,626,627,631,637,641,642,643,647,674,678,679,683,711,878,904,1072,1098,1129,1137,1143,1157,1179,1184,1189,1199,1208,1217,1221,1228,1236,1243,1244,1253,1256,1259,1263,1267,1271,1274,1275,1279,1283,1293,1298,1305,1311,1312,1315,1319,1324,1326,1328,1331,1334,1336,1340,1343,1350,1353,1356,1360,1362,1366,1368,1370,1372,1376,1384,1392,1404,1410,1419,1422,1433,1436,1441,1442,1447,1520,1579,1580,1590,1599,1600,1602,1606,1609,1612,1615,1618,1621,1624,1627,1631,1634,1637,1640,1644,1647,1651,1655,1656,1657,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1677,1679,1680,1681,1682,1683,1684,1685,1686,1688,1689,1691,1692,1694,1696,1697,1699,1700,1701,1702,1703,1704,1706,1707,1708,1709,1710,1711,1724,1726,1728,1757,1758,1759,1760,1761,1762,1763,1764,1765,1766,1767,1768,1770,1771,1772,1773,1774,1775,1777,1781,1785,1786,1787,1788,1789,1790,1791,1792,1794,1796,1798,1800,1802,1803,1804,1805,1807,1809,1811,1812,1813,1814,1815,1816,1817,1818,1819,1820,1821,1822,1825,1826,1827,1828,1830,1832,1833,1835,1836,1838,1840,1842,1843,1844,1845,1846,1847,1848,1849,1850,1851,1852,1853,1855,1856,1857,1858,1860,1861,1862,1863,1864,1866,1868,1870,1872,1873,1874,1875,1876,1877,1878,1879,1880,1881,1882,1883,1884,1885,1886", + "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,3809,3888,3961,4035,4106,4178,4250,4323,4380,4438,4511,4585,4659,4734,4806,4879,4949,5020,5080,5141,5267,5336,5406,5480,5556,5620,5697,5773,5850,5915,5984,6061,6136,6205,6273,6350,6416,6477,6574,6639,6708,6807,6878,6937,6995,7052,7111,7175,7246,7318,7390,7462,7534,7601,7669,7737,7796,7859,7923,8013,8104,8164,8230,8297,8363,8433,8497,8550,8663,8721,8784,8849,8914,8989,9062,9134,9183,9244,9305,9366,9428,9492,9556,9620,9685,9748,9808,9869,9935,9994,10054,10116,10187,10247,10315,10889,10976,11066,11153,11241,11323,11406,11496,11587,12879,12937,12982,13048,13112,13169,13226,13280,13485,13533,13582,13633,13667,13784,13833,13879,14183,14247,14309,14369,14426,14963,15033,15111,15165,15235,15320,15368,15414,15485,15563,15641,15713,15787,15861,15935,16015,16088,16157,16229,16306,16367,16430,16496,16560,16631,16694,16759,16823,16884,16945,16997,17070,17144,17213,17288,17362,17436,17577,17647,24402,25523,25613,25701,25797,25887,26469,26558,26805,27086,27338,27623,28016,28493,28715,28937,29213,29440,29670,29900,30130,30360,30587,31006,31232,31657,31887,32315,32534,32817,33025,33156,33383,33809,34034,34461,34682,35107,35227,35503,35804,36128,36419,36733,36870,37001,37106,37348,37515,37719,37927,38198,38310,38422,38527,38644,38858,39004,39144,39230,39578,39666,39912,40330,40579,40661,40759,41351,41451,41703,42127,42382,42476,42565,42802,44826,45068,45170,45423,47579,57708,59224,69452,70980,72737,73363,73783,74844,76109,76365,76601,77148,77642,78247,78445,79025,79589,79964,80082,80620,80777,80973,81246,81502,81672,81813,81877,82159,82445,83121,83385,83723,84076,84170,84356,84662,84924,85049,85176,85415,85626,85745,85938,86115,86570,86751,86873,87132,87245,87432,87534,87641,87770,88045,88553,89049,89926,90220,90790,90939,91671,91843,92179,92271,92549,97613,102038,102100,102678,103262,103353,103466,103695,103855,104007,104178,104344,104513,104680,104843,105086,105256,105429,105600,105874,106073,106278,106608,106692,106788,106884,106982,107082,107184,107286,107388,107490,107592,107692,107788,107900,108029,108152,108283,108414,108512,108626,108720,108860,108994,109090,109202,109302,109418,109514,109626,109726,109866,110002,110166,110296,110454,110604,110745,110889,111024,111136,111286,111414,111542,111678,111810,111940,112070,112182,112322,113226,113370,113508,114920,115010,115086,115190,115280,115382,115490,115598,115698,115778,115870,115968,116078,116156,116262,116354,116458,116568,116690,116853,117010,117090,117190,117280,117390,117484,117590,117682,117782,117894,118008,118124,118240,118334,118448,118560,118662,118782,118904,118986,119090,119210,119336,119434,119528,119616,119728,119844,119966,120078,120253,120369,120455,120547,120659,120783,120850,120976,121044,121172,121316,121444,121513,121608,121723,121836,121935,122044,122155,122266,122367,122472,122572,122702,122793,122916,123010,123122,123208,123312,123408,123496,123614,123718,123822,123948,124036,124144,124244,124334,124444,124528,124630,124714,124768,124832,124938,125048,125132,125252" + } + }, + { + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml", + "from": { + "startLines": "138,-1,-1,-1,-1,-1,80,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "4,-1,-1,-1,-1,-1,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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "8787,-1,-1,-1,-1,-1,4453,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endLines": "142,-1,-1,-1,-1,-1,80,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "14,-1,-1,-1,-1,-1,94,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "9195,-1,-1,-1,-1,-1,4543,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "226,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,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,371,372,374,375,376,377,378,379,380,381,382,383,384", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "14501,17652,17708,17764,17860,17943,18039,18134,18203,18246,18298,18350,18399,18462,18520,18571,18655,18749,18857,18928,19012,19095,19161,19244,19346,19407,19469,19520,19598,19651,19711,19816,19875,19977,20032,20103,20159,20214,20263,20320,20378,20425,20484,20541,20612,20673,20730,20780,20832,20885,20935,20985,21040,21100,21153,21219,21281,21344,21405,21454,21501,21556,21644,21702,21764,21814,21859,21902,21962,22017,22084,22139,22186,22241,22294,22341,22394,22450,22498,22553,22606,22690,22757,22821,22917,22991,23072,23161,23324,23468,23547,23622,23704,23763,23843,23923,23978,24100,24203,24244,24297,24407,24481,24617,24685,24771,24851,24920,25014,25073,25128,25190,25250,25360", + "endLines": "230,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,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,371,372,374,375,376,377,378,379,380,381,382,383,384", + "endColumns": "14,55,55,95,82,95,94,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,55,54,48,56,57,46,58,56,70,60,56,49,51,52,49,49,54,59,52,65,61,62,60,48,46,54,87,57,61,49,44,42,59,54,66,54,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "14889,17703,17759,17855,17938,18034,18129,18198,18241,18293,18345,18394,18457,18515,18566,18650,18744,18852,18923,19007,19090,19156,19239,19341,19402,19464,19515,19593,19646,19706,19811,19870,19972,20027,20098,20154,20209,20258,20315,20373,20420,20479,20536,20607,20668,20725,20775,20827,20880,20930,20980,21035,21095,21148,21214,21276,21339,21400,21449,21496,21551,21639,21697,21759,21809,21854,21897,21957,22012,22079,22134,22181,22236,22289,22336,22389,22445,22493,22548,22601,22685,22752,22816,22912,22986,23067,23156,23319,23463,23542,23617,23699,23758,23838,23918,23973,24095,24198,24239,24292,24349,24476,24541,24680,24766,24846,24915,25009,25068,25123,25185,25245,25355,25445" + } + }, + { + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "189,190,191,192,193", + "startColumns": "4,4,4,4,4", + "startOffsets": "12570,12622,12675,12728,12780", + "endColumns": "51,52,52,51,51", + "endOffsets": "12617,12670,12723,12775,12827" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ne_values-ne.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-tl_values-tl.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ne\\values-ne.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-tl\\values-tl.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,210,314,422,513,620,747,841,931,1022,1115,1211,1305,1406,1499,1594,1688,1779,1870,1958,2068,2184,2287,2402,2504,2619,2790,2902", - "endColumns": "104,103,107,90,106,126,93,89,90,92,95,93,100,92,94,93,90,90,87,109,115,102,114,101,114,170,111,85", - "endOffsets": "205,309,417,508,615,742,836,926,1017,1110,1206,1300,1401,1494,1589,1683,1774,1865,1953,2063,2179,2282,2397,2499,2614,2785,2897,2983" + "startOffsets": "105,224,332,449,537,643,764,843,921,1012,1105,1201,1295,1396,1489,1584,1678,1769,1860,1944,2053,2164,2265,2375,2492,2600,2763,2865", + "endColumns": "118,107,116,87,105,120,78,77,90,92,95,93,100,92,94,93,90,90,83,108,110,100,109,116,107,162,101,83", + "endOffsets": "219,327,444,532,638,759,838,916,1007,1100,1196,1290,1391,1484,1579,1673,1764,1855,1939,2048,2159,2260,2370,2487,2595,2758,2860,2944" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ne\\values-ne.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-tl\\values-tl.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2041,44 +2124,44 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2988", + "startOffsets": "2949", "endColumns": "100", - "endOffsets": "3084" + "endOffsets": "3045" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v28_values-v28.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v17_values-v17.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v28\\values-v28.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v17\\values-v17.xml", "from": { - "startLines": "2,3,4,8", - "startColumns": "4,4,4,4", - "startOffsets": "55,130,217,447", - "endLines": "2,3,7,11", - "endColumns": "74,86,12,12", - "endOffsets": "125,212,442,684" + "startLines": "2,5,9,12,15,18,22,25,29,33,37,40,43,46,50,53,57", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "55,228,456,614,764,936,1161,1331,1559,1783,2025,2196,2370,2539,2812,3012,3216", + "endLines": "4,8,11,14,17,21,24,28,32,36,39,42,45,49,52,56,60", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "223,451,609,759,931,1156,1326,1554,1778,2020,2191,2365,2534,2807,3007,3211,3540" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-zu_values-zu.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ka_values-ka.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-zu\\values-zu.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ka\\values-ka.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,213,320,434,522,625,752,832,912,1003,1096,1190,1284,1385,1478,1573,1667,1758,1851,1937,2041,2147,2245,2352,2458,2564,2721,2817", - "endColumns": "107,106,113,87,102,126,79,79,90,92,93,93,100,92,94,93,90,92,85,103,105,97,106,105,105,156,95,80", - "endOffsets": "208,315,429,517,620,747,827,907,998,1091,1185,1279,1380,1473,1568,1662,1753,1846,1932,2036,2142,2240,2347,2453,2559,2716,2812,2893" + "startOffsets": "105,214,318,429,517,622,735,819,901,992,1085,1180,1276,1377,1470,1565,1659,1750,1841,1924,2037,2144,2242,2355,2459,2563,2720,2818", + "endColumns": "108,103,110,87,104,112,83,81,90,92,94,95,100,92,94,93,90,90,82,112,106,97,112,103,103,156,97,80", + "endOffsets": "209,313,424,512,617,730,814,896,987,1080,1175,1271,1372,1465,1560,1654,1745,1836,1919,2032,2139,2237,2350,2454,2558,2715,2813,2894" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-zu\\values-zu.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ka\\values-ka.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2089,18 +2172,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2898", + "startOffsets": "2899", "endColumns": "100", - "endOffsets": "2994" + "endOffsets": "2995" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-km_values-km.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-en-rGB_values-en-rGB.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-km\\values-km.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-en-rGB\\values-en-rGB.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2111,54 +2194,38 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2882", + "startOffsets": "2846", "endColumns": "100", - "endOffsets": "2978" + "endOffsets": "2942" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-km\\values-km.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rGB\\values-en-rGB.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,208,308,420,507,611,729,806,883,974,1067,1163,1257,1358,1451,1546,1640,1731,1822,1905,2009,2114,2214,2324,2431,2539,2701,2799", - "endColumns": "102,99,111,86,103,117,76,76,90,92,95,93,100,92,94,93,90,90,82,103,104,99,109,106,107,161,97,82", - "endOffsets": "203,303,415,502,606,724,801,878,969,1062,1158,1252,1353,1446,1541,1635,1726,1817,1900,2004,2109,2209,2319,2426,2534,2696,2794,2877" - } - } - ] - }, - { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-hdpi-v4_values-hdpi-v4.arsc.flat", - "map": [ - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-hdpi-v4\\values-hdpi-v4.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endLines": "6", - "endColumns": "13", - "endOffsets": "327" + "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764", + "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81", + "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-hr_values-hr.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-in_values-in.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-hr\\values-hr.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-in\\values-in.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,210,307,417,503,607,726,810,893,984,1077,1173,1267,1368,1461,1556,1655,1746,1837,1923,2027,2140,2246,2351,2464,2571,2740,2837", - "endColumns": "104,96,109,85,103,118,83,82,90,92,95,93,100,92,94,98,90,90,85,103,112,105,104,112,106,168,96,88", - "endOffsets": "205,302,412,498,602,721,805,888,979,1072,1168,1262,1363,1456,1551,1650,1741,1832,1918,2022,2135,2241,2346,2459,2566,2735,2832,2921" + "startOffsets": "105,215,317,422,509,613,729,811,890,981,1074,1170,1264,1365,1458,1553,1647,1738,1829,1915,2018,2127,2228,2332,2440,2548,2704,2803", + "endColumns": "109,101,104,86,103,115,81,78,90,92,95,93,100,92,94,93,90,90,85,102,108,100,103,107,107,155,98,83", + "endOffsets": "210,312,417,504,608,724,806,885,976,1069,1165,1259,1360,1453,1548,1642,1733,1824,1910,2013,2122,2223,2327,2435,2543,2699,2798,2882" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-hr\\values-hr.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-in\\values-in.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2169,18 +2236,34 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2926", + "startOffsets": "2887", "endColumns": "100", - "endOffsets": "3022" + "endOffsets": "2983" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-uk_values-uk.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v23_values-v23.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-uk\\values-uk.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v23\\values-v23.xml", + "from": { + "startLines": "2,3,4,5,6,19,32,33,34,35,36", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "55,190,325,400,487,1277,2079,2206,2311,2426,2533", + "endLines": "2,3,4,5,18,31,32,33,34,35,36", + "endColumns": "134,134,74,86,12,12,126,104,114,106,112", + "endOffsets": "185,320,395,482,1272,2074,2201,2306,2421,2528,2641" + } + } + ] + }, + { + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-eu_values-eu.arsc.flat", + "map": [ + { + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-eu\\values-eu.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2191,59 +2274,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2900", + "startOffsets": "2938", "endColumns": "100", - "endOffsets": "2996" + "endOffsets": "3034" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-uk\\values-uk.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-eu\\values-eu.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,215,317,423,509,617,735,814,894,985,1078,1174,1268,1369,1462,1557,1652,1743,1834,1915,2021,2128,2226,2334,2440,2549,2719,2819", - "endColumns": "109,101,105,85,107,117,78,79,90,92,95,93,100,92,94,94,90,90,80,105,106,97,107,105,108,169,99,80", - "endOffsets": "210,312,418,504,612,730,809,889,980,1073,1169,1263,1364,1457,1552,1647,1738,1829,1910,2016,2123,2221,2329,2435,2544,2714,2814,2895" - } - } - ] - }, - { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v25_values-v25.arsc.flat", - "map": [ - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v25\\values-v25.xml", - "from": { - "startLines": "2,3,4,6", - "startColumns": "4,4,4,4", - "startOffsets": "55,126,209,308", - "endLines": "2,3,5,7", - "endColumns": "70,82,12,12", - "endOffsets": "121,204,303,414" - } - } - ] - }, - { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v24_values-v24.arsc.flat", - "map": [ - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v24\\values-v24.xml", - "from": { - "startLines": "2,3", - "startColumns": "4,4", - "startOffsets": "55,212", - "endColumns": "156,134", - "endOffsets": "207,342" + "startOffsets": "105,214,312,422,508,614,738,825,909,1001,1095,1192,1286,1388,1482,1578,1675,1767,1860,1942,2051,2161,2260,2369,2475,2586,2757,2856", + "endColumns": "108,97,109,85,105,123,86,83,91,93,96,93,101,93,95,96,91,92,81,108,109,98,108,105,110,170,98,81", + "endOffsets": "209,307,417,503,609,733,820,904,996,1090,1187,1281,1383,1477,1573,1670,1762,1855,1937,2046,2156,2255,2364,2470,2581,2752,2851,2933" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ms_values-ms.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-pt_values-pt.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ms\\values-ms.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-pt\\values-pt.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2254,38 +2306,38 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2881", + "startOffsets": "2929", "endColumns": "100", - "endOffsets": "2977" + "endOffsets": "3025" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ms\\values-ms.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-pt\\values-pt.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,216,321,429,516,620,731,809,888,979,1072,1167,1261,1360,1453,1548,1642,1733,1824,1904,2016,2125,2222,2331,2434,2541,2700,2801", - "endColumns": "110,104,107,86,103,110,77,78,90,92,94,93,98,92,94,93,90,90,79,111,108,96,108,102,106,158,100,79", - "endOffsets": "211,316,424,511,615,726,804,883,974,1067,1162,1256,1355,1448,1543,1637,1728,1819,1899,2011,2120,2217,2326,2429,2536,2695,2796,2876" + "startOffsets": "105,225,331,438,527,628,746,829,909,1000,1093,1189,1283,1384,1477,1572,1667,1758,1849,1936,2043,2155,2257,2365,2472,2582,2744,2844", + "endColumns": "119,105,106,88,100,117,82,79,90,92,95,93,100,92,94,94,90,90,86,106,111,101,107,106,109,161,99,84", + "endOffsets": "220,326,433,522,623,741,824,904,995,1088,1184,1278,1379,1472,1567,1662,1753,1844,1931,2038,2150,2252,2360,2467,2577,2739,2839,2924" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ro_values-ro.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-pa_values-pa.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ro\\values-ro.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-pa\\values-pa.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,226,330,443,531,643,764,849,930,1021,1114,1210,1304,1404,1497,1592,1687,1778,1870,1953,2065,2178,2278,2392,2497,2603,2767,2870", - "endColumns": "120,103,112,87,111,120,84,80,90,92,95,93,99,92,94,94,90,91,82,111,112,99,113,104,105,163,102,82", - "endOffsets": "221,325,438,526,638,759,844,925,1016,1109,1205,1299,1399,1492,1587,1682,1773,1865,1948,2060,2173,2273,2387,2492,2598,2762,2865,2948" + "startOffsets": "105,208,305,410,496,596,709,786,862,953,1046,1142,1236,1337,1430,1525,1619,1710,1801,1880,1981,2085,2182,2291,2390,2500,2659,2759", + "endColumns": "102,96,104,85,99,112,76,75,90,92,95,93,100,92,94,93,90,90,78,100,103,96,108,98,109,158,99,79", + "endOffsets": "203,300,405,491,591,704,781,857,948,1041,1137,1231,1332,1425,1520,1614,1705,1796,1875,1976,2080,2177,2286,2385,2495,2654,2754,2834" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ro\\values-ro.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-pa\\values-pa.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2296,71 +2348,50 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2953", + "startOffsets": "2839", "endColumns": "100", - "endOffsets": "3049" + "endOffsets": "2935" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v21_values-v21.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-pt-rPT_values-pt-rPT.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-v21\\values-v21.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-pt-rPT\\values-pt-rPT.xml", "from": { - "startLines": "2,3,4,5,6,7,8,9,10,13", - "startColumns": "4,4,4,4,4,4,4,4,4,4", - "startOffsets": "55,159,223,290,354,470,596,722,850,1022", - "endLines": "2,3,4,5,6,7,8,9,12,17", - "endColumns": "103,63,66,63,115,125,125,127,12,12", - "endOffsets": "154,218,285,349,465,591,717,845,1017,1355" + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "100", + "endOffsets": "151" }, "to": { - "startLines": "2,3,4,5,263,264,265,266,267,270", - "startColumns": "4,4,4,4,4,4,4,4,4,4", - "startOffsets": "55,159,223,290,19262,19378,19504,19630,19758,19930", - "endLines": "2,3,4,5,263,264,265,266,269,274", - "endColumns": "103,63,66,63,115,125,125,127,12,12", - "endOffsets": "154,218,285,349,19373,19499,19625,19753,19925,20263" + "startLines": "30", + "startColumns": "4", + "startOffsets": "2949", + "endColumns": "100", + "endOffsets": "3045" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v21\\values-v21.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-pt-rPT\\values-pt-rPT.xml", "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,17,19,20,21,22,24,26,27,28,29,30,32,34,36,38,40,42,43,48,50,52,53,54,56,58,59,60,61,62,63,107,110,154,157,160,162,164,166,169,171,174,175,176,179,180,181,182,183,184,187,188,190,192,194,196,200,202,203,204,205,207,211,213,215,216,217,218,219,221,222,223,233,234,235,247", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "55,146,249,352,457,564,673,782,891,1000,1109,1216,1319,1438,1593,1748,1853,1974,2075,2222,2363,2466,2585,2692,2795,2950,3121,3270,3435,3592,3743,3862,4234,4383,4532,4644,4791,4944,5091,5166,5255,5342,5443,5546,8614,8799,11879,12076,12275,12398,12521,12634,12817,12948,13149,13238,13349,13582,13683,13778,13901,14030,14147,14324,14423,14558,14701,14836,14955,15156,15275,15368,15479,15535,15642,15837,15948,16081,16176,16267,16358,16475,16614,16685,16768,17448,17505,17563,18257", - "endLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,16,18,19,20,21,23,25,26,27,28,29,31,33,35,37,39,41,42,47,49,51,52,53,55,57,58,59,60,61,62,106,109,153,156,159,161,163,165,168,170,173,174,175,178,179,180,181,182,183,186,187,189,191,193,195,199,201,202,203,204,206,210,212,214,215,216,217,218,220,221,222,232,233,234,246,258", - "endColumns": "90,102,102,104,106,108,108,108,108,108,106,102,118,12,12,104,120,100,12,12,102,118,106,102,12,12,12,12,12,12,118,12,12,12,111,146,12,12,74,88,86,100,102,12,12,12,12,12,12,12,12,12,12,12,88,110,12,100,94,122,128,116,12,98,12,12,12,12,12,12,92,110,55,12,12,12,12,94,90,90,116,12,70,82,12,56,57,12,12", - "endOffsets": "141,244,347,452,559,668,777,886,995,1104,1211,1314,1433,1588,1743,1848,1969,2070,2217,2358,2461,2580,2687,2790,2945,3116,3265,3430,3587,3738,3857,4229,4378,4527,4639,4786,4939,5086,5161,5250,5337,5438,5541,8609,8794,11874,12071,12270,12393,12516,12629,12812,12943,13144,13233,13344,13577,13678,13773,13896,14025,14142,14319,14418,14553,14696,14831,14950,15151,15270,15363,15474,15530,15637,15832,15943,16076,16171,16262,16353,16470,16609,16680,16763,17443,17500,17558,18252,18958" - }, - "to": { - "startLines": "6,7,8,9,10,11,12,13,14,15,16,17,18,19,21,23,24,25,26,28,30,31,32,33,34,36,38,40,42,44,46,47,52,54,56,57,58,60,62,63,64,65,66,67,111,114,158,161,164,166,168,170,173,175,178,179,180,183,184,185,186,187,188,191,192,194,196,198,200,204,206,207,208,209,211,215,217,219,220,221,222,223,225,226,227,237,238,239,251", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "354,445,548,651,756,863,972,1081,1190,1299,1408,1515,1618,1737,1892,2047,2152,2273,2374,2521,2662,2765,2884,2991,3094,3249,3420,3569,3734,3891,4042,4161,4533,4682,4831,4943,5090,5243,5390,5465,5554,5641,5742,5845,8913,9098,12178,12375,12574,12697,12820,12933,13116,13247,13448,13537,13648,13881,13982,14077,14200,14329,14446,14623,14722,14857,15000,15135,15254,15455,15574,15667,15778,15834,15941,16136,16247,16380,16475,16566,16657,16774,16913,16984,17067,17747,17804,17862,18556", - "endLines": "6,7,8,9,10,11,12,13,14,15,16,17,18,20,22,23,24,25,27,29,30,31,32,33,35,37,39,41,43,45,46,51,53,55,56,57,59,61,62,63,64,65,66,110,113,157,160,163,165,167,169,172,174,177,178,179,182,183,184,185,186,187,190,191,193,195,197,199,203,205,206,207,208,210,214,216,218,219,220,221,222,224,225,226,236,237,238,250,262", - "endColumns": "90,102,102,104,106,108,108,108,108,108,106,102,118,12,12,104,120,100,12,12,102,118,106,102,12,12,12,12,12,12,118,12,12,12,111,146,12,12,74,88,86,100,102,12,12,12,12,12,12,12,12,12,12,12,88,110,12,100,94,122,128,116,12,98,12,12,12,12,12,12,92,110,55,12,12,12,12,94,90,90,116,12,70,82,12,56,57,12,12", - "endOffsets": "440,543,646,751,858,967,1076,1185,1294,1403,1510,1613,1732,1887,2042,2147,2268,2369,2516,2657,2760,2879,2986,3089,3244,3415,3564,3729,3886,4037,4156,4528,4677,4826,4938,5085,5238,5385,5460,5549,5636,5737,5840,8908,9093,12173,12370,12569,12692,12815,12928,13111,13242,13443,13532,13643,13876,13977,14072,14195,14324,14441,14618,14717,14852,14995,15130,15249,15450,15569,15662,15773,15829,15936,16131,16242,16375,16470,16561,16652,16769,16908,16979,17062,17742,17799,17857,18551,19257" + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "105,225,331,438,527,628,752,836,917,1009,1103,1201,1295,1395,1489,1585,1680,1772,1864,1951,2058,2170,2272,2380,2487,2594,2765,2864", + "endColumns": "119,105,106,88,100,123,83,80,91,93,97,93,99,93,95,94,91,91,86,106,111,101,107,106,106,170,98,84", + "endOffsets": "220,326,433,522,623,747,831,912,1004,1098,1196,1290,1390,1484,1580,1675,1767,1859,1946,2053,2165,2267,2375,2482,2589,2760,2859,2944" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-pt-rBR_values-pt-rBR.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sk_values-sk.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-pt-rBR\\values-pt-rBR.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,225,331,438,527,628,746,829,909,1000,1093,1189,1283,1384,1477,1572,1667,1758,1849,1936,2043,2155,2257,2365,2472,2582,2744,2844", - "endColumns": "119,105,106,88,100,117,82,79,90,92,95,93,100,92,94,94,90,90,86,106,111,101,107,106,109,161,99,84", - "endOffsets": "220,326,433,522,623,741,824,904,995,1088,1184,1278,1379,1472,1567,1662,1753,1844,1931,2038,2150,2252,2360,2467,2577,2739,2839,2924" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-pt-rBR\\values-pt-rBR.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-sk\\values-sk.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2371,43 +2402,44 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2929", + "startOffsets": "2918", "endColumns": "100", - "endOffsets": "3025" + "endOffsets": "3014" + } + }, + { + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-sk\\values-sk.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "105,212,312,423,509,617,735,816,897,988,1081,1180,1274,1375,1468,1563,1661,1752,1843,1927,2032,2141,2240,2346,2457,2566,2732,2830", + "endColumns": "106,99,110,85,107,117,80,80,90,92,98,93,100,92,94,97,90,90,83,104,108,98,105,110,108,165,97,87", + "endOffsets": "207,307,418,504,612,730,811,892,983,1076,1175,1269,1370,1463,1558,1656,1747,1838,1922,2027,2136,2235,2341,2452,2561,2727,2825,2913" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v18_values-v18.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v22_values-v22.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v18\\values-v18.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v22\\values-v22.xml", "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "48", - "endOffsets": "99" + "startLines": "2,3,4,9", + "startColumns": "4,4,4,4", + "startOffsets": "55,130,217,553", + "endLines": "2,3,8,13", + "endColumns": "74,86,12,12", + "endOffsets": "125,212,548,896" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-et_values-et.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-lo_values-lo.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-et\\values-et.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,222,329,440,526,628,745,825,903,995,1089,1194,1296,1406,1500,1601,1695,1787,1880,1963,2074,2179,2278,2388,2489,2592,2758,2860", - "endColumns": "116,106,110,85,101,116,79,77,91,93,104,101,109,93,100,93,91,92,82,110,104,98,109,100,102,165,101,81", - "endOffsets": "217,324,435,521,623,740,820,898,990,1084,1189,1291,1401,1495,1596,1690,1782,1875,1958,2069,2174,2273,2383,2484,2587,2753,2855,2937" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-et\\values-et.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-lo\\values-lo.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2418,28 +2450,38 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2942", + "startOffsets": "2836", "endColumns": "100", - "endOffsets": "3038" + "endOffsets": "2932" + } + }, + { + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-lo\\values-lo.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "105,208,305,412,497,602,714,791,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1888,1995,2092,2190,2295,2398,2502,2659,2755", + "endColumns": "102,96,106,84,104,111,76,77,90,92,95,93,100,92,94,93,90,90,79,106,96,97,104,102,103,156,95,80", + "endOffsets": "203,300,407,492,597,709,786,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1883,1990,2087,2185,2290,2393,2497,2654,2750,2831" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-fr_values-fr.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-uz_values-uz.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-fr\\values-fr.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-uz\\values-uz.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,216,331,442,524,630,760,843,923,1014,1107,1206,1301,1402,1495,1588,1683,1774,1865,1951,2061,2173,2276,2387,2494,2601,2760,2859", - "endColumns": "110,114,110,81,105,129,82,79,90,92,98,94,100,92,92,94,90,90,85,109,111,102,110,106,106,158,98,85", - "endOffsets": "211,326,437,519,625,755,838,918,1009,1102,1201,1296,1397,1490,1583,1678,1769,1860,1946,2056,2168,2271,2382,2489,2596,2755,2854,2940" + "startOffsets": "105,210,314,428,514,614,730,810,889,980,1073,1169,1263,1358,1451,1546,1641,1732,1824,1908,2017,2124,2225,2333,2438,2545,2706,2805", + "endColumns": "104,103,113,85,99,115,79,78,90,92,95,93,94,92,94,94,90,91,83,108,106,100,107,104,106,160,98,83", + "endOffsets": "205,309,423,509,609,725,805,884,975,1068,1164,1258,1353,1446,1541,1636,1727,1819,1903,2012,2119,2220,2328,2433,2540,2701,2800,2884" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-fr\\values-fr.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-uz\\values-uz.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2450,18 +2492,43 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2945", + "startOffsets": "2889", "endColumns": "100", - "endOffsets": "3041" + "endOffsets": "2985" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-lo_values-lo.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-xlarge-v4_values-xlarge-v4.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-lo\\values-lo.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-xlarge-v4\\values-xlarge-v4.xml", + "from": { + "startLines": "2,3,4,5,6,7", + "startColumns": "4,4,4,4,4,4", + "startOffsets": "55,126,197,267,337,405", + "endColumns": "70,70,69,69,67,67", + "endOffsets": "121,192,262,332,400,468" + } + } + ] + }, + { + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-fi_values-fi.arsc.flat", + "map": [ + { + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-fi\\values-fi.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "105,213,313,414,500,605,723,810,892,983,1076,1172,1266,1361,1454,1550,1649,1740,1834,1914,2021,2124,2221,2327,2426,2530,2693,2792", + "endColumns": "107,99,100,85,104,117,86,81,90,92,95,93,94,92,95,98,90,93,79,106,102,96,105,98,103,162,98,79", + "endOffsets": "208,308,409,495,600,718,805,887,978,1071,1167,1261,1356,1449,1545,1644,1735,1829,1909,2016,2119,2216,2322,2421,2525,2688,2787,2867" + } + }, + { + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-fi\\values-fi.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2472,38 +2539,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2836", + "startOffsets": "2872", "endColumns": "100", - "endOffsets": "2932" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-lo\\values-lo.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,208,305,412,497,602,714,791,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1888,1995,2092,2190,2295,2398,2502,2659,2755", - "endColumns": "102,96,106,84,104,111,76,77,90,92,95,93,100,92,94,93,90,90,79,106,96,97,104,102,103,156,95,80", - "endOffsets": "203,300,407,492,597,709,786,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1883,1990,2087,2185,2290,2393,2497,2654,2750,2831" + "endOffsets": "2968" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-nb_values-nb.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-fr-rCA_values-fr-rCA.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-nb\\values-nb.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-fr-rCA\\values-fr-rCA.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,213,308,422,508,608,721,797,873,964,1057,1153,1247,1348,1441,1536,1634,1725,1816,1896,1999,2098,2194,2298,2396,2497,2650,2747", - "endColumns": "107,94,113,85,99,112,75,75,90,92,95,93,100,92,94,97,90,90,79,102,98,95,103,97,100,152,96,78", - "endOffsets": "208,303,417,503,603,716,792,868,959,1052,1148,1242,1343,1436,1531,1629,1720,1811,1891,1994,2093,2189,2293,2391,2492,2645,2742,2821" + "startOffsets": "105,216,331,442,529,645,775,858,938,1029,1122,1221,1316,1417,1510,1603,1698,1789,1880,1976,2086,2198,2301,2412,2519,2621,2780,2879", + "endColumns": "110,114,110,86,115,129,82,79,90,92,98,94,100,92,92,94,90,90,95,109,111,102,110,106,101,158,98,85", + "endOffsets": "211,326,437,524,640,770,853,933,1024,1117,1216,1311,1412,1505,1598,1693,1784,1875,1971,2081,2193,2296,2407,2514,2616,2775,2874,2960" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-nb\\values-nb.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-fr-rCA\\values-fr-rCA.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2514,28 +2571,34 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2826", + "startOffsets": "2965", "endColumns": "100", - "endOffsets": "2922" + "endOffsets": "3061" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-or_values-or.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v26_values-v26.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-or\\values-or.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v26\\values-v26.xml", "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,224,334,441,527,631,751,828,905,996,1089,1186,1281,1382,1475,1570,1666,1757,1847,1929,2039,2144,2250,2361,2464,2582,2745,2847", - "endColumns": "118,109,106,85,103,119,76,76,90,92,96,94,100,92,94,95,90,89,81,109,104,105,110,102,117,162,101,88", - "endOffsets": "219,329,436,522,626,746,823,900,991,1084,1181,1276,1377,1470,1565,1661,1752,1842,1924,2034,2139,2245,2356,2459,2577,2740,2842,2931" + "startLines": "2,3,4,8,12,16", + "startColumns": "4,4,4,4,4,4", + "startOffsets": "55,130,217,431,657,896", + "endLines": "2,3,7,11,15,16", + "endColumns": "74,86,12,12,12,92", + "endOffsets": "125,212,426,652,891,984" } - }, + } + ] + }, + { + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-mk_values-mk.arsc.flat", + "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-or\\values-or.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-mk\\values-mk.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2546,15 +2609,25 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2936", + "startOffsets": "2945", "endColumns": "100", - "endOffsets": "3032" + "endOffsets": "3041" + } + }, + { + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-mk\\values-mk.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "105,213,317,425,511,616,735,818,900,997,1096,1193,1293,1400,1499,1600,1696,1793,1884,1971,2077,2184,2285,2392,2503,2607,2763,2861", + "endColumns": "107,103,107,85,104,118,82,81,96,98,96,99,106,98,100,95,96,90,86,105,106,100,106,110,103,155,97,83", + "endOffsets": "208,312,420,506,611,730,813,895,992,1091,1188,1288,1395,1494,1595,1691,1788,1879,1966,2072,2179,2280,2387,2498,2602,2758,2856,2940" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v16_values-v16.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v16_values-v16.arsc.flat", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-v16\\values-v16.xml", @@ -2588,20 +2661,10 @@ ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ja_values-ja.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-gu_values-gu.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ja\\values-ja.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,202,295,400,482,580,688,765,841,932,1025,1121,1215,1316,1409,1504,1598,1689,1780,1858,1960,2059,2154,2257,2352,2448,2596,2693", - "endColumns": "96,92,104,81,97,107,76,75,90,92,95,93,100,92,94,93,90,90,77,101,98,94,102,94,95,147,96,77", - "endOffsets": "197,290,395,477,575,683,760,836,927,1020,1116,1210,1311,1404,1499,1593,1684,1775,1853,1955,2054,2149,2252,2347,2443,2591,2688,2766" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ja\\values-ja.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-gu\\values-gu.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2612,92 +2675,54 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2771", + "startOffsets": "2882", "endColumns": "100", - "endOffsets": "2867" + "endOffsets": "2978" } - } - ] - }, - { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ru_values-ru.arsc.flat", - "map": [ + }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ru\\values-ru.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-gu\\values-gu.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "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" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ru\\values-ru.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2913", - "endColumns": "100", - "endOffsets": "3009" + "startOffsets": "105,214,318,425,512,613,736,813,891,982,1075,1174,1268,1369,1462,1557,1654,1745,1836,1916,2022,2124,2221,2330,2429,2539,2699,2802", + "endColumns": "108,103,106,86,100,122,76,77,90,92,98,93,100,92,94,96,90,90,79,105,101,96,108,98,109,159,102,79", + "endOffsets": "209,313,420,507,608,731,808,886,977,1070,1169,1263,1364,1457,1552,1649,1740,1831,1911,2017,2119,2216,2325,2424,2534,2694,2797,2877" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ta_values-ta.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-watch-v20_values-watch-v20.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ta\\values-ta.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,219,317,432,521,628,754,832,909,1009,1114,1210,1305,1412,1514,1618,1713,1815,1913,1995,2097,2201,2298,2408,2510,2617,2774,2874", - "endColumns": "113,97,114,88,106,125,77,76,99,104,95,94,106,101,103,94,101,97,81,101,103,96,109,101,106,156,99,79", - "endOffsets": "214,312,427,516,623,749,827,904,1004,1109,1205,1300,1407,1509,1613,1708,1810,1908,1990,2092,2196,2293,2403,2505,2612,2769,2869,2949" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ta\\values-ta.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-watch-v20\\values-watch-v20.xml", "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2954", - "endColumns": "100", - "endOffsets": "3050" + "startLines": "2,5,8", + "startColumns": "4,4,4", + "startOffsets": "55,214,385", + "endLines": "4,7,10", + "endColumns": "12,12,12", + "endOffsets": "209,380,553" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sw_values-sw.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sq_values-sq.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-sw\\values-sw.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-sq\\values-sq.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,208,306,414,504,609,726,808,891,982,1075,1169,1263,1364,1457,1552,1647,1738,1830,1912,2013,2122,2221,2328,2437,2542,2704,2801", - "endColumns": "102,97,107,89,104,116,81,82,90,92,93,93,100,92,94,94,90,91,81,100,108,98,106,108,104,161,96,81", - "endOffsets": "203,301,409,499,604,721,803,886,977,1070,1164,1258,1359,1452,1547,1642,1733,1825,1907,2008,2117,2216,2323,2432,2537,2699,2796,2878" + "startOffsets": "105,219,319,431,518,628,751,832,911,1002,1095,1191,1285,1387,1480,1575,1672,1763,1856,1939,2045,2150,2248,2354,2457,2573,2727,2826", + "endColumns": "113,99,111,86,109,122,80,78,90,92,95,93,101,92,94,96,90,92,82,105,104,97,105,102,115,153,98,80", + "endOffsets": "214,314,426,513,623,746,827,906,997,1090,1186,1280,1382,1475,1570,1667,1758,1851,1934,2040,2145,2243,2349,2452,2568,2722,2821,2902" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-sw\\values-sw.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-sq\\values-sq.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2708,18 +2733,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2883", + "startOffsets": "2907", "endColumns": "100", - "endOffsets": "2979" + "endOffsets": "3003" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-pt_values-pt.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ko_values-ko.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-pt\\values-pt.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ko\\values-ko.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2730,38 +2755,38 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2929", + "startOffsets": "2756", "endColumns": "100", - "endOffsets": "3025" + "endOffsets": "2852" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-pt\\values-pt.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ko\\values-ko.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,225,331,438,527,628,746,829,909,1000,1093,1189,1283,1384,1477,1572,1667,1758,1849,1936,2043,2155,2257,2365,2472,2582,2744,2844", - "endColumns": "119,105,106,88,100,117,82,79,90,92,95,93,100,92,94,94,90,90,86,106,111,101,107,106,109,161,99,84", - "endOffsets": "220,326,433,522,623,741,824,904,995,1088,1184,1278,1379,1472,1567,1662,1753,1844,1931,2038,2150,2252,2360,2467,2577,2739,2839,2924" + "startOffsets": "105,200,294,396,478,576,682,761,837,928,1021,1113,1204,1305,1398,1493,1587,1678,1769,1849,1947,2042,2137,2237,2333,2432,2584,2678", + "endColumns": "94,93,101,81,97,105,78,75,90,92,91,90,100,92,94,93,90,90,79,97,94,94,99,95,98,151,93,77", + "endOffsets": "195,289,391,473,571,677,756,832,923,1016,1108,1199,1300,1393,1488,1582,1673,1764,1844,1942,2037,2132,2232,2328,2427,2579,2673,2751" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-tl_values-tl.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ne_values-ne.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-tl\\values-tl.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ne\\values-ne.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,224,332,449,537,643,764,843,921,1012,1105,1201,1295,1396,1489,1584,1678,1769,1860,1944,2053,2164,2265,2375,2492,2600,2763,2865", - "endColumns": "118,107,116,87,105,120,78,77,90,92,95,93,100,92,94,93,90,90,83,108,110,100,109,116,107,162,101,83", - "endOffsets": "219,327,444,532,638,759,838,916,1007,1100,1196,1290,1391,1484,1579,1673,1764,1855,1939,2048,2159,2260,2370,2487,2595,2758,2860,2944" + "startOffsets": "105,210,314,422,513,620,747,841,931,1022,1115,1211,1305,1406,1499,1594,1688,1779,1870,1958,2068,2184,2287,2402,2504,2619,2790,2902", + "endColumns": "104,103,107,90,106,126,93,89,90,92,95,93,100,92,94,93,90,90,87,109,115,102,114,101,114,170,111,85", + "endOffsets": "205,309,417,508,615,742,836,926,1017,1110,1206,1300,1401,1494,1589,1683,1774,1865,1953,2063,2179,2282,2397,2499,2614,2785,2897,2983" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-tl\\values-tl.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ne\\values-ne.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2772,37 +2797,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2949", + "startOffsets": "2988", "endColumns": "100", - "endOffsets": "3045" + "endOffsets": "3084" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-zh-rCN_values-zh-rCN.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sl_values-sl.arsc.flat", "map": [ { - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", - "from": { - "startLines": "122,72,71,70,69,20,21,22,113,114,121,120,27,78,79,77,76,75,91,90,89,81,61,30,31,82,73,115,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,29,19,35,37,34,36,33,32,26,25,98,97,100,112,105,104,106,107,109,108,99,103,101,102,96,110,111,119,117,116,118,28,80,88,93,92,94,87,86,85,84,23,24", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6697,3610,3543,3469,3418,890,931,980,6239,6285,6642,6591,1269,3982,4051,3922,3856,3792,4726,4665,4601,4185,2981,1442,1496,4240,3684,6343,3358,3141,1880,2167,2418,1934,2920,2866,2814,2615,2566,2470,2519,2662,2710,2211,3298,2761,3185,2123,2370,2313,2257,3085,2078,3042,1985,2027,3238,1390,846,1701,1799,1653,1751,1605,1559,1217,1163,5108,5048,5251,6164,5567,5497,5632,5711,5896,5822,5184,5441,5309,5375,4998,6001,6085,6552,6443,6394,6489,1332,4129,4541,4841,4782,4909,4492,4446,4397,4345,1029,1096", - "endLines": "124,72,71,70,69,20,21,22,113,114,121,120,27,78,79,77,76,75,91,90,89,81,61,30,31,82,73,115,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,29,19,35,37,34,36,33,32,26,25,98,97,100,112,105,104,106,107,109,108,99,103,101,102,96,110,111,119,117,116,118,28,80,88,93,92,94,87,86,85,84,23,24", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,42,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6871,3678,3604,3537,3463,925,974,1023,6279,6337,6691,6636,1326,4045,4123,3976,3916,3850,4776,4720,4659,4234,3036,1490,1553,4320,3760,6388,3412,3179,1928,2205,2464,1979,2975,2914,2860,2656,2609,2513,2560,2704,2755,2251,3352,2808,3232,2161,2412,2364,2307,3135,2117,3079,2021,2072,3292,1436,884,1745,1843,1695,1793,1647,1599,1263,1211,5178,5102,5303,6233,5626,5561,5705,5816,5995,5890,5245,5491,5369,5435,5042,6079,6158,6585,6483,6437,6546,1384,4179,4595,4903,4835,4966,4535,4486,4440,4391,1090,1157" - }, - "to": { - "startLines": "6,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,123,124,126,127,128,129,130,131,132,133,134,135,136", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,2945,3018,3084,3157,3207,3247,3295,3343,3388,3445,3499,3549,3611,3679,3756,3815,3880,3943,3998,4058,4121,4175,4235,4288,4350,4435,4516,4566,4625,4668,4721,4764,4815,4865,4925,4978,5029,5075,5123,5171,5217,5264,5314,5359,5418,5470,5522,5565,5612,5668,5723,5778,5822,5864,5905,5955,6014,6065,6108,6157,6206,6253,6300,6347,6392,6443,6496,6571,6630,6687,6761,6825,6894,6972,7082,7186,7259,7325,7380,7445,7510,7559,7642,7720,7758,7803,7929,7991,8149,8204,8263,8330,8388,8450,8498,8543,8591,8642,8708", - "endLines": "8,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,123,124,126,127,128,129,130,131,132,133,134,135,136", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,42,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,3013,3079,3152,3202,3242,3290,3338,3383,3440,3494,3544,3606,3674,3751,3810,3875,3938,3993,4053,4116,4170,4230,4283,4345,4430,4511,4561,4620,4663,4716,4759,4810,4860,4920,4973,5024,5070,5118,5166,5212,5259,5309,5354,5413,5465,5517,5560,5607,5663,5718,5773,5817,5859,5900,5950,6009,6060,6103,6152,6201,6248,6295,6342,6387,6438,6491,6566,6625,6682,6756,6820,6889,6967,7077,7181,7254,7320,7375,7440,7505,7554,7637,7715,7753,7798,7846,7986,8043,8199,8258,8325,8383,8445,8493,8538,8586,8637,8703,8769" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-sl\\values-sl.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2811,66 +2817,40 @@ "endOffsets": "151" }, "to": { - "startLines": "125", + "startLines": "30", "startColumns": "4", - "startOffsets": "8048", + "startOffsets": "2936", "endColumns": "100", - "endOffsets": "8144" - } - }, - { - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "730", - "endLines": "21", - "endColumns": "19", - "endOffsets": "838" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" + "endOffsets": "3032" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-sl\\values-sl.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,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,122", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "384,480,575,675,757,854,960,1036,1112,1203,1296,1394,1490,1585,1678,1773,1865,1956,2047,2125,2221,2317,2412,2509,2604,2702,2851,7851", - "endColumns": "95,94,99,81,96,105,75,75,90,92,97,95,94,92,94,91,90,90,77,95,95,94,96,94,97,148,93,77", - "endOffsets": "475,570,670,752,849,955,1031,1107,1198,1291,1389,1485,1580,1673,1768,1860,1951,2042,2120,2216,2312,2407,2504,2599,2697,2846,2940,7924" + "startOffsets": "105,212,319,427,514,617,736,821,905,997,1091,1187,1281,1377,1471,1567,1667,1759,1851,1935,2043,2152,2252,2365,2472,2576,2756,2853", + "endColumns": "106,106,107,86,102,118,84,83,91,93,95,93,95,93,95,99,91,91,83,107,108,99,112,106,103,179,96,82", + "endOffsets": "207,314,422,509,612,731,816,900,992,1086,1182,1276,1372,1466,1562,1662,1754,1846,1930,2038,2147,2247,2360,2467,2571,2751,2848,2931" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-hi_values-hi.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-fr_values-fr.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-hi\\values-hi.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-fr\\values-fr.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,211,308,418,504,606,728,805,883,974,1067,1163,1257,1358,1451,1546,1640,1731,1822,1912,2021,2124,2226,2336,2437,2549,2711,2812", - "endColumns": "105,96,109,85,101,121,76,77,90,92,95,93,100,92,94,93,90,90,89,108,102,101,109,100,111,161,100,79", - "endOffsets": "206,303,413,499,601,723,800,878,969,1062,1158,1252,1353,1446,1541,1635,1726,1817,1907,2016,2119,2221,2331,2432,2544,2706,2807,2887" + "startOffsets": "105,216,331,442,524,630,760,843,923,1014,1107,1206,1301,1402,1495,1588,1683,1774,1865,1951,2061,2173,2276,2387,2494,2601,2760,2859", + "endColumns": "110,114,110,81,105,129,82,79,90,92,98,94,100,92,92,94,90,90,85,109,111,102,110,106,106,158,98,85", + "endOffsets": "211,326,437,519,625,755,838,918,1009,1102,1201,1296,1397,1490,1583,1678,1769,1860,1946,2056,2168,2271,2382,2489,2596,2755,2854,2940" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-hi\\values-hi.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-fr\\values-fr.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2881,50 +2861,43 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2892", + "startOffsets": "2945", "endColumns": "100", - "endOffsets": "2988" + "endOffsets": "3041" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-mr_values-mr.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v18_values-v18.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-mr\\values-mr.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v18\\values-v18.xml", "from": { "startLines": "2", "startColumns": "4", "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2887", - "endColumns": "100", - "endOffsets": "2983" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-mr\\values-mr.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,216,322,429,519,620,735,812,890,981,1074,1168,1265,1366,1459,1554,1651,1742,1833,1913,2025,2127,2223,2332,2433,2545,2702,2807", - "endColumns": "110,105,106,89,100,114,76,77,90,92,93,96,100,92,94,96,90,90,79,111,101,95,108,100,111,156,104,79", - "endOffsets": "211,317,424,514,615,730,807,885,976,1069,1163,1260,1361,1454,1549,1646,1737,1828,1908,2020,2122,2218,2327,2428,2540,2697,2802,2882" + "endColumns": "48", + "endOffsets": "99" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-gu_values-gu.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ro_values-ro.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-gu\\values-gu.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ro\\values-ro.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "105,226,330,443,531,643,764,849,930,1021,1114,1210,1304,1404,1497,1592,1687,1778,1870,1953,2065,2178,2278,2392,2497,2603,2767,2870", + "endColumns": "120,103,112,87,111,120,84,80,90,92,95,93,99,92,94,94,90,91,82,111,112,99,113,104,105,163,102,82", + "endOffsets": "221,325,438,526,638,759,844,925,1016,1109,1205,1299,1399,1492,1587,1682,1773,1865,1948,2060,2173,2273,2387,2492,2598,2762,2865,2948" + } + }, + { + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ro\\values-ro.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2935,38 +2908,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2882", + "startOffsets": "2953", "endColumns": "100", - "endOffsets": "2978" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-gu\\values-gu.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,214,318,425,512,613,736,813,891,982,1075,1174,1268,1369,1462,1557,1654,1745,1836,1916,2022,2124,2221,2330,2429,2539,2699,2802", - "endColumns": "108,103,106,86,100,122,76,77,90,92,98,93,100,92,94,96,90,90,79,105,101,96,108,98,109,159,102,79", - "endOffsets": "209,313,420,507,608,731,808,886,977,1070,1169,1263,1364,1457,1552,1649,1740,1831,1911,2017,2119,2216,2325,2424,2534,2694,2797,2877" + "endOffsets": "3049" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ca_values-ca.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-en-rIN_values-en-rIN.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ca\\values-ca.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rIN\\values-en-rIN.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,223,329,436,519,627,753,837,918,1009,1102,1196,1291,1390,1483,1576,1670,1761,1852,1935,2046,2155,2253,2363,2467,2575,2735,2834", - "endColumns": "117,105,106,82,107,125,83,80,90,92,93,94,98,92,92,93,90,90,82,110,108,97,109,103,107,159,98,80", - "endOffsets": "218,324,431,514,622,748,832,913,1004,1097,1191,1286,1385,1478,1571,1665,1756,1847,1930,2041,2150,2248,2358,2462,2570,2730,2829,2910" + "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764", + "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81", + "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ca\\values-ca.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-en-rIN\\values-en-rIN.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2977,18 +2940,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2915", + "startOffsets": "2846", "endColumns": "100", - "endOffsets": "3011" + "endOffsets": "2942" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-gl_values-gl.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sv_values-sv.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-gl\\values-gl.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-sv\\values-sv.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2999,60 +2962,44 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2920", + "startOffsets": "2863", "endColumns": "100", - "endOffsets": "3016" + "endOffsets": "2959" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-gl\\values-gl.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-sv\\values-sv.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,217,329,437,522,624,750,834,915,1007,1101,1199,1293,1394,1488,1584,1679,1771,1863,1945,2052,2161,2260,2368,2472,2579,2738,2838", - "endColumns": "111,111,107,84,101,125,83,80,91,93,97,93,100,93,95,94,91,91,81,106,108,98,107,103,106,158,99,81", - "endOffsets": "212,324,432,517,619,745,829,910,1002,1096,1194,1288,1389,1483,1579,1674,1766,1858,1940,2047,2156,2255,2363,2467,2574,2733,2833,2915" + "startOffsets": "105,211,314,425,510,612,725,801,877,970,1065,1161,1255,1358,1453,1550,1648,1744,1837,1917,2023,2123,2219,2324,2426,2528,2682,2784", + "endColumns": "105,102,110,84,101,112,75,75,92,94,95,93,102,94,96,97,95,92,79,105,99,95,104,101,101,153,101,78", + "endOffsets": "206,309,420,505,607,720,796,872,965,1060,1156,1250,1353,1448,1545,1643,1739,1832,1912,2018,2118,2214,2319,2421,2523,2677,2779,2858" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-pa_values-pa.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-watch-v21_values-watch-v21.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-pa\\values-pa.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,208,305,410,496,596,709,786,862,953,1046,1142,1236,1337,1430,1525,1619,1710,1801,1880,1981,2085,2182,2291,2390,2500,2659,2759", - "endColumns": "102,96,104,85,99,112,76,75,90,92,95,93,100,92,94,93,90,90,78,100,103,96,108,98,109,158,99,79", - "endOffsets": "203,300,405,491,591,704,781,857,948,1041,1137,1231,1332,1425,1520,1614,1705,1796,1875,1976,2080,2177,2286,2385,2495,2654,2754,2834" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-pa\\values-pa.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-watch-v21\\values-watch-v21.xml", "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2839", - "endColumns": "100", - "endOffsets": "2935" + "startLines": "2,6,10", + "startColumns": "4,4,4", + "startOffsets": "55,271,499", + "endLines": "5,9,13", + "endColumns": "12,12,12", + "endOffsets": "266,494,724" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-en-rGB_values-en-rGB.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ur_values-ur.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-en-rGB\\values-en-rGB.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ur\\values-ur.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3063,38 +3010,38 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2846", + "startOffsets": "2904", "endColumns": "100", - "endOffsets": "2942" + "endOffsets": "3000" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rGB\\values-en-rGB.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ur\\values-ur.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764", - "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81", - "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841" + "startOffsets": "105,215,321,430,516,620,740,816,892,984,1078,1174,1268,1370,1464,1560,1654,1746,1838,1923,2031,2140,2242,2353,2453,2561,2726,2824", + "endColumns": "109,105,108,85,103,119,75,75,91,93,95,93,101,93,95,93,91,91,84,107,108,101,110,99,107,164,97,79", + "endOffsets": "210,316,425,511,615,735,811,887,979,1073,1169,1263,1365,1459,1555,1649,1741,1833,1918,2026,2135,2237,2348,2448,2556,2721,2819,2899" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-lt_values-lt.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-et_values-et.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-lt\\values-lt.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-et\\values-et.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,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,222,329,440,526,628,745,825,903,995,1089,1194,1296,1406,1500,1601,1695,1787,1880,1963,2074,2179,2278,2388,2489,2592,2758,2860", + "endColumns": "116,106,110,85,101,116,79,77,91,93,104,101,109,93,100,93,91,92,82,110,104,98,109,100,102,165,101,81", + "endOffsets": "217,324,435,521,623,740,820,898,990,1084,1189,1291,1401,1495,1596,1690,1782,1875,1958,2069,2174,2273,2383,2484,2587,2753,2855,2937" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-lt\\values-lt.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-et\\values-et.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3105,43 +3052,60 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2978", + "startOffsets": "2942", "endColumns": "100", - "endOffsets": "3074" + "endOffsets": "3038" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ldltr-v21_values-ldltr-v21.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ta_values-ta.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ldltr-v21\\values-ldltr-v21.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ta\\values-ta.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "105,219,317,432,521,628,754,832,909,1009,1114,1210,1305,1412,1514,1618,1713,1815,1913,1995,2097,2201,2298,2408,2510,2617,2774,2874", + "endColumns": "113,97,114,88,106,125,77,76,99,104,95,94,106,101,103,94,101,97,81,101,103,96,109,101,106,156,99,79", + "endOffsets": "214,312,427,516,623,749,827,904,1004,1109,1205,1300,1407,1509,1613,1708,1810,1908,1990,2092,2196,2293,2403,2505,2612,2769,2869,2949" + } + }, + { + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ta\\values-ta.xml", "from": { "startLines": "2", "startColumns": "4", "startOffsets": "55", - "endColumns": "112", - "endOffsets": "163" + "endColumns": "100", + "endOffsets": "151" + }, + "to": { + "startLines": "30", + "startColumns": "4", + "startOffsets": "2954", + "endColumns": "100", + "endOffsets": "3050" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-af_values-af.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-pt-rBR_values-pt-rBR.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-af\\values-af.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-pt-rBR\\values-pt-rBR.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,209,309,415,500,603,721,797,874,965,1058,1154,1248,1348,1441,1536,1635,1730,1824,1905,2012,2115,2212,2320,2422,2524,2678,2776", - "endColumns": "103,99,105,84,102,117,75,76,90,92,95,93,99,92,94,98,94,93,80,106,102,96,107,101,101,153,97,79", - "endOffsets": "204,304,410,495,598,716,792,869,960,1053,1149,1243,1343,1436,1531,1630,1725,1819,1900,2007,2110,2207,2315,2417,2519,2673,2771,2851" + "startOffsets": "105,225,331,438,527,628,746,829,909,1000,1093,1189,1283,1384,1477,1572,1667,1758,1849,1936,2043,2155,2257,2365,2472,2582,2744,2844", + "endColumns": "119,105,106,88,100,117,82,79,90,92,95,93,100,92,94,94,90,90,86,106,111,101,107,106,109,161,99,84", + "endOffsets": "220,326,433,522,623,741,824,904,995,1088,1184,1278,1379,1472,1567,1662,1753,1844,1931,2038,2150,2252,2360,2467,2577,2739,2839,2924" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-af\\values-af.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-pt-rBR\\values-pt-rBR.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3152,18 +3116,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2856", + "startOffsets": "2929", "endColumns": "100", - "endOffsets": "2952" + "endOffsets": "3025" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-eu_values-eu.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-hr_values-hr.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-eu\\values-eu.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-hr\\values-hr.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "105,210,307,417,503,607,726,810,893,984,1077,1173,1267,1368,1461,1556,1655,1746,1837,1923,2027,2140,2246,2351,2464,2571,2740,2837", + "endColumns": "104,96,109,85,103,118,83,82,90,92,95,93,100,92,94,98,90,90,85,103,112,105,104,112,106,168,96,88", + "endOffsets": "205,302,412,498,602,721,805,888,979,1072,1168,1262,1363,1456,1551,1650,1741,1832,1918,2022,2135,2241,2346,2459,2566,2735,2832,2921" + } + }, + { + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-hr\\values-hr.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3174,43 +3148,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2938", + "startOffsets": "2926", "endColumns": "100", - "endOffsets": "3034" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-eu\\values-eu.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,214,312,422,508,614,738,825,909,1001,1095,1192,1286,1388,1482,1578,1675,1767,1860,1942,2051,2161,2260,2369,2475,2586,2757,2856", - "endColumns": "108,97,109,85,105,123,86,83,91,93,96,93,101,93,95,96,91,92,81,108,109,98,108,105,110,170,98,81", - "endOffsets": "209,307,417,503,609,733,820,904,996,1090,1187,1281,1383,1477,1573,1670,1762,1855,1937,2046,2156,2255,2364,2470,2581,2752,2851,2933" + "endOffsets": "3022" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-night-v8_values-night-v8.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-bg_values-bg.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-night-v8\\values-night-v8.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-bg\\values-bg.xml", "from": { - "startLines": "2,3,4,5,6,7,8", - "startColumns": "4,4,4,4,4,4,4", - "startOffsets": "55,125,209,293,389,491,593", - "endColumns": "69,83,83,95,101,101,93", - "endOffsets": "120,204,288,384,486,588,682" + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "105,220,327,432,518,623,744,823,901,992,1085,1181,1275,1376,1469,1564,1672,1763,1854,1937,2051,2160,2260,2374,2480,2588,2748,2847", + "endColumns": "114,106,104,85,104,120,78,77,90,92,95,93,100,92,94,107,90,90,82,113,108,99,113,105,107,159,98,82", + "endOffsets": "215,322,427,513,618,739,818,896,987,1080,1176,1270,1371,1464,1559,1667,1758,1849,1932,2046,2155,2255,2369,2475,2583,2743,2842,2925" } - } - ] - }, - { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-pt-rPT_values-pt-rPT.arsc.flat", - "map": [ + }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-pt-rPT\\values-pt-rPT.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-bg\\values-bg.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3221,38 +3180,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2949", + "startOffsets": "2930", "endColumns": "100", - "endOffsets": "3045" - } - }, - { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-pt-rPT\\values-pt-rPT.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,225,331,438,527,628,752,836,917,1009,1103,1201,1295,1395,1489,1585,1680,1772,1864,1951,2058,2170,2272,2380,2487,2594,2765,2864", - "endColumns": "119,105,106,88,100,123,83,80,91,93,97,93,99,93,95,94,91,91,86,106,111,101,107,106,106,170,98,84", - "endOffsets": "220,326,433,522,623,747,831,912,1004,1098,1196,1290,1390,1484,1580,1675,1767,1859,1946,2053,2165,2267,2375,2482,2589,2760,2859,2944" + "endOffsets": "3026" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-fi_values-fi.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-as_values-as.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-fi\\values-fi.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-as\\values-as.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,213,313,414,500,605,723,810,892,983,1076,1172,1266,1361,1454,1550,1649,1740,1834,1914,2021,2124,2221,2327,2426,2530,2693,2792", - "endColumns": "107,99,100,85,104,117,86,81,90,92,95,93,94,92,95,98,90,93,79,106,102,96,105,98,103,162,98,79", - "endOffsets": "208,308,409,495,600,718,805,887,978,1071,1167,1261,1356,1449,1545,1644,1735,1829,1909,2016,2119,2216,2322,2421,2525,2688,2787,2867" + "startOffsets": "105,213,312,419,515,617,736,816,896,987,1080,1173,1268,1368,1461,1558,1652,1743,1834,1923,2025,2140,2243,2352,2471,2591,2758,2861", + "endColumns": "107,98,106,95,101,118,79,79,90,92,92,94,99,92,96,93,90,90,88,101,114,102,108,118,119,166,102,88", + "endOffsets": "208,307,414,510,612,731,811,891,982,1075,1168,1263,1363,1456,1553,1647,1738,1829,1918,2020,2135,2238,2347,2466,2586,2753,2856,2945" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-fi\\values-fi.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-as\\values-as.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3263,18 +3212,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2872", + "startOffsets": "2950", "endColumns": "100", - "endOffsets": "2968" + "endOffsets": "3046" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-si_values-si.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-kk_values-kk.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-si\\values-si.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-kk\\values-kk.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3285,28 +3234,38 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2903", + "startOffsets": "2893", "endColumns": "100", - "endOffsets": "2999" + "endOffsets": "2989" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-si\\values-si.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-kk\\values-kk.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,215,322,429,517,622,738,827,914,1005,1098,1193,1287,1388,1481,1576,1670,1761,1852,1936,2045,2150,2248,2358,2457,2563,2722,2821", - "endColumns": "109,106,106,87,104,115,88,86,90,92,94,93,100,92,94,93,90,90,83,108,104,97,109,98,105,158,98,81", - "endOffsets": "210,317,424,512,617,733,822,909,1000,1093,1188,1282,1383,1476,1571,1665,1756,1847,1931,2040,2145,2243,2353,2452,2558,2717,2816,2898" + "startOffsets": "105,217,320,430,515,621,740,821,901,992,1085,1181,1275,1376,1469,1564,1661,1752,1844,1925,2028,2133,2231,2338,2447,2547,2713,2812", + "endColumns": "111,102,109,84,105,118,80,79,90,92,95,93,100,92,94,96,90,91,80,102,104,97,106,108,99,165,98,80", + "endOffsets": "212,315,425,510,616,735,816,896,987,1080,1176,1270,1371,1464,1559,1656,1747,1839,1920,2023,2128,2226,2333,2442,2542,2708,2807,2888" } } ] }, { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-b+sr+Latn_values-b+sr+Latn.arsc.flat", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-en-rCA_values-en-rCA.arsc.flat", "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rCA\\values-en-rCA.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764", + "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81", + "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841" + } + }, + { + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-en-rCA\\values-en-rCA.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3317,19 +3276,41 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2912", + "startOffsets": "2846", "endColumns": "100", - "endOffsets": "3008" + "endOffsets": "2942" } - }, + } + ] + }, + { + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-zu_values-zu.arsc.flat", + "map": [ { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-zu\\values-zu.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,214,318,424,510,614,732,814,895,986,1079,1175,1269,1370,1463,1558,1663,1754,1845,1933,2039,2147,2248,2353,2461,2562,2731,2828", - "endColumns": "108,103,105,85,103,117,81,80,90,92,95,93,100,92,94,104,90,90,87,105,107,100,104,107,100,168,96,83", - "endOffsets": "209,313,419,505,609,727,809,890,981,1074,1170,1264,1365,1458,1553,1658,1749,1840,1928,2034,2142,2243,2348,2456,2557,2726,2823,2907" + "startOffsets": "105,213,320,434,522,625,752,832,912,1003,1096,1190,1284,1385,1478,1573,1667,1758,1851,1937,2041,2147,2245,2352,2458,2564,2721,2817", + "endColumns": "107,106,113,87,102,126,79,79,90,92,93,93,100,92,94,93,90,92,85,103,105,97,106,105,105,156,95,80", + "endOffsets": "208,315,429,517,620,747,827,907,998,1091,1185,1279,1380,1473,1568,1662,1753,1846,1932,2036,2142,2240,2347,2453,2559,2716,2812,2893" + } + }, + { + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-zu\\values-zu.xml", + "from": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "100", + "endOffsets": "151" + }, + "to": { + "startLines": "30", + "startColumns": "4", + "startOffsets": "2898", + "endColumns": "100", + "endOffsets": "2994" } } ] diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json index 9d07d2ba..9f11142a 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-af\\values-af.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-af\\values-af.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-af\\values-af.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json index 58991070..066ffefa 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-am\\values-am.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-am\\values-am.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-am\\values-am.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json index 6c2289df..c4dc81d1 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ar\\values-ar.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ar\\values-ar.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ar\\values-ar.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json index c1aa6e46..3c84ad2e 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-as\\values-as.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-as\\values-as.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-as\\values-as.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json index 2d5ff673..f3daece3 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-az\\values-az.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-az\\values-az.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-az\\values-az.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+sr+Latn.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+sr+Latn.json index 907db740..f6fd0192 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+sr+Latn.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+sr+Latn.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-b+sr+Latn\\values-b+sr+Latn.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-b+sr+Latn\\values-b+sr+Latn.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json index 3dadb2b6..f077c033 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-be\\values-be.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-be\\values-be.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-be\\values-be.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json index 8aafa083..6edcceb5 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bg\\values-bg.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bg\\values-bg.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-bg\\values-bg.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json index 92d35a10..c0f981a0 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bn\\values-bn.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bn\\values-bn.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-bn\\values-bn.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json index 4c97717a..459769b7 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bs\\values-bs.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bs\\values-bs.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-bs\\values-bs.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json index 8f8e0cdc..563b53cf 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ca\\values-ca.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ca\\values-ca.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ca\\values-ca.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json index 2a72a79c..20c98cab 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-cs\\values-cs.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-cs\\values-cs.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-cs\\values-cs.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json index 92741e19..be57e0b6 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-da\\values-da.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-da\\values-da.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-da\\values-da.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json index 96603fd5..8313ae18 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-de\\values-de.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-de\\values-de.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-de\\values-de.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json index cee6d805..06bf10de 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-el\\values-el.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-el\\values-el.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-el\\values-el.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rAU.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rAU.json index 99705a03..dfa70567 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rAU.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rAU.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rAU\\values-en-rAU.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rAU\\values-en-rAU.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rAU\\values-en-rAU.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rCA.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rCA.json index 30ed9ebd..79f58a32 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rCA.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rCA.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rCA\\values-en-rCA.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rCA\\values-en-rCA.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rCA\\values-en-rCA.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rGB.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rGB.json index 33f89917..1a2ebf89 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rGB.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rGB.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rGB\\values-en-rGB.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rGB\\values-en-rGB.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-en-rGB\\values-en-rGB.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rIN.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rIN.json index 40dc3a6a..8d43fb6b 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rIN.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rIN.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rIN\\values-en-rIN.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rIN\\values-en-rIN.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rIN\\values-en-rIN.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rXC.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rXC.json index cdbf36fb..32189ddf 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rXC.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rXC.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rXC\\values-en-rXC.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rXC\\values-en-rXC.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rXC\\values-en-rXC.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es-rUS.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es-rUS.json index a1e15f15..ff04a895 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es-rUS.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es-rUS.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-es-rUS\\values-es-rUS.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-es-rUS\\values-es-rUS.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-es-rUS\\values-es-rUS.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json index fca626c3..3c493eb7 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-es\\values-es.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-es\\values-es.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-es\\values-es.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json index 6f32ea45..12517450 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-et\\values-et.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-et\\values-et.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-et\\values-et.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json index f7ba752e..cd27ea67 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-eu\\values-eu.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-eu\\values-eu.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-eu\\values-eu.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json index 6f5f06ef..73447dd2 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fa\\values-fa.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fa\\values-fa.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-fa\\values-fa.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json index 6d088e04..6232d7f8 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fi\\values-fi.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fi\\values-fi.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-fi\\values-fi.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr-rCA.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr-rCA.json index bf8afff2..a1742b87 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr-rCA.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr-rCA.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fr-rCA\\values-fr-rCA.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fr-rCA\\values-fr-rCA.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-fr-rCA\\values-fr-rCA.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json index 5192df5e..56919f34 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fr\\values-fr.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fr\\values-fr.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-fr\\values-fr.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json index 7bb30bcc..815972fd 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-gl\\values-gl.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-gl\\values-gl.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-gl\\values-gl.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gu.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gu.json index fa801154..1663beea 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gu.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gu.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-gu\\values-gu.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-gu\\values-gu.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-gu\\values-gu.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h720dp-v13.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h720dp-v13.json index bee6bba9..dfb42914 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h720dp-v13.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h720dp-v13.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-h720dp-v13\\values-h720dp-v13.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-h720dp-v13\\values-h720dp-v13.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-h720dp-v13\\values-h720dp-v13.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hdpi-v4.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hdpi-v4.json index 7e055b5d..ea9b50d5 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hdpi-v4.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hdpi-v4.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hdpi-v4\\values-hdpi-v4.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hdpi-v4\\values-hdpi-v4.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-hdpi-v4\\values-hdpi-v4.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hi.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hi.json index 015a2d6f..3745474b 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hi.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hi.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hi\\values-hi.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hi\\values-hi.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-hi\\values-hi.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hr.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hr.json index 578c3f4d..116154b7 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hr.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hr.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hr\\values-hr.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hr\\values-hr.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-hr\\values-hr.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hu.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hu.json index 919387c5..ef57062f 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hu.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hu.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hu\\values-hu.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hu\\values-hu.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-hu\\values-hu.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hy.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hy.json index c995d547..eb8c3d0c 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hy.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hy.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hy\\values-hy.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hy\\values-hy.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-hy\\values-hy.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-in.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-in.json index 002aba06..0e838927 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-in.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-in.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-in\\values-in.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-in\\values-in.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-in\\values-in.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-is.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-is.json index 1f58449b..33b45319 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-is.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-is.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-is\\values-is.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-is\\values-is.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-is\\values-is.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-it.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-it.json index ad867fcf..1ba6837d 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-it.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-it.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-it\\values-it.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-it\\values-it.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-it\\values-it.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-iw.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-iw.json index 37539572..69160549 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-iw.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-iw.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-iw\\values-iw.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-iw\\values-iw.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-iw\\values-iw.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json index 68f6f99f..97855615 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ja\\values-ja.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ja\\values-ja.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ja\\values-ja.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ka.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ka.json index 828be292..d45c657d 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ka.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ka.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ka\\values-ka.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ka\\values-ka.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ka\\values-ka.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kk.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kk.json index 5735da23..641e30d8 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kk.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kk.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-kk\\values-kk.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-kk\\values-kk.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-kk\\values-kk.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-km.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-km.json index 3fb37ffe..b5e8c63f 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-km.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-km.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-km\\values-km.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-km\\values-km.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-km\\values-km.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kn.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kn.json index 0c790ed0..6720ed73 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kn.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kn.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-kn\\values-kn.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-kn\\values-kn.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-kn\\values-kn.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ko.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ko.json index 67686611..53d60503 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ko.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ko.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ko\\values-ko.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ko\\values-ko.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ko\\values-ko.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ky.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ky.json index ab094e0e..0bcae196 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ky.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ky.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ky\\values-ky.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ky\\values-ky.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ky\\values-ky.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-land.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-land.json index 631453ce..4f7ab956 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-land.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-land.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-land\\values-land.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-land\\values-land.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-land\\values-land.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-large-v4.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-large-v4.json index 042f4b3a..a364e8a6 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-large-v4.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-large-v4.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-large-v4\\values-large-v4.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-large-v4\\values-large-v4.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-large-v4\\values-large-v4.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ldltr-v21.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ldltr-v21.json index c0b216a0..3e12b1bd 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ldltr-v21.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ldltr-v21.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ldltr-v21\\values-ldltr-v21.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ldltr-v21\\values-ldltr-v21.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ldltr-v21\\values-ldltr-v21.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lo.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lo.json index 62fe129a..dcd2270e 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lo.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lo.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-lo\\values-lo.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-lo\\values-lo.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-lo\\values-lo.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lt.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lt.json index eee1bf03..1cc7319e 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lt.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lt.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-lt\\values-lt.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-lt\\values-lt.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-lt\\values-lt.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lv.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lv.json index 815487f6..9c9fafe2 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lv.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lv.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-lv\\values-lv.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-lv\\values-lv.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-lv\\values-lv.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mk.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mk.json index 0a1902de..aaa0cae0 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mk.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mk.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-mk\\values-mk.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-mk\\values-mk.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-mk\\values-mk.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ml.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ml.json index f321efda..af8018c7 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ml.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ml.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ml\\values-ml.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ml\\values-ml.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ml\\values-ml.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mn.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mn.json index c5c173a3..193e09a0 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mn.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mn.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-mn\\values-mn.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-mn\\values-mn.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-mn\\values-mn.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mr.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mr.json index 3ea27630..8f36ff37 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mr.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mr.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-mr\\values-mr.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-mr\\values-mr.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-mr\\values-mr.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ms.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ms.json index 55daacc2..bbc11259 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ms.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ms.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ms\\values-ms.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ms\\values-ms.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ms\\values-ms.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-my.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-my.json index 7c0f3dca..b50ed248 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-my.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-my.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-my\\values-my.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-my\\values-my.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-my\\values-my.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nb.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nb.json index 3261bd8a..1204744e 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nb.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nb.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-nb\\values-nb.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-nb\\values-nb.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-nb\\values-nb.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ne.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ne.json index 1ce1c84b..28e7673d 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ne.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ne.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ne\\values-ne.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ne\\values-ne.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ne\\values-ne.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-night-v8.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-night-v8.json index c63cde5b..09e03fc6 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-night-v8.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-night-v8.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-night-v8\\values-night-v8.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-night-v8\\values-night-v8.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-night-v8\\values-night-v8.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nl.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nl.json index cb75c86d..cd675870 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nl.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nl.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-nl\\values-nl.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-nl\\values-nl.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-nl\\values-nl.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-or.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-or.json index 427a61e5..00e2bf26 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-or.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-or.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-or\\values-or.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-or\\values-or.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-or\\values-or.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pa.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pa.json index 62ee6e27..d497a4f0 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pa.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pa.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pa\\values-pa.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pa\\values-pa.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-pa\\values-pa.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pl.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pl.json index 08e650ad..67f0a2b4 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pl.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pl.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pl\\values-pl.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pl\\values-pl.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-pl\\values-pl.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-port.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-port.json index 7b797adf..27290b91 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-port.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-port.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-port\\values-port.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-port\\values-port.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-port\\values-port.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rBR.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rBR.json index cee8c148..4a5ca122 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rBR.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rBR.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pt-rBR\\values-pt-rBR.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pt-rBR\\values-pt-rBR.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-pt-rBR\\values-pt-rBR.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rPT.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rPT.json index 2941c8cf..4c30ebbf 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rPT.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rPT.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pt-rPT\\values-pt-rPT.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pt-rPT\\values-pt-rPT.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-pt-rPT\\values-pt-rPT.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt.json index 983101c9..65ab284b 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pt\\values-pt.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pt\\values-pt.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-pt\\values-pt.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ro.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ro.json index ae5adfb4..e4d94de5 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ro.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ro.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ro\\values-ro.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ro\\values-ro.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ro\\values-ro.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ru.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ru.json index 13a2e0bb..bbba37a5 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ru.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ru.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ru\\values-ru.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ru\\values-ru.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ru\\values-ru.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-si.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-si.json index e6c02190..b5a1788d 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-si.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-si.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-si\\values-si.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-si\\values-si.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-si\\values-si.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sk.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sk.json index ffb26f61..3492264b 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sk.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sk.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sk\\values-sk.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sk\\values-sk.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-sk\\values-sk.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sl.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sl.json index 1ccb866e..a8f0d02b 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sl.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sl.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sl\\values-sl.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sl\\values-sl.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-sl\\values-sl.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sq.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sq.json index f08c69b9..33a95ed4 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sq.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sq.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sq\\values-sq.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sq\\values-sq.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-sq\\values-sq.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sr.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sr.json index 5aeeb534..9e0399c7 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sr.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sr.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sr\\values-sr.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sr\\values-sr.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-sr\\values-sr.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sv.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sv.json index ab5f8809..143930ed 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sv.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sv.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sv\\values-sv.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sv\\values-sv.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-sv\\values-sv.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw.json index a2d3e53d..fcf42bac 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sw\\values-sw.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sw\\values-sw.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-sw\\values-sw.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw600dp-v13.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw600dp-v13.json index 2fc5cd9a..729869fd 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw600dp-v13.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw600dp-v13.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sw600dp-v13\\values-sw600dp-v13.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sw600dp-v13\\values-sw600dp-v13.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-sw600dp-v13\\values-sw600dp-v13.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ta.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ta.json index 35a37923..55449c30 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ta.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ta.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ta\\values-ta.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ta\\values-ta.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-ta\\values-ta.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-te.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-te.json index 0faa9d40..2ee19384 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-te.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-te.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-te\\values-te.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-te\\values-te.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-te\\values-te.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-th.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-th.json index fa2f10e8..1c7ec2dc 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-th.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-th.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-th\\values-th.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-th\\values-th.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-th\\values-th.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tl.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tl.json index f3dc339d..fc762bdc 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tl.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tl.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-tl\\values-tl.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-tl\\values-tl.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-tl\\values-tl.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr.json index d8596052..c378f187 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-tr\\values-tr.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-tr\\values-tr.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-tr\\values-tr.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uk.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uk.json index 1479a74a..c6e5b2b4 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uk.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uk.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-uk\\values-uk.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-uk\\values-uk.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-uk\\values-uk.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ur.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ur.json index f34237be..27ca2ab4 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ur.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ur.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ur\\values-ur.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ur\\values-ur.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-ur\\values-ur.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uz.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uz.json index 3be37f13..e97ed56e 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uz.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uz.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-uz\\values-uz.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-uz\\values-uz.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-uz\\values-uz.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v16.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v16.json index 775d928a..c0abac33 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v16.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v16.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v16\\values-v16.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v16\\values-v16.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-v16\\values-v16.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v17.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v17.json index 01d76a93..60c38b6f 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v17.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v17.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v17\\values-v17.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v17\\values-v17.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v17\\values-v17.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v18.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v18.json index 35474b87..2f27dcb0 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v18.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v18.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v18\\values-v18.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v18\\values-v18.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v18\\values-v18.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v21.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v21.json index d24e02f1..7a843cd8 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v21.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v21.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v21\\values-v21.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v21\\values-v21.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-v21\\values-v21.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v22.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v22.json index 22ce2c2f..ccddce5d 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v22.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v22.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v22\\values-v22.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v22\\values-v22.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v22\\values-v22.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v23.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v23.json index fe8f0635..26f52abc 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v23.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v23.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v23\\values-v23.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v23\\values-v23.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v23\\values-v23.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v24.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v24.json index 29dc8c08..641eb55d 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v24.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v24.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v24\\values-v24.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v24\\values-v24.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v24\\values-v24.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v25.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v25.json index 34a99c23..b0118d47 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v25.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v25.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v25\\values-v25.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v25\\values-v25.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v25\\values-v25.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v26.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v26.json index 47c78d02..e8150ecc 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v26.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v26.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v26\\values-v26.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v26\\values-v26.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v26\\values-v26.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v28.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v28.json index d4fc02ae..68b88fe0 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v28.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v28.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v28\\values-v28.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v28\\values-v28.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-v28\\values-v28.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-vi.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-vi.json index 435f10ad..ed3cf915 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-vi.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-vi.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-vi\\values-vi.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-vi\\values-vi.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-vi\\values-vi.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v20.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v20.json index b75cec6d..e5f61443 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v20.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v20.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-watch-v20\\values-watch-v20.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-watch-v20\\values-watch-v20.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-watch-v20\\values-watch-v20.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v21.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v21.json index 1e1c4b6f..f33dbb22 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v21.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v21.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-watch-v21\\values-watch-v21.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-watch-v21\\values-watch-v21.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-watch-v21\\values-watch-v21.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-xlarge-v4.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-xlarge-v4.json index af188750..22006a53 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-xlarge-v4.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-xlarge-v4.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-xlarge-v4\\values-xlarge-v4.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-xlarge-v4\\values-xlarge-v4.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-xlarge-v4\\values-xlarge-v4.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json index 898841ce..704d1df3 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json @@ -1,10 +1,29 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rCN\\values-zh-rCN.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rCN\\values-zh-rCN.xml", "map": [ { - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endLines": "21", + "endColumns": "19", + "endOffsets": "838" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } + }, + { + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", "from": { "startLines": "122,72,71,70,69,20,21,22,113,114,121,120,27,78,79,77,76,75,91,90,89,81,61,30,31,82,73,115,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,29,19,35,37,34,36,33,32,26,25,98,97,100,112,105,104,106,107,109,108,99,103,101,102,96,110,111,119,117,116,118,28,80,88,93,92,94,87,86,85,84,23,24", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -39,25 +58,6 @@ "endOffsets": "8144" } }, - { - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "730", - "endLines": "21", - "endColumns": "19", - "endOffsets": "838" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - }, { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml", "from": { diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rHK.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rHK.json index dedb2255..856efac2 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rHK.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rHK.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rHK\\values-zh-rHK.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rHK\\values-zh-rHK.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values-zh-rHK\\values-zh-rHK.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json index 52000489..565cae2f 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rTW\\values-zh-rTW.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rTW\\values-zh-rTW.xml", "map": [ { - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "from": { "startLines": "123,73,72,71,70,20,21,22,113,114,122,121,27,77,78,76,75,74,90,89,88,80,62,30,31,81,38,115,69,65,40,46,51,41,61,60,59,55,54,52,53,56,57,47,68,58,66,45,50,49,48,64,44,63,42,43,67,29,19,35,37,34,36,33,32,26,25,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,120,118,117,119,28,79,87,92,91,93,86,85,84,83,23,24", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -57,7 +57,7 @@ } }, { - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zu.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zu.json index f3c87179..2f3d6b75 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zu.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zu.json @@ -1,7 +1,7 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zu\\values-zu.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zu\\values-zu.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values-zu\\values-zu.xml", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json index 27f36a67..16013c86 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -1,154 +1,135 @@ { "logs": [ { - "outputFile": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values\\values.xml", + "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values\\values.xml", "map": [ { "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\2b9474e47639de47b19dc72cadc6eaea\\transformed\\support-compat-28.0.0\\res\\values\\values.xml", "from": { - "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,6,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,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,319,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,12,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,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,612,3518,5583,7343,7720" + "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" }, "to": { - "startLines": "60,61,158,159,160,161,162,163,164,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,202,203,209,210,214,215,216,217,218,219,225,367,1708,1709,1713,1714,1718,1883,1884,2549,2699,2742,2774,2811", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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,10432,10502,10570,10642,10712,10773,10847,11704,11765,11826,11888,11952,12014,12075,12143,12243,12303,12369,12442,12511,12568,12620,13397,13469,13784,13819,13996,14046,14107,14164,14198,14233,14543,24279,113531,113648,113849,113959,114160,126461,126533,162412,170954,173860,175925,177685", - "endLines": "60,61,158,159,160,161,162,163,164,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,202,203,209,210,214,215,216,217,218,219,225,367,1708,1712,1713,1717,1718,1883,1884,2555,2741,2773,2810,2817", - "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,24", - "endOffsets": "3784,3847,10497,10565,10637,10707,10768,10842,10915,11760,11821,11883,11947,12009,12070,12138,12238,12298,12364,12437,12506,12563,12615,12677,13464,13540,13814,13849,14041,14102,14159,14193,14228,14263,14608,24345,113643,113844,113954,114155,114284,126528,126595,162705,173855,175920,177680,178057" + "startLines": "60,61,158,159,160,161,162,163,164,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,202,203,209,210,214,215,216,217,218,219,225,373,1712,1713,1717,1718,1722,1887,1888", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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,10320,10390,10458,10530,10600,10661,10735,11592,11653,11714,11776,11840,11902,11963,12031,12131,12191,12257,12330,12399,12456,12508,13285,13357,13672,13707,13884,13934,13995,14052,14086,14121,14431,24546,112327,112444,112645,112755,112956,125257,125329", + "endLines": "60,61,158,159,160,161,162,163,164,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,202,203,209,210,214,215,216,217,218,219,225,373,1712,1716,1717,1721,1722,1887,1888", + "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,10385,10453,10525,10595,10656,10730,10803,11648,11709,11771,11835,11897,11958,12026,12126,12186,12252,12325,12394,12451,12503,12565,13352,13428,13702,13737,13929,13990,14047,14081,14116,14151,14496,24612,112439,112640,112750,112951,113080,125324,125391" } }, { - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml", "from": { - "startLines": "19,20,21,22,18", - "startColumns": "4,4,4,4,4", - "startOffsets": "783,836,890,944,730", - "endColumns": "51,52,52,51,51", - "endOffsets": "830,884,938,991,777" - }, - "to": { - "startLines": "189,190,191,192,193", - "startColumns": "4,4,4,4,4", - "startOffsets": "12682,12734,12787,12840,12892", - "endColumns": "51,52,52,51,51", - "endOffsets": "12729,12782,12835,12887,12939" - } - }, - { - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml", - "from": { - "startLines": "50,55,64,60,22,26,30,35,40,18,45", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905", - "endLines": "53,58,67,62,25,29,33,38,43,21,48", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104" + "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" }, "to": { - "startLines": "1444,1448,1452,1456,1725,1729,1733,1737,1741,1745,1749", + "startLines": "1448,1452,1456,1460,1729,1733,1737,1741,1745,1749,1753", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "93552,93756,93967,94174,114717,114900,115085,115270,115473,115679,115862", - "endLines": "1447,1451,1455,1458,1728,1732,1736,1740,1744,1748,1752", + "startOffsets": "92554,92758,92969,93176,113513,113696,113881,114066,114269,114475,114658", + "endLines": "1451,1455,1459,1462,1732,1736,1740,1744,1748,1752,1756", "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "93751,93962,94169,94329,114895,115080,115265,115468,115674,115857,116058" + "endOffsets": "92753,92964,93171,93331,113691,113876,114061,114264,114470,114653,114854" } }, { - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml", "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "758,1073", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1065,1191" + "startLines": "-1,-1", + "startColumns": "-1,-1", + "startOffsets": "-1,-1" }, "to": { "startLines": "2,8", "startColumns": "4,4", - "startOffsets": "105,412", + "startOffsets": "105,300", "endLines": "7,11", "endColumns": "19,19", - "endOffsets": "407,527" + "endOffsets": "295,415" } }, { - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml", "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "730", - "endColumns": "56", - "endOffsets": "782" + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-1" }, "to": { "startLines": "82", "startColumns": "4", - "startOffsets": "5258", + "startOffsets": "5146", "endColumns": "56", - "endOffsets": "5310" + "endOffsets": "5198" } }, { - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\4433a4478073ef0c67208fcc6161f90b\\transformed\\coordinatorlayout-28.0.0\\res\\values\\values.xml", "from": { - "startLines": "133,77,80,79,78,20,21,22,123,124,132,131,27,86,87,85,84,83,99,98,97,89,40,39,69,30,31,90,42,81,125,76,72,50,43,53,58,44,68,67,66,62,61,59,60,63,52,64,54,75,65,73,49,48,57,56,55,71,47,70,45,46,51,74,29,19,35,37,34,36,33,32,26,25,106,105,109,121,114,113,115,116,118,117,107,108,112,110,111,104,119,120,130,128,127,129,28,88,96,101,100,102,95,94,93,92,23,24", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8404,4238,4502,4405,4335,894,938,991,7892,7942,8345,8293,1356,4962,5057,4890,4805,4721,5936,5852,5749,5235,2091,2039,3729,1563,1617,5297,2186,4586,8006,4166,3917,2617,2246,2787,3093,2305,3657,3595,3537,3311,3258,3153,3207,3362,2731,3413,2835,4099,3474,3967,2567,2519,3037,2948,2889,3854,2468,3808,2363,2407,2675,4031,1507,846,1832,1942,1784,1888,1727,1678,1300,1246,6399,6331,6643,7793,7012,6930,7087,7177,7421,7341,6484,6560,6870,6708,6789,6275,7566,7689,8251,8122,8064,8176,1441,5166,5662,6073,6003,6154,5602,5546,5483,5422,1044,1155", - "endLines": "137,77,80,79,78,20,21,22,123,124,132,131,27,86,87,85,84,83,99,98,97,89,40,39,69,30,31,90,42,81,125,76,72,50,43,53,58,44,68,67,66,62,61,59,60,63,52,64,54,75,65,73,49,48,57,56,55,71,47,70,45,46,51,74,29,19,35,37,34,36,33,32,26,25,106,105,109,121,114,113,115,116,118,117,107,108,112,110,111,104,119,120,130,128,127,129,28,88,96,101,100,102,95,94,93,92,23,24", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,56,57,46,58,56,70,60,56,49,51,52,49,49,54,59,52,65,61,62,48,46,54,87,57,61,49,44,42,59,54,66,54,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "8812,4329,4580,4496,4399,932,985,1038,7936,8000,8398,8339,1435,5051,5160,4956,4884,4799,5997,5930,5846,5291,2148,2085,3802,1611,1672,5397,2240,4683,8056,4232,3961,2669,2299,2829,3147,2357,3723,3651,3589,3356,3305,3201,3252,3407,2781,3468,2883,4160,3531,4025,2611,2561,3087,3031,2942,3911,2513,3848,2401,2462,2725,4093,1557,888,1882,1990,1826,1936,1778,1721,1350,1294,6478,6393,6702,7884,7081,7006,7171,7335,7560,7415,6554,6637,6924,6783,6864,6325,7683,7787,8287,8170,8116,8245,1501,5229,5743,6148,6067,6243,5656,5596,5540,5477,1149,1240" + "startLines": "-1,-1", + "startColumns": "-1,-1", + "startOffsets": "-1,-1" }, "to": { - "startLines": "226,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,365,366,368,369,370,371,372,373,374,375,376,377,378", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "14613,17764,17860,17943,18039,18108,18151,18203,18255,18304,18367,18425,18476,18560,18654,18762,18833,18917,19000,19066,19149,19251,19312,19374,19425,19503,19556,19616,19721,19780,19882,19937,20008,20057,20114,20172,20219,20278,20335,20406,20467,20524,20574,20626,20679,20729,20779,20834,20894,20947,21013,21075,21138,21187,21234,21289,21377,21435,21497,21547,21592,21635,21695,21750,21817,21872,21919,21974,22027,22074,22127,22183,22231,22286,22339,22423,22490,22554,22650,22724,22805,22894,23057,23201,23280,23355,23437,23496,23576,23656,23711,23833,23936,23977,24030,24140,24214,24350,24418,24504,24584,24653,24747,24806,24861,24923,24983,25093", - "endLines": "230,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,365,366,368,369,370,371,372,373,374,375,376,377,378", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,56,57,46,58,56,70,60,56,49,51,52,49,49,54,59,52,65,61,62,48,46,54,87,57,61,49,44,42,59,54,66,54,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "15001,17855,17938,18034,18103,18146,18198,18250,18299,18362,18420,18471,18555,18649,18757,18828,18912,18995,19061,19144,19246,19307,19369,19420,19498,19551,19611,19716,19775,19877,19932,20003,20052,20109,20167,20214,20273,20330,20401,20462,20519,20569,20621,20674,20724,20774,20829,20889,20942,21008,21070,21133,21182,21229,21284,21372,21430,21492,21542,21587,21630,21690,21745,21812,21867,21914,21969,22022,22069,22122,22178,22226,22281,22334,22418,22485,22549,22645,22719,22800,22889,23052,23196,23275,23350,23432,23491,23571,23651,23706,23828,23931,23972,24025,24082,24209,24274,24413,24499,24579,24648,24742,24801,24856,24918,24978,25088,25178" + "startLines": "12,1889", + "startColumns": "4,4", + "startOffsets": "420,125396", + "endLines": "12,1891", + "endColumns": "60,12", + "endOffsets": "476,125536" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\4433a4478073ef0c67208fcc6161f90b\\transformed\\coordinatorlayout-28.0.0\\res\\values\\values.xml", + "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values\\values.xml", "from": { - "startLines": "2,102,3,13", - "startColumns": "4,4,4,4", - "startOffsets": "55,5935,116,724", - "endLines": "2,104,12,101", - "endColumns": "60,12,24,24", - "endOffsets": "111,6075,719,5930" + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" }, "to": { - "startLines": "12,1885,2582,2592", - "startColumns": "4,4,4,4", - "startOffsets": "532,126600,164102,164710", - "endLines": "12,1887,2591,2680", - "endColumns": "60,12,24,24", - "endOffsets": "588,126740,164705,169916" + "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,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,165,166,167,168,169,170,171,172,173,194,195,196,197,198,199,200,201,204,205,206,207,208,211,212,213,220,221,222,223,224,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,370,385,386,387,388,389,390,398,399,403,407,411,416,422,429,433,437,442,446,450,454,458,462,466,472,476,482,486,492,496,501,505,508,512,518,522,528,532,538,541,545,549,553,557,561,562,563,564,567,570,573,576,580,581,582,583,584,587,589,591,593,598,599,603,609,613,614,616,627,628,632,638,642,643,644,648,675,679,680,684,712,879,905,1073,1099,1130,1138,1144,1158,1180,1185,1190,1200,1209,1218,1222,1229,1237,1244,1245,1254,1257,1260,1264,1268,1272,1275,1276,1280,1284,1294,1299,1306,1312,1313,1316,1320,1325,1327,1329,1332,1335,1337,1341,1344,1351,1354,1357,1361,1363,1367,1369,1371,1373,1377,1385,1393,1405,1411,1420,1423,1434,1437,1442,1443,1463,1521,1580,1581,1591,1600,1601,1603,1607,1610,1613,1616,1619,1622,1625,1628,1632,1635,1638,1641,1645,1648,1652,1656,1657,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1678,1680,1681,1682,1683,1684,1685,1686,1687,1689,1690,1692,1693,1695,1697,1698,1700,1701,1702,1703,1704,1705,1707,1708,1709,1710,1711,1723,1725,1727,1757,1758,1759,1760,1761,1762,1763,1764,1765,1766,1767,1768,1769,1771,1772,1773,1774,1775,1776,1778,1782,1786,1787,1788,1789,1790,1791,1792,1793,1795,1797,1799,1801,1803,1804,1805,1806,1808,1810,1812,1813,1814,1815,1816,1817,1818,1819,1820,1821,1822,1823,1826,1827,1828,1829,1831,1833,1834,1836,1837,1839,1841,1843,1844,1845,1846,1847,1848,1849,1850,1851,1852,1853,1854,1856,1857,1858,1859,1861,1862,1863,1864,1865,1867,1869,1871,1873,1874,1875,1876,1877,1878,1879,1880,1881,1882,1883,1884,1885,1886", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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,3740,3814,3893,3966,4040,4111,4183,4255,4328,4385,4443,4516,4590,4664,4739,4811,4884,4954,5025,5085,5203,5272,5341,5411,5485,5561,5625,5702,5778,5855,5920,5989,6066,6141,6210,6278,6355,6421,6482,6579,6644,6713,6812,6883,6942,7000,7057,7116,7180,7251,7323,7395,7467,7539,7606,7674,7742,7801,7864,7928,8018,8109,8169,8235,8302,8368,8438,8502,8555,8668,8726,8789,8854,8919,8994,9067,9139,9188,9249,9310,9371,9433,9497,9561,9625,9690,9753,9813,9874,9940,9999,10059,10121,10192,10252,10808,10894,10981,11071,11158,11246,11328,11411,11501,12832,12884,12942,12987,13053,13117,13174,13231,13433,13490,13538,13587,13638,13742,13789,13838,14156,14188,14252,14314,14374,14894,14968,15038,15116,15170,15240,15325,15373,15419,15490,15568,15646,15718,15792,15866,15940,16020,16093,16162,16234,16311,16372,16435,16501,16565,16636,16699,16764,16828,16889,16950,17002,17075,17149,17218,17293,17367,17441,17582,24354,25450,25528,25618,25706,25802,25892,26474,26563,26810,27091,27343,27628,28021,28498,28720,28942,29218,29445,29675,29905,30135,30365,30592,31011,31237,31662,31892,32320,32539,32822,33030,33161,33388,33814,34039,34466,34687,35112,35232,35508,35809,36133,36424,36738,36875,37006,37111,37353,37520,37724,37932,38203,38315,38427,38532,38649,38863,39009,39149,39235,39583,39671,39917,40335,40584,40666,40764,41356,41456,41708,42132,42387,42481,42570,42807,44831,45073,45175,45428,47584,57713,59229,69457,70985,72742,73368,73788,74849,76114,76370,76606,77153,77647,78252,78450,79030,79594,79969,80087,80625,80782,80978,81251,81507,81677,81818,81882,82164,82450,83126,83390,83728,84081,84175,84361,84667,84929,85054,85181,85420,85631,85750,85943,86120,86575,86756,86878,87137,87250,87437,87539,87646,87775,88050,88558,89054,89931,90225,90795,90944,91676,91848,92184,92276,93336,97618,102043,102105,102683,103267,103358,103471,103700,103860,104012,104183,104349,104518,104685,104848,105091,105261,105434,105605,105879,106078,106283,106613,106697,106793,106889,106987,107087,107189,107291,107393,107495,107597,107697,107793,107905,108034,108157,108288,108419,108517,108631,108725,108865,108999,109095,109207,109307,109423,109519,109631,109731,109871,110007,110171,110301,110459,110609,110750,110894,111029,111141,111291,111419,111547,111683,111815,111945,112075,112187,113085,113231,113375,114859,114925,115015,115091,115195,115285,115387,115495,115603,115703,115783,115875,115973,116083,116161,116267,116359,116463,116573,116695,116858,117015,117095,117195,117285,117395,117489,117595,117687,117787,117899,118013,118129,118245,118339,118453,118565,118667,118787,118909,118991,119095,119215,119341,119439,119533,119621,119733,119849,119971,120083,120258,120374,120460,120552,120664,120788,120855,120981,121049,121177,121321,121449,121518,121613,121728,121841,121940,122049,122160,122271,122372,122477,122577,122707,122798,122921,123015,123127,123213,123317,123413,123501,123619,123723,123827,123953,124041,124149,124249,124339,124449,124533,124635,124719,124773,124837,124943,125053,125137", + "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,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,165,166,167,168,169,170,171,172,173,194,195,196,197,198,199,200,201,204,205,206,207,208,211,212,213,220,221,222,223,224,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,370,385,386,387,388,389,397,398,402,406,410,415,421,428,432,436,441,445,449,453,457,461,465,471,475,481,485,491,495,500,504,507,511,517,521,527,531,537,540,544,548,552,556,560,561,562,563,566,569,572,575,579,580,581,582,583,586,588,590,592,597,598,602,608,612,613,615,626,627,631,637,641,642,643,647,674,678,679,683,711,878,904,1072,1098,1129,1137,1143,1157,1179,1184,1189,1199,1208,1217,1221,1228,1236,1243,1244,1253,1256,1259,1263,1267,1271,1274,1275,1279,1283,1293,1298,1305,1311,1312,1315,1319,1324,1326,1328,1331,1334,1336,1340,1343,1350,1353,1356,1360,1362,1366,1368,1370,1372,1376,1384,1392,1404,1410,1419,1422,1433,1436,1441,1442,1447,1520,1579,1580,1590,1599,1600,1602,1606,1609,1612,1615,1618,1621,1624,1627,1631,1634,1637,1640,1644,1647,1651,1655,1656,1657,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1677,1679,1680,1681,1682,1683,1684,1685,1686,1688,1689,1691,1692,1694,1696,1697,1699,1700,1701,1702,1703,1704,1706,1707,1708,1709,1710,1711,1724,1726,1728,1757,1758,1759,1760,1761,1762,1763,1764,1765,1766,1767,1768,1770,1771,1772,1773,1774,1775,1777,1781,1785,1786,1787,1788,1789,1790,1791,1792,1794,1796,1798,1800,1802,1803,1804,1805,1807,1809,1811,1812,1813,1814,1815,1816,1817,1818,1819,1820,1821,1822,1825,1826,1827,1828,1830,1832,1833,1835,1836,1838,1840,1842,1843,1844,1845,1846,1847,1848,1849,1850,1851,1852,1853,1855,1856,1857,1858,1860,1861,1862,1863,1864,1866,1868,1870,1872,1873,1874,1875,1876,1877,1878,1879,1880,1881,1882,1883,1884,1885,1886", + "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,3809,3888,3961,4035,4106,4178,4250,4323,4380,4438,4511,4585,4659,4734,4806,4879,4949,5020,5080,5141,5267,5336,5406,5480,5556,5620,5697,5773,5850,5915,5984,6061,6136,6205,6273,6350,6416,6477,6574,6639,6708,6807,6878,6937,6995,7052,7111,7175,7246,7318,7390,7462,7534,7601,7669,7737,7796,7859,7923,8013,8104,8164,8230,8297,8363,8433,8497,8550,8663,8721,8784,8849,8914,8989,9062,9134,9183,9244,9305,9366,9428,9492,9556,9620,9685,9748,9808,9869,9935,9994,10054,10116,10187,10247,10315,10889,10976,11066,11153,11241,11323,11406,11496,11587,12879,12937,12982,13048,13112,13169,13226,13280,13485,13533,13582,13633,13667,13784,13833,13879,14183,14247,14309,14369,14426,14963,15033,15111,15165,15235,15320,15368,15414,15485,15563,15641,15713,15787,15861,15935,16015,16088,16157,16229,16306,16367,16430,16496,16560,16631,16694,16759,16823,16884,16945,16997,17070,17144,17213,17288,17362,17436,17577,17647,24402,25523,25613,25701,25797,25887,26469,26558,26805,27086,27338,27623,28016,28493,28715,28937,29213,29440,29670,29900,30130,30360,30587,31006,31232,31657,31887,32315,32534,32817,33025,33156,33383,33809,34034,34461,34682,35107,35227,35503,35804,36128,36419,36733,36870,37001,37106,37348,37515,37719,37927,38198,38310,38422,38527,38644,38858,39004,39144,39230,39578,39666,39912,40330,40579,40661,40759,41351,41451,41703,42127,42382,42476,42565,42802,44826,45068,45170,45423,47579,57708,59224,69452,70980,72737,73363,73783,74844,76109,76365,76601,77148,77642,78247,78445,79025,79589,79964,80082,80620,80777,80973,81246,81502,81672,81813,81877,82159,82445,83121,83385,83723,84076,84170,84356,84662,84924,85049,85176,85415,85626,85745,85938,86115,86570,86751,86873,87132,87245,87432,87534,87641,87770,88045,88553,89049,89926,90220,90790,90939,91671,91843,92179,92271,92549,97613,102038,102100,102678,103262,103353,103466,103695,103855,104007,104178,104344,104513,104680,104843,105086,105256,105429,105600,105874,106073,106278,106608,106692,106788,106884,106982,107082,107184,107286,107388,107490,107592,107692,107788,107900,108029,108152,108283,108414,108512,108626,108720,108860,108994,109090,109202,109302,109418,109514,109626,109726,109866,110002,110166,110296,110454,110604,110745,110889,111024,111136,111286,111414,111542,111678,111810,111940,112070,112182,112322,113226,113370,113508,114920,115010,115086,115190,115280,115382,115490,115598,115698,115778,115870,115968,116078,116156,116262,116354,116458,116568,116690,116853,117010,117090,117190,117280,117390,117484,117590,117682,117782,117894,118008,118124,118240,118334,118448,118560,118662,118782,118904,118986,119090,119210,119336,119434,119528,119616,119728,119844,119966,120078,120253,120369,120455,120547,120659,120783,120850,120976,121044,121172,121316,121444,121513,121608,121723,121836,121935,122044,122155,122266,122367,122472,122572,122702,122793,122916,123010,123122,123208,123312,123408,123496,123614,123718,123822,123948,124036,124144,124244,124334,124444,124528,124630,124714,124768,124832,124938,125048,125132,125252" } }, { - "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7aa3a488ec69f96886facece9aaa9406\\transformed\\appcompat-v7-28.0.0\\res\\values\\values.xml", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml", "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,1303,1304,1305,1306,1307,1308,1309,1310,1311,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325,1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,1360,1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1390,1391,1392,1393,1394,1395,1396,1397,1398,1399,1400,1401,1402,1403,1404,1405,1406,1407,1408,1409,1410,1411,1412,1413,1414,1415,1416,1417,1418,1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1453,1461,1462,1466,1470,1474,1479,1485,1492,1496,1500,1505,1509,1513,1517,1521,1525,1529,1535,1539,1545,1549,1555,1559,1564,1568,1571,1575,1581,1585,1591,1595,1601,1604,1608,1612,1616,1620,1624,1625,1626,1627,1630,1633,1636,1639,1643,1644,1645,1646,1647,1650,1652,1654,1656,1661,1662,1666,1672,1676,1677,1679,1690,1691,1695,1701,1705,1706,1707,1711,1738,1742,1743,1747,1775,1943,1969,2138,2164,2195,2203,2209,2223,2245,2250,2255,2265,2274,2283,2287,2294,2302,2309,2310,2319,2322,2325,2329,2333,2337,2340,2341,2345,2349,2359,2364,2371,2377,2378,2381,2385,2390,2392,2394,2397,2400,2402,2406,2409,2416,2419,2422,2426,2428,2432,2434,2436,2438,2442,2450,2458,2470,2476,2485,2488,2499,2502,2507,2508,2513,2571,2630,2631,2641,2650,2651,2653,2657,2660,2663,2666,2669,2672,2675,2678,2682,2685,2688,2691,2695,2698,2702,2706,2707,2708,2709,2710,2711,2712,2713,2714,2715,2716,2717,2718,2719,2720,2721,2722,2723,2724,2725,2726,2728,2730,2731,2732,2733,2734,2735,2736,2737,2739,2740,2742,2743,2745,2747,2748,2750,2751,2752,2753,2754,2755,2757,2758,2759,2760,2761,2762,2764,2766,2768,2769,2770,2771,2772,2773,2774,2775,2776,2777,2778,2779,2780,2782,2783,2784,2785,2786,2787,2789,2793,2797,2798,2799,2800,2801,2802,2803,2804,2806,2808,2810,2812,2814,2815,2816,2817,2819,2821,2823,2824,2825,2826,2827,2828,2829,2830,2831,2832,2833,2834,2837,2838,2839,2840,2842,2844,2845,2847,2848,2850,2852,2854,2855,2856,2857,2858,2859,2860,2861,2862,2863,2864,2865,2867,2868,2869,2870,2872,2873,2874,2875,2876,2878,2880,2882,2884,2885,2886,2887,2888,2889,2890,2891,2892,2893,2894,2895,2896,2897,69,152,155,158,161,175,186,196,223,230,241,271,298,307,344,725,730,756,774,810,816,822,845,986,1006,1012,1016,1022,1059,1071,1098,1103,1169,1184,1249,1268,1294", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,160,205,254,295,350,409,471,552,613,688,764,841,919,1004,1086,1162,1238,1315,1393,1499,1605,1684,1764,1821,1879,1953,2028,2093,2159,2219,2280,2352,2425,2492,2560,2619,2678,2737,2796,2855,2909,2963,3016,3070,3124,3178,3232,3306,3385,3458,3532,3603,3675,3747,3820,3877,3935,4008,4082,4156,4231,4303,4376,4446,4517,4577,70911,70980,71049,71119,71193,71269,71333,71410,71486,71563,71628,71697,71774,71849,71918,71986,72063,72129,72190,72287,72352,72421,72520,72591,72650,72708,72765,72824,72888,72959,73031,73103,73175,73247,73314,73382,73450,73509,73572,73636,73726,73817,73877,73943,74010,74076,74146,74210,74263,74376,74434,74497,74562,74627,74702,74775,74847,74896,74957,75018,75079,75141,75205,75269,75333,75398,75461,75521,75582,75648,75707,75767,75829,75900,75960,76028,76114,76201,76291,76378,76466,76548,76631,76721,76812,76864,76922,76967,77033,77097,77154,77211,77265,77322,77370,77419,77470,77504,77551,77600,77646,77678,77742,77804,77864,77921,77995,78065,78143,78197,78267,78352,78400,78446,78517,78595,78673,78745,78819,78893,78967,79047,79120,79189,79261,79338,79399,79462,79528,79592,79663,79726,79791,79855,79916,79977,80029,80102,80176,80245,80320,80394,80468,80609,80679,80732,80810,80900,80988,81084,81174,81756,81845,82092,82373,82625,82910,83303,83780,84002,84224,84500,84727,84957,85187,85417,85647,85874,86293,86519,86944,87174,87602,87821,88104,88312,88443,88670,89096,89321,89748,89969,90394,90514,90790,91091,91415,91706,92020,92157,92288,92393,92635,92802,93006,93214,93485,93597,93709,93814,93931,94145,94291,94431,94517,94865,94953,95199,95617,95866,95948,96046,96663,96763,97015,97439,97694,97788,97877,98114,100166,100408,100510,100763,102947,113668,115184,126004,127532,129289,129915,130335,131396,132661,132917,133153,133700,134194,134799,134997,135577,136141,136516,136634,137172,137329,137525,137798,138054,138224,138365,138429,138711,138997,139673,139937,140275,140628,140722,140908,141214,141476,141601,141728,141967,142178,142297,142490,142667,143122,143303,143425,143684,143797,143984,144086,144193,144322,144597,145105,145601,146478,146772,147342,147491,148223,148395,148731,148823,149101,153445,157932,157994,158624,159238,159329,159442,159671,159831,159983,160154,160320,160489,160656,160819,161062,161232,161405,161576,161850,162049,162254,162584,162668,162764,162860,162958,163058,163160,163262,163364,163466,163568,163668,163764,163876,164005,164128,164259,164390,164488,164602,164696,164836,164970,165066,165178,165278,165394,165490,165602,165702,165842,165978,166142,166272,166430,166580,166721,166865,167000,167112,167262,167390,167518,167654,167786,167916,168046,168158,168298,168444,168588,168726,168792,168882,168958,169062,169152,169254,169362,169470,169570,169650,169742,169840,169950,170028,170134,170226,170330,170440,170562,170725,170882,170962,171062,171152,171262,171356,171462,171554,171654,171766,171880,171996,172112,172206,172320,172432,172534,172654,172776,172858,172962,173082,173208,173306,173400,173488,173600,173716,173838,173950,174125,174241,174327,174419,174531,174655,174722,174848,174916,175044,175188,175316,175385,175480,175595,175708,175807,175916,176027,176138,176239,176344,176444,176574,176665,176788,176882,176994,177080,177184,177280,177368,177486,177590,177694,177820,177908,178016,178116,178206,178316,178400,178502,178586,178640,178704,178810,178920,179004,4638,9782,9900,10015,10147,10862,11554,12071,13718,14103,14700,16299,17832,18220,20527,40045,40305,41697,42730,44743,45005,45361,46191,52973,54107,54401,54624,54951,57001,57649,59282,59552,63403,64004,67813,69028,70437", - "endLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,1303,1304,1305,1306,1307,1308,1309,1310,1311,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325,1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,1360,1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1390,1391,1392,1393,1394,1395,1396,1397,1398,1399,1400,1401,1402,1403,1404,1405,1406,1407,1408,1409,1410,1411,1412,1413,1414,1415,1416,1417,1418,1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1460,1461,1465,1469,1473,1478,1484,1491,1495,1499,1504,1508,1512,1516,1520,1524,1528,1534,1538,1544,1548,1554,1558,1563,1567,1570,1574,1580,1584,1590,1594,1600,1603,1607,1611,1615,1619,1623,1624,1625,1626,1629,1632,1635,1638,1642,1643,1644,1645,1646,1649,1651,1653,1655,1660,1661,1665,1671,1675,1676,1678,1689,1690,1694,1700,1704,1705,1706,1710,1737,1741,1742,1746,1774,1942,1968,2137,2163,2194,2202,2208,2222,2244,2249,2254,2264,2273,2282,2286,2293,2301,2308,2309,2318,2321,2324,2328,2332,2336,2339,2340,2344,2348,2358,2363,2370,2376,2377,2380,2384,2389,2391,2393,2396,2399,2401,2405,2408,2415,2418,2421,2425,2427,2431,2433,2435,2437,2441,2449,2457,2469,2475,2484,2487,2498,2501,2506,2507,2512,2570,2629,2630,2640,2649,2650,2652,2656,2659,2662,2665,2668,2671,2674,2677,2681,2684,2687,2690,2694,2697,2701,2705,2706,2707,2708,2709,2710,2711,2712,2713,2714,2715,2716,2717,2718,2719,2720,2721,2722,2723,2724,2725,2727,2729,2730,2731,2732,2733,2734,2735,2736,2738,2739,2741,2742,2744,2746,2747,2749,2750,2751,2752,2753,2754,2756,2757,2758,2759,2760,2761,2763,2765,2767,2768,2769,2770,2771,2772,2773,2774,2775,2776,2777,2778,2779,2781,2782,2783,2784,2785,2786,2788,2792,2796,2797,2798,2799,2800,2801,2802,2803,2805,2807,2809,2811,2813,2814,2815,2816,2818,2820,2822,2823,2824,2825,2826,2827,2828,2829,2830,2831,2832,2833,2836,2837,2838,2839,2841,2843,2844,2846,2847,2849,2851,2853,2854,2855,2856,2857,2858,2859,2860,2861,2862,2863,2864,2866,2867,2868,2869,2871,2872,2873,2874,2875,2877,2879,2881,2883,2884,2885,2886,2887,2888,2889,2890,2891,2892,2893,2894,2895,2896,2897,151,154,157,160,174,185,195,222,229,240,270,297,306,343,724,729,755,773,809,815,821,844,985,1005,1011,1015,1021,1058,1070,1097,1102,1168,1183,1248,1267,1293,1302", - "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,63,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,91,12,12,12,61,12,12,90,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24", - "endOffsets": "155,200,249,290,345,404,466,547,608,683,759,836,914,999,1081,1157,1233,1310,1388,1494,1600,1679,1759,1816,1874,1948,2023,2088,2154,2214,2275,2347,2420,2487,2555,2614,2673,2732,2791,2850,2904,2958,3011,3065,3119,3173,3227,3301,3380,3453,3527,3598,3670,3742,3815,3872,3930,4003,4077,4151,4226,4298,4371,4441,4512,4572,4633,70975,71044,71114,71188,71264,71328,71405,71481,71558,71623,71692,71769,71844,71913,71981,72058,72124,72185,72282,72347,72416,72515,72586,72645,72703,72760,72819,72883,72954,73026,73098,73170,73242,73309,73377,73445,73504,73567,73631,73721,73812,73872,73938,74005,74071,74141,74205,74258,74371,74429,74492,74557,74622,74697,74770,74842,74891,74952,75013,75074,75136,75200,75264,75328,75393,75456,75516,75577,75643,75702,75762,75824,75895,75955,76023,76109,76196,76286,76373,76461,76543,76626,76716,76807,76859,76917,76962,77028,77092,77149,77206,77260,77317,77365,77414,77465,77499,77546,77595,77641,77673,77737,77799,77859,77916,77990,78060,78138,78192,78262,78347,78395,78441,78512,78590,78668,78740,78814,78888,78962,79042,79115,79184,79256,79333,79394,79457,79523,79587,79658,79721,79786,79850,79911,79972,80024,80097,80171,80240,80315,80389,80463,80604,80674,80727,80805,80895,80983,81079,81169,81751,81840,82087,82368,82620,82905,83298,83775,83997,84219,84495,84722,84952,85182,85412,85642,85869,86288,86514,86939,87169,87597,87816,88099,88307,88438,88665,89091,89316,89743,89964,90389,90509,90785,91086,91410,91701,92015,92152,92283,92388,92630,92797,93001,93209,93480,93592,93704,93809,93926,94140,94286,94426,94512,94860,94948,95194,95612,95861,95943,96041,96658,96758,97010,97434,97689,97783,97872,98109,100161,100403,100505,100758,102942,113663,115179,125999,127527,129284,129910,130330,131391,132656,132912,133148,133695,134189,134794,134992,135572,136136,136511,136629,137167,137324,137520,137793,138049,138219,138360,138424,138706,138992,139668,139932,140270,140623,140717,140903,141209,141471,141596,141723,141962,142173,142292,142485,142662,143117,143298,143420,143679,143792,143979,144081,144188,144317,144592,145100,145596,146473,146767,147337,147486,148218,148390,148726,148818,149096,153440,157927,157989,158619,159233,159324,159437,159666,159826,159978,160149,160315,160484,160651,160814,161057,161227,161400,161571,161845,162044,162249,162579,162663,162759,162855,162953,163053,163155,163257,163359,163461,163563,163663,163759,163871,164000,164123,164254,164385,164483,164597,164691,164831,164965,165061,165173,165273,165389,165485,165597,165697,165837,165973,166137,166267,166425,166575,166716,166860,166995,167107,167257,167385,167513,167649,167781,167911,168041,168153,168293,168439,168583,168721,168787,168877,168953,169057,169147,169249,169357,169465,169565,169645,169737,169835,169945,170023,170129,170221,170325,170435,170557,170720,170877,170957,171057,171147,171257,171351,171457,171549,171649,171761,171875,171991,172107,172201,172315,172427,172529,172649,172771,172853,172957,173077,173203,173301,173395,173483,173595,173711,173833,173945,174120,174236,174322,174414,174526,174650,174717,174843,174911,175039,175183,175311,175380,175475,175590,175703,175802,175911,176022,176133,176234,176339,176439,176569,176660,176783,176877,176989,177075,177179,177275,177363,177481,177585,177689,177815,177903,178011,178111,178201,178311,178395,178497,178581,178635,178699,178805,178915,178999,179119,9777,9895,10010,10142,10857,11549,12066,13713,14098,14695,16294,17827,18215,20522,40040,40300,41692,42725,44738,45000,45356,46186,52968,54102,54396,54619,54946,56996,57644,59277,59547,63398,63999,67808,69023,70432,70906" + "startLines": "138,-1,-1,-1,-1,-1,80,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "4,-1,-1,-1,-1,-1,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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "8787,-1,-1,-1,-1,-1,4453,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endLines": "142,-1,-1,-1,-1,-1,80,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "14,-1,-1,-1,-1,-1,94,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "9195,-1,-1,-1,-1,-1,4543,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" }, "to": { - "startLines": "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,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,165,166,167,168,169,170,171,172,173,194,195,196,197,198,199,200,201,204,205,206,207,208,211,212,213,220,221,222,223,224,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,364,379,380,381,382,383,384,392,393,397,401,405,410,416,423,427,431,436,440,444,448,452,456,460,466,470,476,480,486,490,495,499,502,506,512,516,522,526,532,535,539,543,547,551,555,556,557,558,561,564,567,570,574,575,576,577,578,581,583,585,587,592,593,597,603,607,608,610,621,622,626,632,636,637,638,642,669,673,674,678,706,874,900,1069,1095,1126,1134,1140,1154,1176,1181,1186,1196,1205,1214,1218,1225,1233,1240,1241,1250,1253,1256,1260,1264,1268,1271,1272,1276,1280,1290,1295,1302,1308,1309,1312,1316,1321,1323,1325,1328,1331,1333,1337,1340,1347,1350,1353,1357,1359,1363,1365,1367,1369,1373,1381,1389,1401,1407,1416,1419,1430,1433,1438,1439,1459,1517,1576,1577,1587,1596,1597,1599,1603,1606,1609,1612,1615,1618,1621,1624,1628,1631,1634,1637,1641,1644,1648,1652,1653,1654,1655,1656,1657,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1674,1676,1677,1678,1679,1680,1681,1682,1683,1685,1686,1688,1689,1691,1693,1694,1696,1697,1698,1699,1700,1701,1703,1704,1705,1706,1707,1719,1721,1723,1753,1754,1755,1756,1757,1758,1759,1760,1761,1762,1763,1764,1765,1767,1768,1769,1770,1771,1772,1774,1778,1782,1783,1784,1785,1786,1787,1788,1789,1791,1793,1795,1797,1799,1800,1801,1802,1804,1806,1808,1809,1810,1811,1812,1813,1814,1815,1816,1817,1818,1819,1822,1823,1824,1825,1827,1829,1830,1832,1833,1835,1837,1839,1840,1841,1842,1843,1844,1845,1846,1847,1848,1849,1850,1852,1853,1854,1855,1857,1858,1859,1860,1861,1863,1865,1867,1869,1870,1871,1872,1873,1874,1875,1876,1877,1878,1879,1880,1881,1882,1888,1971,1974,1977,1980,1994,2005,2015,2042,2049,2060,2090,2117,2126,2163,2544,2556,2681,2818,2854,2860,2866,2889,3030,3050,3056,3060,3066,3103,3115,3142,3147,3213,3228,3293,3312,3338", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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,3852,3926,4005,4078,4152,4223,4295,4367,4440,4497,4555,4628,4702,4776,4851,4923,4996,5066,5137,5197,5315,5384,5453,5523,5597,5673,5737,5814,5890,5967,6032,6101,6178,6253,6322,6390,6467,6533,6594,6691,6756,6825,6924,6995,7054,7112,7169,7228,7292,7363,7435,7507,7579,7651,7718,7786,7854,7913,7976,8040,8130,8221,8281,8347,8414,8480,8550,8614,8667,8780,8838,8901,8966,9031,9106,9179,9251,9300,9361,9422,9483,9545,9609,9673,9737,9802,9865,9925,9986,10052,10111,10171,10233,10304,10364,10920,11006,11093,11183,11270,11358,11440,11523,11613,12944,12996,13054,13099,13165,13229,13286,13343,13545,13602,13650,13699,13750,13854,13901,13950,14268,14300,14364,14426,14486,15006,15080,15150,15228,15282,15352,15437,15485,15531,15602,15680,15758,15830,15904,15978,16052,16132,16205,16274,16346,16423,16484,16547,16613,16677,16748,16811,16876,16940,17001,17062,17114,17187,17261,17330,17405,17479,17553,17694,24087,25183,25261,25351,25439,25535,25625,26207,26296,26543,26824,27076,27361,27754,28231,28453,28675,28951,29178,29408,29638,29868,30098,30325,30744,30970,31395,31625,32053,32272,32555,32763,32894,33121,33547,33772,34199,34420,34845,34965,35241,35542,35866,36157,36471,36608,36739,36844,37086,37253,37457,37665,37936,38048,38160,38265,38382,38596,38742,38882,38968,39316,39404,39650,40068,40317,40399,40497,41114,41214,41466,41890,42145,42239,42328,42565,44617,44859,44961,45214,47398,58119,59635,70455,71983,73740,74366,74786,75847,77112,77368,77604,78151,78645,79250,79448,80028,80592,80967,81085,81623,81780,81976,82249,82505,82675,82816,82880,83162,83448,84124,84388,84726,85079,85173,85359,85665,85927,86052,86179,86418,86629,86748,86941,87118,87573,87754,87876,88135,88248,88435,88537,88644,88773,89048,89556,90052,90929,91223,91793,91942,92674,92846,93182,93274,94334,98678,103165,103227,103857,104471,104562,104675,104904,105064,105216,105387,105553,105722,105889,106052,106295,106465,106638,106809,107083,107282,107487,107817,107901,107997,108093,108191,108291,108393,108495,108597,108699,108801,108901,108997,109109,109238,109361,109492,109623,109721,109835,109929,110069,110203,110299,110411,110511,110627,110723,110835,110935,111075,111211,111375,111505,111663,111813,111954,112098,112233,112345,112495,112623,112751,112887,113019,113149,113279,113391,114289,114435,114579,116063,116129,116219,116295,116399,116489,116591,116699,116807,116907,116987,117079,117177,117287,117365,117471,117563,117667,117777,117899,118062,118219,118299,118399,118489,118599,118693,118799,118891,118991,119103,119217,119333,119449,119543,119657,119769,119871,119991,120113,120195,120299,120419,120545,120643,120737,120825,120937,121053,121175,121287,121462,121578,121664,121756,121868,121992,122059,122185,122253,122381,122525,122653,122722,122817,122932,123045,123144,123253,123364,123475,123576,123681,123781,123911,124002,124125,124219,124331,124417,124521,124617,124705,124823,124927,125031,125157,125245,125353,125453,125543,125653,125737,125839,125923,125977,126041,126147,126257,126341,126745,131889,132007,132122,132254,132969,133661,134178,135825,136210,136807,138406,139939,140327,142634,162152,162710,169921,178062,180075,180337,180693,181523,188305,189439,189733,189956,190283,192333,192981,194614,194884,198735,199336,203145,204360,205769", - "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,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,165,166,167,168,169,170,171,172,173,194,195,196,197,198,199,200,201,204,205,206,207,208,211,212,213,220,221,222,223,224,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,364,379,380,381,382,383,391,392,396,400,404,409,415,422,426,430,435,439,443,447,451,455,459,465,469,475,479,485,489,494,498,501,505,511,515,521,525,531,534,538,542,546,550,554,555,556,557,560,563,566,569,573,574,575,576,577,580,582,584,586,591,592,596,602,606,607,609,620,621,625,631,635,636,637,641,668,672,673,677,705,873,899,1068,1094,1125,1133,1139,1153,1175,1180,1185,1195,1204,1213,1217,1224,1232,1239,1240,1249,1252,1255,1259,1263,1267,1270,1271,1275,1279,1289,1294,1301,1307,1308,1311,1315,1320,1322,1324,1327,1330,1332,1336,1339,1346,1349,1352,1356,1358,1362,1364,1366,1368,1372,1380,1388,1400,1406,1415,1418,1429,1432,1437,1438,1443,1516,1575,1576,1586,1595,1596,1598,1602,1605,1608,1611,1614,1617,1620,1623,1627,1630,1633,1636,1640,1643,1647,1651,1652,1653,1654,1655,1656,1657,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1673,1675,1676,1677,1678,1679,1680,1681,1682,1684,1685,1687,1688,1690,1692,1693,1695,1696,1697,1698,1699,1700,1702,1703,1704,1705,1706,1707,1720,1722,1724,1753,1754,1755,1756,1757,1758,1759,1760,1761,1762,1763,1764,1766,1767,1768,1769,1770,1771,1773,1777,1781,1782,1783,1784,1785,1786,1787,1788,1790,1792,1794,1796,1798,1799,1800,1801,1803,1805,1807,1808,1809,1810,1811,1812,1813,1814,1815,1816,1817,1818,1821,1822,1823,1824,1826,1828,1829,1831,1832,1834,1836,1838,1839,1840,1841,1842,1843,1844,1845,1846,1847,1848,1849,1851,1852,1853,1854,1856,1857,1858,1859,1860,1862,1864,1866,1868,1869,1870,1871,1872,1873,1874,1875,1876,1877,1878,1879,1880,1881,1882,1970,1973,1976,1979,1993,2004,2014,2041,2048,2059,2089,2116,2125,2162,2543,2548,2581,2698,2853,2859,2865,2888,3029,3049,3055,3059,3065,3102,3114,3141,3146,3212,3227,3292,3311,3337,3346", - "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,63,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,91,12,12,12,61,12,12,90,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24", - "endOffsets": "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,3921,4000,4073,4147,4218,4290,4362,4435,4492,4550,4623,4697,4771,4846,4918,4991,5061,5132,5192,5253,5379,5448,5518,5592,5668,5732,5809,5885,5962,6027,6096,6173,6248,6317,6385,6462,6528,6589,6686,6751,6820,6919,6990,7049,7107,7164,7223,7287,7358,7430,7502,7574,7646,7713,7781,7849,7908,7971,8035,8125,8216,8276,8342,8409,8475,8545,8609,8662,8775,8833,8896,8961,9026,9101,9174,9246,9295,9356,9417,9478,9540,9604,9668,9732,9797,9860,9920,9981,10047,10106,10166,10228,10299,10359,10427,11001,11088,11178,11265,11353,11435,11518,11608,11699,12991,13049,13094,13160,13224,13281,13338,13392,13597,13645,13694,13745,13779,13896,13945,13991,14295,14359,14421,14481,14538,15075,15145,15223,15277,15347,15432,15480,15526,15597,15675,15753,15825,15899,15973,16047,16127,16200,16269,16341,16418,16479,16542,16608,16672,16743,16806,16871,16935,16996,17057,17109,17182,17256,17325,17400,17474,17548,17689,17759,24135,25256,25346,25434,25530,25620,26202,26291,26538,26819,27071,27356,27749,28226,28448,28670,28946,29173,29403,29633,29863,30093,30320,30739,30965,31390,31620,32048,32267,32550,32758,32889,33116,33542,33767,34194,34415,34840,34960,35236,35537,35861,36152,36466,36603,36734,36839,37081,37248,37452,37660,37931,38043,38155,38260,38377,38591,38737,38877,38963,39311,39399,39645,40063,40312,40394,40492,41109,41209,41461,41885,42140,42234,42323,42560,44612,44854,44956,45209,47393,58114,59630,70450,71978,73735,74361,74781,75842,77107,77363,77599,78146,78640,79245,79443,80023,80587,80962,81080,81618,81775,81971,82244,82500,82670,82811,82875,83157,83443,84119,84383,84721,85074,85168,85354,85660,85922,86047,86174,86413,86624,86743,86936,87113,87568,87749,87871,88130,88243,88430,88532,88639,88768,89043,89551,90047,90924,91218,91788,91937,92669,92841,93177,93269,93547,98673,103160,103222,103852,104466,104557,104670,104899,105059,105211,105382,105548,105717,105884,106047,106290,106460,106633,106804,107078,107277,107482,107812,107896,107992,108088,108186,108286,108388,108490,108592,108694,108796,108896,108992,109104,109233,109356,109487,109618,109716,109830,109924,110064,110198,110294,110406,110506,110622,110718,110830,110930,111070,111206,111370,111500,111658,111808,111949,112093,112228,112340,112490,112618,112746,112882,113014,113144,113274,113386,113526,114430,114574,114712,116124,116214,116290,116394,116484,116586,116694,116802,116902,116982,117074,117172,117282,117360,117466,117558,117662,117772,117894,118057,118214,118294,118394,118484,118594,118688,118794,118886,118986,119098,119212,119328,119444,119538,119652,119764,119866,119986,120108,120190,120294,120414,120540,120638,120732,120820,120932,121048,121170,121282,121457,121573,121659,121751,121863,121987,122054,122180,122248,122376,122520,122648,122717,122812,122927,123040,123139,123248,123359,123470,123571,123676,123776,123906,123997,124120,124214,124326,124412,124516,124612,124700,124818,124922,125026,125152,125240,125348,125448,125538,125648,125732,125834,125918,125972,126036,126142,126252,126336,126456,131884,132002,132117,132249,132964,133656,134173,135820,136205,136802,138401,139934,140322,142629,162147,162407,164097,170949,180070,180332,180688,181518,188300,189434,189728,189951,190278,192328,192976,194609,194879,198730,199331,203140,204355,205764,206238" + "startLines": "226,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,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,371,372,374,375,376,377,378,379,380,381,382,383,384", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "14501,17652,17708,17764,17860,17943,18039,18134,18203,18246,18298,18350,18399,18462,18520,18571,18655,18749,18857,18928,19012,19095,19161,19244,19346,19407,19469,19520,19598,19651,19711,19816,19875,19977,20032,20103,20159,20214,20263,20320,20378,20425,20484,20541,20612,20673,20730,20780,20832,20885,20935,20985,21040,21100,21153,21219,21281,21344,21405,21454,21501,21556,21644,21702,21764,21814,21859,21902,21962,22017,22084,22139,22186,22241,22294,22341,22394,22450,22498,22553,22606,22690,22757,22821,22917,22991,23072,23161,23324,23468,23547,23622,23704,23763,23843,23923,23978,24100,24203,24244,24297,24407,24481,24617,24685,24771,24851,24920,25014,25073,25128,25190,25250,25360", + "endLines": "230,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,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,371,372,374,375,376,377,378,379,380,381,382,383,384", + "endColumns": "14,55,55,95,82,95,94,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,55,54,48,56,57,46,58,56,70,60,56,49,51,52,49,49,54,59,52,65,61,62,60,48,46,54,87,57,61,49,44,42,59,54,66,54,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "14889,17703,17759,17855,17938,18034,18129,18198,18241,18293,18345,18394,18457,18515,18566,18650,18744,18852,18923,19007,19090,19156,19239,19341,19402,19464,19515,19593,19646,19706,19811,19870,19972,20027,20098,20154,20209,20258,20315,20373,20420,20479,20536,20607,20668,20725,20775,20827,20880,20930,20980,21035,21095,21148,21214,21276,21339,21400,21449,21496,21551,21639,21697,21759,21809,21854,21897,21957,22012,22079,22134,22181,22236,22289,22336,22389,22445,22493,22548,22601,22685,22752,22816,22912,22986,23067,23156,23319,23463,23542,23617,23699,23758,23838,23918,23973,24095,24198,24239,24292,24349,24476,24541,24680,24766,24846,24915,25009,25068,25123,25185,25245,25355,25445" + } + }, + { + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "189,190,191,192,193", + "startColumns": "4,4,4,4,4", + "startOffsets": "12570,12622,12675,12728,12780", + "endColumns": "51,52,52,51,51", + "endOffsets": "12617,12670,12723,12775,12827" } } ] diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json index 049bf927..34ce47d1 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json @@ -1,386 +1,398 @@ [ { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\datetime_picker.xml" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_small.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\raw\\introduction" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_dropdown.xml" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\menu\\call_note_edit.xml" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\widget_2x.xml" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\xml\\widget_4x_info.xml" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\account_dialog_title.xml" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\delete.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\search_result.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\raw\\introduction" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_edit.xml" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\call_record.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit_list_item.xml" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_input_passwd.xml.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_input_passwd.xml" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\folder_list_item.xml" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_dropdown.xml" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_edit_text.xml" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit.xml" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\xml\\widget_2x_info.xml" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\color\\secondary_text_dark.xml" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_background.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\selected.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_options.xml" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\delete.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\widget_4x.xml" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_trash_folder.xml.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\trash_folder.xml" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\settings_header.xml" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\xml\\widget_2x_info.xml" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable\\new_note.xml" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_list.xml" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_list.xml" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_footer.xml" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\call_note_edit.xml" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_options.xml" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\selected.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\notification.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\add_account_text.xml" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_trash_folder.xml.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\menu\\trash_folder.xml" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\settings_header.xml" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\widget_2x.xml" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\account_dialog_title.xml" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\color\\primary_text_dark.xml" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\clock.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\xml\\preferences.xml" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_add_secret.xml.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_add_secret.xml" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\raw-zh-rCN\\introduction" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\menu\\sub_folder.xml" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_item.xml" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable\\new_note.xml" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\folder_list_item.xml" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\xml\\searchable.xml" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit_list_item.xml" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_item.xml" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_edit_text.xml" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_super.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_edit.xml" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_super.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\widget_4x.xml" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\menu\\call_record_folder.xml" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_lock.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\lock.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_small.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_list.xml" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\sub_folder.xml" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_background.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\add_account_text.xml" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\color\\primary_text_dark.xml" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\xml\\searchable.xml" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\clock.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\call_record_folder.xml" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\raw-zh-rCN\\introduction" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\datetime_picker.xml" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit.xml" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\xml\\preferences.xml" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\color\\secondary_text_dark.xml" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\search_result.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_list.xml" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_large.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\notification.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_footer.xml" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\xml\\widget_4x_info.xml" }, { - "merged": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat", - "source": "E:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png" + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png" + }, + { + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\call_record.png" + }, + { + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_large.png" + }, + { + "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat", + "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png" } ] \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ index f142fc9d..f7572160 100644 Binary files a/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/4444f51aca52f119f940126f8e09453df450a37a12ba0dfce8eaef8968454555_0.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/4444f51aca52f119f940126f8e09453df450a37a12ba0dfce8eaef8968454555_0.jar deleted file mode 100644 index ce1bc6db..00000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/4444f51aca52f119f940126f8e09453df450a37a12ba0dfce8eaef8968454555_0.jar and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/4444f51aca52f119f940126f8e09453df450a37a12ba0dfce8eaef8968454555_1.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/4444f51aca52f119f940126f8e09453df450a37a12ba0dfce8eaef8968454555_1.jar deleted file mode 100644 index 739a133e..00000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/4444f51aca52f119f940126f8e09453df450a37a12ba0dfce8eaef8968454555_1.jar and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/4444f51aca52f119f940126f8e09453df450a37a12ba0dfce8eaef8968454555_2.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/4444f51aca52f119f940126f8e09453df450a37a12ba0dfce8eaef8968454555_2.jar deleted file mode 100644 index 8f098401..00000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/4444f51aca52f119f940126f8e09453df450a37a12ba0dfce8eaef8968454555_2.jar and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/4444f51aca52f119f940126f8e09453df450a37a12ba0dfce8eaef8968454555_3.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/4444f51aca52f119f940126f8e09453df450a37a12ba0dfce8eaef8968454555_3.jar deleted file mode 100644 index 5556281e..00000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/4444f51aca52f119f940126f8e09453df450a37a12ba0dfce8eaef8968454555_3.jar and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/4444f51aca52f119f940126f8e09453df450a37a12ba0dfce8eaef8968454555_4.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/4444f51aca52f119f940126f8e09453df450a37a12ba0dfce8eaef8968454555_4.jar deleted file mode 100644 index bc47a23a..00000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/4444f51aca52f119f940126f8e09453df450a37a12ba0dfce8eaef8968454555_4.jar and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/4444f51aca52f119f940126f8e09453df450a37a12ba0dfce8eaef8968454555_5.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/4444f51aca52f119f940126f8e09453df450a37a12ba0dfce8eaef8968454555_5.jar deleted file mode 100644 index a1ff9618..00000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/4444f51aca52f119f940126f8e09453df450a37a12ba0dfce8eaef8968454555_5.jar and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/e7fe7fba8592629dfe423c88d33d1167a220226eeec93e2e06e96b0d7fd2cbb2_0.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/e7fe7fba8592629dfe423c88d33d1167a220226eeec93e2e06e96b0d7fd2cbb2_0.jar new file mode 100644 index 00000000..017fefcb Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/e7fe7fba8592629dfe423c88d33d1167a220226eeec93e2e06e96b0d7fd2cbb2_0.jar differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/e7fe7fba8592629dfe423c88d33d1167a220226eeec93e2e06e96b0d7fd2cbb2_1.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/e7fe7fba8592629dfe423c88d33d1167a220226eeec93e2e06e96b0d7fd2cbb2_1.jar new file mode 100644 index 00000000..ced392e3 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/e7fe7fba8592629dfe423c88d33d1167a220226eeec93e2e06e96b0d7fd2cbb2_1.jar differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/e7fe7fba8592629dfe423c88d33d1167a220226eeec93e2e06e96b0d7fd2cbb2_2.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/e7fe7fba8592629dfe423c88d33d1167a220226eeec93e2e06e96b0d7fd2cbb2_2.jar new file mode 100644 index 00000000..74b61438 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/e7fe7fba8592629dfe423c88d33d1167a220226eeec93e2e06e96b0d7fd2cbb2_2.jar differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/e7fe7fba8592629dfe423c88d33d1167a220226eeec93e2e06e96b0d7fd2cbb2_3.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/e7fe7fba8592629dfe423c88d33d1167a220226eeec93e2e06e96b0d7fd2cbb2_3.jar new file mode 100644 index 00000000..48aa1029 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/e7fe7fba8592629dfe423c88d33d1167a220226eeec93e2e06e96b0d7fd2cbb2_3.jar differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/e7fe7fba8592629dfe423c88d33d1167a220226eeec93e2e06e96b0d7fd2cbb2_4.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/e7fe7fba8592629dfe423c88d33d1167a220226eeec93e2e06e96b0d7fd2cbb2_4.jar new file mode 100644 index 00000000..d11dad50 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/e7fe7fba8592629dfe423c88d33d1167a220226eeec93e2e06e96b0d7fd2cbb2_4.jar differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/e7fe7fba8592629dfe423c88d33d1167a220226eeec93e2e06e96b0d7fd2cbb2_5.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/e7fe7fba8592629dfe423c88d33d1167a220226eeec93e2e06e96b0d7fd2cbb2_5.jar new file mode 100644 index 00000000..c887d6bc Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/e7fe7fba8592629dfe423c88d33d1167a220226eeec93e2e06e96b0d7fd2cbb2_5.jar differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex index 7200f8ef..2cb3fc9d 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex index 650a8321..0a9716c1 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex index fdbfacea..aaad7bff 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex index 0750f7ed..53d71489 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex index 0d0f89fb..3724aaaa 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex index 334c0717..bb17ac9b 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex index bac308b8..11fee193 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex index 414b538b..9f1ab677 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex index d38cc182..84f1c160 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex index f883ffe4..cb0119f8 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex index e75c54a6..e6e31852 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex index b530e343..335431af 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex index 8745e4ff..dc61f2e8 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex index 287ec5c9..701ad2a6 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex index 6f3b4a63..6350a2c9 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex index a6f45b58..7233616a 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex index c355a1b6..75f53096 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex index 4c548ae3..e4c22993 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex index 44ce3315..e3d9413b 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex index a599b0b5..a8484a1c 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$5.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$5.dex new file mode 100644 index 00000000..6582b155 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$5.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$6.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$6.dex new file mode 100644 index 00000000..08812587 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$6.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$7.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$7.dex new file mode 100644 index 00000000..2fada195 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$7.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex index 8d916afb..dc63f8cd 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex index 7ad89550..341c7e27 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex index 28391498..7352da1d 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex index 5e2cb532..e4b25ee6 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex index a062c42f..b57a8402 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$10.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$10.dex new file mode 100644 index 00000000..f290f6d3 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$10.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$11.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$11.dex new file mode 100644 index 00000000..c9b02ada Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$11.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex index fb2cfb82..4152a06f 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex index d8690b42..98acb1b9 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex index bf49499e..63e261c1 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex index 5f9d02b0..b2f0fb25 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex index c30c3dab..824ceb89 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex index 633509a7..4a630b64 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex index 466d53b8..914c859f 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex index 3942a97c..1bb98186 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex index 59cd7ef5..929edc49 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex index f55c2a85..fa133a0e 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex index d7b2ffc0..a557c996 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex index bfeaa479..f3ee34be 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex index a22cf1da..22441c87 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex index 275040f7..6a25ba18 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex index c7f5d1c0..daad4f70 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex index fd7d8b6e..4a285535 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex index 1cf2080e..e5370833 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex index 91b3adbb..17070a45 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex index a5ec8e53..61b2fff7 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex index 8d138814..8b5ad6e4 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex index 17010e3c..0096d387 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex index 220a4372..39efca4c 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex index 08e05a33..f215e38a 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex differ diff --git a/src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt b/src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt index 2eef7f70..1ef57e5c 100644 --- a/src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt +++ b/src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt @@ -622,41 +622,42 @@ int drawable list_yellow_down 0x7f07007d int drawable list_yellow_middle 0x7f07007e int drawable list_yellow_single 0x7f07007f int drawable list_yellow_up 0x7f070080 -int drawable menu_delete 0x7f070081 -int drawable menu_move 0x7f070082 -int drawable new_note 0x7f070083 -int drawable new_note_normal 0x7f070084 -int drawable new_note_pressed 0x7f070085 -int drawable note_edit_color_selector_panel 0x7f070086 -int drawable notification 0x7f070087 -int drawable notification_action_background 0x7f070088 -int drawable notification_bg 0x7f070089 -int drawable notification_bg_low 0x7f07008a -int drawable notification_bg_low_normal 0x7f07008b -int drawable notification_bg_low_pressed 0x7f07008c -int drawable notification_bg_normal 0x7f07008d -int drawable notification_bg_normal_pressed 0x7f07008e -int drawable notification_icon_background 0x7f07008f -int drawable notification_template_icon_bg 0x7f070090 -int drawable notification_template_icon_low_bg 0x7f070091 -int drawable notification_tile_bg 0x7f070092 -int drawable notify_panel_notification_icon_bg 0x7f070093 -int drawable search_result 0x7f070094 -int drawable selected 0x7f070095 -int drawable title_alert 0x7f070096 -int drawable title_bar_bg 0x7f070097 -int drawable tooltip_frame_dark 0x7f070098 -int drawable tooltip_frame_light 0x7f070099 -int drawable widget_2x_blue 0x7f07009a -int drawable widget_2x_green 0x7f07009b -int drawable widget_2x_red 0x7f07009c -int drawable widget_2x_white 0x7f07009d -int drawable widget_2x_yellow 0x7f07009e -int drawable widget_4x_blue 0x7f07009f -int drawable widget_4x_green 0x7f0700a0 -int drawable widget_4x_red 0x7f0700a1 -int drawable widget_4x_white 0x7f0700a2 -int drawable widget_4x_yellow 0x7f0700a3 +int drawable lock 0x7f070081 +int drawable menu_delete 0x7f070082 +int drawable menu_move 0x7f070083 +int drawable new_note 0x7f070084 +int drawable new_note_normal 0x7f070085 +int drawable new_note_pressed 0x7f070086 +int drawable note_edit_color_selector_panel 0x7f070087 +int drawable notification 0x7f070088 +int drawable notification_action_background 0x7f070089 +int drawable notification_bg 0x7f07008a +int drawable notification_bg_low 0x7f07008b +int drawable notification_bg_low_normal 0x7f07008c +int drawable notification_bg_low_pressed 0x7f07008d +int drawable notification_bg_normal 0x7f07008e +int drawable notification_bg_normal_pressed 0x7f07008f +int drawable notification_icon_background 0x7f070090 +int drawable notification_template_icon_bg 0x7f070091 +int drawable notification_template_icon_low_bg 0x7f070092 +int drawable notification_tile_bg 0x7f070093 +int drawable notify_panel_notification_icon_bg 0x7f070094 +int drawable search_result 0x7f070095 +int drawable selected 0x7f070096 +int drawable title_alert 0x7f070097 +int drawable title_bar_bg 0x7f070098 +int drawable tooltip_frame_dark 0x7f070099 +int drawable tooltip_frame_light 0x7f07009a +int drawable widget_2x_blue 0x7f07009b +int drawable widget_2x_green 0x7f07009c +int drawable widget_2x_red 0x7f07009d +int drawable widget_2x_white 0x7f07009e +int drawable widget_2x_yellow 0x7f07009f +int drawable widget_4x_blue 0x7f0700a0 +int drawable widget_4x_green 0x7f0700a1 +int drawable widget_4x_red 0x7f0700a2 +int drawable widget_4x_white 0x7f0700a3 +int drawable widget_4x_yellow 0x7f0700a4 int id ALT 0x7f080000 int id CTRL 0x7f080001 int id FUNCTION 0x7f080002 @@ -715,152 +716,158 @@ int id decor_content_parent 0x7f080036 int id default_activity_button 0x7f080037 int id delete 0x7f080038 int id disableHome 0x7f080039 -int id edit_query 0x7f08003a -int id end 0x7f08003b -int id et_edit_text 0x7f08003c -int id et_foler_name 0x7f08003d -int id expand_activities_button 0x7f08003e -int id expanded_menu 0x7f08003f -int id fill 0x7f080040 -int id fill_horizontal 0x7f080041 -int id fill_vertical 0x7f080042 -int id font_size_selector 0x7f080043 -int id forever 0x7f080044 -int id group_divider 0x7f080045 -int id home 0x7f080046 -int id homeAsUp 0x7f080047 -int id hour 0x7f080048 -int id icon 0x7f080049 -int id icon_group 0x7f08004a -int id ifRoom 0x7f08004b -int id image 0x7f08004c -int id info 0x7f08004d -int id italic 0x7f08004e -int id iv_alert_icon 0x7f08004f -int id iv_bg_blue 0x7f080050 -int id iv_bg_blue_select 0x7f080051 -int id iv_bg_green 0x7f080052 -int id iv_bg_green_select 0x7f080053 -int id iv_bg_red 0x7f080054 -int id iv_bg_red_select 0x7f080055 -int id iv_bg_white 0x7f080056 -int id iv_bg_white_select 0x7f080057 -int id iv_bg_yellow 0x7f080058 -int id iv_bg_yellow_select 0x7f080059 -int id iv_large_select 0x7f08005a -int id iv_medium_select 0x7f08005b -int id iv_small_select 0x7f08005c -int id iv_super_select 0x7f08005d -int id left 0x7f08005e -int id line1 0x7f08005f -int id line3 0x7f080060 -int id listMode 0x7f080061 -int id list_item 0x7f080062 -int id ll_font_large 0x7f080063 -int id ll_font_normal 0x7f080064 -int id ll_font_small 0x7f080065 -int id ll_font_super 0x7f080066 -int id menu_alert 0x7f080067 -int id menu_change_view 0x7f080068 -int id menu_delete 0x7f080069 -int id menu_delete_remind 0x7f08006a -int id menu_export_text 0x7f08006b -int id menu_font_size 0x7f08006c -int id menu_list_mode 0x7f08006d -int id menu_new_folder 0x7f08006e -int id menu_new_note 0x7f08006f -int id menu_restore 0x7f080070 -int id menu_search 0x7f080071 -int id menu_send_to_desktop 0x7f080072 -int id menu_setting 0x7f080073 -int id menu_share 0x7f080074 -int id menu_sync 0x7f080075 -int id menu_time_order 0x7f080076 -int id message 0x7f080077 -int id middle 0x7f080078 -int id minute 0x7f080079 -int id move 0x7f08007a -int id multiply 0x7f08007b -int id navigation_bar 0x7f08007c -int id never 0x7f08007d -int id none 0x7f08007e -int id normal 0x7f08007f -int id note_bg_color_selector 0x7f080080 -int id note_edit_list 0x7f080081 -int id note_edit_view 0x7f080082 -int id note_item 0x7f080083 -int id note_title 0x7f080084 -int id notes_list 0x7f080085 -int id notification_background 0x7f080086 -int id notification_main_column 0x7f080087 -int id notification_main_column_container 0x7f080088 -int id parentPanel 0x7f080089 -int id prefenerece_sync_status_textview 0x7f08008a -int id preference_sync_button 0x7f08008b -int id progress_circular 0x7f08008c -int id progress_horizontal 0x7f08008d -int id radio 0x7f08008e -int id right 0x7f08008f -int id right_icon 0x7f080090 -int id right_side 0x7f080091 -int id screen 0x7f080092 -int id scrollIndicatorDown 0x7f080093 -int id scrollIndicatorUp 0x7f080094 -int id scrollView 0x7f080095 -int id search_badge 0x7f080096 -int id search_bar 0x7f080097 -int id search_button 0x7f080098 -int id search_close_btn 0x7f080099 -int id search_edit_frame 0x7f08009a -int id search_go_btn 0x7f08009b -int id search_mag_icon 0x7f08009c -int id search_plate 0x7f08009d -int id search_src_text 0x7f08009e -int id search_voice_btn 0x7f08009f -int id select_dialog_listview 0x7f0800a0 -int id selection_menu 0x7f0800a1 -int id shortcut 0x7f0800a2 -int id showCustom 0x7f0800a3 -int id showHome 0x7f0800a4 -int id showTitle 0x7f0800a5 -int id spacer 0x7f0800a6 -int id split_action_bar 0x7f0800a7 -int id src_atop 0x7f0800a8 -int id src_in 0x7f0800a9 -int id src_over 0x7f0800aa -int id start 0x7f0800ab -int id submenuarrow 0x7f0800ac -int id submit_area 0x7f0800ad -int id sv_note_edit 0x7f0800ae -int id tabMode 0x7f0800af -int id tag_transition_group 0x7f0800b0 -int id tag_unhandled_key_event_manager 0x7f0800b1 -int id tag_unhandled_key_listeners 0x7f0800b2 -int id text 0x7f0800b3 -int id text2 0x7f0800b4 -int id textSpacerNoButtons 0x7f0800b5 -int id textSpacerNoTitle 0x7f0800b6 -int id text_num 0x7f0800b7 -int id time 0x7f0800b8 -int id title 0x7f0800b9 -int id titleDividerNoCustom 0x7f0800ba -int id title_template 0x7f0800bb -int id top 0x7f0800bc -int id topPanel 0x7f0800bd -int id tv_alert_date 0x7f0800be -int id tv_folder_name 0x7f0800bf -int id tv_modified_date 0x7f0800c0 -int id tv_name 0x7f0800c1 -int id tv_time 0x7f0800c2 -int id tv_title 0x7f0800c3 -int id tv_title_bar 0x7f0800c4 -int id uniform 0x7f0800c5 -int id up 0x7f0800c6 -int id useLogo 0x7f0800c7 -int id widget_bg_image 0x7f0800c8 -int id widget_text 0x7f0800c9 -int id withText 0x7f0800ca -int id wrap_content 0x7f0800cb +int id editText_describe 0x7f08003a +int id editText_password 0x7f08003b +int id edit_query 0x7f08003c +int id end 0x7f08003d +int id et_edit_text 0x7f08003e +int id et_foler_name 0x7f08003f +int id et_input_passwd 0x7f080040 +int id expand_activities_button 0x7f080041 +int id expanded_menu 0x7f080042 +int id fill 0x7f080043 +int id fill_horizontal 0x7f080044 +int id fill_vertical 0x7f080045 +int id font_size_selector 0x7f080046 +int id forever 0x7f080047 +int id group_divider 0x7f080048 +int id home 0x7f080049 +int id homeAsUp 0x7f08004a +int id hour 0x7f08004b +int id icon 0x7f08004c +int id icon_group 0x7f08004d +int id ifRoom 0x7f08004e +int id image 0x7f08004f +int id info 0x7f080050 +int id italic 0x7f080051 +int id iv_alert_icon 0x7f080052 +int id iv_bg_blue 0x7f080053 +int id iv_bg_blue_select 0x7f080054 +int id iv_bg_green 0x7f080055 +int id iv_bg_green_select 0x7f080056 +int id iv_bg_red 0x7f080057 +int id iv_bg_red_select 0x7f080058 +int id iv_bg_white 0x7f080059 +int id iv_bg_white_select 0x7f08005a +int id iv_bg_yellow 0x7f08005b +int id iv_bg_yellow_select 0x7f08005c +int id iv_large_select 0x7f08005d +int id iv_lock 0x7f08005e +int id iv_medium_select 0x7f08005f +int id iv_small_select 0x7f080060 +int id iv_super_select 0x7f080061 +int id left 0x7f080062 +int id line1 0x7f080063 +int id line3 0x7f080064 +int id listMode 0x7f080065 +int id list_item 0x7f080066 +int id ll_font_large 0x7f080067 +int id ll_font_normal 0x7f080068 +int id ll_font_small 0x7f080069 +int id ll_font_super 0x7f08006a +int id menu_add_secret 0x7f08006b +int id menu_alert 0x7f08006c +int id menu_change_view 0x7f08006d +int id menu_delete 0x7f08006e +int id menu_delete_remind 0x7f08006f +int id menu_delete_secret 0x7f080070 +int id menu_export_text 0x7f080071 +int id menu_font_size 0x7f080072 +int id menu_list_mode 0x7f080073 +int id menu_new_folder 0x7f080074 +int id menu_new_note 0x7f080075 +int id menu_restore 0x7f080076 +int id menu_search 0x7f080077 +int id menu_send_to_desktop 0x7f080078 +int id menu_setting 0x7f080079 +int id menu_share 0x7f08007a +int id menu_sync 0x7f08007b +int id menu_time_order 0x7f08007c +int id message 0x7f08007d +int id middle 0x7f08007e +int id minute 0x7f08007f +int id move 0x7f080080 +int id multiply 0x7f080081 +int id navigation_bar 0x7f080082 +int id never 0x7f080083 +int id none 0x7f080084 +int id normal 0x7f080085 +int id note_bg_color_selector 0x7f080086 +int id note_edit_list 0x7f080087 +int id note_edit_view 0x7f080088 +int id note_item 0x7f080089 +int id note_title 0x7f08008a +int id notes_list 0x7f08008b +int id notification_background 0x7f08008c +int id notification_main_column 0x7f08008d +int id notification_main_column_container 0x7f08008e +int id parentPanel 0x7f08008f +int id prefenerece_sync_status_textview 0x7f080090 +int id preference_sync_button 0x7f080091 +int id progress_circular 0x7f080092 +int id progress_horizontal 0x7f080093 +int id radio 0x7f080094 +int id right 0x7f080095 +int id right_icon 0x7f080096 +int id right_side 0x7f080097 +int id screen 0x7f080098 +int id scrollIndicatorDown 0x7f080099 +int id scrollIndicatorUp 0x7f08009a +int id scrollView 0x7f08009b +int id search_badge 0x7f08009c +int id search_bar 0x7f08009d +int id search_button 0x7f08009e +int id search_close_btn 0x7f08009f +int id search_edit_frame 0x7f0800a0 +int id search_go_btn 0x7f0800a1 +int id search_mag_icon 0x7f0800a2 +int id search_plate 0x7f0800a3 +int id search_src_text 0x7f0800a4 +int id search_voice_btn 0x7f0800a5 +int id select_dialog_listview 0x7f0800a6 +int id selection_menu 0x7f0800a7 +int id shortcut 0x7f0800a8 +int id showCustom 0x7f0800a9 +int id showHome 0x7f0800aa +int id showTitle 0x7f0800ab +int id spacer 0x7f0800ac +int id split_action_bar 0x7f0800ad +int id src_atop 0x7f0800ae +int id src_in 0x7f0800af +int id src_over 0x7f0800b0 +int id start 0x7f0800b1 +int id submenuarrow 0x7f0800b2 +int id submit_area 0x7f0800b3 +int id sv_note_edit 0x7f0800b4 +int id tabMode 0x7f0800b5 +int id tag_transition_group 0x7f0800b6 +int id tag_unhandled_key_event_manager 0x7f0800b7 +int id tag_unhandled_key_listeners 0x7f0800b8 +int id text 0x7f0800b9 +int id text2 0x7f0800ba +int id textSpacerNoButtons 0x7f0800bb +int id textSpacerNoTitle 0x7f0800bc +int id text_num 0x7f0800bd +int id time 0x7f0800be +int id title 0x7f0800bf +int id titleDividerNoCustom 0x7f0800c0 +int id title_template 0x7f0800c1 +int id top 0x7f0800c2 +int id topPanel 0x7f0800c3 +int id tv_alert_date 0x7f0800c4 +int id tv_folder_name 0x7f0800c5 +int id tv_modified_date 0x7f0800c6 +int id tv_name 0x7f0800c7 +int id tv_time 0x7f0800c8 +int id tv_title 0x7f0800c9 +int id tv_title_bar 0x7f0800ca +int id uniform 0x7f0800cb +int id up 0x7f0800cc +int id useLogo 0x7f0800cd +int id widget_bg_image 0x7f0800ce +int id widget_text 0x7f0800cf +int id withText 0x7f0800d0 +int id wrap_content 0x7f0800d1 int integer abc_config_activityDefaultDur 0x7f090000 int integer abc_config_activityShortDur 0x7f090001 int integer cancel_button_image_alpha 0x7f090002 @@ -897,27 +904,29 @@ int layout abc_tooltip 0x7f0a001b int layout account_dialog_title 0x7f0a001c int layout add_account_text 0x7f0a001d int layout datetime_picker 0x7f0a001e -int layout dialog_edit_text 0x7f0a001f -int layout folder_list_item 0x7f0a0020 -int layout note_edit 0x7f0a0021 -int layout note_edit_list_item 0x7f0a0022 -int layout note_item 0x7f0a0023 -int layout note_list 0x7f0a0024 -int layout note_list_dropdown_menu 0x7f0a0025 -int layout note_list_footer 0x7f0a0026 -int layout notification_action 0x7f0a0027 -int layout notification_action_tombstone 0x7f0a0028 -int layout notification_template_custom_big 0x7f0a0029 -int layout notification_template_icon_group 0x7f0a002a -int layout notification_template_part_chronometer 0x7f0a002b -int layout notification_template_part_time 0x7f0a002c -int layout select_dialog_item_material 0x7f0a002d -int layout select_dialog_multichoice_material 0x7f0a002e -int layout select_dialog_singlechoice_material 0x7f0a002f -int layout settings_header 0x7f0a0030 -int layout support_simple_spinner_dropdown_item 0x7f0a0031 -int layout widget_2x 0x7f0a0032 -int layout widget_4x 0x7f0a0033 +int layout dialog_add_secret 0x7f0a001f +int layout dialog_edit_text 0x7f0a0020 +int layout dialog_input_passwd 0x7f0a0021 +int layout folder_list_item 0x7f0a0022 +int layout note_edit 0x7f0a0023 +int layout note_edit_list_item 0x7f0a0024 +int layout note_item 0x7f0a0025 +int layout note_list 0x7f0a0026 +int layout note_list_dropdown_menu 0x7f0a0027 +int layout note_list_footer 0x7f0a0028 +int layout notification_action 0x7f0a0029 +int layout notification_action_tombstone 0x7f0a002a +int layout notification_template_custom_big 0x7f0a002b +int layout notification_template_icon_group 0x7f0a002c +int layout notification_template_part_chronometer 0x7f0a002d +int layout notification_template_part_time 0x7f0a002e +int layout select_dialog_item_material 0x7f0a002f +int layout select_dialog_multichoice_material 0x7f0a0030 +int layout select_dialog_singlechoice_material 0x7f0a0031 +int layout settings_header 0x7f0a0032 +int layout support_simple_spinner_dropdown_item 0x7f0a0033 +int layout widget_2x 0x7f0a0034 +int layout widget_4x 0x7f0a0035 int menu call_note_edit 0x7f0b0000 int menu call_record_folder 0x7f0b0001 int menu note_edit 0x7f0b0002 @@ -967,115 +976,121 @@ int string abc_searchview_description_voice 0x7f0e0023 int string abc_shareactionprovider_share_with 0x7f0e0024 int string abc_shareactionprovider_share_with_application 0x7f0e0025 int string abc_toolbar_collapse_description 0x7f0e0026 -int string alert_message_delete_folder 0x7f0e0027 -int string alert_message_delete_note 0x7f0e0028 -int string alert_message_delete_notes 0x7f0e0029 -int string alert_title_delete 0x7f0e002a -int string app_name 0x7f0e002b -int string app_widget2x2 0x7f0e002c -int string app_widget4x4 0x7f0e002d -int string button_delete 0x7f0e002e -int string call_record_folder_name 0x7f0e002f -int string datetime_dialog_cancel 0x7f0e0030 -int string datetime_dialog_ok 0x7f0e0031 -int string delete_remind_time_message 0x7f0e0032 -int string error_note_empty_for_clock 0x7f0e0033 -int string error_note_empty_for_send_to_desktop 0x7f0e0034 -int string error_note_not_exist 0x7f0e0035 -int string error_sdcard_export 0x7f0e0036 -int string error_sdcard_unmounted 0x7f0e0037 -int string error_sync_cancelled 0x7f0e0038 -int string error_sync_internal 0x7f0e0039 -int string error_sync_network 0x7f0e003a -int string failed_sdcard_export 0x7f0e003b -int string file_name_txt_format 0x7f0e003c -int string file_path 0x7f0e003d -int string folder_exist 0x7f0e003e -int string format_date_ymd 0x7f0e003f -int string format_datetime_mdhm 0x7f0e0040 -int string format_exported_file_location 0x7f0e0041 -int string format_folder_files_count 0x7f0e0042 -int string format_move_notes_to_folder 0x7f0e0043 -int string hint_foler_name 0x7f0e0044 -int string info_note_enter_desktop 0x7f0e0045 -int string menu_alert 0x7f0e0046 -int string menu_change_view 0x7f0e0047 -int string menu_create_folder 0x7f0e0048 -int string menu_delete 0x7f0e0049 -int string menu_deselect_all 0x7f0e004a -int string menu_export_text 0x7f0e004b -int string menu_folder_change_name 0x7f0e004c -int string menu_folder_delete 0x7f0e004d -int string menu_folder_view 0x7f0e004e -int string menu_font_large 0x7f0e004f -int string menu_font_normal 0x7f0e0050 -int string menu_font_size 0x7f0e0051 -int string menu_font_small 0x7f0e0052 -int string menu_font_super 0x7f0e0053 -int string menu_init_order 0x7f0e0054 -int string menu_list_mode 0x7f0e0055 -int string menu_move 0x7f0e0056 -int string menu_move_parent_folder 0x7f0e0057 -int string menu_normal_mode 0x7f0e0058 -int string menu_remove_remind 0x7f0e0059 -int string menu_restore 0x7f0e005a -int string menu_search 0x7f0e005b -int string menu_select_all 0x7f0e005c -int string menu_select_none 0x7f0e005d -int string menu_select_title 0x7f0e005e -int string menu_send_to_desktop 0x7f0e005f -int string menu_setting 0x7f0e0060 -int string menu_share 0x7f0e0061 -int string menu_sync 0x7f0e0062 -int string menu_sync_cancel 0x7f0e0063 -int string menu_time_order 0x7f0e0064 -int string menu_title_select_folder 0x7f0e0065 -int string note_alert_expired 0x7f0e0066 -int string note_length 0x7f0e0067 -int string note_link_email 0x7f0e0068 -int string note_link_other 0x7f0e0069 -int string note_link_tel 0x7f0e006a -int string note_link_web 0x7f0e006b -int string notealert_enter 0x7f0e006c -int string notealert_ok 0x7f0e006d -int string notelist_menu_new 0x7f0e006e -int string notelist_string_info 0x7f0e006f -int string preferences_account_summary 0x7f0e0070 -int string preferences_account_title 0x7f0e0071 -int string preferences_add_account 0x7f0e0072 -int string preferences_bg_random_appear_title 0x7f0e0073 -int string preferences_button_sync_cancel 0x7f0e0074 -int string preferences_button_sync_immediately 0x7f0e0075 -int string preferences_dialog_change_account_title 0x7f0e0076 -int string preferences_dialog_change_account_warn_msg 0x7f0e0077 -int string preferences_dialog_select_account_tips 0x7f0e0078 -int string preferences_dialog_select_account_title 0x7f0e0079 -int string preferences_last_sync_time 0x7f0e007a -int string preferences_last_sync_time_format 0x7f0e007b -int string preferences_menu_cancel 0x7f0e007c -int string preferences_menu_change_account 0x7f0e007d -int string preferences_menu_remove_account 0x7f0e007e -int string preferences_title 0x7f0e007f -int string preferences_toast_cannot_change_account 0x7f0e0080 -int string preferences_toast_success_set_accout 0x7f0e0081 -int string search 0x7f0e0082 -int string search_hint 0x7f0e0083 -int string search_label 0x7f0e0084 -int string search_menu_title 0x7f0e0085 -int string search_setting_description 0x7f0e0086 -int string set_remind_time_message 0x7f0e0087 -int string status_bar_notification_info_overflow 0x7f0e0088 -int string success_sdcard_export 0x7f0e0089 -int string success_sync_account 0x7f0e008a -int string sync_progress_init_list 0x7f0e008b -int string sync_progress_login 0x7f0e008c -int string sync_progress_syncing 0x7f0e008d -int string ticker_cancel 0x7f0e008e -int string ticker_fail 0x7f0e008f -int string ticker_success 0x7f0e0090 -int string ticker_syncing 0x7f0e0091 -int string widget_havenot_content 0x7f0e0092 -int string widget_under_visit_mode 0x7f0e0093 +int string add_describe 0x7f0e0027 +int string add_password 0x7f0e0028 +int string alert_message_delete_folder 0x7f0e0029 +int string alert_message_delete_note 0x7f0e002a +int string alert_message_delete_notes 0x7f0e002b +int string alert_message_delete_secret 0x7f0e002c +int string alert_title_delete 0x7f0e002d +int string app_name 0x7f0e002e +int string app_widget2x2 0x7f0e002f +int string app_widget4x4 0x7f0e0030 +int string button_delete 0x7f0e0031 +int string call_record_folder_name 0x7f0e0032 +int string datetime_dialog_cancel 0x7f0e0033 +int string datetime_dialog_ok 0x7f0e0034 +int string delete_remind_time_message 0x7f0e0035 +int string error_note_empty_for_clock 0x7f0e0036 +int string error_note_empty_for_send_to_desktop 0x7f0e0037 +int string error_note_not_exist 0x7f0e0038 +int string error_sdcard_export 0x7f0e0039 +int string error_sdcard_unmounted 0x7f0e003a +int string error_sync_cancelled 0x7f0e003b +int string error_sync_internal 0x7f0e003c +int string error_sync_network 0x7f0e003d +int string failed_sdcard_export 0x7f0e003e +int string file_name_txt_format 0x7f0e003f +int string file_path 0x7f0e0040 +int string folder_exist 0x7f0e0041 +int string format_date_ymd 0x7f0e0042 +int string format_datetime_mdhm 0x7f0e0043 +int string format_exported_file_location 0x7f0e0044 +int string format_folder_files_count 0x7f0e0045 +int string format_move_notes_to_folder 0x7f0e0046 +int string hint_foler_name 0x7f0e0047 +int string info_note_enter_desktop 0x7f0e0048 +int string input_passwd 0x7f0e0049 +int string menu_add_secret 0x7f0e004a +int string menu_alert 0x7f0e004b +int string menu_change_view 0x7f0e004c +int string menu_create_folder 0x7f0e004d +int string menu_delete 0x7f0e004e +int string menu_deselect_all 0x7f0e004f +int string menu_export_text 0x7f0e0050 +int string menu_folder_change_name 0x7f0e0051 +int string menu_folder_delete 0x7f0e0052 +int string menu_folder_view 0x7f0e0053 +int string menu_font_large 0x7f0e0054 +int string menu_font_normal 0x7f0e0055 +int string menu_font_size 0x7f0e0056 +int string menu_font_small 0x7f0e0057 +int string menu_font_super 0x7f0e0058 +int string menu_init_order 0x7f0e0059 +int string menu_list_mode 0x7f0e005a +int string menu_move 0x7f0e005b +int string menu_move_parent_folder 0x7f0e005c +int string menu_normal_mode 0x7f0e005d +int string menu_remove_remind 0x7f0e005e +int string menu_remove_secret 0x7f0e005f +int string menu_restore 0x7f0e0060 +int string menu_search 0x7f0e0061 +int string menu_select_all 0x7f0e0062 +int string menu_select_none 0x7f0e0063 +int string menu_select_title 0x7f0e0064 +int string menu_send_to_desktop 0x7f0e0065 +int string menu_setting 0x7f0e0066 +int string menu_share 0x7f0e0067 +int string menu_sync 0x7f0e0068 +int string menu_sync_cancel 0x7f0e0069 +int string menu_time_order 0x7f0e006a +int string menu_title_select_folder 0x7f0e006b +int string note_alert_expired 0x7f0e006c +int string note_length 0x7f0e006d +int string note_link_email 0x7f0e006e +int string note_link_other 0x7f0e006f +int string note_link_tel 0x7f0e0070 +int string note_link_web 0x7f0e0071 +int string notealert_enter 0x7f0e0072 +int string notealert_ok 0x7f0e0073 +int string notelist_menu_new 0x7f0e0074 +int string notelist_string_info 0x7f0e0075 +int string preferences_account_summary 0x7f0e0076 +int string preferences_account_title 0x7f0e0077 +int string preferences_add_account 0x7f0e0078 +int string preferences_bg_random_appear_title 0x7f0e0079 +int string preferences_button_sync_cancel 0x7f0e007a +int string preferences_button_sync_immediately 0x7f0e007b +int string preferences_dialog_change_account_title 0x7f0e007c +int string preferences_dialog_change_account_warn_msg 0x7f0e007d +int string preferences_dialog_select_account_tips 0x7f0e007e +int string preferences_dialog_select_account_title 0x7f0e007f +int string preferences_last_sync_time 0x7f0e0080 +int string preferences_last_sync_time_format 0x7f0e0081 +int string preferences_menu_cancel 0x7f0e0082 +int string preferences_menu_change_account 0x7f0e0083 +int string preferences_menu_remove_account 0x7f0e0084 +int string preferences_title 0x7f0e0085 +int string preferences_toast_cannot_change_account 0x7f0e0086 +int string preferences_toast_success_set_accout 0x7f0e0087 +int string search 0x7f0e0088 +int string search_hint 0x7f0e0089 +int string search_label 0x7f0e008a +int string search_menu_title 0x7f0e008b +int string search_setting_description 0x7f0e008c +int string set_remind_time_message 0x7f0e008d +int string status_bar_notification_info_overflow 0x7f0e008e +int string success_sdcard_export 0x7f0e008f +int string success_sync_account 0x7f0e0090 +int string sync_progress_init_list 0x7f0e0091 +int string sync_progress_login 0x7f0e0092 +int string sync_progress_syncing 0x7f0e0093 +int string ticker_cancel 0x7f0e0094 +int string ticker_fail 0x7f0e0095 +int string ticker_success 0x7f0e0096 +int string ticker_syncing 0x7f0e0097 +int string widget_havenot_content 0x7f0e0098 +int string widget_under_visit_mode 0x7f0e0099 int style AlertDialog_AppCompat 0x7f0f0000 int style AlertDialog_AppCompat_Light 0x7f0f0001 int style Animation_AppCompat_Dialog 0x7f0f0002 diff --git a/src/Notes-master1/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json b/src/Notes-master1/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json index 1920ca85..51f6368b 100644 --- a/src/Notes-master1/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json +++ b/src/Notes-master1/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json @@ -1 +1 @@ -{"enableV1Signing":true,"enableV2Signing":false,"enableV3Signing":false,"enableV4Signing":false} \ No newline at end of file +{"enableV1Signing":false,"enableV2Signing":true,"enableV3Signing":false,"enableV4Signing":false} \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt index dfce9e6e..dec761db 100644 --- a/src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt +++ b/src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt @@ -51,7 +51,6 @@ net.micode.notes:style/Widget.AppCompat.AutoCompleteTextView = 0x7f0f0124 net.micode.notes:style/Widget.AppCompat.ActionBar.TabText = 0x7f0f011d net.micode.notes:style/Widget.AppCompat.ActionBar.TabBar = 0x7f0f011c net.micode.notes:style/Widget.AppCompat.ActionBar.Solid = 0x7f0f011b -net.micode.notes:style/ThemeOverlay.AppCompat.Dialog.Alert = 0x7f0f0118 net.micode.notes:style/ThemeOverlay.AppCompat.Dialog = 0x7f0f0117 net.micode.notes:style/ThemeOverlay.AppCompat = 0x7f0f0113 net.micode.notes:style/Theme.AppCompat.NoActionBar = 0x7f0f0112 @@ -87,7 +86,6 @@ net.micode.notes:style/TextAppearance.AppCompat.Subhead.Inverse = 0x7f0f00d8 net.micode.notes:style/TextAppearance.AppCompat.Small.Inverse = 0x7f0f00d6 net.micode.notes:style/TextAppearance.Compat.Notification.Line2 = 0x7f0f00f1 net.micode.notes:style/TextAppearance.AppCompat.SearchResult.Subtitle = 0x7f0f00d3 -net.micode.notes:style/TextAppearance.AppCompat.Light.Widget.PopupMenu.Large = 0x7f0f00ce net.micode.notes:style/TextAppearance.AppCompat.Light.SearchResult.Subtitle = 0x7f0f00cc net.micode.notes:style/TextAppearance.AppCompat.Large.Inverse = 0x7f0f00cb net.micode.notes:style/TextAppearance.AppCompat.Inverse = 0x7f0f00c9 @@ -142,8 +140,6 @@ net.micode.notes:style/ThemeOverlay.AppCompat.Light = 0x7f0f0119 net.micode.notes:style/Base.V7.Widget.AppCompat.AutoCompleteTextView = 0x7f0f0064 net.micode.notes:style/Base.V7.Theme.AppCompat.Dialog = 0x7f0f0060 net.micode.notes:style/Base.V7.Theme.AppCompat = 0x7f0f005f -net.micode.notes:style/Widget.AppCompat.Light.ActionBar.TabBar = 0x7f0f0137 -net.micode.notes:style/Base.V28.Theme.AppCompat = 0x7f0f005d net.micode.notes:style/Base.V26.Widget.AppCompat.Toolbar = 0x7f0f005c net.micode.notes:style/Base.V21.Theme.AppCompat.Light.Dialog = 0x7f0f0054 net.micode.notes:style/Base.V21.Theme.AppCompat.Light = 0x7f0f0053 @@ -201,81 +197,85 @@ net.micode.notes:style/Base.AlertDialog.AppCompat = 0x7f0f0005 net.micode.notes:style/Animation.AppCompat.Tooltip = 0x7f0f0004 net.micode.notes:style/TextAppearance.AppCompat.Light.SearchResult.Title = 0x7f0f00cd net.micode.notes:style/Animation.AppCompat.DropDownUp = 0x7f0f0003 -net.micode.notes:string/widget_havenot_content = 0x7f0e0092 -net.micode.notes:string/ticker_success = 0x7f0e0090 -net.micode.notes:string/ticker_fail = 0x7f0e008f -net.micode.notes:string/ticker_cancel = 0x7f0e008e -net.micode.notes:string/success_sync_account = 0x7f0e008a -net.micode.notes:string/success_sdcard_export = 0x7f0e0089 -net.micode.notes:string/status_bar_notification_info_overflow = 0x7f0e0088 -net.micode.notes:string/set_remind_time_message = 0x7f0e0087 -net.micode.notes:string/search_menu_title = 0x7f0e0085 -net.micode.notes:string/search = 0x7f0e0082 +net.micode.notes:string/widget_havenot_content = 0x7f0e0098 +net.micode.notes:string/ticker_success = 0x7f0e0096 +net.micode.notes:string/ticker_fail = 0x7f0e0095 +net.micode.notes:string/ticker_cancel = 0x7f0e0094 +net.micode.notes:string/success_sync_account = 0x7f0e0090 +net.micode.notes:string/success_sdcard_export = 0x7f0e008f +net.micode.notes:string/status_bar_notification_info_overflow = 0x7f0e008e +net.micode.notes:string/set_remind_time_message = 0x7f0e008d +net.micode.notes:string/search_menu_title = 0x7f0e008b +net.micode.notes:string/search = 0x7f0e0088 net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.Button.Colored = 0x7f0f0031 -net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0e0081 -net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0e0080 +net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0e0087 +net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0e0086 net.micode.notes:style/Base.TextAppearance.AppCompat.SearchResult = 0x7f0f001e -net.micode.notes:string/preferences_title = 0x7f0e007f -net.micode.notes:string/preferences_menu_remove_account = 0x7f0e007e -net.micode.notes:string/preferences_last_sync_time_format = 0x7f0e007b -net.micode.notes:string/preferences_last_sync_time = 0x7f0e007a +net.micode.notes:string/preferences_title = 0x7f0e0085 +net.micode.notes:string/preferences_menu_remove_account = 0x7f0e0084 +net.micode.notes:string/preferences_last_sync_time_format = 0x7f0e0081 +net.micode.notes:string/preferences_last_sync_time = 0x7f0e0080 net.micode.notes:style/RtlOverlay.Widget.AppCompat.PopupMenuItem.InternalGroup = 0x7f0f00b2 -net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0e0078 -net.micode.notes:string/preferences_button_sync_immediately = 0x7f0e0075 +net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0e007e +net.micode.notes:string/preferences_button_sync_immediately = 0x7f0e007b net.micode.notes:styleable/GradientColorItem = 0x7f100018 -net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0e0073 -net.micode.notes:string/preferences_add_account = 0x7f0e0072 -net.micode.notes:string/preferences_account_title = 0x7f0e0071 -net.micode.notes:string/preferences_account_summary = 0x7f0e0070 -net.micode.notes:string/notelist_string_info = 0x7f0e006f -net.micode.notes:string/notealert_ok = 0x7f0e006d -net.micode.notes:string/note_link_web = 0x7f0e006b -net.micode.notes:string/note_link_tel = 0x7f0e006a -net.micode.notes:string/note_link_email = 0x7f0e0068 -net.micode.notes:string/note_length = 0x7f0e0067 -net.micode.notes:string/note_alert_expired = 0x7f0e0066 -net.micode.notes:string/menu_time_order = 0x7f0e0064 +net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0e0079 +net.micode.notes:string/preferences_add_account = 0x7f0e0078 +net.micode.notes:string/preferences_account_title = 0x7f0e0077 +net.micode.notes:string/preferences_account_summary = 0x7f0e0076 +net.micode.notes:string/notelist_string_info = 0x7f0e0075 +net.micode.notes:string/notealert_ok = 0x7f0e0073 +net.micode.notes:string/note_link_web = 0x7f0e0071 +net.micode.notes:string/note_link_tel = 0x7f0e0070 +net.micode.notes:string/note_link_email = 0x7f0e006e +net.micode.notes:string/note_length = 0x7f0e006d +net.micode.notes:string/note_alert_expired = 0x7f0e006c +net.micode.notes:string/menu_time_order = 0x7f0e006a net.micode.notes:style/Base.V23.Theme.AppCompat = 0x7f0f0058 -net.micode.notes:string/menu_sync_cancel = 0x7f0e0063 -net.micode.notes:string/menu_sync = 0x7f0e0062 -net.micode.notes:string/menu_share = 0x7f0e0061 +net.micode.notes:string/menu_sync_cancel = 0x7f0e0069 +net.micode.notes:string/menu_sync = 0x7f0e0068 +net.micode.notes:string/menu_share = 0x7f0e0067 net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0f00fd -net.micode.notes:string/menu_setting = 0x7f0e0060 -net.micode.notes:string/menu_send_to_desktop = 0x7f0e005f -net.micode.notes:string/menu_select_all = 0x7f0e005c +net.micode.notes:string/menu_setting = 0x7f0e0066 +net.micode.notes:string/menu_select_all = 0x7f0e0062 net.micode.notes:style/AlertDialog.AppCompat = 0x7f0f0000 -net.micode.notes:string/menu_search = 0x7f0e005b +net.micode.notes:string/menu_search = 0x7f0e0061 net.micode.notes:style/Theme.AppCompat.DayNight = 0x7f0f0100 -net.micode.notes:string/menu_remove_remind = 0x7f0e0059 -net.micode.notes:string/menu_font_super = 0x7f0e0053 -net.micode.notes:string/menu_font_normal = 0x7f0e0050 -net.micode.notes:string/menu_font_large = 0x7f0e004f -net.micode.notes:string/menu_folder_delete = 0x7f0e004d -net.micode.notes:string/menu_folder_change_name = 0x7f0e004c -net.micode.notes:string/search_label = 0x7f0e0084 -net.micode.notes:string/menu_export_text = 0x7f0e004b -net.micode.notes:string/menu_delete = 0x7f0e0049 -net.micode.notes:string/info_note_enter_desktop = 0x7f0e0045 +net.micode.notes:string/menu_remove_remind = 0x7f0e005e +net.micode.notes:string/menu_font_super = 0x7f0e0058 +net.micode.notes:string/menu_font_normal = 0x7f0e0055 +net.micode.notes:string/menu_font_large = 0x7f0e0054 +net.micode.notes:string/menu_folder_delete = 0x7f0e0052 +net.micode.notes:string/menu_folder_change_name = 0x7f0e0051 +net.micode.notes:string/search_label = 0x7f0e008a +net.micode.notes:string/menu_export_text = 0x7f0e0050 +net.micode.notes:string/menu_delete = 0x7f0e004e +net.micode.notes:string/menu_add_secret = 0x7f0e004a +net.micode.notes:string/input_passwd = 0x7f0e0049 +net.micode.notes:string/info_note_enter_desktop = 0x7f0e0048 net.micode.notes:style/TextAppearance.Widget.AppCompat.Toolbar.Subtitle = 0x7f0f00f5 -net.micode.notes:string/format_move_notes_to_folder = 0x7f0e0043 -net.micode.notes:string/format_datetime_mdhm = 0x7f0e0040 -net.micode.notes:string/folder_exist = 0x7f0e003e -net.micode.notes:string/file_path = 0x7f0e003d +net.micode.notes:string/format_move_notes_to_folder = 0x7f0e0046 +net.micode.notes:string/format_datetime_mdhm = 0x7f0e0043 +net.micode.notes:string/folder_exist = 0x7f0e0041 +net.micode.notes:string/file_path = 0x7f0e0040 net.micode.notes:style/Widget.AppCompat.ListMenuView = 0x7f0f014a -net.micode.notes:string/file_name_txt_format = 0x7f0e003c -net.micode.notes:string/failed_sdcard_export = 0x7f0e003b -net.micode.notes:string/error_sync_network = 0x7f0e003a +net.micode.notes:string/file_name_txt_format = 0x7f0e003f +net.micode.notes:string/error_sync_network = 0x7f0e003d net.micode.notes:style/Widget.AppCompat.ActionMode = 0x7f0f0122 -net.micode.notes:string/error_sync_cancelled = 0x7f0e0038 +net.micode.notes:string/error_sync_cancelled = 0x7f0e003b net.micode.notes:style/Widget.AppCompat.Spinner.DropDown = 0x7f0f015c -net.micode.notes:string/error_sdcard_export = 0x7f0e0036 -net.micode.notes:string/error_note_empty_for_clock = 0x7f0e0033 -net.micode.notes:string/datetime_dialog_ok = 0x7f0e0031 +net.micode.notes:string/error_sdcard_export = 0x7f0e0039 +net.micode.notes:string/error_note_empty_for_clock = 0x7f0e0036 +net.micode.notes:string/datetime_dialog_ok = 0x7f0e0034 net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0f00a0 -net.micode.notes:string/app_name = 0x7f0e002b -net.micode.notes:string/alert_message_delete_notes = 0x7f0e0029 +net.micode.notes:string/app_name = 0x7f0e002e +net.micode.notes:string/alert_message_delete_secret = 0x7f0e002c +net.micode.notes:string/alert_message_delete_notes = 0x7f0e002b net.micode.notes:style/Base.Widget.AppCompat.ProgressBar.Horizontal = 0x7f0f0093 -net.micode.notes:string/alert_message_delete_folder = 0x7f0e0027 +net.micode.notes:string/alert_message_delete_folder = 0x7f0e0029 +net.micode.notes:style/Widget.AppCompat.Light.ActionBar.TabBar = 0x7f0f0137 +net.micode.notes:style/Base.V28.Theme.AppCompat = 0x7f0f005d +net.micode.notes:string/add_password = 0x7f0e0028 net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.PopupMenu.Small = 0x7f0f0036 net.micode.notes:string/abc_toolbar_collapse_description = 0x7f0e0026 net.micode.notes:string/abc_shareactionprovider_share_with_application = 0x7f0e0025 @@ -285,7 +285,7 @@ net.micode.notes:style/Base.TextAppearance.AppCompat.Small = 0x7f0f0021 net.micode.notes:string/abc_searchview_description_query = 0x7f0e0020 net.micode.notes:string/abc_searchview_description_clear = 0x7f0e001f net.micode.notes:string/abc_search_hint = 0x7f0e001e -net.micode.notes:string/sync_progress_login = 0x7f0e008c +net.micode.notes:string/sync_progress_login = 0x7f0e0092 net.micode.notes:string/abc_prepend_shortcut_label = 0x7f0e001d net.micode.notes:string/abc_menu_shift_shortcut_label = 0x7f0e001a net.micode.notes:string/abc_menu_function_shortcut_label = 0x7f0e0018 @@ -311,26 +311,31 @@ net.micode.notes:style/Base.Theme.AppCompat.Dialog.Alert = 0x7f0f003f net.micode.notes:menu/note_list_dropdown = 0x7f0b0004 net.micode.notes:menu/note_edit = 0x7f0b0002 net.micode.notes:menu/call_record_folder = 0x7f0b0001 -net.micode.notes:layout/widget_4x = 0x7f0a0033 -net.micode.notes:layout/widget_2x = 0x7f0a0032 -net.micode.notes:layout/settings_header = 0x7f0a0030 -net.micode.notes:layout/notification_template_part_time = 0x7f0a002c -net.micode.notes:layout/notification_template_icon_group = 0x7f0a002a +net.micode.notes:layout/widget_4x = 0x7f0a0035 +net.micode.notes:layout/widget_2x = 0x7f0a0034 +net.micode.notes:layout/settings_header = 0x7f0a0032 +net.micode.notes:layout/notification_template_part_time = 0x7f0a002e +net.micode.notes:layout/notification_template_icon_group = 0x7f0a002c net.micode.notes:style/Theme.AppCompat.Light.DialogWhenLarge = 0x7f0f0110 -net.micode.notes:layout/notification_action_tombstone = 0x7f0a0028 +net.micode.notes:layout/notification_action_tombstone = 0x7f0a002a net.micode.notes:styleable/ButtonBarLayout = 0x7f10000f -net.micode.notes:layout/notification_action = 0x7f0a0027 -net.micode.notes:layout/note_list = 0x7f0a0024 -net.micode.notes:layout/note_item = 0x7f0a0023 +net.micode.notes:layout/notification_action = 0x7f0a0029 +net.micode.notes:layout/note_list = 0x7f0a0026 +net.micode.notes:layout/note_item = 0x7f0a0025 +net.micode.notes:string/failed_sdcard_export = 0x7f0e003e +net.micode.notes:layout/dialog_input_passwd = 0x7f0a0021 net.micode.notes:style/Base.V7.ThemeOverlay.AppCompat.Dialog = 0x7f0f0063 -net.micode.notes:layout/dialog_edit_text = 0x7f0a001f +net.micode.notes:layout/dialog_edit_text = 0x7f0a0020 +net.micode.notes:string/menu_send_to_desktop = 0x7f0e0065 +net.micode.notes:layout/dialog_add_secret = 0x7f0a001f net.micode.notes:layout/add_account_text = 0x7f0a001d net.micode.notes:layout/abc_search_view = 0x7f0a0019 +net.micode.notes:string/menu_remove_secret = 0x7f0e005f net.micode.notes:layout/abc_search_dropdown_item_icons_2line = 0x7f0a0018 net.micode.notes:layout/abc_screen_simple = 0x7f0a0015 net.micode.notes:layout/abc_popup_menu_item_layout = 0x7f0a0013 net.micode.notes:layout/abc_list_menu_item_radio = 0x7f0a0011 -net.micode.notes:string/widget_under_visit_mode = 0x7f0e0093 +net.micode.notes:string/widget_under_visit_mode = 0x7f0e0099 net.micode.notes:layout/abc_list_menu_item_layout = 0x7f0a0010 net.micode.notes:layout/abc_expanded_menu_layout = 0x7f0a000d net.micode.notes:layout/abc_dialog_title_material = 0x7f0a000c @@ -340,7 +345,7 @@ net.micode.notes:style/Base.Widget.AppCompat.CompoundButton.CheckBox = 0x7f0f007 net.micode.notes:layout/abc_alert_dialog_material = 0x7f0a0009 net.micode.notes:style/Theme.AppCompat.Light = 0x7f0f010b net.micode.notes:style/Animation.AppCompat.Dialog = 0x7f0f0002 -net.micode.notes:string/menu_move_parent_folder = 0x7f0e0057 +net.micode.notes:string/menu_move_parent_folder = 0x7f0e005c net.micode.notes:layout/abc_alert_dialog_button_bar_material = 0x7f0a0008 net.micode.notes:layout/abc_activity_chooser_view = 0x7f0a0006 net.micode.notes:styleable/AnimatedStateListDrawableTransition = 0x7f100009 @@ -348,122 +353,126 @@ net.micode.notes:layout/abc_action_mode_bar = 0x7f0a0004 net.micode.notes:layout/abc_action_menu_item_layout = 0x7f0a0002 net.micode.notes:layout/abc_action_bar_up_container = 0x7f0a0001 net.micode.notes:integer/status_bar_notification_info_maxnum = 0x7f090004 -net.micode.notes:id/wrap_content = 0x7f0800cb -net.micode.notes:id/withText = 0x7f0800ca -net.micode.notes:id/tv_title_bar = 0x7f0800c4 +net.micode.notes:id/wrap_content = 0x7f0800d1 +net.micode.notes:id/withText = 0x7f0800d0 +net.micode.notes:id/tv_title_bar = 0x7f0800ca net.micode.notes:style/TextAppearance.AppCompat.Widget.ActionMode.Subtitle = 0x7f0f00e1 net.micode.notes:layout/abc_list_menu_item_icon = 0x7f0a000f -net.micode.notes:id/tv_modified_date = 0x7f0800c0 -net.micode.notes:id/tv_alert_date = 0x7f0800be -net.micode.notes:id/title_template = 0x7f0800bb -net.micode.notes:id/time = 0x7f0800b8 -net.micode.notes:id/text_num = 0x7f0800b7 +net.micode.notes:id/tv_modified_date = 0x7f0800c6 +net.micode.notes:id/tv_alert_date = 0x7f0800c4 +net.micode.notes:id/title_template = 0x7f0800c1 +net.micode.notes:id/time = 0x7f0800be +net.micode.notes:id/text_num = 0x7f0800bd net.micode.notes:style/Theme.AppCompat.DialogWhenLarge = 0x7f0f010a -net.micode.notes:id/textSpacerNoButtons = 0x7f0800b5 -net.micode.notes:id/tag_unhandled_key_listeners = 0x7f0800b2 -net.micode.notes:id/tag_unhandled_key_event_manager = 0x7f0800b1 +net.micode.notes:id/textSpacerNoButtons = 0x7f0800bb +net.micode.notes:id/tag_unhandled_key_listeners = 0x7f0800b8 +net.micode.notes:id/tag_unhandled_key_event_manager = 0x7f0800b7 net.micode.notes:style/TextAppearance.AppCompat.Light.Widget.PopupMenu.Small = 0x7f0f00cf -net.micode.notes:id/tag_transition_group = 0x7f0800b0 +net.micode.notes:id/tag_transition_group = 0x7f0800b6 net.micode.notes:layout/abc_screen_toolbar = 0x7f0a0017 -net.micode.notes:id/tabMode = 0x7f0800af -net.micode.notes:id/submit_area = 0x7f0800ad -net.micode.notes:string/notealert_enter = 0x7f0e006c -net.micode.notes:id/src_over = 0x7f0800aa -net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0e0034 -net.micode.notes:id/spacer = 0x7f0800a6 +net.micode.notes:id/tabMode = 0x7f0800b5 +net.micode.notes:id/submit_area = 0x7f0800b3 +net.micode.notes:string/notealert_enter = 0x7f0e0072 +net.micode.notes:id/src_over = 0x7f0800b0 +net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0e0037 +net.micode.notes:id/spacer = 0x7f0800ac net.micode.notes:style/Base.Widget.AppCompat.ActionMode = 0x7f0f006f -net.micode.notes:id/shortcut = 0x7f0800a2 -net.micode.notes:id/selection_menu = 0x7f0800a1 -net.micode.notes:id/search_plate = 0x7f08009d -net.micode.notes:id/search_close_btn = 0x7f080099 -net.micode.notes:id/search_bar = 0x7f080097 -net.micode.notes:id/scrollIndicatorUp = 0x7f080094 -net.micode.notes:id/right_side = 0x7f080091 +net.micode.notes:id/shortcut = 0x7f0800a8 +net.micode.notes:id/selection_menu = 0x7f0800a7 +net.micode.notes:id/search_plate = 0x7f0800a3 +net.micode.notes:id/search_close_btn = 0x7f08009f +net.micode.notes:id/search_bar = 0x7f08009d +net.micode.notes:id/scrollIndicatorUp = 0x7f08009a +net.micode.notes:id/right_side = 0x7f080097 net.micode.notes:layout/abc_alert_dialog_title_material = 0x7f0a000a -net.micode.notes:id/right_icon = 0x7f080090 +net.micode.notes:id/right_icon = 0x7f080096 net.micode.notes:string/abc_searchview_description_voice = 0x7f0e0023 -net.micode.notes:id/preference_sync_button = 0x7f08008b +net.micode.notes:id/preference_sync_button = 0x7f080091 net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0f00fa -net.micode.notes:id/tv_time = 0x7f0800c2 -net.micode.notes:id/prefenerece_sync_status_textview = 0x7f08008a -net.micode.notes:style/RtlOverlay.Widget.AppCompat.Search.DropDown.Query = 0x7f0f00ba -net.micode.notes:attr/fontProviderFetchTimeout = 0x7f030078 -net.micode.notes:id/parentPanel = 0x7f080089 -net.micode.notes:id/notification_main_column_container = 0x7f080088 +net.micode.notes:id/tv_time = 0x7f0800c8 +net.micode.notes:id/prefenerece_sync_status_textview = 0x7f080090 +net.micode.notes:id/notification_main_column_container = 0x7f08008e net.micode.notes:style/Widget.AppCompat.ListView.Menu = 0x7f0f014e -net.micode.notes:id/notification_main_column = 0x7f080087 +net.micode.notes:id/notification_main_column = 0x7f08008d net.micode.notes:style/TextAppearance.AppCompat.Widget.PopupMenu.Small = 0x7f0f00ec -net.micode.notes:id/notification_background = 0x7f080086 -net.micode.notes:string/menu_list_mode = 0x7f0e0055 -net.micode.notes:drawable/abc_list_divider_material = 0x7f070028 -net.micode.notes:id/note_title = 0x7f080084 +net.micode.notes:id/notification_background = 0x7f08008c +net.micode.notes:id/notes_list = 0x7f08008b +net.micode.notes:style/Base.Theme.AppCompat.Dialog.FixedSize = 0x7f0f0040 +net.micode.notes:id/note_item = 0x7f080089 net.micode.notes:attr/actionModeBackground = 0x7f030010 -net.micode.notes:id/normal = 0x7f08007f +net.micode.notes:id/normal = 0x7f080085 net.micode.notes:attr/actionModeSplitBackground = 0x7f03001a -net.micode.notes:id/never = 0x7f08007d -net.micode.notes:id/multiply = 0x7f08007b -net.micode.notes:id/middle = 0x7f080078 +net.micode.notes:id/never = 0x7f080083 +net.micode.notes:id/multiply = 0x7f080081 +net.micode.notes:id/middle = 0x7f08007e net.micode.notes:string/abc_font_family_subhead_material = 0x7f0e0012 -net.micode.notes:id/menu_time_order = 0x7f080076 -net.micode.notes:id/menu_search = 0x7f080071 -net.micode.notes:id/menu_restore = 0x7f080070 -net.micode.notes:id/menu_delete_remind = 0x7f08006a +net.micode.notes:id/menu_time_order = 0x7f08007c +net.micode.notes:id/menu_search = 0x7f080077 +net.micode.notes:id/menu_restore = 0x7f080076 +net.micode.notes:style/TextAppearance.AppCompat.Light.Widget.PopupMenu.Large = 0x7f0f00ce +net.micode.notes:id/menu_delete_secret = 0x7f080070 +net.micode.notes:id/menu_delete_remind = 0x7f08006f net.micode.notes:style/Widget.AppCompat.Toolbar.Button.Navigation = 0x7f0f0161 -net.micode.notes:id/menu_change_view = 0x7f080068 -net.micode.notes:id/menu_alert = 0x7f080067 +net.micode.notes:id/menu_change_view = 0x7f08006d +net.micode.notes:id/menu_alert = 0x7f08006c net.micode.notes:style/Widget.AppCompat.SeekBar = 0x7f0f0159 -net.micode.notes:drawable/notification_bg_normal = 0x7f07008d -net.micode.notes:id/ll_font_super = 0x7f080066 +net.micode.notes:drawable/notification_bg_normal = 0x7f07008e +net.micode.notes:id/ll_font_super = 0x7f08006a net.micode.notes:dimen/abc_dialog_fixed_width_major = 0x7f06001e -net.micode.notes:id/ll_font_small = 0x7f080065 +net.micode.notes:id/ll_font_small = 0x7f080069 net.micode.notes:string/abc_menu_delete_shortcut_label = 0x7f0e0016 net.micode.notes:color/abc_background_cache_hint_selector_material_dark = 0x7f050000 -net.micode.notes:id/ll_font_normal = 0x7f080064 +net.micode.notes:id/ll_font_normal = 0x7f080068 net.micode.notes:integer/abc_config_activityShortDur = 0x7f090001 -net.micode.notes:id/list_item = 0x7f080062 -net.micode.notes:string/menu_init_order = 0x7f0e0054 -net.micode.notes:id/top = 0x7f0800bc -net.micode.notes:id/fill_horizontal = 0x7f080041 -net.micode.notes:id/left = 0x7f08005e +net.micode.notes:id/list_item = 0x7f080066 +net.micode.notes:string/menu_init_order = 0x7f0e0059 +net.micode.notes:id/top = 0x7f0800c2 +net.micode.notes:id/fill_horizontal = 0x7f080044 +net.micode.notes:id/left = 0x7f080062 net.micode.notes:style/TextAppearance.AppCompat.Display4 = 0x7f0f00c7 -net.micode.notes:id/iv_super_select = 0x7f08005d +net.micode.notes:id/iv_super_select = 0x7f080061 net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.ActionBar.Subtitle = 0x7f0f0029 -net.micode.notes:id/note_edit_view = 0x7f080082 +net.micode.notes:id/note_edit_view = 0x7f080088 net.micode.notes:style/TextAppearanceNormal = 0x7f0f00f9 -net.micode.notes:id/iv_small_select = 0x7f08005c -net.micode.notes:drawable/notification_action_background = 0x7f070088 -net.micode.notes:id/iv_bg_white_select = 0x7f080057 +net.micode.notes:id/iv_small_select = 0x7f080060 +net.micode.notes:id/iv_lock = 0x7f08005e +net.micode.notes:drawable/notification_action_background = 0x7f070089 +net.micode.notes:id/iv_bg_white_select = 0x7f08005a net.micode.notes:attr/actionModePasteDrawable = 0x7f030016 -net.micode.notes:id/iv_bg_red_select = 0x7f080055 -net.micode.notes:id/widget_text = 0x7f0800c9 +net.micode.notes:id/iv_bg_red_select = 0x7f080058 +net.micode.notes:id/widget_text = 0x7f0800cf net.micode.notes:attr/indeterminateProgressStyle = 0x7f030089 -net.micode.notes:id/iv_bg_green_select = 0x7f080053 +net.micode.notes:id/iv_bg_green_select = 0x7f080056 net.micode.notes:style/TextAppearance.AppCompat.Subhead = 0x7f0f00d7 net.micode.notes:attr/actionModeCopyDrawable = 0x7f030013 -net.micode.notes:drawable/widget_4x_yellow = 0x7f0700a3 -net.micode.notes:id/image = 0x7f08004c +net.micode.notes:drawable/widget_4x_yellow = 0x7f0700a4 +net.micode.notes:id/image = 0x7f08004f net.micode.notes:dimen/hint_pressed_alpha_material_dark = 0x7f060059 -net.micode.notes:id/icon_group = 0x7f08004a -net.micode.notes:id/home = 0x7f080046 +net.micode.notes:id/icon_group = 0x7f08004d +net.micode.notes:id/home = 0x7f080049 net.micode.notes:color/secondary_text_dark = 0x7f050049 -net.micode.notes:id/group_divider = 0x7f080045 +net.micode.notes:id/group_divider = 0x7f080048 net.micode.notes:layout/abc_list_menu_item_checkbox = 0x7f0a000e net.micode.notes:drawable/abc_list_longpressed_holo = 0x7f07002b -net.micode.notes:id/forever = 0x7f080044 -net.micode.notes:string/error_sdcard_unmounted = 0x7f0e0037 -net.micode.notes:id/font_size_selector = 0x7f080043 +net.micode.notes:id/forever = 0x7f080047 +net.micode.notes:string/error_sdcard_unmounted = 0x7f0e003a +net.micode.notes:id/editText_describe = 0x7f08003a +net.micode.notes:id/font_size_selector = 0x7f080046 net.micode.notes:style/NoteTheme = 0x7f0f00a3 net.micode.notes:drawable/abc_cab_background_top_mtrl_alpha = 0x7f07000f -net.micode.notes:id/fill_vertical = 0x7f080042 +net.micode.notes:id/fill_vertical = 0x7f080045 net.micode.notes:style/Base.V7.Theme.AppCompat.Light = 0x7f0f0061 net.micode.notes:color/primary_material_light = 0x7f050041 -net.micode.notes:id/iv_large_select = 0x7f08005a +net.micode.notes:id/iv_large_select = 0x7f08005d net.micode.notes:style/Widget.AppCompat.ButtonBar.AlertDialog = 0x7f0f012c net.micode.notes:style/Base.Widget.AppCompat.RatingBar = 0x7f0f0094 -net.micode.notes:id/expanded_menu = 0x7f08003f -net.micode.notes:id/expand_activities_button = 0x7f08003e -net.micode.notes:id/et_foler_name = 0x7f08003d -net.micode.notes:id/edit_query = 0x7f08003a +net.micode.notes:id/expanded_menu = 0x7f080042 +net.micode.notes:id/expand_activities_button = 0x7f080041 +net.micode.notes:id/et_foler_name = 0x7f08003f +net.micode.notes:id/edit_query = 0x7f08003c +net.micode.notes:drawable/abc_ic_search_api_material = 0x7f07001e +net.micode.notes:id/SHIFT = 0x7f080004 +net.micode.notes:id/editText_password = 0x7f08003b net.micode.notes:style/Theme.AppCompat.Light.Dialog.MinWidth = 0x7f0f010f net.micode.notes:id/custom = 0x7f080033 net.micode.notes:id/content = 0x7f080031 @@ -477,29 +486,27 @@ net.micode.notes:id/chronometer = 0x7f08002d net.micode.notes:style/Widget.AppCompat.PopupMenu = 0x7f0f014f net.micode.notes:id/center_vertical = 0x7f08002b net.micode.notes:id/btn_new_note = 0x7f080025 -net.micode.notes:style/Base.Theme.AppCompat.Dialog.FixedSize = 0x7f0f0040 -net.micode.notes:id/note_item = 0x7f080083 net.micode.notes:style/Theme.AppCompat.Dialog.MinWidth = 0x7f0f0109 -net.micode.notes:id/italic = 0x7f08004e +net.micode.notes:id/italic = 0x7f080051 net.micode.notes:style/Base.Theme.AppCompat.Light.DarkActionBar = 0x7f0f0044 net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.Button.Borderless.Colored = 0x7f0f0030 -net.micode.notes:string/format_folder_files_count = 0x7f0e0042 +net.micode.notes:string/format_folder_files_count = 0x7f0e0045 net.micode.notes:id/bottom = 0x7f080024 net.micode.notes:id/beginning = 0x7f080022 net.micode.notes:attr/colorControlHighlight = 0x7f03004f net.micode.notes:id/async = 0x7f080021 -net.micode.notes:id/title = 0x7f0800b9 -net.micode.notes:id/iv_bg_white = 0x7f080056 +net.micode.notes:id/title = 0x7f0800bf +net.micode.notes:id/iv_bg_white = 0x7f080059 net.micode.notes:dimen/compat_button_inset_horizontal_material = 0x7f06004b net.micode.notes:id/amPm = 0x7f080020 net.micode.notes:style/Base.Widget.AppCompat.ButtonBar = 0x7f0f0078 net.micode.notes:id/always = 0x7f08001f net.micode.notes:id/alertTitle = 0x7f08001d -net.micode.notes:string/delete_remind_time_message = 0x7f0e0032 +net.micode.notes:string/delete_remind_time_message = 0x7f0e0035 net.micode.notes:id/actions = 0x7f08001a net.micode.notes:id/action_text = 0x7f080019 net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.PopupMenu.Header = 0x7f0f0034 -net.micode.notes:string/notelist_menu_new = 0x7f0e006e +net.micode.notes:string/notelist_menu_new = 0x7f0e0074 net.micode.notes:color/material_grey_50 = 0x7f050037 net.micode.notes:id/action_mode_close_button = 0x7f080017 net.micode.notes:id/action_mode_bar = 0x7f080015 @@ -516,50 +523,48 @@ net.micode.notes:id/account_dialog_subtitle = 0x7f080006 net.micode.notes:style/RtlOverlay.Widget.AppCompat.PopupMenuItem.Shortcut = 0x7f0f00b3 net.micode.notes:attr/buttonBarPositiveButtonStyle = 0x7f03003b net.micode.notes:id/FUNCTION = 0x7f080002 -net.micode.notes:id/iv_bg_blue_select = 0x7f080051 +net.micode.notes:id/iv_bg_blue_select = 0x7f080054 net.micode.notes:attr/autoSizeMinTextSize = 0x7f03002d -net.micode.notes:id/none = 0x7f08007e -net.micode.notes:drawable/widget_4x_red = 0x7f0700a1 -net.micode.notes:drawable/widget_2x_white = 0x7f07009d -net.micode.notes:drawable/widget_2x_green = 0x7f07009b +net.micode.notes:id/none = 0x7f080084 +net.micode.notes:drawable/widget_4x_red = 0x7f0700a2 +net.micode.notes:drawable/widget_2x_white = 0x7f07009e +net.micode.notes:drawable/widget_2x_green = 0x7f07009c net.micode.notes:style/Base.Widget.AppCompat.Spinner.Underlined = 0x7f0f009c -net.micode.notes:drawable/tooltip_frame_dark = 0x7f070098 -net.micode.notes:id/homeAsUp = 0x7f080047 +net.micode.notes:drawable/tooltip_frame_dark = 0x7f070099 +net.micode.notes:id/homeAsUp = 0x7f08004a net.micode.notes:drawable/abc_text_cursor_material = 0x7f070047 -net.micode.notes:drawable/title_bar_bg = 0x7f070097 -net.micode.notes:drawable/title_alert = 0x7f070096 +net.micode.notes:drawable/title_bar_bg = 0x7f070098 +net.micode.notes:drawable/title_alert = 0x7f070097 net.micode.notes:color/abc_background_cache_hint_selector_material_light = 0x7f050001 -net.micode.notes:drawable/selected = 0x7f070095 +net.micode.notes:drawable/selected = 0x7f070096 net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.PopupMenu.Large = 0x7f0f0035 -net.micode.notes:drawable/search_result = 0x7f070094 -net.micode.notes:drawable/abc_ic_search_api_material = 0x7f07001e -net.micode.notes:id/SHIFT = 0x7f080004 +net.micode.notes:drawable/search_result = 0x7f070095 net.micode.notes:attr/fontFamily = 0x7f030074 -net.micode.notes:drawable/notify_panel_notification_icon_bg = 0x7f070093 +net.micode.notes:drawable/notify_panel_notification_icon_bg = 0x7f070094 net.micode.notes:string/abc_font_family_caption_material = 0x7f0e000b -net.micode.notes:drawable/notification_template_icon_bg = 0x7f070090 -net.micode.notes:string/search_hint = 0x7f0e0083 -net.micode.notes:id/text = 0x7f0800b3 -net.micode.notes:drawable/notification_icon_background = 0x7f07008f -net.micode.notes:drawable/notification_bg_normal_pressed = 0x7f07008e +net.micode.notes:drawable/notification_template_icon_bg = 0x7f070091 +net.micode.notes:string/search_hint = 0x7f0e0089 +net.micode.notes:id/text = 0x7f0800b9 +net.micode.notes:drawable/notification_icon_background = 0x7f070090 +net.micode.notes:drawable/notification_bg_normal_pressed = 0x7f07008f net.micode.notes:drawable/abc_edit_text_material = 0x7f070012 -net.micode.notes:drawable/notification_bg_low_pressed = 0x7f07008c -net.micode.notes:id/src_in = 0x7f0800a9 +net.micode.notes:drawable/notification_bg_low_pressed = 0x7f07008d +net.micode.notes:id/src_in = 0x7f0800af net.micode.notes:attr/paddingStart = 0x7f0300ae -net.micode.notes:drawable/notification_bg_low_normal = 0x7f07008b +net.micode.notes:drawable/notification_bg_low_normal = 0x7f07008c net.micode.notes:style/Base.Widget.AppCompat.Button = 0x7f0f0072 -net.micode.notes:id/note_bg_color_selector = 0x7f080080 +net.micode.notes:id/note_bg_color_selector = 0x7f080086 net.micode.notes:style/Base.Widget.AppCompat.Button.Borderless = 0x7f0f0073 net.micode.notes:style/Base.TextAppearance.AppCompat.SearchResult.Title = 0x7f0f0020 net.micode.notes:anim/abc_tooltip_exit = 0x7f01000b -net.micode.notes:drawable/new_note_pressed = 0x7f070085 -net.micode.notes:drawable/new_note_normal = 0x7f070084 -net.micode.notes:drawable/menu_delete = 0x7f070081 +net.micode.notes:drawable/new_note_pressed = 0x7f070086 +net.micode.notes:drawable/new_note_normal = 0x7f070085 +net.micode.notes:drawable/menu_delete = 0x7f070082 net.micode.notes:drawable/abc_text_select_handle_middle_mtrl_dark = 0x7f07004a net.micode.notes:drawable/list_yellow_up = 0x7f070080 net.micode.notes:drawable/list_yellow_single = 0x7f07007f net.micode.notes:styleable/MenuView = 0x7f10001e -net.micode.notes:string/format_date_ymd = 0x7f0e003f +net.micode.notes:string/format_date_ymd = 0x7f0e0042 net.micode.notes:string/abc_activity_chooser_view_see_all = 0x7f0e0004 net.micode.notes:attr/numericModifiers = 0x7f0300aa net.micode.notes:drawable/list_yellow_middle = 0x7f07007e @@ -571,30 +576,31 @@ net.micode.notes:drawable/list_red_up = 0x7f070078 net.micode.notes:style/Base.Theme.AppCompat.Dialog = 0x7f0f003e net.micode.notes:dimen/abc_text_size_caption_material = 0x7f06003c net.micode.notes:drawable/list_red_single = 0x7f070077 +net.micode.notes:id/menu_add_secret = 0x7f08006b net.micode.notes:drawable/abc_ic_star_half_black_36dp = 0x7f070023 net.micode.notes:drawable/list_red_middle = 0x7f070076 net.micode.notes:drawable/list_green_down = 0x7f070071 net.micode.notes:style/Widget.AppCompat.ActionBar = 0x7f0f011a -net.micode.notes:id/showCustom = 0x7f0800a3 +net.micode.notes:id/showCustom = 0x7f0800a9 net.micode.notes:id/disableHome = 0x7f080039 net.micode.notes:style/Widget.AppCompat.Light.ActionBar.Solid = 0x7f0f0135 net.micode.notes:drawable/list_footer_bg = 0x7f070070 net.micode.notes:style/Widget.AppCompat.Light.ActionBar.TabBar.Inverse = 0x7f0f0138 net.micode.notes:drawable/abc_menu_hardkey_panel_mtrl_mult = 0x7f070034 net.micode.notes:drawable/list_folder = 0x7f07006f -net.micode.notes:id/ifRoom = 0x7f08004b +net.micode.notes:id/ifRoom = 0x7f08004e net.micode.notes:drawable/list_blue_up = 0x7f07006e net.micode.notes:dimen/tooltip_margin = 0x7f060071 -net.micode.notes:id/menu_font_size = 0x7f08006c +net.micode.notes:id/menu_font_size = 0x7f080072 net.micode.notes:drawable/list_blue_single = 0x7f07006d net.micode.notes:style/TextAppearance.AppCompat.Title.Inverse = 0x7f0f00da -net.micode.notes:string/hint_foler_name = 0x7f0e0044 +net.micode.notes:string/hint_foler_name = 0x7f0e0047 net.micode.notes:drawable/abc_cab_background_top_material = 0x7f07000e net.micode.notes:drawable/font_super = 0x7f070068 -net.micode.notes:string/menu_deselect_all = 0x7f0e004a -net.micode.notes:id/minute = 0x7f080079 +net.micode.notes:string/menu_deselect_all = 0x7f0e004f +net.micode.notes:id/minute = 0x7f08007f net.micode.notes:drawable/font_small = 0x7f070067 -net.micode.notes:id/iv_medium_select = 0x7f08005b +net.micode.notes:id/iv_medium_select = 0x7f08005f net.micode.notes:attr/selectableItemBackgroundBorderless = 0x7f0300c4 net.micode.notes:drawable/edit_yellow = 0x7f070063 net.micode.notes:drawable/edit_white = 0x7f070062 @@ -611,23 +617,23 @@ net.micode.notes:id/action_bar = 0x7f080008 net.micode.notes:drawable/abc_item_background_holo_dark = 0x7f070026 net.micode.notes:drawable/abc_text_select_handle_middle_mtrl_light = 0x7f07004b net.micode.notes:attr/searchViewStyle = 0x7f0300c1 -net.micode.notes:drawable/widget_4x_green = 0x7f0700a0 -net.micode.notes:id/topPanel = 0x7f0800bd +net.micode.notes:drawable/widget_4x_green = 0x7f0700a1 +net.micode.notes:id/topPanel = 0x7f0800c3 net.micode.notes:dimen/abc_edit_text_inset_bottom_material = 0x7f06002c net.micode.notes:drawable/abc_tab_indicator_mtrl_alpha = 0x7f070046 -net.micode.notes:id/tv_folder_name = 0x7f0800bf +net.micode.notes:id/tv_folder_name = 0x7f0800c5 net.micode.notes:drawable/abc_btn_switch_to_on_mtrl_00012 = 0x7f07000c net.micode.notes:drawable/abc_switch_track_mtrl_alpha = 0x7f070044 net.micode.notes:style/Widget.AppCompat.Spinner.DropDown.ActionBar = 0x7f0f015d net.micode.notes:string/abc_action_menu_overflow_description = 0x7f0e0002 -net.micode.notes:id/icon = 0x7f080049 +net.micode.notes:id/icon = 0x7f08004c net.micode.notes:id/action_bar_root = 0x7f08000b net.micode.notes:attr/seekBarStyle = 0x7f0300c2 net.micode.notes:drawable/abc_spinner_mtrl_am_alpha = 0x7f070041 net.micode.notes:drawable/abc_seekbar_track_material = 0x7f070040 net.micode.notes:drawable/abc_seekbar_tick_mark_material = 0x7f07003f net.micode.notes:style/Widget.AppCompat.Button.Borderless.Colored = 0x7f0f0127 -net.micode.notes:id/info = 0x7f08004d +net.micode.notes:id/info = 0x7f080050 net.micode.notes:drawable/abc_ic_menu_copy_mtrl_am_alpha = 0x7f070018 net.micode.notes:drawable/list_green_up = 0x7f070074 net.micode.notes:style/Widget.AppCompat.Light.ActionBar.Solid.Inverse = 0x7f0f0136 @@ -636,17 +642,17 @@ net.micode.notes:drawable/abc_scrubber_track_mtrl_alpha = 0x7f07003d net.micode.notes:drawable/abc_scrubber_control_to_pressed_mtrl_005 = 0x7f07003b net.micode.notes:id/add = 0x7f08001c net.micode.notes:drawable/abc_scrubber_control_to_pressed_mtrl_000 = 0x7f07003a -net.micode.notes:drawable/widget_4x_white = 0x7f0700a2 +net.micode.notes:drawable/widget_4x_white = 0x7f0700a3 net.micode.notes:attr/buttonTintMode = 0x7f030043 net.micode.notes:drawable/abc_scrubber_control_off_mtrl_alpha = 0x7f070039 net.micode.notes:drawable/abc_ratingbar_indicator_material = 0x7f070036 net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.ActionMode.Subtitle = 0x7f0f002d net.micode.notes:drawable/abc_popup_background_mtrl_mult = 0x7f070035 -net.micode.notes:id/search_button = 0x7f080098 +net.micode.notes:id/search_button = 0x7f08009e net.micode.notes:drawable/list_blue_down = 0x7f07006b -net.micode.notes:id/menu_new_note = 0x7f08006f +net.micode.notes:id/menu_new_note = 0x7f080075 net.micode.notes:string/abc_action_bar_up_description = 0x7f0e0001 -net.micode.notes:id/iv_bg_green = 0x7f080052 +net.micode.notes:id/iv_bg_green = 0x7f080055 net.micode.notes:drawable/abc_list_selector_holo_light = 0x7f070033 net.micode.notes:attr/collapseContentDescription = 0x7f030048 net.micode.notes:drawable/abc_list_selector_holo_dark = 0x7f070032 @@ -655,6 +661,9 @@ net.micode.notes:attr/autoSizePresetSizes = 0x7f03002e net.micode.notes:array/format_for_exported_note = 0x7f020000 net.micode.notes:drawable/abc_list_selector_background_transition_holo_light = 0x7f07002f net.micode.notes:drawable/abc_list_pressed_holo_light = 0x7f07002d +net.micode.notes:string/menu_list_mode = 0x7f0e005a +net.micode.notes:id/note_title = 0x7f08008a +net.micode.notes:drawable/abc_list_divider_material = 0x7f070028 net.micode.notes:style/Base.V22.Theme.AppCompat.Light = 0x7f0f0057 net.micode.notes:dimen/notification_right_side_padding_top = 0x7f060064 net.micode.notes:drawable/abc_ic_star_half_black_48dp = 0x7f070024 @@ -664,19 +673,19 @@ net.micode.notes:drawable/abc_ic_star_black_48dp = 0x7f070021 net.micode.notes:color/abc_primary_text_material_dark = 0x7f05000a net.micode.notes:drawable/list_red_down = 0x7f070075 net.micode.notes:drawable/list_blue_middle = 0x7f07006c -net.micode.notes:string/preferences_menu_cancel = 0x7f0e007c +net.micode.notes:string/preferences_menu_cancel = 0x7f0e0082 net.micode.notes:drawable/abc_ic_star_black_36dp = 0x7f070020 net.micode.notes:drawable/abc_ic_star_black_16dp = 0x7f07001f net.micode.notes:drawable/abc_ic_menu_selectall_mtrl_alpha = 0x7f07001c -net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f070086 +net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f070087 net.micode.notes:id/date = 0x7f080035 -net.micode.notes:id/search_voice_btn = 0x7f08009f +net.micode.notes:id/search_voice_btn = 0x7f0800a5 net.micode.notes:drawable/abc_ic_menu_paste_mtrl_am_alpha = 0x7f07001b net.micode.notes:drawable/abc_ic_menu_overflow_material = 0x7f07001a net.micode.notes:style/Platform.V21.AppCompat.Light = 0x7f0f00aa net.micode.notes:drawable/abc_ic_menu_cut_mtrl_alpha = 0x7f070019 -net.micode.notes:string/preferences_button_sync_cancel = 0x7f0e0074 -net.micode.notes:id/search_edit_frame = 0x7f08009a +net.micode.notes:string/preferences_button_sync_cancel = 0x7f0e007a +net.micode.notes:id/search_edit_frame = 0x7f0800a0 net.micode.notes:drawable/abc_ic_go_search_api_material = 0x7f070017 net.micode.notes:style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse = 0x7f0f00de net.micode.notes:drawable/abc_ic_commit_search_api_mtrl_alpha = 0x7f070016 @@ -703,7 +712,7 @@ net.micode.notes:dimen/tooltip_precise_anchor_threshold = 0x7f060073 net.micode.notes:id/action_bar_spinner = 0x7f08000c net.micode.notes:dimen/tooltip_horizontal_padding = 0x7f060070 net.micode.notes:style/ThemeOverlay.AppCompat.Dark = 0x7f0f0115 -net.micode.notes:drawable/notification_tile_bg = 0x7f070092 +net.micode.notes:drawable/notification_tile_bg = 0x7f070093 net.micode.notes:attr/elevation = 0x7f030070 net.micode.notes:attr/collapseIcon = 0x7f030049 net.micode.notes:dimen/tooltip_corner_radius = 0x7f06006f @@ -715,15 +724,15 @@ net.micode.notes:attr/actionBarTabStyle = 0x7f030007 net.micode.notes:dimen/text_font_size_normal = 0x7f06006c net.micode.notes:dimen/text_font_size_medium = 0x7f06006b net.micode.notes:style/Base.TextAppearance.AppCompat.Display3 = 0x7f0f0013 -net.micode.notes:id/iv_alert_icon = 0x7f08004f +net.micode.notes:id/iv_alert_icon = 0x7f080052 net.micode.notes:color/material_grey_100 = 0x7f050035 net.micode.notes:dimen/text_font_size_large = 0x7f06006a net.micode.notes:dimen/notification_top_pad_large_text = 0x7f060069 -net.micode.notes:id/up = 0x7f0800c6 +net.micode.notes:id/up = 0x7f0800cc net.micode.notes:color/abc_tint_default = 0x7f050013 -net.micode.notes:id/menu_delete = 0x7f080069 +net.micode.notes:id/menu_delete = 0x7f08006e net.micode.notes:drawable/abc_control_background_material = 0x7f070010 -net.micode.notes:id/src_atop = 0x7f0800a8 +net.micode.notes:id/src_atop = 0x7f0800ae net.micode.notes:color/abc_primary_text_disable_only_material_dark = 0x7f050008 net.micode.notes:dimen/notification_right_icon_size = 0x7f060063 net.micode.notes:dimen/notification_main_column_padding_top = 0x7f060061 @@ -731,13 +740,13 @@ net.micode.notes:style/TextAppearance.AppCompat.Widget.ActionMode.Subtitle.Inver net.micode.notes:dimen/notification_large_icon_width = 0x7f060060 net.micode.notes:attr/navigationContentDescription = 0x7f0300a7 net.micode.notes:attr/progressBarPadding = 0x7f0300b7 -net.micode.notes:id/menu_list_mode = 0x7f08006d +net.micode.notes:id/menu_list_mode = 0x7f080073 net.micode.notes:style/TextAppearance.Compat.Notification.Info = 0x7f0f00f0 net.micode.notes:style/TextAppearance.AppCompat.Headline = 0x7f0f00c8 net.micode.notes:dimen/notification_large_icon_height = 0x7f06005f net.micode.notes:dimen/notification_content_margin_start = 0x7f06005e net.micode.notes:dimen/notification_action_icon_size = 0x7f06005b -net.micode.notes:id/widget_bg_image = 0x7f0800c8 +net.micode.notes:id/widget_bg_image = 0x7f0800ce net.micode.notes:dimen/hint_alpha_material_dark = 0x7f060057 net.micode.notes:dimen/highlight_alpha_material_dark = 0x7f060055 net.micode.notes:dimen/compat_button_padding_vertical_material = 0x7f06004e @@ -748,9 +757,9 @@ net.micode.notes:dimen/disabled_alpha_material_dark = 0x7f060052 net.micode.notes:style/Widget.AppCompat.CompoundButton.CheckBox = 0x7f0f012d net.micode.notes:dimen/compat_notification_large_icon_max_height = 0x7f060050 net.micode.notes:style/Widget.Compat.NotificationActionText = 0x7f0f0163 -net.micode.notes:string/error_note_not_exist = 0x7f0e0035 +net.micode.notes:string/error_note_not_exist = 0x7f0e0038 net.micode.notes:id/action_bar_activity_content = 0x7f080009 -net.micode.notes:layout/notification_template_custom_big = 0x7f0a0029 +net.micode.notes:layout/notification_template_custom_big = 0x7f0a002b net.micode.notes:dimen/compat_button_padding_horizontal_material = 0x7f06004d net.micode.notes:color/bright_foreground_disabled_material_dark = 0x7f05001e net.micode.notes:drawable/abc_ic_star_half_black_16dp = 0x7f070022 @@ -760,15 +769,17 @@ net.micode.notes:styleable/Spinner = 0x7f100023 net.micode.notes:dimen/abc_text_size_title_material_toolbar = 0x7f06004a net.micode.notes:color/primary_material_dark = 0x7f050040 net.micode.notes:dimen/abc_text_size_subtitle_material_toolbar = 0x7f060048 +net.micode.notes:style/ThemeOverlay.AppCompat.Dialog.Alert = 0x7f0f0118 +net.micode.notes:id/et_input_passwd = 0x7f080040 net.micode.notes:id/contentPanel = 0x7f080032 net.micode.notes:dimen/abc_text_size_menu_material = 0x7f060045 -net.micode.notes:id/right = 0x7f08008f +net.micode.notes:id/right = 0x7f080095 net.micode.notes:dimen/abc_text_size_large_material = 0x7f060042 net.micode.notes:dimen/abc_text_size_display_4_material = 0x7f060040 net.micode.notes:dimen/abc_seekbar_track_background_height_material = 0x7f060035 net.micode.notes:dimen/abc_text_size_display_3_material = 0x7f06003f net.micode.notes:dimen/abc_text_size_display_1_material = 0x7f06003d -net.micode.notes:id/note_edit_list = 0x7f080081 +net.micode.notes:id/note_edit_list = 0x7f080087 net.micode.notes:attr/progressBarStyle = 0x7f0300b8 net.micode.notes:dimen/abc_text_size_button_material = 0x7f06003b net.micode.notes:style/Base.Widget.AppCompat.ActionBar.Solid = 0x7f0f0068 @@ -785,27 +796,27 @@ net.micode.notes:attr/colorBackgroundFloating = 0x7f03004c net.micode.notes:dimen/abc_progress_bar_height_material = 0x7f060032 net.micode.notes:anim/abc_slide_out_top = 0x7f010009 net.micode.notes:dimen/abc_panel_menu_list_width = 0x7f060031 -net.micode.notes:layout/select_dialog_item_material = 0x7f0a002d +net.micode.notes:layout/select_dialog_item_material = 0x7f0a002f net.micode.notes:dimen/abc_edit_text_inset_top_material = 0x7f06002e net.micode.notes:attr/allowStacking = 0x7f030026 net.micode.notes:attr/fontProviderPackage = 0x7f030079 -net.micode.notes:id/line3 = 0x7f080060 +net.micode.notes:id/line3 = 0x7f080064 net.micode.notes:dimen/abc_edit_text_inset_horizontal_material = 0x7f06002d -net.micode.notes:drawable/widget_4x_blue = 0x7f07009f +net.micode.notes:drawable/widget_4x_blue = 0x7f0700a0 net.micode.notes:dimen/abc_dropdownitem_text_padding_left = 0x7f06002a net.micode.notes:dimen/abc_disabled_alpha_material_light = 0x7f060028 net.micode.notes:style/TextAppearance.AppCompat.Menu = 0x7f0f00d2 -net.micode.notes:layout/note_list_footer = 0x7f0a0026 +net.micode.notes:layout/note_list_footer = 0x7f0a0028 net.micode.notes:dimen/abc_disabled_alpha_material_dark = 0x7f060027 net.micode.notes:dimen/abc_dialog_padding_top_material = 0x7f060025 -net.micode.notes:id/start = 0x7f0800ab +net.micode.notes:id/start = 0x7f0800b1 net.micode.notes:dimen/abc_dialog_padding_material = 0x7f060024 net.micode.notes:color/switch_thumb_disabled_material_dark = 0x7f05004e net.micode.notes:dimen/abc_dialog_list_padding_top_no_title = 0x7f060021 net.micode.notes:dimen/abc_dialog_fixed_width_minor = 0x7f06001f net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.TextView.SpinnerItem = 0x7f0f0038 net.micode.notes:drawable/abc_btn_check_to_on_mtrl_015 = 0x7f070005 -net.micode.notes:string/search_setting_description = 0x7f0e0086 +net.micode.notes:string/search_setting_description = 0x7f0e008c net.micode.notes:attr/defaultQueryHint = 0x7f030060 net.micode.notes:dimen/abc_dialog_title_divider_material = 0x7f060026 net.micode.notes:dimen/abc_dialog_fixed_height_minor = 0x7f06001d @@ -815,7 +826,7 @@ net.micode.notes:dimen/abc_control_padding_material = 0x7f06001a net.micode.notes:style/Widget.AppCompat.EditText = 0x7f0f0132 net.micode.notes:dimen/abc_action_bar_stacked_tab_max_width = 0x7f06000a net.micode.notes:drawable/abc_text_select_handle_right_mtrl_light = 0x7f07004d -net.micode.notes:layout/notification_template_part_chronometer = 0x7f0a002b +net.micode.notes:layout/notification_template_part_chronometer = 0x7f0a002d net.micode.notes:attr/overlapAnchor = 0x7f0300ab net.micode.notes:dimen/abc_control_inset_material = 0x7f060019 net.micode.notes:dimen/abc_cascading_menus_min_smallest_width = 0x7f060016 @@ -823,12 +834,12 @@ net.micode.notes:id/buttonPanel = 0x7f080027 net.micode.notes:id/SYM = 0x7f080005 net.micode.notes:dimen/abc_button_padding_vertical_material = 0x7f060015 net.micode.notes:dimen/abc_button_padding_horizontal_material = 0x7f060014 -net.micode.notes:drawable/notification = 0x7f070087 +net.micode.notes:drawable/notification = 0x7f070088 net.micode.notes:drawable/abc_text_select_handle_left_mtrl_light = 0x7f070049 net.micode.notes:dimen/abc_button_inset_horizontal_material = 0x7f060012 net.micode.notes:style/ThemeOverlay.AppCompat.Dark.ActionBar = 0x7f0f0116 net.micode.notes:dimen/abc_action_button_min_width_overflow_material = 0x7f06000f -net.micode.notes:string/menu_font_size = 0x7f0e0051 +net.micode.notes:string/menu_font_size = 0x7f0e0056 net.micode.notes:attr/iconifiedByDefault = 0x7f030087 net.micode.notes:dimen/abc_action_button_min_width_material = 0x7f06000e net.micode.notes:attr/actionModeCloseButtonStyle = 0x7f030011 @@ -855,8 +866,8 @@ net.micode.notes:color/user_query_highlight = 0x7f050056 net.micode.notes:id/center_horizontal = 0x7f08002a net.micode.notes:color/switch_thumb_normal_material_dark = 0x7f050052 net.micode.notes:dimen/tooltip_precise_anchor_extra_offset = 0x7f060072 -net.micode.notes:string/menu_alert = 0x7f0e0046 -net.micode.notes:string/alert_message_delete_note = 0x7f0e0028 +net.micode.notes:string/menu_alert = 0x7f0e004b +net.micode.notes:string/alert_message_delete_note = 0x7f0e002a net.micode.notes:color/switch_thumb_material_dark = 0x7f050050 net.micode.notes:color/secondary_text_disabled_material_light = 0x7f05004d net.micode.notes:color/secondary_text_disabled_material_dark = 0x7f05004c @@ -875,7 +886,7 @@ net.micode.notes:color/material_grey_600 = 0x7f050038 net.micode.notes:style/Base.Widget.AppCompat.RatingBar.Small = 0x7f0f0096 net.micode.notes:drawable/abc_textfield_search_activated_mtrl_alpha = 0x7f070050 net.micode.notes:drawable/abc_btn_check_material = 0x7f070003 -net.micode.notes:id/sv_note_edit = 0x7f0800ae +net.micode.notes:id/sv_note_edit = 0x7f0800b4 net.micode.notes:color/tooltip_background_dark = 0x7f050054 net.micode.notes:color/abc_search_url_text_pressed = 0x7f05000e net.micode.notes:dimen/notification_small_icon_background_padding = 0x7f060065 @@ -885,8 +896,8 @@ net.micode.notes:attr/submitBackground = 0x7f0300d2 net.micode.notes:xml/widget_4x_info = 0x7f110003 net.micode.notes:color/material_deep_teal_200 = 0x7f050033 net.micode.notes:attr/listPreferredItemPaddingRight = 0x7f0300a1 -net.micode.notes:layout/select_dialog_multichoice_material = 0x7f0a002e -net.micode.notes:id/search_badge = 0x7f080096 +net.micode.notes:layout/select_dialog_multichoice_material = 0x7f0a0030 +net.micode.notes:id/search_badge = 0x7f08009c net.micode.notes:attr/autoCompleteTextViewStyle = 0x7f03002b net.micode.notes:color/foreground_material_dark = 0x7f05002c net.micode.notes:drawable/abc_vector_test = 0x7f070053 @@ -920,38 +931,37 @@ net.micode.notes:layout/abc_screen_content_include = 0x7f0a0014 net.micode.notes:color/material_grey_300 = 0x7f050036 net.micode.notes:color/abc_secondary_text_material_dark = 0x7f050010 net.micode.notes:color/bright_foreground_inverse_material_light = 0x7f050021 -net.micode.notes:string/ticker_syncing = 0x7f0e0091 -net.micode.notes:string/call_record_folder_name = 0x7f0e002f +net.micode.notes:string/ticker_syncing = 0x7f0e0097 +net.micode.notes:string/call_record_folder_name = 0x7f0e0032 net.micode.notes:color/background_material_light = 0x7f05001d net.micode.notes:color/background_material_dark = 0x7f05001c net.micode.notes:style/TextAppearance.AppCompat.Small = 0x7f0f00d5 -net.micode.notes:layout/note_list_dropdown_menu = 0x7f0a0025 +net.micode.notes:layout/note_list_dropdown_menu = 0x7f0a0027 net.micode.notes:color/background_floating_material_light = 0x7f05001b net.micode.notes:attr/actionBarTabTextStyle = 0x7f030008 net.micode.notes:color/background_floating_material_dark = 0x7f05001a -net.micode.notes:id/et_edit_text = 0x7f08003c +net.micode.notes:id/et_edit_text = 0x7f08003e net.micode.notes:attr/actionBarStyle = 0x7f030005 -net.micode.notes:string/error_sync_internal = 0x7f0e0039 +net.micode.notes:string/error_sync_internal = 0x7f0e003c net.micode.notes:color/abc_tint_switch_track = 0x7f050017 -net.micode.notes:id/notes_list = 0x7f080085 net.micode.notes:color/abc_tint_spinner = 0x7f050016 net.micode.notes:drawable/abc_ic_ab_back_material = 0x7f070013 net.micode.notes:attr/autoSizeStepGranularity = 0x7f03002f net.micode.notes:color/abc_tint_seek_thumb = 0x7f050015 net.micode.notes:attr/measureWithLargestChild = 0x7f0300a5 net.micode.notes:attr/buttonGravity = 0x7f03003d -net.micode.notes:drawable/notification_bg_low = 0x7f07008a +net.micode.notes:drawable/notification_bg_low = 0x7f07008b net.micode.notes:drawable/abc_dialog_material_background = 0x7f070011 net.micode.notes:anim/abc_fade_out = 0x7f010001 net.micode.notes:attr/backgroundTintMode = 0x7f030035 net.micode.notes:color/highlighted_text_material_dark = 0x7f05002e -net.micode.notes:id/fill = 0x7f080040 +net.micode.notes:id/fill = 0x7f080043 net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.ActionMode.Title = 0x7f0f002e net.micode.notes:color/abc_primary_text_material_light = 0x7f05000b net.micode.notes:color/secondary_text_default_material_light = 0x7f05004b net.micode.notes:attr/initialActivityCount = 0x7f03008a net.micode.notes:color/abc_btn_colored_text_material = 0x7f050003 -net.micode.notes:id/submenuarrow = 0x7f0800ac +net.micode.notes:id/submenuarrow = 0x7f0800b2 net.micode.notes:drawable/abc_ic_menu_share_mtrl_alpha = 0x7f07001d net.micode.notes:styleable/ActionBarLayout = 0x7f100001 net.micode.notes:style/Base.V28.Theme.AppCompat.Light = 0x7f0f005e @@ -961,8 +971,8 @@ net.micode.notes:styleable/LinearLayoutCompat_Layout = 0x7f10001a net.micode.notes:id/action_menu_divider = 0x7f080013 net.micode.notes:drawable/abc_text_select_handle_left_mtrl_dark = 0x7f070048 net.micode.notes:attr/alertDialogButtonGroupStyle = 0x7f030022 -net.micode.notes:string/menu_normal_mode = 0x7f0e0058 -net.micode.notes:string/format_exported_file_location = 0x7f0e0041 +net.micode.notes:string/menu_normal_mode = 0x7f0e005d +net.micode.notes:string/format_exported_file_location = 0x7f0e0044 net.micode.notes:bool/abc_config_actionMenuItemAllCaps = 0x7f040002 net.micode.notes:dimen/abc_text_size_headline_material = 0x7f060041 net.micode.notes:style/Base.Widget.AppCompat.SeekBar = 0x7f0f0099 @@ -972,12 +982,12 @@ net.micode.notes:color/bright_foreground_material_dark = 0x7f050022 net.micode.notes:bool/abc_action_bar_embed_tabs = 0x7f040000 net.micode.notes:attr/windowNoTitle = 0x7f03010f net.micode.notes:id/action_menu_presenter = 0x7f080014 -net.micode.notes:string/menu_select_none = 0x7f0e005d +net.micode.notes:string/menu_select_none = 0x7f0e0063 net.micode.notes:attr/closeItemLayout = 0x7f030047 net.micode.notes:style/Widget.AppCompat.Light.PopupMenu = 0x7f0f0146 net.micode.notes:dimen/abc_alert_dialog_button_bar_height = 0x7f060010 net.micode.notes:drawable/abc_list_divider_mtrl_alpha = 0x7f070029 -net.micode.notes:id/search_mag_icon = 0x7f08009c +net.micode.notes:id/search_mag_icon = 0x7f0800a2 net.micode.notes:array/menu_share_ways = 0x7f020001 net.micode.notes:attr/textAppearanceLargePopupMenu = 0x7f0300dd net.micode.notes:attr/windowFixedHeightMinor = 0x7f03010a @@ -985,7 +995,7 @@ net.micode.notes:style/TextAppearance.AppCompat.Medium = 0x7f0f00d0 net.micode.notes:color/abc_hint_foreground_material_dark = 0x7f050005 net.micode.notes:drawable/abc_list_focused_holo = 0x7f07002a net.micode.notes:attr/textAppearanceListItemSecondary = 0x7f0300df -net.micode.notes:drawable/new_note = 0x7f070083 +net.micode.notes:drawable/new_note = 0x7f070084 net.micode.notes:attr/ttcIndex = 0x7f030103 net.micode.notes:anim/abc_slide_out_bottom = 0x7f010008 net.micode.notes:attr/background = 0x7f030031 @@ -996,14 +1006,14 @@ net.micode.notes:layout/abc_activity_chooser_view_list_item = 0x7f0a0007 net.micode.notes:attr/tooltipFrameBackground = 0x7f0300fe net.micode.notes:style/TextAppearance.AppCompat.Widget.ActionMode.Title = 0x7f0f00e3 net.micode.notes:style/Base.TextAppearance.AppCompat.Menu = 0x7f0f001d -net.micode.notes:id/menu_new_folder = 0x7f08006e +net.micode.notes:id/menu_new_folder = 0x7f080074 net.micode.notes:string/abc_searchview_description_search = 0x7f0e0021 net.micode.notes:drawable/call_record = 0x7f070056 net.micode.notes:style/TextAppearance.AppCompat.SearchResult.Title = 0x7f0f00d4 net.micode.notes:attr/singleChoiceItemLayout = 0x7f0300c9 net.micode.notes:attr/titleTextColor = 0x7f0300f9 net.micode.notes:attr/titleTextAppearance = 0x7f0300f8 -net.micode.notes:string/note_link_other = 0x7f0e0069 +net.micode.notes:string/note_link_other = 0x7f0e006f net.micode.notes:drawable/abc_textfield_activated_mtrl_alpha = 0x7f07004e net.micode.notes:dimen/notification_subtext_size = 0x7f060067 net.micode.notes:attr/titleMarginStart = 0x7f0300f5 @@ -1021,8 +1031,8 @@ net.micode.notes:attr/tintMode = 0x7f0300f0 net.micode.notes:attr/layout_insetEdge = 0x7f030094 net.micode.notes:style/Platform.V21.AppCompat = 0x7f0f00a9 net.micode.notes:attr/textColorAlertDialogListItem = 0x7f0300e5 -net.micode.notes:string/app_widget2x2 = 0x7f0e002c -net.micode.notes:id/split_action_bar = 0x7f0800a7 +net.micode.notes:string/app_widget2x2 = 0x7f0e002f +net.micode.notes:id/split_action_bar = 0x7f0800ad net.micode.notes:attr/paddingBottomNoButtons = 0x7f0300ac net.micode.notes:style/Base.Animation.AppCompat.Dialog = 0x7f0f0007 net.micode.notes:attr/buttonPanelSideLayout = 0x7f03003f @@ -1030,16 +1040,16 @@ net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.ActionBar.Subtitle.I net.micode.notes:attr/textAppearancePopupMenuHeader = 0x7f0300e1 net.micode.notes:layout/abc_action_menu_layout = 0x7f0a0003 net.micode.notes:attr/actionBarTheme = 0x7f030009 -net.micode.notes:string/datetime_dialog_cancel = 0x7f0e0030 +net.micode.notes:string/datetime_dialog_cancel = 0x7f0e0033 net.micode.notes:attr/popupMenuStyle = 0x7f0300b3 net.micode.notes:attr/tint = 0x7f0300ef net.micode.notes:style/TextAppearance.AppCompat.Large = 0x7f0f00ca net.micode.notes:color/primary_text_dark = 0x7f050042 -net.micode.notes:id/ll_font_large = 0x7f080063 +net.micode.notes:id/ll_font_large = 0x7f080067 net.micode.notes:id/cb_edit_item = 0x7f080028 -net.micode.notes:string/button_delete = 0x7f0e002e +net.micode.notes:string/button_delete = 0x7f0e0031 net.micode.notes:attr/trackTintMode = 0x7f030102 -net.micode.notes:id/progress_horizontal = 0x7f08008d +net.micode.notes:id/progress_horizontal = 0x7f080093 net.micode.notes:color/secondary_text_default_material_dark = 0x7f05004a net.micode.notes:dimen/abc_text_size_display_2_material = 0x7f06003e net.micode.notes:attr/barLength = 0x7f030036 @@ -1047,16 +1057,16 @@ net.micode.notes:attr/actionMenuTextColor = 0x7f03000f net.micode.notes:style/Base.V7.Theme.AppCompat.Light.Dialog = 0x7f0f0062 net.micode.notes:attr/switchStyle = 0x7f0300da net.micode.notes:id/action_select_all = 0x7f080018 -net.micode.notes:id/scrollIndicatorDown = 0x7f080093 +net.micode.notes:id/scrollIndicatorDown = 0x7f080099 net.micode.notes:attr/textColorSearchUrl = 0x7f0300e6 net.micode.notes:attr/switchPadding = 0x7f0300d9 net.micode.notes:attr/suggestionRowLayout = 0x7f0300d7 net.micode.notes:attr/subtitleTextStyle = 0x7f0300d6 -net.micode.notes:string/menu_move = 0x7f0e0056 +net.micode.notes:string/menu_move = 0x7f0e005b net.micode.notes:dimen/abc_action_bar_stacked_max_height = 0x7f060009 net.micode.notes:style/Theme.AppCompat.DayNight.NoActionBar = 0x7f0f0106 -net.micode.notes:id/search_go_btn = 0x7f08009b -net.micode.notes:drawable/notification_template_icon_low_bg = 0x7f070091 +net.micode.notes:id/search_go_btn = 0x7f0800a1 +net.micode.notes:drawable/notification_template_icon_low_bg = 0x7f070092 net.micode.notes:attr/divider = 0x7f030065 net.micode.notes:attr/subtitleTextColor = 0x7f0300d5 net.micode.notes:attr/statusBarBackground = 0x7f0300d0 @@ -1064,21 +1074,21 @@ net.micode.notes:string/abc_menu_ctrl_shortcut_label = 0x7f0e0015 net.micode.notes:layout/abc_popup_menu_header_item_layout = 0x7f0a0012 net.micode.notes:dimen/abc_switch_padding = 0x7f060038 net.micode.notes:style/Widget.AppCompat.ProgressBar.Horizontal = 0x7f0f0153 -net.micode.notes:string/sync_progress_init_list = 0x7f0e008b +net.micode.notes:string/sync_progress_init_list = 0x7f0e0091 net.micode.notes:color/foreground_material_light = 0x7f05002d -net.micode.notes:id/radio = 0x7f08008e +net.micode.notes:id/radio = 0x7f080094 net.micode.notes:attr/state_above_anchor = 0x7f0300cf net.micode.notes:attr/itemPadding = 0x7f03008c net.micode.notes:attr/dividerPadding = 0x7f030067 -net.micode.notes:layout/note_edit = 0x7f0a0021 +net.micode.notes:layout/note_edit = 0x7f0a0023 net.micode.notes:attr/srcCompat = 0x7f0300ce net.micode.notes:drawable/abc_ic_voice_search_api_material = 0x7f070025 -net.micode.notes:id/search_src_text = 0x7f08009e +net.micode.notes:id/search_src_text = 0x7f0800a4 net.micode.notes:dimen/abc_action_bar_default_padding_start_material = 0x7f060004 net.micode.notes:color/primary_dark_material_light = 0x7f05003f -net.micode.notes:id/text2 = 0x7f0800b4 +net.micode.notes:id/text2 = 0x7f0800ba net.micode.notes:drawable/abc_btn_radio_material = 0x7f070008 -net.micode.notes:id/menu_share = 0x7f080074 +net.micode.notes:id/menu_share = 0x7f08007a net.micode.notes:attr/showTitle = 0x7f0300c8 net.micode.notes:attr/isLightTheme = 0x7f03008b net.micode.notes:style/Base.Widget.AppCompat.ActivityChooserView = 0x7f0f0070 @@ -1093,7 +1103,7 @@ net.micode.notes:drawable/abc_btn_radio_to_on_mtrl_000 = 0x7f070009 net.micode.notes:attr/searchIcon = 0x7f0300c0 net.micode.notes:attr/searchHintIcon = 0x7f0300bf net.micode.notes:style/Base.Widget.AppCompat.DrawerArrowToggle.Common = 0x7f0f007e -net.micode.notes:id/line1 = 0x7f08005f +net.micode.notes:id/line1 = 0x7f080063 net.micode.notes:attr/ratingBarStyleIndicator = 0x7f0300bd net.micode.notes:color/abc_hint_foreground_material_light = 0x7f050006 net.micode.notes:dimen/abc_dialog_min_width_minor = 0x7f060023 @@ -1110,7 +1120,7 @@ net.micode.notes:styleable/ListPopupWindow = 0x7f10001b net.micode.notes:attr/actionViewClass = 0x7f030020 net.micode.notes:style/Widget.AppCompat.ActionButton.CloseMode = 0x7f0f0120 net.micode.notes:attr/dialogPreferredPadding = 0x7f030062 -net.micode.notes:layout/folder_list_item = 0x7f0a0020 +net.micode.notes:layout/folder_list_item = 0x7f0a0022 net.micode.notes:color/accent_material_light = 0x7f050019 net.micode.notes:attr/voiceIcon = 0x7f030105 net.micode.notes:dimen/notification_small_icon_size_as_large = 0x7f060066 @@ -1124,16 +1134,16 @@ net.micode.notes:attr/checkedTextViewStyle = 0x7f030045 net.micode.notes:drawable/edit_title_green = 0x7f07005e net.micode.notes:drawable/abc_seekbar_thumb_material = 0x7f07003e net.micode.notes:drawable/abc_item_background_holo_light = 0x7f070027 -net.micode.notes:string/menu_folder_view = 0x7f0e004e +net.micode.notes:string/menu_folder_view = 0x7f0e0053 net.micode.notes:color/ripple_material_light = 0x7f050048 net.micode.notes:attr/navigationMode = 0x7f0300a9 -net.micode.notes:id/menu_export_text = 0x7f08006b +net.micode.notes:id/menu_export_text = 0x7f080071 net.micode.notes:attr/logo = 0x7f0300a2 net.micode.notes:attr/listPopupWindowStyle = 0x7f03009c net.micode.notes:style/Widget.AppCompat.RatingBar.Small = 0x7f0f0156 net.micode.notes:attr/thumbTintMode = 0x7f0300eb net.micode.notes:attr/actionBarPopupTheme = 0x7f030002 -net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0e0079 +net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0e007f net.micode.notes:layout/abc_action_bar_title_item = 0x7f0a0000 net.micode.notes:attr/listPreferredItemHeightSmall = 0x7f03009f net.micode.notes:style/Base.V7.Widget.AppCompat.EditText = 0x7f0f0065 @@ -1161,13 +1171,13 @@ net.micode.notes:attr/layout_anchorGravity = 0x7f030091 net.micode.notes:color/primary_dark_material_dark = 0x7f05003e net.micode.notes:attr/layout_anchor = 0x7f030090 net.micode.notes:style/Platform.ThemeOverlay.AppCompat.Light = 0x7f0f00a8 -net.micode.notes:string/menu_font_small = 0x7f0e0052 +net.micode.notes:string/menu_font_small = 0x7f0e0057 net.micode.notes:drawable/list_background = 0x7f07006a net.micode.notes:style/Theme.AppCompat.Light.NoActionBar = 0x7f0f0111 net.micode.notes:color/abc_color_highlight_material = 0x7f050004 net.micode.notes:dimen/abc_action_bar_elevation_material = 0x7f060005 net.micode.notes:attr/keylines = 0x7f03008d -net.micode.notes:layout/support_simple_spinner_dropdown_item = 0x7f0a0031 +net.micode.notes:layout/support_simple_spinner_dropdown_item = 0x7f0a0033 net.micode.notes:attr/tooltipForegroundColor = 0x7f0300fd net.micode.notes:dimen/compat_control_corner_material = 0x7f06004f net.micode.notes:attr/alphabeticModifiers = 0x7f030028 @@ -1175,6 +1185,7 @@ net.micode.notes:integer/abc_config_activityDefaultDur = 0x7f090000 net.micode.notes:color/dim_foreground_material_light = 0x7f050029 net.micode.notes:attr/spinBars = 0x7f0300ca net.micode.notes:id/META = 0x7f080003 +net.micode.notes:drawable/lock = 0x7f070081 net.micode.notes:attr/subtitleTextAppearance = 0x7f0300d4 net.micode.notes:id/center = 0x7f080029 net.micode.notes:attr/iconTintMode = 0x7f030086 @@ -1182,18 +1193,18 @@ net.micode.notes:style/Base.TextAppearance.AppCompat.Light.Widget.PopupMenu.Larg net.micode.notes:drawable/abc_spinner_textfield_background_material = 0x7f070042 net.micode.notes:layout/account_dialog_title = 0x7f0a001c net.micode.notes:attr/fontProviderAuthority = 0x7f030075 -net.micode.notes:drawable/widget_2x_blue = 0x7f07009a +net.micode.notes:drawable/widget_2x_blue = 0x7f07009b net.micode.notes:style/Base.Widget.AppCompat.TextView.SpinnerItem = 0x7f0f009d net.micode.notes:attr/iconTint = 0x7f030085 net.micode.notes:attr/textAppearanceListItemSmall = 0x7f0300e0 net.micode.notes:attr/layout = 0x7f03008f net.micode.notes:style/Base.Widget.AppCompat.ActionBar.TabView = 0x7f0f006b -net.micode.notes:id/tv_name = 0x7f0800c1 +net.micode.notes:id/tv_name = 0x7f0800c7 net.micode.notes:attr/icon = 0x7f030084 net.micode.notes:style/Widget.AppCompat.Button = 0x7f0f0125 -net.micode.notes:id/uniform = 0x7f0800c5 +net.micode.notes:id/uniform = 0x7f0800cb net.micode.notes:attr/multiChoiceItemLayout = 0x7f0300a6 -net.micode.notes:id/iv_bg_blue = 0x7f080050 +net.micode.notes:id/iv_bg_blue = 0x7f080053 net.micode.notes:attr/colorAccent = 0x7f03004b net.micode.notes:attr/goIcon = 0x7f03007f net.micode.notes:dimen/abc_text_size_menu_header_material = 0x7f060044 @@ -1204,10 +1215,13 @@ net.micode.notes:style/Base.Widget.AppCompat.Light.ActionBar.TabView = 0x7f0f008 net.micode.notes:drawable/bg_btn_set_color = 0x7f070054 net.micode.notes:style/TextAppearance.AppCompat.Widget.PopupMenu.Large = 0x7f0f00eb net.micode.notes:dimen/hint_pressed_alpha_material_light = 0x7f06005a -net.micode.notes:id/titleDividerNoCustom = 0x7f0800ba +net.micode.notes:id/titleDividerNoCustom = 0x7f0800c0 net.micode.notes:attr/fontVariationSettings = 0x7f03007c -net.micode.notes:layout/note_edit_list_item = 0x7f0a0022 +net.micode.notes:layout/note_edit_list_item = 0x7f0a0024 net.micode.notes:attr/fontStyle = 0x7f03007b +net.micode.notes:style/RtlOverlay.Widget.AppCompat.Search.DropDown.Query = 0x7f0f00ba +net.micode.notes:id/parentPanel = 0x7f08008f +net.micode.notes:attr/fontProviderFetchTimeout = 0x7f030078 net.micode.notes:drawable/edit_green = 0x7f07005b net.micode.notes:color/switch_thumb_material_light = 0x7f050051 net.micode.notes:dimen/abc_text_size_subhead_material = 0x7f060047 @@ -1216,13 +1230,13 @@ net.micode.notes:attr/expandActivityOverflowButtonDrawable = 0x7f030071 net.micode.notes:style/Base.Widget.AppCompat.RatingBar.Indicator = 0x7f0f0095 net.micode.notes:drawable/abc_ic_arrow_drop_right_black_24dp = 0x7f070014 net.micode.notes:attr/lastBaselineToBottomHeight = 0x7f03008e -net.micode.notes:id/showTitle = 0x7f0800a5 -net.micode.notes:id/progress_circular = 0x7f08008c +net.micode.notes:id/showTitle = 0x7f0800ab +net.micode.notes:id/progress_circular = 0x7f080092 net.micode.notes:attr/editTextStyle = 0x7f03006f -net.micode.notes:id/textSpacerNoTitle = 0x7f0800b6 +net.micode.notes:id/textSpacerNoTitle = 0x7f0800bc net.micode.notes:attr/editTextColor = 0x7f03006e net.micode.notes:attr/editTextBackground = 0x7f03006d -net.micode.notes:id/iv_bg_yellow_select = 0x7f080059 +net.micode.notes:id/iv_bg_yellow_select = 0x7f08005c net.micode.notes:color/material_blue_grey_900 = 0x7f050031 net.micode.notes:attr/drawableSize = 0x7f030069 net.micode.notes:drawable/list_white_single = 0x7f07007b @@ -1232,11 +1246,11 @@ net.micode.notes:attr/dividerVertical = 0x7f030068 net.micode.notes:dimen/abc_seekbar_track_progress_height_material = 0x7f060036 net.micode.notes:attr/textAppearanceSmallPopupMenu = 0x7f0300e4 net.micode.notes:style/Base.Widget.AppCompat.SeekBar.Discrete = 0x7f0f009a -net.micode.notes:id/navigation_bar = 0x7f08007c -net.micode.notes:id/menu_sync = 0x7f080075 +net.micode.notes:id/navigation_bar = 0x7f080082 +net.micode.notes:id/menu_sync = 0x7f08007b net.micode.notes:style/Widget.AppCompat.ProgressBar = 0x7f0f0152 net.micode.notes:dimen/abc_text_size_title_material = 0x7f060049 -net.micode.notes:id/menu_setting = 0x7f080073 +net.micode.notes:id/menu_setting = 0x7f080079 net.micode.notes:drawable/edit_title_blue = 0x7f07005d net.micode.notes:style/Theme.AppCompat = 0x7f0f00fe net.micode.notes:attr/dialogTheme = 0x7f030063 @@ -1249,9 +1263,9 @@ net.micode.notes:style/Base.Widget.AppCompat.PopupMenu.Overflow = 0x7f0f0090 net.micode.notes:drawable/abc_ratingbar_small_material = 0x7f070038 net.micode.notes:attr/fontProviderQuery = 0x7f03007a net.micode.notes:string/abc_menu_sym_shortcut_label = 0x7f0e001c -net.micode.notes:id/hour = 0x7f080048 +net.micode.notes:id/hour = 0x7f08004b net.micode.notes:attr/theme = 0x7f0300e7 -net.micode.notes:string/alert_title_delete = 0x7f0e002a +net.micode.notes:string/alert_title_delete = 0x7f0e002d net.micode.notes:attr/dialogCornerRadius = 0x7f030061 net.micode.notes:attr/customNavigationLayout = 0x7f03005f net.micode.notes:style/Base.TextAppearance.AppCompat.Subhead = 0x7f0f0023 @@ -1266,10 +1280,10 @@ net.micode.notes:styleable/TextAppearance = 0x7f100027 net.micode.notes:style/TextAppearance.AppCompat.Widget.Switch = 0x7f0f00ed net.micode.notes:dimen/abc_control_corner_material = 0x7f060018 net.micode.notes:string/abc_font_family_display_1_material = 0x7f0e000c -net.micode.notes:id/useLogo = 0x7f0800c7 +net.micode.notes:id/useLogo = 0x7f0800cd net.micode.notes:attr/contentInsetStartWithNavigation = 0x7f03005c net.micode.notes:attr/contentInsetStart = 0x7f03005b -net.micode.notes:string/menu_select_title = 0x7f0e005e +net.micode.notes:string/menu_select_title = 0x7f0e0064 net.micode.notes:color/material_blue_grey_950 = 0x7f050032 net.micode.notes:id/CTRL = 0x7f080001 net.micode.notes:style/Base.TextAppearance.AppCompat.Title = 0x7f0f0025 @@ -1277,26 +1291,26 @@ net.micode.notes:dimen/abc_dropdownitem_text_padding_right = 0x7f06002b net.micode.notes:attr/paddingTopNoTitle = 0x7f0300af net.micode.notes:attr/contentInsetRight = 0x7f03005a net.micode.notes:style/Base.AlertDialog.AppCompat.Light = 0x7f0f0006 -net.micode.notes:id/menu_send_to_desktop = 0x7f080072 -net.micode.notes:id/end = 0x7f08003b +net.micode.notes:id/menu_send_to_desktop = 0x7f080078 +net.micode.notes:id/end = 0x7f08003d net.micode.notes:color/bright_foreground_disabled_material_light = 0x7f05001f net.micode.notes:attr/dropDownListViewStyle = 0x7f03006b net.micode.notes:attr/thumbTextPadding = 0x7f0300e9 net.micode.notes:style/RtlUnderlay.Widget.AppCompat.ActionButton = 0x7f0f00bd net.micode.notes:style/Base.TextAppearance.AppCompat.Button = 0x7f0f000f -net.micode.notes:string/menu_restore = 0x7f0e005a -net.micode.notes:string/app_widget4x4 = 0x7f0e002d +net.micode.notes:string/menu_restore = 0x7f0e0060 +net.micode.notes:string/app_widget4x4 = 0x7f0e0030 net.micode.notes:id/action_mode_bar_stub = 0x7f080016 net.micode.notes:attr/colorPrimaryDark = 0x7f030053 net.micode.notes:style/Widget.AppCompat.ActionButton = 0x7f0f011f net.micode.notes:style/Base.Animation.AppCompat.Tooltip = 0x7f0f0009 -net.micode.notes:string/sync_progress_syncing = 0x7f0e008d +net.micode.notes:string/sync_progress_syncing = 0x7f0e0093 net.micode.notes:attr/contentInsetEnd = 0x7f030057 net.micode.notes:style/AlertDialog.AppCompat.Light = 0x7f0f0001 net.micode.notes:attr/panelBackground = 0x7f0300b0 net.micode.notes:string/abc_capital_off = 0x7f0e0006 net.micode.notes:attr/imageButtonStyle = 0x7f030088 -net.micode.notes:id/showHome = 0x7f0800a4 +net.micode.notes:id/showHome = 0x7f0800aa net.micode.notes:dimen/abc_action_bar_content_inset_material = 0x7f060000 net.micode.notes:drawable/edit_blue = 0x7f07005a net.micode.notes:style/Widget.AppCompat.TextView.SpinnerItem = 0x7f0f015f @@ -1327,16 +1341,16 @@ net.micode.notes:attr/textAppearanceSearchResultSubtitle = 0x7f0300e2 net.micode.notes:id/collapseActionView = 0x7f080030 net.micode.notes:dimen/abc_dialog_fixed_height_major = 0x7f06001c net.micode.notes:style/TextAppearance.AppCompat.Widget.Button.Borderless.Colored = 0x7f0f00e6 -net.micode.notes:string/menu_change_view = 0x7f0e0047 +net.micode.notes:string/menu_change_view = 0x7f0e004c net.micode.notes:dimen/abc_action_bar_subtitle_bottom_margin_material = 0x7f06000b net.micode.notes:attr/checkboxStyle = 0x7f030044 -net.micode.notes:drawable/widget_2x_yellow = 0x7f07009e +net.micode.notes:drawable/widget_2x_yellow = 0x7f07009f net.micode.notes:attr/preserveIconSpacing = 0x7f0300b6 -net.micode.notes:string/menu_title_select_folder = 0x7f0e0065 +net.micode.notes:string/menu_title_select_folder = 0x7f0e006b net.micode.notes:drawable/bg_color_btn_mask = 0x7f070055 net.micode.notes:string/abc_menu_enter_shortcut_label = 0x7f0e0017 net.micode.notes:color/bright_foreground_inverse_material_dark = 0x7f050020 -net.micode.notes:id/message = 0x7f080077 +net.micode.notes:id/message = 0x7f08007d net.micode.notes:drawable/dropdown_icon = 0x7f070059 net.micode.notes:drawable/abc_scrubber_primary_mtrl_alpha = 0x7f07003c net.micode.notes:style/Widget.AppCompat.Spinner = 0x7f0f015b @@ -1351,11 +1365,11 @@ net.micode.notes:attr/gapBetweenBars = 0x7f03007e net.micode.notes:style/TextAppearance.AppCompat = 0x7f0f00bf net.micode.notes:layout/abc_tooltip = 0x7f0a001b net.micode.notes:attr/buttonStyleSmall = 0x7f030041 -net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0e0077 +net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0e007d net.micode.notes:color/primary_text_default_material_light = 0x7f050044 net.micode.notes:menu/call_note_edit = 0x7f0b0000 net.micode.notes:attr/switchMinWidth = 0x7f0300d8 -net.micode.notes:id/listMode = 0x7f080061 +net.micode.notes:id/listMode = 0x7f080065 net.micode.notes:attr/actionModeStyle = 0x7f03001b net.micode.notes:id/ALT = 0x7f080000 net.micode.notes:attr/titleTextStyle = 0x7f0300fa @@ -1373,12 +1387,12 @@ net.micode.notes:attr/arrowShaftLength = 0x7f03002a net.micode.notes:attr/backgroundTint = 0x7f030034 net.micode.notes:attr/actionModeWebSearchDrawable = 0x7f03001c net.micode.notes:attr/listDividerAlertDialog = 0x7f030098 -net.micode.notes:layout/select_dialog_singlechoice_material = 0x7f0a002f +net.micode.notes:layout/select_dialog_singlechoice_material = 0x7f0a0031 net.micode.notes:attr/actionBarSize = 0x7f030003 net.micode.notes:style/Base.V21.ThemeOverlay.AppCompat.Dialog = 0x7f0f0055 net.micode.notes:string/abc_font_family_display_2_material = 0x7f0e000d net.micode.notes:layout/datetime_picker = 0x7f0a001e -net.micode.notes:id/scrollView = 0x7f080095 +net.micode.notes:id/scrollView = 0x7f08009b net.micode.notes:attr/activityChooserViewStyle = 0x7f030021 net.micode.notes:attr/actionDropDownStyle = 0x7f03000c net.micode.notes:attr/textAllCaps = 0x7f0300dc @@ -1388,19 +1402,19 @@ net.micode.notes:attr/alpha = 0x7f030027 net.micode.notes:style/Base.V23.Theme.AppCompat.Light = 0x7f0f0059 net.micode.notes:dimen/abc_config_prefDialogWidth = 0x7f060017 net.micode.notes:attr/buttonTint = 0x7f030042 -net.micode.notes:id/iv_bg_yellow = 0x7f080058 +net.micode.notes:id/iv_bg_yellow = 0x7f08005b net.micode.notes:style/Base.Theme.AppCompat.DialogWhenLarge = 0x7f0f0042 net.micode.notes:attr/tickMark = 0x7f0300ec -net.micode.notes:id/move = 0x7f08007a -net.micode.notes:id/iv_bg_red = 0x7f080054 +net.micode.notes:id/move = 0x7f080080 +net.micode.notes:id/iv_bg_red = 0x7f080057 net.micode.notes:attr/actionOverflowMenuStyle = 0x7f03001e net.micode.notes:color/abc_input_method_navigation_guard = 0x7f050007 net.micode.notes:dimen/abc_text_size_small_material = 0x7f060046 net.micode.notes:attr/color = 0x7f03004a net.micode.notes:color/accent_material_dark = 0x7f050018 net.micode.notes:attr/layout_dodgeInsetEdges = 0x7f030093 -net.micode.notes:drawable/notification_bg = 0x7f070089 -net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0e0076 +net.micode.notes:drawable/notification_bg = 0x7f07008a +net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0e007c net.micode.notes:dimen/text_font_size_super = 0x7f06006e net.micode.notes:attr/alertDialogStyle = 0x7f030024 net.micode.notes:layout/abc_select_dialog_material = 0x7f0a001a @@ -1415,8 +1429,8 @@ net.micode.notes:style/RtlOverlay.Widget.AppCompat.PopupMenuItem = 0x7f0f00b1 net.micode.notes:anim/abc_tooltip_enter = 0x7f01000a net.micode.notes:attr/actionModeSelectAllDrawable = 0x7f030018 net.micode.notes:attr/ratingBarStyle = 0x7f0300bc -net.micode.notes:drawable/tooltip_frame_light = 0x7f070099 -net.micode.notes:drawable/menu_move = 0x7f070082 +net.micode.notes:drawable/tooltip_frame_light = 0x7f07009a +net.micode.notes:drawable/menu_move = 0x7f070083 net.micode.notes:attr/actionBarWidgetTheme = 0x7f03000a net.micode.notes:attr/actionModeCloseDrawable = 0x7f030012 net.micode.notes:attr/actionBarItemBackground = 0x7f030001 @@ -1436,13 +1450,14 @@ net.micode.notes:dimen/abc_alert_dialog_button_dimen = 0x7f060011 net.micode.notes:attr/windowFixedHeightMajor = 0x7f030109 net.micode.notes:attr/ratingBarStyleSmall = 0x7f0300be net.micode.notes:id/delete = 0x7f080038 -net.micode.notes:string/preferences_menu_change_account = 0x7f0e007d +net.micode.notes:string/preferences_menu_change_account = 0x7f0e0083 net.micode.notes:attr/borderlessButtonStyle = 0x7f030037 net.micode.notes:dimen/abc_dialog_min_width_major = 0x7f060022 net.micode.notes:attr/drawerArrowStyle = 0x7f03006a net.micode.notes:attr/tickMarkTint = 0x7f0300ed net.micode.notes:drawable/abc_list_pressed_holo_dark = 0x7f07002c net.micode.notes:drawable/list_white_middle = 0x7f07007a +net.micode.notes:string/add_describe = 0x7f0e0027 net.micode.notes:attr/windowActionModeOverlay = 0x7f030108 net.micode.notes:color/material_deep_teal_500 = 0x7f050034 net.micode.notes:attr/arrowHeadLength = 0x7f030029 @@ -1454,25 +1469,25 @@ net.micode.notes:id/btn_set_bg_color = 0x7f080026 net.micode.notes:attr/panelMenuListTheme = 0x7f0300b1 net.micode.notes:attr/autoSizeTextType = 0x7f030030 net.micode.notes:attr/actionButtonStyle = 0x7f03000b -net.micode.notes:drawable/widget_2x_red = 0x7f07009c +net.micode.notes:drawable/widget_2x_red = 0x7f07009d net.micode.notes:string/abc_shareactionprovider_share_with = 0x7f0e0024 net.micode.notes:attr/actionBarSplitStyle = 0x7f030004 net.micode.notes:style/Widget.AppCompat.ActionBar.TabView = 0x7f0f011e -net.micode.notes:id/select_dialog_listview = 0x7f0800a0 +net.micode.notes:id/select_dialog_listview = 0x7f0800a6 net.micode.notes:attr/actionModeShareDrawable = 0x7f030019 net.micode.notes:styleable/CoordinatorLayout = 0x7f100012 net.micode.notes:layout/abc_action_mode_close_item_material = 0x7f0a0005 net.micode.notes:attr/listItemLayout = 0x7f030099 -net.micode.notes:id/screen = 0x7f080092 +net.micode.notes:id/screen = 0x7f080098 net.micode.notes:drawable/edit_title_red = 0x7f07005f net.micode.notes:drawable/abc_list_selector_background_transition_holo_dark = 0x7f07002e -net.micode.notes:id/tv_title = 0x7f0800c3 +net.micode.notes:id/tv_title = 0x7f0800c9 net.micode.notes:color/ripple_material_dark = 0x7f050047 net.micode.notes:style/TextAppearance.AppCompat.Widget.PopupMenu.Header = 0x7f0f00ea net.micode.notes:anim/abc_popup_exit = 0x7f010004 net.micode.notes:integer/cancel_button_image_alpha = 0x7f090002 net.micode.notes:dimen/abc_text_size_medium_material = 0x7f060043 -net.micode.notes:string/menu_create_folder = 0x7f0e0048 +net.micode.notes:string/menu_create_folder = 0x7f0e004d net.micode.notes:attr/windowActionBar = 0x7f030106 net.micode.notes:drawable/abc_tab_indicator_material = 0x7f070045 net.micode.notes:styleable/AlertDialog = 0x7f100006 diff --git a/src/Notes-master1/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt b/src/Notes-master1/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt index ca9d273d..f8a46a41 100644 --- a/src/Notes-master1/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt +++ b/src/Notes-master1/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt @@ -623,6 +623,7 @@ drawable list_yellow_down drawable list_yellow_middle drawable list_yellow_single drawable list_yellow_up +drawable lock drawable menu_delete drawable menu_move drawable new_note @@ -716,10 +717,13 @@ id decor_content_parent id default_activity_button id delete id disableHome +id editText_describe +id editText_password id edit_query id end id et_edit_text id et_foler_name +id et_input_passwd id expand_activities_button id expanded_menu id fill @@ -749,6 +753,7 @@ id iv_bg_white_select id iv_bg_yellow id iv_bg_yellow_select id iv_large_select +id iv_lock id iv_medium_select id iv_small_select id iv_super_select @@ -761,10 +766,12 @@ id ll_font_large id ll_font_normal id ll_font_small id ll_font_super +id menu_add_secret id menu_alert id menu_change_view id menu_delete id menu_delete_remind +id menu_delete_secret id menu_export_text id menu_font_size id menu_list_mode @@ -898,7 +905,9 @@ layout abc_tooltip layout account_dialog_title layout add_account_text layout datetime_picker +layout dialog_add_secret layout dialog_edit_text +layout dialog_input_passwd layout folder_list_item layout note_edit layout note_edit_list_item @@ -968,9 +977,12 @@ string abc_searchview_description_voice string abc_shareactionprovider_share_with string abc_shareactionprovider_share_with_application string abc_toolbar_collapse_description +string add_describe +string add_password string alert_message_delete_folder string alert_message_delete_note string alert_message_delete_notes +string alert_message_delete_secret string alert_title_delete string app_name string app_widget2x2 @@ -999,6 +1011,8 @@ string format_folder_files_count string format_move_notes_to_folder string hint_foler_name string info_note_enter_desktop +string input_passwd +string menu_add_secret string menu_alert string menu_change_view string menu_create_folder @@ -1019,6 +1033,7 @@ string menu_move string menu_move_parent_folder string menu_normal_mode string menu_remove_remind +string menu_remove_secret string menu_restore string menu_search string menu_select_all diff --git a/src/Notes-master1/app/build/outputs/apk/debug/app-debug.apk b/src/Notes-master1/app/build/outputs/apk/debug/app-debug.apk index 669a5dac..74a52a28 100644 Binary files a/src/Notes-master1/app/build/outputs/apk/debug/app-debug.apk and b/src/Notes-master1/app/build/outputs/apk/debug/app-debug.apk differ diff --git a/src/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt index 7363adcd..caffed48 100644 --- a/src/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/src/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,9 +1,9 @@ -- Merging decision tree log --- manifest -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 MERGED from [com.android.support:appcompat-v7:28.0.0] C:\Users\С\.gradle\caches\transforms-3\7aa3a488ec69f96886facece9aaa9406\transformed\appcompat-v7-28.0.0\AndroidManifest.xml:17:1-22:12 MERGED from [com.android.support:support-fragment:28.0.0] C:\Users\С\.gradle\caches\transforms-3\d7823733cf657bf5585e38375aaf86e5\transformed\support-fragment-28.0.0\AndroidManifest.xml:17:1-22:12 MERGED from [com.android.support:animated-vector-drawable:28.0.0] C:\Users\С\.gradle\caches\transforms-3\74ce360b3b9c66bbcf1c66588559d812\transformed\animated-vector-drawable-28.0.0\AndroidManifest.xml:17:1-22:12 @@ -30,61 +30,61 @@ MERGED from [android.arch.lifecycle:livedata:1.1.1] C:\Users\С MERGED from [android.arch.lifecycle:livedata-core:1.1.1] C:\Users\С\.gradle\caches\transforms-3\ed642353549cd1357a6c2a4682ab3ae3\transformed\livedata-core-1.1.1\AndroidManifest.xml:17:1-22:12 MERGED from [android.arch.core:runtime:1.1.1] C:\Users\С\.gradle\caches\transforms-3\c360566d4530bcdfdeab7a0798072d85\transformed\runtime-1.1.1\AndroidManifest.xml:17:1-22:12 MERGED from [com.android.support:interpolator:28.0.0] C:\Users\С\.gradle\caches\transforms-3\28d63aba52764488305f21d67e729d53\transformed\interpolator-28.0.0\AndroidManifest.xml:17:1-22:12 -INJECTED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 package - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:19:5-31 - INJECTED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml - INJECTED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:19:5-31 + INJECTED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml + INJECTED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml android:versionName - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:21:5-30 - INJECTED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml - INJECTED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:21:5-30 + INJECTED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml + INJECTED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml xmlns:android - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:18:11-69 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:18:11-69 android:versionCode - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:20:5-28 - INJECTED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml - INJECTED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:20:5-28 + INJECTED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml + INJECTED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81 android:name - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:25:22-78 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:25:22-78 uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88 android:name - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:26:22-85 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:26:22-85 uses-permission#android.permission.INTERNET -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67 android:name - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:27:22-64 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:27:22-64 uses-permission#android.permission.READ_CONTACTS -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72 android:name - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:28:22-69 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:28:22-69 uses-permission#android.permission.MANAGE_ACCOUNTS -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74 android:name - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:29:22-71 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:29:22-71 uses-permission#android.permission.AUTHENTICATE_ACCOUNTS -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80 android:name - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:30:22-77 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:30:22-77 uses-permission#android.permission.GET_ACCOUNTS -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71 android:name - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:31:22-68 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:31:22-68 uses-permission#android.permission.USE_CREDENTIALS -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74 android:name - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:32:22-71 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:32:22-71 uses-permission#android.permission.RECEIVE_BOOT_COMPLETED -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81 android:name - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78 application -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:35:5-149:19 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:35:5-149:19 MERGED from [com.android.support:support-compat:28.0.0] C:\Users\С\.gradle\caches\transforms-3\2b9474e47639de47b19dc72cadc6eaea\transformed\support-compat-28.0.0\AndroidManifest.xml:22:5-94 MERGED from [com.android.support:support-compat:28.0.0] C:\Users\С\.gradle\caches\transforms-3\2b9474e47639de47b19dc72cadc6eaea\transformed\support-compat-28.0.0\AndroidManifest.xml:22:5-94 MERGED from [com.android.support:versionedparcelable:28.0.0] C:\Users\С\.gradle\caches\transforms-3\0e979f093d8e2d4d316810ed500ba370\transformed\versionedparcelable-28.0.0\AndroidManifest.xml:22:5-23:19 @@ -92,169 +92,169 @@ MERGED from [com.android.support:versionedparcelable:28.0.0] C:\Users\С android:appComponentFactory ADDED from [com.android.support:support-compat:28.0.0] C:\Users\С\.gradle\caches\transforms-3\2b9474e47639de47b19dc72cadc6eaea\transformed\support-compat-28.0.0\AndroidManifest.xml:22:18-91 android:label - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41 android:icon - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42 activity#net.micode.notes.ui.NotesListActivity -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:38:9-51:20 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:38:9-51:20 android:label - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45 android:launchMode - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43 android:windowSoftInputMode - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:45:13-52 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:45:13-52 android:uiOptions - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:44:13-57 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:44:13-57 android:configChanges - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74 android:theme - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:43:13-71 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:43:13-71 android:name - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:39:13-49 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:39:13-49 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:47:13-50:29 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:47:13-50:29 action#android.intent.action.MAIN -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:48:17-69 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:48:17-69 android:name - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:48:25-66 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:48:25-66 category#android.intent.category.LAUNCHER -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:49:17-77 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:49:17-77 android:name - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:49:27-74 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:49:27-74 activity#net.micode.notes.ui.NoteEditActivity -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:53:9-81:20 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:53:9-81:20 android:launchMode - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:56:13-43 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:56:13-43 android:configChanges - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:55:13-74 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:55:13-74 android:theme - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:57:13-71 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:57:13-71 android:name - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:54:13-48 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:54:13-48 intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:59:13-64:29 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:59:13-64:29 action#android.intent.action.VIEW -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:60:17-69 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:60:17-69 android:name - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:60:25-66 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:60:25-66 category#android.intent.category.DEFAULT -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 android:name - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 data -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 android:mimeType - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:66:13-71:29 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:66:13-71:29 action#android.intent.action.INSERT_OR_EDIT -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:67:17-79 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:67:17-79 android:name - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:67:25-76 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:67:25-76 intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:73:13-76:29 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:73:13-76:29 action#android.intent.action.SEARCH -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:74:17-71 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:74:17-71 android:name - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:74:25-68 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:74:25-68 meta-data#android.app.searchable -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:78:13-80:54 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:78:13-80:54 android:resource - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:80:17-51 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:80:17-51 android:name - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:79:17-54 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:79:17-54 provider#net.micode.notes.data.NotesProvider -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:83:9-86:43 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:83:9-86:43 android:authorities - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:85:13-47 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:85:13-47 android:multiprocess - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:86:13-40 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:86:13-40 android:name - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:84:13-63 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:84:13-63 receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:88:9-100:20 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:88:9-100:20 android:label - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:90:13-50 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:90:13-50 android:name - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:89:13-57 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:89:13-57 intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29 action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84 android:name - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81 action#android.appwidget.action.APPWIDGET_DELETED -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85 android:name - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82 action#android.intent.action.PRIVACY_MODE_CHANGED -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 android:name - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 meta-data#android.appwidget.provider -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58 android:resource - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55 android:name - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58 receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:101:9-114:20 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:101:9-114:20 android:label - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:103:13-50 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:103:13-50 android:name - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:102:13-57 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:102:13-57 receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:116:9-120:20 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:116:9-120:20 android:name - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:116:19-55 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:116:19-55 intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:117:13-119:29 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:117:13-119:29 action#android.intent.action.BOOT_COMPLETED -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:118:17-79 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:118:17-79 android:name - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:118:25-76 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:118:25-76 receiver#net.micode.notes.ui.AlarmReceiver -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:122:9-125:20 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:122:9-125:20 android:process - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:124:13-38 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:124:13-38 android:name - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:123:13-61 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:123:13-61 activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:127:9-132:20 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:127:9-132:20 android:label - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:129:13-45 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:129:13-45 android:launchMode - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:130:13-48 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:130:13-48 android:theme - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:131:13-75 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:131:13-75 android:name - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:128:13-50 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:128:13-50 activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:134:9-139:20 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:134:9-139:20 android:label - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:136:13-54 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:136:13-54 android:launchMode - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:137:13-43 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:137:13-43 android:theme - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:138:13-60 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:138:13-60 android:name - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:135:13-71 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:135:13-71 service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:141:9-144:19 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:141:9-144:19 android:exported - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:143:13-37 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:143:13-37 android:name - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:142:13-74 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:142:13-74 meta-data#android.app.default_searchable -ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:146:9-148:52 +ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:146:9-148:52 android:value - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:148:13-49 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:148:13-49 android:name - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:147:13-58 + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:147:13-58 uses-sdk -INJECTED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml reason: use-sdk injection requested -INJECTED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml -INJECTED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml +INJECTED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml reason: use-sdk injection requested +INJECTED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml +INJECTED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml MERGED from [com.android.support:appcompat-v7:28.0.0] C:\Users\С\.gradle\caches\transforms-3\7aa3a488ec69f96886facece9aaa9406\transformed\appcompat-v7-28.0.0\AndroidManifest.xml:20:5-44 MERGED from [com.android.support:appcompat-v7:28.0.0] C:\Users\С\.gradle\caches\transforms-3\7aa3a488ec69f96886facece9aaa9406\transformed\appcompat-v7-28.0.0\AndroidManifest.xml:20:5-44 MERGED from [com.android.support:support-fragment:28.0.0] C:\Users\С\.gradle\caches\transforms-3\d7823733cf657bf5585e38375aaf86e5\transformed\support-fragment-28.0.0\AndroidManifest.xml:20:5-44 @@ -307,13 +307,13 @@ MERGED from [android.arch.core:runtime:1.1.1] C:\Users\С MERGED from [android.arch.core:runtime:1.1.1] C:\Users\С\.gradle\caches\transforms-3\c360566d4530bcdfdeab7a0798072d85\transformed\runtime-1.1.1\AndroidManifest.xml:20:5-44 MERGED from [com.android.support:interpolator:28.0.0] C:\Users\С\.gradle\caches\transforms-3\28d63aba52764488305f21d67e729d53\transformed\interpolator-28.0.0\AndroidManifest.xml:20:5-44 MERGED from [com.android.support:interpolator:28.0.0] C:\Users\С\.gradle\caches\transforms-3\28d63aba52764488305f21d67e729d53\transformed\interpolator-28.0.0\AndroidManifest.xml:20:5-44 -INJECTED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml -INJECTED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml +INJECTED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml +INJECTED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml android:targetSdkVersion - INJECTED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml - INJECTED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml + INJECTED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml + INJECTED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml android:minSdkVersion - INJECTED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml - ADDED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml - INJECTED from E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml + INJECTED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml + ADDED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml + INJECTED from E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin index 14c0f474..118e324d 100644 Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/data/Notes.java b/src/Notes-master1/app/src/main/java/net/micode/notes/data/Notes.java index ff6056fc..a59bc257 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/data/Notes.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/data/Notes.java @@ -171,6 +171,24 @@ public class Notes { *

Type : INTEGER (long)

*/ public static final String GROUP = "group_num"; + + /** + * The note describe if have passwd + *

Type : TEXT

+ */ + public static final String DESCRI = "describe"; + + /** + * The note have passwd or not + *

Type : INTEGER (long)

+ */ + public static final String HAVEPA = "have_passwd"; + + /** + * The note password + *

Type : TEXT

+ */ + public static final String PASSWD = "password"; } public interface DataColumns { diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java index 70ea58e4..5ad7c271 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java @@ -30,7 +30,7 @@ import net.micode.notes.data.Notes.NoteColumns; public class NotesDatabaseHelper extends SQLiteOpenHelper { private static final String DB_NAME = "note.db"; - private static final int DB_VERSION = 5; + private static final int DB_VERSION = 6; public interface TABLE { public static final String NOTE = "note"; @@ -61,7 +61,10 @@ 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.GROUP + " INTEGER NOT NULL DEFAULT 0" + + NoteColumns.GROUP + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.DESCRI + " TEXT NOT NULL DEFAULT 'secreted'," + + NoteColumns.HAVEPA + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.PASSWD + " TEXT NOT NULL DEFAULT ''" + ")"; private static final String CREATE_DATA_TABLE_SQL = @@ -328,6 +331,11 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { oldVersion++; } + if (oldVersion == 5){ + upgradeToV6(db); + oldVersion++; + } + if (reCreateTriggers) { reCreateNoteTableTriggers(db); reCreateDataTableTriggers(db); @@ -372,4 +380,14 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { + " INTEGER NOT NULL DEFAULT 0"); Log.d("ABC", "fif"); } + + private void upgradeToV6(SQLiteDatabase db) { + db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.DESCRI + + " TEXT NOT NULL DEFAULT 'secreted'"); + db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.HAVEPA + + " INTEGER NOT NULL DEFAULT 0"); + db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.PASSWD + + " TEXT NOT NULL DEFAULT ''"); + Log.d("ABC", "fif"); + } } diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/model/WorkingNote.java b/src/Notes-master1/app/src/main/java/net/micode/notes/model/WorkingNote.java index 6b83f06e..3aa5a99e 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/model/WorkingNote.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/model/WorkingNote.java @@ -60,6 +60,14 @@ public class WorkingNote { private boolean mIsDeleted; + private String mDescribe; + + private long mHavePasswd; + + private String mPassword; + + + private NoteSettingChangedListener mNoteSettingStatusListener; public static final String[] DATA_PROJECTION = new String[] { @@ -78,7 +86,10 @@ public class WorkingNote { NoteColumns.BG_COLOR_ID, NoteColumns.WIDGET_ID, NoteColumns.WIDGET_TYPE, - NoteColumns.MODIFIED_DATE + NoteColumns.MODIFIED_DATE, + NoteColumns.DESCRI, + NoteColumns.HAVEPA, + NoteColumns.PASSWD }; private static final int DATA_ID_COLUMN = 0; @@ -101,6 +112,12 @@ public class WorkingNote { private static final int NOTE_MODIFIED_DATE_COLUMN = 5; + private static final int NOTE_DESCRI_COLUMN = 6; + + private static final int NOTE_HAVEPA_COLUMN = 7; + + private static final int NOTE_PASSWD_COLUMN = 8; + // New note construct private WorkingNote(Context context, long folderId) { mContext = context; @@ -112,6 +129,9 @@ public class WorkingNote { mIsDeleted = false; mMode = 0; mWidgetType = Notes.TYPE_WIDGET_INVALIDE; + mHavePasswd = 0; + mPassword = ""; + mDescribe = ""; } // Existing note construct @@ -137,6 +157,9 @@ public class WorkingNote { mWidgetType = cursor.getInt(NOTE_WIDGET_TYPE_COLUMN); mAlertDate = cursor.getLong(NOTE_ALERTED_DATE_COLUMN); mModifiedDate = cursor.getLong(NOTE_MODIFIED_DATE_COLUMN); + mDescribe = cursor.getString(NOTE_DESCRI_COLUMN); + mHavePasswd = cursor.getLong(NOTE_HAVEPA_COLUMN); + mPassword = cursor.getString(NOTE_PASSWD_COLUMN); } cursor.close(); } else { @@ -288,6 +311,16 @@ public class WorkingNote { } } + public void setPassword(String descri, String password, long havepasswd){ + mDescribe = descri; + mPassword = password; + mHavePasswd = havepasswd; + mNote.setNoteValue(NoteColumns.DESCRI, String.valueOf(mDescribe)); + mNote.setNoteValue(NoteColumns.PASSWD, String.valueOf(mPassword)); + mNote.setNoteValue(NoteColumns.HAVEPA, String.valueOf(mHavePasswd)); + } + + public void convertToCallNote(String phoneNumber, long callDate) { mNote.setCallData(CallNote.CALL_DATE, String.valueOf(callDate)); mNote.setCallData(CallNote.PHONE_NUMBER, phoneNumber); @@ -342,6 +375,14 @@ public class WorkingNote { return mWidgetType; } + public long getHavePasswd() { + return mHavePasswd; + } + + public String getPassword() { + return mPassword; + } + public interface NoteSettingChangedListener { /** * Called when the background color of current note has just changed diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java index d606895b..49a1ee3f 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java @@ -16,6 +16,8 @@ package net.micode.notes.ui; +import android.app.Dialog; +import android.content.ContentValues; import android.support.v7.app.AppCompatActivity; import android.app.Activity; import android.app.AlarmManager; @@ -46,6 +48,8 @@ import android.view.MotionEvent; import android.view.View; import android.view.View.OnClickListener; import android.view.WindowManager; +import android.view.inputmethod.InputMethodManager; +import android.widget.Button; import android.widget.CheckBox; import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; @@ -85,6 +89,8 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen public TextView tvAlertDate; public ImageView ibSetBgColor; + + public ImageView ivLock; } private static final Map sBgSelectorBtnsMap = new HashMap(); @@ -370,6 +376,13 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen mNoteHeaderHolder.tvAlertDate.setVisibility(View.GONE); mNoteHeaderHolder.ivAlertIcon.setVisibility(View.GONE); }; + + if (mWorkingNote.getHavePasswd() == 0) { + mNoteHeaderHolder.ivLock.setVisibility(View.GONE); + } + else { + mNoteHeaderHolder.ivLock.setVisibility(View.VISIBLE); + } } @Override @@ -428,6 +441,7 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen mNoteHeaderHolder = new HeadViewHolder(); mNoteHeaderHolder.tvModified = (TextView) findViewById(R.id.tv_modified_date); mNoteHeaderHolder.ivAlertIcon = (ImageView) findViewById(R.id.iv_alert_icon); + mNoteHeaderHolder.ivLock = (ImageView) findViewById(R.id.iv_lock); mNoteHeaderHolder.tvAlertDate = (TextView) findViewById(R.id.tv_alert_date); mNoteHeaderHolder.ibSetBgColor = (ImageView) findViewById(R.id.btn_set_bg_color); mNoteHeaderHolder.ibSetBgColor.setOnClickListener(this); @@ -562,6 +576,11 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen } else { menu.findItem(R.id.menu_delete_remind).setVisible(false); } + if(mWorkingNote.getHavePasswd() == 1) { + menu.findItem(R.id.menu_add_secret).setVisible(false); + }else { + menu.findItem(R.id.menu_delete_secret).setVisible(false); + } return true; } @@ -607,6 +626,12 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen case R.id.menu_delete_remind: mWorkingNote.setAlertDate(0, false); break; + case R.id.menu_add_secret: + add_secret(); + break; + case R.id.menu_delete_secret: + delete_secret(); + break; default: break; } @@ -930,4 +955,64 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen private void showToast(int resId, int duration) { Toast.makeText(this, resId, duration).show(); } + + private void add_secret(){ + final AlertDialog.Builder builder = new AlertDialog.Builder(this); + View view = LayoutInflater.from(this).inflate(R.layout.dialog_add_secret, null); + final EditText eDescribe = (EditText) view.findViewById(R.id.editText_describe); + final EditText ePassword = (EditText) view.findViewById(R.id.editText_password); + showSoftInput(); + builder.setView(view); + builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialogInterface, int i) { + hideSoftInput(view); + String iDescribe = eDescribe.getText().toString(); + String iPassword = ePassword.getText().toString(); + long iHavepasswd = 1; + Toast.makeText(NoteEditActivity.this, "已设置密码",Toast.LENGTH_SHORT).show(); + mWorkingNote.setPassword(iDescribe, iPassword ,iHavepasswd); + mNoteHeaderHolder.ivLock.setVisibility(View.VISIBLE); + } + }); + builder.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + hideSoftInput(view); + } + }); + builder.show(); + } + + private void delete_secret(){ + AlertDialog.Builder builder = new AlertDialog.Builder(this); + builder.setTitle(getString(R.string.alert_title_delete)); + builder.setMessage(getString(R.string.alert_message_delete_secret)); + builder.setPositiveButton(android.R.string.ok, + new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + String iDescribe = "secreted"; + String iPassword = ""; + long iHavepasswd = 0; + Toast.makeText(NoteEditActivity.this, "密码已删除",Toast.LENGTH_SHORT).show(); + mWorkingNote.setPassword(iDescribe, iPassword ,iHavepasswd); + mNoteHeaderHolder.ivLock.setVisibility(View.GONE); + } + }); + builder.setNegativeButton(android.R.string.cancel, null); + builder.show(); + + } + + private void showSoftInput() { + InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + if (inputMethodManager != null) { + inputMethodManager.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0); + } + } + + private void hideSoftInput(View view) { + InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0); + } + } diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteItemData.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteItemData.java index 9ef849a0..b35d07f4 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteItemData.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteItemData.java @@ -40,6 +40,9 @@ public class NoteItemData { NoteColumns.TYPE, NoteColumns.WIDGET_ID, NoteColumns.WIDGET_TYPE, + NoteColumns.DESCRI, + NoteColumns.HAVEPA, + NoteColumns.PASSWD }; private static final int ID_COLUMN = 0; @@ -54,6 +57,9 @@ public class NoteItemData { private static final int TYPE_COLUMN = 9; private static final int WIDGET_ID_COLUMN = 10; private static final int WIDGET_TYPE_COLUMN = 11; + private static final int DESCRI_COLUMN = 12; + private static final int HAVEPA_COLUMN = 13; + private static final int PASSWD_COLUMN = 14; private long mId; private long mAlertDate; @@ -67,6 +73,9 @@ public class NoteItemData { private int mType; private int mWidgetId; private int mWidgetType; + private String mDescribe; + private long mHavePasswd; + private String mPassword; private String mName; private String mPhoneNumber; @@ -91,6 +100,9 @@ public class NoteItemData { mType = cursor.getInt(TYPE_COLUMN); mWidgetId = cursor.getInt(WIDGET_ID_COLUMN); mWidgetType = cursor.getInt(WIDGET_TYPE_COLUMN); + mDescribe = cursor.getString(DESCRI_COLUMN); + mHavePasswd = cursor.getLong(HAVEPA_COLUMN); + mPassword = cursor.getString(PASSWD_COLUMN); mPhoneNumber = ""; if (mParentId == Notes.ID_CALL_RECORD_FOLDER) { @@ -206,6 +218,16 @@ public class NoteItemData { return mWidgetId; } + public String getDescribe() { + return mDescribe; + } + + public long getHavePassword() { + return mHavePasswd; + } + + public String getPassword() {return mPassword; } + public String getSnippet() { return mSnippet; } diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java index 3785aeee..d570e1ca 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -17,6 +17,7 @@ package net.micode.notes.ui; import android.app.Activity; +import android.media.DrmInitData; import android.support.v7.app.AppCompatActivity; import android.app.AlertDialog; import android.app.Dialog; @@ -571,10 +572,44 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe } private void openNode(NoteItemData data) { - Intent intent = new Intent(this, NoteEditActivity.class); - intent.setAction(Intent.ACTION_VIEW); - intent.putExtra(Intent.EXTRA_UID, data.getId()); - this.startActivityForResult(intent, REQUEST_CODE_OPEN_NODE); + if (data.getHavePassword() == 1){ + final AlertDialog.Builder builder = new AlertDialog.Builder(this); + View view2 = LayoutInflater.from(this).inflate(R.layout.dialog_input_passwd, null); + final EditText etName = (EditText) view2.findViewById(R.id.et_input_passwd); + showSoftInput(); + builder.setTitle("输入密码"); + builder.setView(view2); + builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialogInterface, int i) { + hideSoftInput(etName); + String password = etName.getText().toString(); + if(password.equals(data.getPassword())){ + Toast.makeText(NotesListActivity.this, "密码正确", Toast.LENGTH_SHORT).show(); + Intent intent = new Intent(NotesListActivity.this, NoteEditActivity.class); + intent.setAction(Intent.ACTION_VIEW); + intent.putExtra(Intent.EXTRA_UID, data.getId()); + NotesListActivity.this.startActivityForResult(intent, REQUEST_CODE_OPEN_NODE); + } + else{ + Toast.makeText(NotesListActivity.this, "密码错误,请重新输入", Toast.LENGTH_SHORT).show(); + } + } + }); + builder.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + hideSoftInput(etName); + } + }); + builder.show(); + } + else { + Intent intent = new Intent(this, NoteEditActivity.class); + intent.setAction(Intent.ACTION_VIEW); + intent.putExtra(Intent.EXTRA_UID, data.getId()); + this.startActivityForResult(intent, REQUEST_CODE_OPEN_NODE); + } + } private void openFolder(NoteItemData data) { @@ -688,7 +723,6 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe }); } cursor.close(); - } dialog.dismiss(); } @@ -977,6 +1011,7 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe } break; case SUB_FOLDER: + Log.d("abc", "ac"); case CALL_RECORD_FOLDER: if (item.getType() == Notes.TYPE_NOTE) { openNode(item); diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListItem.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListItem.java index eb69a8cc..9c0c21c2 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListItem.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListItem.java @@ -40,6 +40,7 @@ public class NotesListItem extends LinearLayout { private TextView mCallName; private NoteItemData mItemData; private CheckBox mCheckBox; + private ImageView mLock; public NotesListItem(Context context) { super(context); @@ -49,6 +50,7 @@ public class NotesListItem extends LinearLayout { mTime = (TextView) findViewById(R.id.tv_time); mCallName = (TextView) findViewById(R.id.tv_name); mCheckBox = (CheckBox) findViewById(android.R.id.checkbox); + mLock = (ImageView) findViewById(R.id.iv_lock); } public void bind(Context context, NoteItemData data, boolean choiceMode, boolean checked) { @@ -87,6 +89,7 @@ public class NotesListItem extends LinearLayout { + context.getString(R.string.format_folder_files_count, data.getNotesCount())); mAlert.setVisibility(View.GONE); + mLock.setVisibility(View.GONE); } else { mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet())); if (data.hasAlert()) { @@ -95,9 +98,19 @@ public class NotesListItem extends LinearLayout { } else { mAlert.setVisibility(View.GONE); } + mLock.setImageResource(R.drawable.lock); + if(data.getHavePassword() == 0){ + mLock.setVisibility(View.GONE); + } + else { + mLock.setVisibility(View.VISIBLE); + } } } if (data.getType() == Notes.TYPE_NOTE){ + if(data.getHavePassword() == 1){ + mTitle.setText(data.getDescribe()); + } if(data.getAlertDate() == 0){ CharSequence ss_data = "Have no time"; mTime.setText(ss_data); diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/lock.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/lock.png new file mode 100644 index 00000000..1888d62a Binary files /dev/null and b/src/Notes-master1/app/src/main/res/drawable-hdpi/lock.png differ diff --git a/src/Notes-master1/app/src/main/res/layout/dialog_add_secret.xml b/src/Notes-master1/app/src/main/res/layout/dialog_add_secret.xml new file mode 100644 index 00000000..2220663a --- /dev/null +++ b/src/Notes-master1/app/src/main/res/layout/dialog_add_secret.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/Notes-master1/app/src/main/res/layout/dialog_input_passwd.xml b/src/Notes-master1/app/src/main/res/layout/dialog_input_passwd.xml new file mode 100644 index 00000000..4d3b442f --- /dev/null +++ b/src/Notes-master1/app/src/main/res/layout/dialog_input_passwd.xml @@ -0,0 +1,7 @@ + + \ No newline at end of file diff --git a/src/Notes-master1/app/src/main/res/layout/note_edit.xml b/src/Notes-master1/app/src/main/res/layout/note_edit.xml index 4149aadd..1705a57e 100644 --- a/src/Notes-master1/app/src/main/res/layout/note_edit.xml +++ b/src/Notes-master1/app/src/main/res/layout/note_edit.xml @@ -47,6 +47,12 @@ android:layout_gravity="center_vertical" android:background="@drawable/title_alert" /> + + + diff --git a/src/Notes-master1/app/src/main/res/menu/note_edit.xml b/src/Notes-master1/app/src/main/res/menu/note_edit.xml index 494fba69..3678f575 100644 --- a/src/Notes-master1/app/src/main/res/menu/note_edit.xml +++ b/src/Notes-master1/app/src/main/res/menu/note_edit.xml @@ -49,4 +49,12 @@ + + + + \ No newline at end of file diff --git a/src/Notes-master1/app/src/main/res/values/strings.xml b/src/Notes-master1/app/src/main/res/values/strings.xml index 9acd9b40..313166e4 100644 --- a/src/Notes-master1/app/src/main/res/values/strings.xml +++ b/src/Notes-master1/app/src/main/res/values/strings.xml @@ -72,10 +72,13 @@ Send to home Remind me Delete reminder + Add secret + Delete secret Select folder Parent folder Note added to home Confirm to delete folder and its notes? + Confirm to delete secret of this note? Delete selected notes Confirm to delete the selected %d notes? Confirm to delete this note? @@ -124,7 +127,9 @@ Delete Call notes Input name - + Input describe + Input password + Input password Searching Notes Search notes Text in your notes