diff --git a/src/Notes-master3/.gradle/7.3.3/checksums/checksums.lock b/src/Notes-master3/.gradle/7.3.3/checksums/checksums.lock index 1729793..3cc2fad 100644 Binary files a/src/Notes-master3/.gradle/7.3.3/checksums/checksums.lock and b/src/Notes-master3/.gradle/7.3.3/checksums/checksums.lock differ diff --git a/src/Notes-master3/.gradle/7.3.3/checksums/md5-checksums.bin b/src/Notes-master3/.gradle/7.3.3/checksums/md5-checksums.bin index 59220b9..acdcb38 100644 Binary files a/src/Notes-master3/.gradle/7.3.3/checksums/md5-checksums.bin and b/src/Notes-master3/.gradle/7.3.3/checksums/md5-checksums.bin differ diff --git a/src/Notes-master3/.gradle/7.3.3/checksums/sha1-checksums.bin b/src/Notes-master3/.gradle/7.3.3/checksums/sha1-checksums.bin index a75f3dc..7fd14c1 100644 Binary files a/src/Notes-master3/.gradle/7.3.3/checksums/sha1-checksums.bin and b/src/Notes-master3/.gradle/7.3.3/checksums/sha1-checksums.bin differ diff --git a/src/Notes-master3/.gradle/7.3.3/executionHistory/executionHistory.bin b/src/Notes-master3/.gradle/7.3.3/executionHistory/executionHistory.bin index 5c629ff..8ccde8d 100644 Binary files a/src/Notes-master3/.gradle/7.3.3/executionHistory/executionHistory.bin and b/src/Notes-master3/.gradle/7.3.3/executionHistory/executionHistory.bin differ diff --git a/src/Notes-master3/.gradle/7.3.3/executionHistory/executionHistory.lock b/src/Notes-master3/.gradle/7.3.3/executionHistory/executionHistory.lock index 6f3b809..d80c201 100644 Binary files a/src/Notes-master3/.gradle/7.3.3/executionHistory/executionHistory.lock and b/src/Notes-master3/.gradle/7.3.3/executionHistory/executionHistory.lock differ diff --git a/src/Notes-master3/.gradle/7.3.3/fileHashes/fileHashes.bin b/src/Notes-master3/.gradle/7.3.3/fileHashes/fileHashes.bin index 419e3ee..355f4f3 100644 Binary files a/src/Notes-master3/.gradle/7.3.3/fileHashes/fileHashes.bin and b/src/Notes-master3/.gradle/7.3.3/fileHashes/fileHashes.bin differ diff --git a/src/Notes-master3/.gradle/7.3.3/fileHashes/fileHashes.lock b/src/Notes-master3/.gradle/7.3.3/fileHashes/fileHashes.lock index ec4a0f3..94a8782 100644 Binary files a/src/Notes-master3/.gradle/7.3.3/fileHashes/fileHashes.lock and b/src/Notes-master3/.gradle/7.3.3/fileHashes/fileHashes.lock differ diff --git a/src/Notes-master3/.gradle/7.3.3/fileHashes/resourceHashesCache.bin b/src/Notes-master3/.gradle/7.3.3/fileHashes/resourceHashesCache.bin index 9d1f4c4..3a984a0 100644 Binary files a/src/Notes-master3/.gradle/7.3.3/fileHashes/resourceHashesCache.bin and b/src/Notes-master3/.gradle/7.3.3/fileHashes/resourceHashesCache.bin differ diff --git a/src/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 7b8c23b..6b6d53b 100644 Binary files a/src/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/Notes-master3/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes-master3/.gradle/buildOutputCleanup/outputFiles.bin index 2c4c88f..d106d89 100644 Binary files a/src/Notes-master3/.gradle/buildOutputCleanup/outputFiles.bin and b/src/Notes-master3/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/src/Notes-master3/.gradle/file-system.probe b/src/Notes-master3/.gradle/file-system.probe index 90057f1..d4346d4 100644 Binary files a/src/Notes-master3/.gradle/file-system.probe and b/src/Notes-master3/.gradle/file-system.probe differ diff --git a/src/Notes-master3/.idea/deploymentTargetDropDown.xml b/src/Notes-master3/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index 283167a..0000000 --- a/src/Notes-master3/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Notes-master3/.idea/gradle.xml b/src/Notes-master3/.idea/gradle.xml index d48a5c9..5a149e2 100644 --- a/src/Notes-master3/.idea/gradle.xml +++ b/src/Notes-master3/.idea/gradle.xml @@ -12,10 +12,7 @@ diff --git a/src/Notes-master3/.idea/misc.xml b/src/Notes-master3/.idea/misc.xml index 9e0b151..91bfd41 100644 --- a/src/Notes-master3/.idea/misc.xml +++ b/src/Notes-master3/.idea/misc.xml @@ -4,18 +4,14 @@ diff --git a/src/Notes-master3/.idea/sonarlint/issuestore/0/8/08c35f02f11c35ae9ebf8db0a482054dfa1cf493 b/src/Notes-master3/.idea/sonarlint/issuestore/0/8/08c35f02f11c35ae9ebf8db0a482054dfa1cf493 index 5b94d8b..24e0ac8 100644 --- a/src/Notes-master3/.idea/sonarlint/issuestore/0/8/08c35f02f11c35ae9ebf8db0a482054dfa1cf493 +++ b/src/Notes-master3/.idea/sonarlint/issuestore/0/8/08c35f02f11c35ae9ebf8db0a482054dfa1cf493 @@ -1,15 +1,15 @@ s -java:S4144"\Update this method so that its implementation is not identical to "getParentId" on line 186.( -x -java:S1450H"VRemove the "mLocked" field and declare it as a local variable in the relevant methods.(ԕ8Æ0 +java:S4144"\Update this method so that its implementation is not identical to "getParentId" on line 190.( +q +java:S1450J"VRemove the "mLocked" field and declare it as a local variable in the relevant methods.(ԕ > -java:S1125U"(Remove the unnecessary boolean literals.( +java:S1125X"(Remove the unnecessary boolean literals.( m -java:S3776q"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.( +java:S3776u"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.( C -java:S1125r"(Remove the unnecessary boolean literals.( +java:S1125v"(Remove the unnecessary boolean literals.( > -java:S1125s"(Remove the unnecessary boolean literals.( +java:S1125w"(Remove the unnecessary boolean literals.( F -java:S1068H"+Remove this unused "mLocked" private field.(ԕ \ No newline at end of file +java:S1068J"+Remove this unused "mLocked" private field.(ԕ \ No newline at end of file diff --git a/src/Notes-master3/.idea/sonarlint/issuestore/1/0/10133dfbf3adffaaf1ccf77ae669b88a4bcddf78 b/src/Notes-master3/.idea/sonarlint/issuestore/1/0/10133dfbf3adffaaf1ccf77ae669b88a4bcddf78 deleted file mode 100644 index ca25687..0000000 --- a/src/Notes-master3/.idea/sonarlint/issuestore/1/0/10133dfbf3adffaaf1ccf77ae669b88a4bcddf78 +++ /dev/null @@ -1,4 +0,0 @@ - -U -java:S1118 -":Add a private constructor to hide the implicit public one.( \ No newline at end of file diff --git a/src/Notes-master3/.idea/sonarlint/issuestore/2/a/2afbb999f001938c88fa43fc2ef52abf0f8213e4 b/src/Notes-master3/.idea/sonarlint/issuestore/2/a/2afbb999f001938c88fa43fc2ef52abf0f8213e4 new file mode 100644 index 0000000..e69de29 diff --git a/src/Notes-master3/.idea/sonarlint/issuestore/2/f/2fe3432799c272061172eda7b66b7c2169c8db43 b/src/Notes-master3/.idea/sonarlint/issuestore/2/f/2fe3432799c272061172eda7b66b7c2169c8db43 new file mode 100644 index 0000000..702d6b0 --- /dev/null +++ b/src/Notes-master3/.idea/sonarlint/issuestore/2/f/2fe3432799c272061172eda7b66b7c2169c8db43 @@ -0,0 +1,10 @@ + +` java:S112&"FDefine and throw a dedicated exception instead of using a generic one.( +7 +java:S1643G"Use a StringBuilder instead.(Ɋ +U +java:S1118":Add a private constructor to hide the implicit public one.( +O +java:S2864="4Iterate over the "entrySet" instead of the "keySet".( +S java:S106>"9Replace this use of System.out or System.err by a logger.(녧 +N java:S106J"9Replace this use of System.out or System.err by a logger.(̇ \ No newline at end of file diff --git a/src/Notes-master3/.idea/sonarlint/issuestore/3/2/32360bf24febc78f20db52498c7576b3d8650d56 b/src/Notes-master3/.idea/sonarlint/issuestore/3/2/32360bf24febc78f20db52498c7576b3d8650d56 index 8042818..ff57ed3 100644 --- a/src/Notes-master3/.idea/sonarlint/issuestore/3/2/32360bf24febc78f20db52498c7576b3d8650d56 +++ b/src/Notes-master3/.idea/sonarlint/issuestore/3/2/32360bf24febc78f20db52498c7576b3d8650d56 @@ -18,9 +18,9 @@ java:S1319S"`The type of "ids" should be an interface such as "Set" rather than  java:S1319"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".( S -java:S2589>"8Remove this expression which always evaluates to "false"(Ύ -S java:S2589e"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.( T diff --git a/src/Notes-master3/.idea/sonarlint/issuestore/3/e/3e688be40dc69cfd1062f41d0fc27fe261a26710 b/src/Notes-master3/.idea/sonarlint/issuestore/3/e/3e688be40dc69cfd1062f41d0fc27fe261a26710 index dfc49cc..50bbf84 100644 --- a/src/Notes-master3/.idea/sonarlint/issuestore/3/e/3e688be40dc69cfd1062f41d0fc27fe261a26710 +++ b/src/Notes-master3/.idea/sonarlint/issuestore/3/e/3e688be40dc69cfd1062f41d0fc27fe261a26710 @@ -1,34 +1,5 @@ g -<<<<<<< HEAD -java:S1301"KReplace this "switch" statement by "if" statements to increase readability.(۫ -X -java:S18747"=Remove this use of "FLAG_SHOW_WHEN_LOCKED"; it is deprecated.( -Q -java:S1874;";Remove this use of "FLAG_TURN_SCREEN_ON"; it is deprecated.( -U -java:S1874="?Remove this use of "FLAG_LAYOUT_INSET_DECOR"; it is deprecated.( -H -java:S1874W"2Remove this use of "isScreenOn"; it is deprecated.( -P -java:S1874a":Remove this use of "setAudioStreamType"; it is deprecated.(ۭ -P -java:S1874c":Remove this use of "setAudioStreamType"; it is deprecated.(̡ -` -java:S2147m"ECombine this catch with the one at line 106, which has the same body.( -[ -java:S2147p"ECombine this catch with the one at line 106, which has the same body.( -[ -java:S2147s"ECombine this catch with the one at line 106, which has the same body.(ﭣ -M -java:S1135k"2Complete the task associated to this TODO comment.(̐ -M -java:S1135n"2Complete the task associated to this TODO comment.(̐ -M -java:S1135q"2Complete the task associated to this TODO comment.(̐ -M -java:S1135t"2Complete the task associated to this TODO comment.(̐ -======= java:S1301"KReplace this "switch" statement by "if" statements to increase readability.(۫ X java:S1874J"=Remove this use of "FLAG_SHOW_WHEN_LOCKED"; it is deprecated.( @@ -55,5 +26,4 @@ java:S1135 N java:S1135"2Complete the task associated to this TODO comment.(̐ G -java:S1068<"*Remove this unused "wakeup" private field.(8ӿ0 ->>>>>>> xiaojinchi_branch +java:S1068<"*Remove this unused "wakeup" private field.(8ӿ0 \ No newline at end of file diff --git a/src/Notes-master3/.idea/sonarlint/issuestore/5/0/503adcf2a0be1ecdb94a15efba4433b6589877b9 b/src/Notes-master3/.idea/sonarlint/issuestore/5/0/503adcf2a0be1ecdb94a15efba4433b6589877b9 deleted file mode 100644 index cfaba04..0000000 --- a/src/Notes-master3/.idea/sonarlint/issuestore/5/0/503adcf2a0be1ecdb94a15efba4433b6589877b9 +++ /dev/null @@ -1,14 +0,0 @@ - -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.( -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".(Κ \ No newline at end of file diff --git a/src/Notes-master3/.idea/sonarlint/issuestore/5/d/5dfe6902d8ec740690f88d644e74362c3be08fad b/src/Notes-master3/.idea/sonarlint/issuestore/5/d/5dfe6902d8ec740690f88d644e74362c3be08fad deleted file mode 100644 index 505f811..0000000 --- a/src/Notes-master3/.idea/sonarlint/issuestore/5/d/5dfe6902d8ec740690f88d644e74362c3be08fad +++ /dev/null @@ -1,9 +0,0 @@ - -m -java:S37763"RRefactor this method to reduce its Cognitive Complexity from 16 to the 15 allowed.( -O -java:S1874?"9Remove this use of "setTextAppearance"; it is deprecated.( -O -java:S1874F"9Remove this use of "setTextAppearance"; it is deprecated.( -O -java:S1874P"9Remove this use of "setTextAppearance"; it is deprecated.( \ No newline at end of file diff --git a/src/Notes-master3/.idea/sonarlint/issuestore/8/7/876016634c6642b35109680ccac740dc8271b236 b/src/Notes-master3/.idea/sonarlint/issuestore/8/7/876016634c6642b35109680ccac740dc8271b236 deleted file mode 100644 index 6ea887e..0000000 --- a/src/Notes-master3/.idea/sonarlint/issuestore/8/7/876016634c6642b35109680ccac740dc8271b236 +++ /dev/null @@ -1,15 +0,0 @@ - -F -java:S1066"/Merge this if statement with the enclosing one.( -3 -java:S2386N"Make this member "protected".( -8 -java:S2386X"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.( -? -java:S1068:")Remove this unused "image" private field.(Ƚ -S -java:S1068v"8Remove this unused "NOTE_PASSWORD_COLUMN" private field.( \ No newline at end of file diff --git a/src/Notes-master3/.idea/sonarlint/issuestore/8/c/8c55c3ccc257e5907959013f99656e4c8ec3903e b/src/Notes-master3/.idea/sonarlint/issuestore/8/c/8c55c3ccc257e5907959013f99656e4c8ec3903e new file mode 100644 index 0000000..0a90068 --- /dev/null +++ b/src/Notes-master3/.idea/sonarlint/issuestore/8/c/8c55c3ccc257e5907959013f99656e4c8ec3903e @@ -0,0 +1,2 @@ + +K xml:S5594<"1Implement permissions on this exported component.( \ No newline at end of file diff --git a/src/Notes-master3/.idea/sonarlint/issuestore/9/1/918ca359602392354123b7d3b63264baf7ea9dde b/src/Notes-master3/.idea/sonarlint/issuestore/9/1/918ca359602392354123b7d3b63264baf7ea9dde new file mode 100644 index 0000000..e69de29 diff --git a/src/Notes-master3/.idea/sonarlint/issuestore/a/1/a130ec2a8612d749a4ec673c99126daf6e3058c2 b/src/Notes-master3/.idea/sonarlint/issuestore/a/1/a130ec2a8612d749a4ec673c99126daf6e3058c2 deleted file mode 100644 index 9eaae83..0000000 --- a/src/Notes-master3/.idea/sonarlint/issuestore/a/1/a130ec2a8612d749a4ec673c99126daf6e3058c2 +++ /dev/null @@ -1,19 +0,0 @@ - -o java:S115"ZRename this constant name to match the regular expression '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'.( -t java:S115"ZRename this constant name to match the regular expression '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'.(ä -t java:S115 "ZRename this constant name to match the regular expression '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'.( -o java:S115 -"ZRename this constant name to match the regular expression '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'.( -o java:S115 "ZRename this constant name to match the regular expression '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'.(׹ -t java:S115 "ZRename this constant name to match the regular expression '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'.(䚸 - -java:S1186"Add a nested comment explaining why this method is empty, throw an UnsupportedOperationException or complete the implementation.(ǧ -3 -java:S1118"Hide this public constructor.(ǧ -m -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.(ŗ -D -java:S1905")Remove this unnecessary cast to "double".( -f java:S128"LEnd this switch case with an unconditional break, return or throw statement.(޾ -F -java:S4524!"+Move this default to the end of the switch.(ݖҘ \ No newline at end of file diff --git a/src/Notes-master3/.idea/sonarlint/issuestore/a/4/a446c87b1013132f8adaf83656b582028e8809af b/src/Notes-master3/.idea/sonarlint/issuestore/a/4/a446c87b1013132f8adaf83656b582028e8809af new file mode 100644 index 0000000..6498931 --- /dev/null +++ b/src/Notes-master3/.idea/sonarlint/issuestore/a/4/a446c87b1013132f8adaf83656b582028e8809af @@ -0,0 +1,17 @@ + +e +java:S2095"NUse try-with-resources or close this "FileOutputStream" in a "finally" clause.( +k java:S116w"VRename this field "TEXT_FORMAT" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ћ +i +java:S3776"RRefactor this method to reduce its Cognitive Complexity from 27 to the 15 allowed.( +h +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 301, which has the same body.(ߝȴ +\ +java:S2147"ECombine this catch with the one at line 334, which has the same body.(ﭣ +] java:S899"BDo something with the "boolean" value returned by "createNewFile".(А +9 +java:S3398H"#Move this method into "TextExport".( +? +java:S3398"#Move this method into "TextExport".( \ No newline at end of file diff --git a/src/Notes-master3/.idea/sonarlint/issuestore/a/7/a7641cfac724321d508c2a284223a711011a93f5 b/src/Notes-master3/.idea/sonarlint/issuestore/a/7/a7641cfac724321d508c2a284223a711011a93f5 deleted file mode 100644 index 9d3e320..0000000 --- a/src/Notes-master3/.idea/sonarlint/issuestore/a/7/a7641cfac724321d508c2a284223a711011a93f5 +++ /dev/null @@ -1,13 +0,0 @@ - -f -java:S11929"KDefine a constant instead of duplicating this literal "content://" 4 times.( -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.(߀ \ No newline at end of file diff --git a/src/Notes-master3/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32 b/src/Notes-master3/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32 deleted file mode 100644 index 23544ef..0000000 --- a/src/Notes-master3/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32 +++ /dev/null @@ -1,94 +0,0 @@ - -p -java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥 -> -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(ܴ -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(ά -g -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"( -7 -java:S1116a"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.(Ѿk -n -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.( -2 -java:S3626"Remove this redundant jump.(݅ -2 -java:S3626"Remove this redundant jump.(݅ -2 -java:S3626"Remove this redundant jump.(݅ -P -java:S1874"9Remove this use of "PreferenceManager"; it is deprecated.(­ -Z -java:S1874"CRemove this use of "getDefaultSharedPreferences"; it is deprecated.(­ -N -java:S1135"2Complete the task associated to this TODO comment.(̐ -F -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.( -n -java:S3252"RUse static access with "android.widget.AbsListView" for "MultiChoiceModeListener".( -N -java:S1135"2Complete the task associated to this TODO comment.( -N -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.( -8 -java:S1116"Remove this empty statement.( -i -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 20 to the 15 allowed.( -C -java:S1874".Remove this use of ""; it is deprecated.(? -? java:S108")Either remove or fill this block of code.(ʥ -K -java:S1874"/Remove this use of "execute"; it is deprecated.(嫏 -S -java:S1874"7Remove this use of "toggleSoftInput"; it is deprecated.( -O -java:S1874"3Remove this use of "SHOW_FORCED"; it is deprecated.( -h -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.(# -N -java:S1135"2Complete the task associated to this TODO comment.( -^ -java:S1126"BReplace this if-then-else statement by a single method invocation.(玒 -N -java:S1135"2Complete the task associated to this TODO comment.( -f -java:S1874"JDon't override a deprecated method or explicitly mark it as "@Deprecated".( -J -java:S1874".Remove this use of ""; it is deprecated.(Ч -f -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.(嫏 -h -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(b -K -java:S3398"/Move this method into "BackgroundQueryHandler".( -< -java:S3398"%Move this method into "ModeCallback".( -A -java:S3398"%Move this method into "ModeCallback".( -G -java:S3398"0Move this method into "OnListItemClickListener".( \ No newline at end of file diff --git a/src/Notes-master3/.idea/sonarlint/issuestore/c/4/c42ad3cd6e664963fa1849c760a57d417d500ee7 b/src/Notes-master3/.idea/sonarlint/issuestore/c/4/c42ad3cd6e664963fa1849c760a57d417d500ee7 new file mode 100644 index 0000000..9a59a4b --- /dev/null +++ b/src/Notes-master3/.idea/sonarlint/issuestore/c/4/c42ad3cd6e664963fa1849c760a57d417d500ee7 @@ -0,0 +1,95 @@ + +P +java:S1118":Add a private constructor to hide the implicit public one.( +` +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.( +[ +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.( +` +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.( +` +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.( +[ +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:S11241"EReorder the modifiers to comply with the Java Language Specification.( +[ +java:S11243"EReorder the modifiers to comply with the Java Language Specification.(̥ +[ +java:S11245"EReorder the modifiers to comply with the Java Language Specification.(Ƒ +Z +java:S11247"EReorder the modifiers to comply with the Java Language Specification.( +` +java:S11249"EReorder the modifiers to comply with the Java Language Specification.( +Z +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.( +[ +java:S1124?"EReorder the modifiers to comply with the Java Language Specification.(֫ +Z +java:S1124A"EReorder the modifiers to comply with the Java Language Specification.($ +[ +java:S1124C"EReorder the modifiers to comply with the Java Language Specification.( +` +java:S1124E"EReorder the modifiers to comply with the Java Language Specification.( +[ +java:S1124G"EReorder the modifiers to comply with the Java Language Specification.( +[ +java:S1124I"EReorder the modifiers to comply with the Java Language Specification.(૵ +` +java:S1124K"EReorder the modifiers to comply with the Java Language Specification.(֐ +[ +java:S1124M"EReorder the modifiers to comply with the Java Language Specification.( +` +java:S1124O"EReorder the modifiers to comply with the Java Language Specification.( +` +java:S1124Q"EReorder the modifiers to comply with the Java Language Specification.( +[ +java:S1124S"EReorder the modifiers to comply with the Java Language Specification.( +[ +java:S1124U"EReorder the modifiers to comply with the Java Language Specification.(ʹ +` +java:S1124W"EReorder the modifiers to comply with the Java Language Specification.(ԣ +[ +java:S1124Y"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.(Ȩ +[ +java:S1124_"EReorder the modifiers to comply with the Java Language Specification.( +[ +java:S1124a"EReorder the modifiers to comply with the Java Language Specification.(̀ +` +java:S1124c"EReorder the modifiers to comply with the Java Language Specification.(â +` +java:S1124e"EReorder the modifiers to comply with the Java Language Specification.( +[ +java:S1124g"EReorder the modifiers to comply with the Java Language Specification.(ƒ +` +java:S1124i"EReorder the modifiers to comply with the Java Language Specification.( +` +java:S1124k"EReorder the modifiers to comply with the Java Language Specification.( +Z +java:S1124m"EReorder the modifiers to comply with the Java Language Specification.(†- +` +java:S1124o"EReorder the modifiers to comply with the Java Language Specification.( \ No newline at end of file diff --git a/src/Notes-master3/.idea/sonarlint/issuestore/d/1/d187f1271655c3d91661a39fe6de395b6a9f290a b/src/Notes-master3/.idea/sonarlint/issuestore/d/1/d187f1271655c3d91661a39fe6de395b6a9f290a index 0e25932..1ce26f1 100644 --- a/src/Notes-master3/.idea/sonarlint/issuestore/d/1/d187f1271655c3d91661a39fe6de395b6a9f290a +++ b/src/Notes-master3/.idea/sonarlint/issuestore/d/1/d187f1271655c3d91661a39fe6de395b6a9f290a @@ -1,5 +1,3 @@ -\ -java:S2259"@A "NullPointerException" could be thrown; "js" is nullable here.( i -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 16 to the 15 allowed.(ǎ \ No newline at end of file +java:S3776"RRefactor this method to reduce its Cognitive Complexity from 16 to the 15 allowed.(ǎ \ No newline at end of file diff --git a/src/Notes-master3/.idea/sonarlint/issuestore/d/a/da57ce446af85bbd9aefee65e969869f0cff78b0 b/src/Notes-master3/.idea/sonarlint/issuestore/d/a/da57ce446af85bbd9aefee65e969869f0cff78b0 deleted file mode 100644 index 1d90a67..0000000 --- a/src/Notes-master3/.idea/sonarlint/issuestore/d/a/da57ce446af85bbd9aefee65e969869f0cff78b0 +++ /dev/null @@ -1,59 +0,0 @@ - -? -java:S1604"(Make this anonymous inner class a lambda( -? -java:S1604"(Make this anonymous inner class a lambda(ܨ -? -java:S1604"(Make this anonymous inner class a lambda(ܨ -? -java:S1604"(Make this anonymous inner class a lambda(ά -? -java:S1604"(Make this anonymous inner class a lambda(څ -? -java:S1604"(Make this anonymous inner class a lambda( -? -java:S1604"(Make this anonymous inner class a lambda(î -? -java:S1604"(Make this anonymous inner class a lambda(î -g -java:S1301"KReplace this "switch" statement by "if" statements to increase readability.(崡 -U -java:S18743":Remove this use of "PreferenceActivity"; it is deprecated.( -P -java:S1874@":Remove this use of "PreferenceCategory"; it is deprecated.(Θ -` -java:S1874I"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(Θ -K -java:S1874J"0Remove this use of "onCreate"; it is deprecated.(ȢՖ -P -java:S1874P":Remove this use of "PreferenceCategory"; it is deprecated.( -L -java:S1874P"6Remove this use of "findPreference"; it is deprecated.( -I -java:S1874X"3Remove this use of "getListView"; it is deprecated.(د -h -java:S3776\"RRefactor this method to reduce its Cognitive Complexity from 20 to the 15 allowed.(٫ -` -java:S1874x"JDon't override a deprecated method or explicitly mark it as "@Deprecated".( -G -java:S1874|"1Remove this use of "onDestroy"; it is deprecated.(ʷ -H -java:S1874"1Remove this use of "removeAll"; it is deprecated.( -N -java:S1874"2Remove this use of "Preference"; it is deprecated.( -N -java:S1874"2Remove this use of "Preference"; it is deprecated.( -G -java:S1874"0Remove this use of "setTitle"; it is deprecated.( -N -java:S1874"2Remove this use of "setSummary"; it is deprecated.( -[ -java:S1874"DRemove this use of "setOnPreferenceClickListener"; it is deprecated.( -N -java:S1874"2Remove this use of "Preference"; it is deprecated.( -Q -java:S1874"5Remove this use of "addPreference"; it is deprecated.(ن -a -java:S1874"JDon't override a deprecated method or explicitly mark it as "@Deprecated".( -Q -java:S1161":Add the "@Override" annotation above this method signature( \ No newline at end of file diff --git a/src/Notes-master3/.idea/sonarlint/issuestore/d/d/dd970bd8ce083850fca1d4d159647ccd110e57cb b/src/Notes-master3/.idea/sonarlint/issuestore/d/d/dd970bd8ce083850fca1d4d159647ccd110e57cb new file mode 100644 index 0000000..5405687 --- /dev/null +++ b/src/Notes-master3/.idea/sonarlint/issuestore/d/d/dd970bd8ce083850fca1d4d159647ccd110e57cb @@ -0,0 +1,15 @@ + +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.( +O +java:S2589"8Remove this expression which always evaluates to "false"( +\ +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.( +U +java:S1155">Use isEmpty() to check whether the collection is empty or not.( +\ +java:S2147"ECombine this catch with the one at line 242, which has the same body.(暩 \ No newline at end of file diff --git a/src/Notes-master3/.idea/sonarlint/issuestore/e/0/e094aec5c3e1b6f44539adff3114f5a1ad603ddc b/src/Notes-master3/.idea/sonarlint/issuestore/e/0/e094aec5c3e1b6f44539adff3114f5a1ad603ddc new file mode 100644 index 0000000..7984771 --- /dev/null +++ b/src/Notes-master3/.idea/sonarlint/issuestore/e/0/e094aec5c3e1b6f44539adff3114f5a1ad603ddc @@ -0,0 +1,3 @@ + +t +java:S2293*"YReplace the type specification in this constructor call with the diamond operator ("<>").(ʩ \ No newline at end of file diff --git a/src/Notes-master3/.idea/sonarlint/issuestore/f/4/f4a01d6a4fcb971362ec00a83903fd3902f52164 b/src/Notes-master3/.idea/sonarlint/issuestore/f/4/f4a01d6a4fcb971362ec00a83903fd3902f52164 new file mode 100644 index 0000000..e69de29 diff --git a/src/Notes-master3/.idea/sonarlint/issuestore/index.pb b/src/Notes-master3/.idea/sonarlint/issuestore/index.pb index 0425b6f..0729da8 100644 --- a/src/Notes-master3/.idea/sonarlint/issuestore/index.pb +++ b/src/Notes-master3/.idea/sonarlint/issuestore/index.pb @@ -1,53 +1,12 @@ 7 gradlew,5\b\5bbfa66edb4db3c7c33c5181f43510990d3307f9 -g -7app/src/main/java/net/micode/notes/gtask/data/Task.java,d\1\d187f1271655c3d91661a39fe6de395b6a9f290a -<<<<<<< HEAD -X -(gradle/wrapper/gradle-wrapper.properties,f\b\fbe448ebfc3eb2d4e308f6b8b043666f5b57235e -d -4app/src/main/java/net/micode/notes/data/Contact.java,9\a\9a3a19793537958b8b1b03a81985999e22705a2f -@ -local.properties,0\7\0712df971a99ac4d2fccb8e0fb19f377f3374cca -l ->>>>>> xiaojinchi_branch p @app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java,4\5\4529b3a97b0f3b19b895aa06f23bed63ff38a312 u Eapp/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java,f\0\f087b1ba1b9c91b7293fea0fb071eaed62a42137 h 8app/src/main/java/net/micode/notes/tool/ScreenUtils.java,a\d\ad590109436b2eb4769f3f458b66ad7751784d6d -<<<<<<< HEAD -< - build.gradle,f\0\f07866736216be0ee2aba49e392191aeae700a35 -======= d 4app/src/main/java/net/micode/notes/data/Contact.java,9\a\9a3a19793537958b8b1b03a81985999e22705a2f X @@ -58,42 +17,20 @@ L gradle.properties.properties,8\c\8ce4a8a05a725a9f27d9278347f33f2603a52493 ? settings.gradle,0\5\05efc8b1657769a27696d478ded1e95f38737233 -@ -local.properties,0\7\0712df971a99ac4d2fccb8e0fb19f377f3374cca j :app/src/main/java/net/micode/notes/data/NotesProvider.java,6\a\6a65e747031f27aef20597b4181148a9fbf963d5 -b -2app/src/main/java/net/micode/notes/data/Notes.java,a\7\a7641cfac724321d508c2a284223a711011a93f5 -p -@app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java,1\e\1eb2363b523dbcae43d3c6e4790c64436af61b13 -< - build.gradle,f\0\f07866736216be0ee2aba49e392191aeae700a35 i 9app/src/main/java/net/micode/notes/ui/ScreenListener.java,a\d\adc88f87585668f7123f43f97cd404c4f4043a2a l ->>>>>> xiaojinchi_branch +7app/src/main/java/net/micode/notes/ui/NoteItemData.java,0\8\08c35f02f11c35ae9ebf8db0a482054dfa1cf493 +h +8app/src/main/java/net/micode/notes/tool/BackupUtils.java,a\4\a446c87b1013132f8adaf83656b582028e8809af +f +6app/src/main/java/net/micode/notes/tool/DataUtils.java,3\2\32360bf24febc78f20db52498c7576b3d8650d56 +m +=app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java,c\4\c42ad3cd6e664963fa1849c760a57d417d500ee7 +P + app/src/main/AndroidManifest.xml,8\c\8c55c3ccc257e5907959013f99656e4c8ec3903e +e +5app/src/main/java/net/micode/notes/tool/HttpUtil.java,2\f\2fe3432799c272061172eda7b66b7c2169c8db43 +g +7app/src/main/java/net/micode/notes/gtask/data/Task.java,d\1\d187f1271655c3d91661a39fe6de395b6a9f290a +k +;app/src/main/java/net/micode/notes/gtask/data/TaskList.java,e\0\e094aec5c3e1b6f44539adff3114f5a1ad603ddc +@ +app/build.gradle,f\4\f4a01d6a4fcb971362ec00a83903fd3902f52164 +@ +local.properties,0\7\0712df971a99ac4d2fccb8e0fb19f377f3374cca +< + build.gradle,f\0\f07866736216be0ee2aba49e392191aeae700a35 +A +gradle.properties,2\a\2afbb999f001938c88fa43fc2ef52abf0f8213e4 +A +core/build.gradle,9\1\918ca359602392354123b7d3b63264baf7ea9dde +p +@app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java,1\e\1eb2363b523dbcae43d3c6e4790c64436af61b13 +b +2app/src/main/java/net/micode/notes/model/Note.java,d\d\dd970bd8ce083850fca1d4d159647ccd110e57cb +k +;app/src/main/java/net/micode/notes/ui/NotesListAdapter.java,2\8\283f16cc23da56ca65616082bc810304d3511d0a \ No newline at end of file diff --git a/src/Notes-master3/app/build.gradle b/src/Notes-master3/app/build.gradle index f983766..24785b3 100644 --- a/src/Notes-master3/app/build.gradle +++ b/src/Notes-master3/app/build.gradle @@ -9,11 +9,7 @@ android { applicationId "net.micode.notes" useLibrary'org.apache.http.legacy' minSdkVersion 21 -<<<<<<< HEAD - targetSdkVersion 8 -======= targetSdkVersion 23 ->>>>>>> xiaojinchi_branch } lintOptions{ abortOnError false } @@ -23,14 +19,11 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } } -<<<<<<< HEAD -======= sourceSets{ main{ jniLibs.srcDirs = ['libs'] } } ->>>>>>> xiaojinchi_branch packagingOptions { exclude 'META-INF/DEPENDENCIES' exclude 'META-INF/NOTICE' @@ -44,13 +37,10 @@ dependencies { //implementation files('C:\\Users\\87334\\Desktop\\Notes-master\\httpcomponents-client-4.5.13\\lib\\httpclient-win-4.5.13.jar') //implementation files('C:\\Users\\87334\\Desktop\\Notes-master\\httpcomponents-client-4.5.13\\lib\\httpcore-4.4.13.jar') implementation 'com.android.support:appcompat-v7:28.0.0' -<<<<<<< HEAD -======= implementation 'com.squareup.retrofit2:converter-gson:2.4.0' //implementation files('libs\\Msc.jar') implementation project(path: ':core') implementation fileTree(dir: 'libs', include: ['*.jar']) ->>>>>>> xiaojinchi_branch } sonarqube { properties { diff --git a/src/Notes-master3/app/build/intermediates/apk/debug/app-debug.apk b/src/Notes-master3/app/build/intermediates/apk/debug/app-debug.apk index a608d82..8897f6b 100644 Binary files a/src/Notes-master3/app/build/intermediates/apk/debug/app-debug.apk and b/src/Notes-master3/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/src/Notes-master3/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/Notes-master3/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar index 821e54b..6b7ad17 100644 Binary files a/src/Notes-master3/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/src/Notes-master3/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ diff --git a/src/Notes-master3/app/build/intermediates/compile_app_classes_jar/debug/classes.jar b/src/Notes-master3/app/build/intermediates/compile_app_classes_jar/debug/classes.jar index 9df2ca4..04612d2 100644 Binary files a/src/Notes-master3/app/build/intermediates/compile_app_classes_jar/debug/classes.jar and b/src/Notes-master3/app/build/intermediates/compile_app_classes_jar/debug/classes.jar differ diff --git a/src/Notes-master3/app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex b/src/Notes-master3/app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex index 7197ae0..dc5dc09 100644 Binary files a/src/Notes-master3/app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex and b/src/Notes-master3/app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex differ diff --git a/src/Notes-master3/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex b/src/Notes-master3/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex index 9ed28ca..f661295 100644 Binary files a/src/Notes-master3/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex and b/src/Notes-master3/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex differ diff --git a/src/Notes-master3/app/build/intermediates/dex/debug/mergeProjectDexDebug/11/classes.dex b/src/Notes-master3/app/build/intermediates/dex/debug/mergeProjectDexDebug/11/classes.dex index 3bc1e6f..40b14f5 100644 Binary files a/src/Notes-master3/app/build/intermediates/dex/debug/mergeProjectDexDebug/11/classes.dex and b/src/Notes-master3/app/build/intermediates/dex/debug/mergeProjectDexDebug/11/classes.dex differ diff --git a/src/Notes-master3/app/build/intermediates/dex/debug/mergeProjectDexDebug/12/classes.dex b/src/Notes-master3/app/build/intermediates/dex/debug/mergeProjectDexDebug/12/classes.dex index 3b62a54..5332b93 100644 Binary files a/src/Notes-master3/app/build/intermediates/dex/debug/mergeProjectDexDebug/12/classes.dex and b/src/Notes-master3/app/build/intermediates/dex/debug/mergeProjectDexDebug/12/classes.dex differ diff --git a/src/Notes-master3/app/build/intermediates/dex/debug/mergeProjectDexDebug/15/classes.dex b/src/Notes-master3/app/build/intermediates/dex/debug/mergeProjectDexDebug/15/classes.dex index 1ba78f7..a8662a0 100644 Binary files a/src/Notes-master3/app/build/intermediates/dex/debug/mergeProjectDexDebug/15/classes.dex and b/src/Notes-master3/app/build/intermediates/dex/debug/mergeProjectDexDebug/15/classes.dex differ diff --git a/src/Notes-master3/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex b/src/Notes-master3/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex index f74e3dd..0451dd3 100644 Binary files a/src/Notes-master3/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex and b/src/Notes-master3/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex differ diff --git a/src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index 4e7cd4c..dc938e2 100644 Binary files a/src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state index b2a288c..5fd1936 100644 Binary files a/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state and b/src/Notes-master3/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state differ diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index 2d9f00a..4699f49 100644 --- a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,18 +1,4 @@ -<<<<<<< HEAD -#Thu Oct 13 08:29:24 CST 2022 -net.micode.notes.app-main-10\:/layout/note_edit_list_item.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_green_down.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat -net.micode.notes.app-main-10\:/layout/note_edit.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat -net.micode.notes.app-main-10\:/drawable-hdpi/selected.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_red.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_white_middle.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat -net.micode.notes.app-main-10\:/xml/preferences.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_red_up.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/font_normal.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/widget_2x_blue.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_white.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat -======= -#Fri Oct 21 23:33:18 CST 2022 +#Tue Nov 01 08:51:52 CST 2022 net.micode.notes.app-main-13\:/drawable-hdpi/read.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_read.png.flat net.micode.notes.app-main-10\:/layout/note_edit_list_item.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat net.micode.notes.app-main-13\:/drawable-hdpi/icon_app.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat @@ -25,77 +11,12 @@ net.micode.notes.app-main-13\:/drawable-hdpi/list_blue_single.9.png=D\:\\Notes-m net.micode.notes.app-main-13\:/menu/sub_folder.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_red.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat net.micode.notes.app-main-10\:/drawable-hdpi/list_red_up.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/font_normal.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat net.micode.notes.app-main-13\:/drawable-hdpi/edit_red.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat ->>>>>>> xiaojinchi_branch +net.micode.notes.app-main-10\:/drawable-hdpi/font_normal.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat net.micode.notes.app-main-10\:/drawable-hdpi/edit_red.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat net.micode.notes.app-main-10\:/drawable-hdpi/title_alert.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat net.micode.notes.app-main-10\:/drawable-hdpi/font_super.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat net.micode.notes.app-main-10\:/drawable-hdpi/list_background.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat -<<<<<<< HEAD -net.micode.notes.app-main-10\:/menu/note_list.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat -net.micode.notes.app-main-10\:/layout/dialog_edit_text.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat -net.micode.notes.app-main-10\:/layout/note_list_dropdown_menu.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat -net.micode.notes.app-main-10\:/drawable-hdpi/widget_2x_white.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/clock.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat -net.micode.notes.app-main-10\:/layout/widget_2x.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_green_single.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/notification.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_blue_middle.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_red_middle.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_red_single.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_blue_single.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/new_note_normal.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_white_up.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/edit_yellow.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_green_up.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_footer_bg.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/dropdown_icon.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/new_note_pressed.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_green_middle.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/widget_2x_red.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat -net.micode.notes.app-main-10\:/menu/note_list_options.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat -net.micode.notes.app-main-10\:/drawable-hdpi/menu_move.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat -net.micode.notes.app-main-10\:/layout/settings_header.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat -net.micode.notes.app-main-10\:/drawable-hdpi/edit_white.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat -net.micode.notes.app-main-10\:/menu/call_note_edit.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat -net.micode.notes.app-main-10\:/drawable-hdpi/call_record.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat -net.micode.notes.app-main-10\:/color/secondary_text_dark.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat -net.micode.notes.app-main-10\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_blue_up.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_white_single.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/title_bar_bg.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/edit_title_blue.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat -net.micode.notes.app-main-10\:/layout/widget_4x.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat -net.micode.notes.app-main-10\:/drawable-hdpi/read.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_read.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/edit_title_green.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_blue_down.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat -net.micode.notes.app-main-10\:/xml/widget_4x_info.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat -net.micode.notes.app-main-10\:/drawable-hdpi/font_small.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_folder.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat -net.micode.notes.app-main-10\:/menu/sub_folder.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat -net.micode.notes.app-main-10\:/layout/datetime_picker.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat -net.micode.notes.app-main-10\:/drawable/new_note.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_yellow_up.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/edit_green.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat -net.micode.notes.app-main-10\:/color/primary_text_dark.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_yellow_single.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/icon_app.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/edit_blue.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat -net.micode.notes.app-main-10\:/menu/note_list_dropdown.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat -net.micode.notes.app-main-10\:/raw-zh-rCN/introduction=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_red_down.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_white_down.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat -net.micode.notes.app-main-10\:/raw/introduction=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat -net.micode.notes.app-main-10\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat -net.micode.notes.app-main-10\:/layout/folder_list_item.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat -net.micode.notes.app-main-10\:/layout/add_account_text.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat -net.micode.notes.app-main-10\:/layout/note_list_footer.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat -net.micode.notes.app-main-10\:/drawable-hdpi/delete.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat -net.micode.notes.app-main-10\:/layout/account_dialog_title.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat -net.micode.notes.app-main-10\:/drawable-hdpi/edit_title_red.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat -======= net.micode.notes.app-main-13\:/drawable-hdpi/widget_2x_green.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat net.micode.notes.app-main-13\:/xml/widget_4x_info.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat net.micode.notes.app-main-10\:/layout/note_list_dropdown_menu.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat @@ -115,8 +36,8 @@ net.micode.notes.app-main-13\:/menu/note_list.xml=D\:\\Notes-master3\\app\\build net.micode.notes.app-main-10\:/drawable-hdpi/new_note_normal.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat net.micode.notes.app-main-13\:/drawable-hdpi/list_white_up.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat net.micode.notes.app-main-10\:/drawable-hdpi/edit_yellow.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_green_up.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat net.micode.notes.app-main-13\:/xml/widget_2x_info.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat +net.micode.notes.app-main-10\:/drawable-hdpi/list_green_up.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat net.micode.notes.app-main-10\:/drawable-hdpi/list_footer_bg.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat net.micode.notes.app-main-10\:/drawable-hdpi/new_note_pressed.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat net.micode.notes.app-main-10\:/drawable-hdpi/list_green_middle.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat @@ -135,8 +56,8 @@ net.micode.notes.app-main-10\:/drawable-hdpi/title_bar_bg.9.png=D\:\\Notes-maste net.micode.notes.app-main-10\:/drawable-hdpi/edit_title_blue.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat net.micode.notes.app-main-10\:/layout/widget_4x.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat net.micode.notes.app-main-13\:/color/secondary_text_dark.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_blue_down.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat net.micode.notes.app-main-13\:/menu/note_list_dropdown.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat +net.micode.notes.app-main-10\:/drawable-hdpi/list_blue_down.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat net.micode.notes.app-main-10\:/xml/widget_4x_info.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat net.micode.notes.app-main-10\:/drawable-hdpi/list_folder.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat net.micode.notes.app-main-13\:/drawable-hdpi/clock.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat @@ -150,8 +71,8 @@ net.micode.notes.app-main-13\:/drawable-hdpi/font_small.png=D\:\\Notes-master3\\ net.micode.notes.app-main-10\:/drawable-hdpi/icon_app.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat net.micode.notes.app-main-10\:/drawable-hdpi/edit_blue.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat net.micode.notes.app-main-10\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_red_down.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat net.micode.notes.app-main-10\:/drawable-hdpi/list_white_down.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat +net.micode.notes.app-main-10\:/drawable-hdpi/list_red_down.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat net.micode.notes.app-main-10\:/raw/introduction=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat net.micode.notes.app-main-13\:/layout/note_list_dropdown_menu.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat net.micode.notes.app-main-13\:/drawable-hdpi/list_red_down.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat @@ -252,20 +173,11 @@ net.micode.notes.app-main-13\:/drawable/butto_read.xml=D\:\\Notes-master3\\app\\ net.micode.notes.app-main-10\:/layout/add_account_text.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat net.micode.notes.app-main-10\:/layout/note_list_footer.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat net.micode.notes.app-main-13\:/drawable-hdpi/list_footer_bg.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat ->>>>>>> xiaojinchi_branch net.micode.notes.app-main-10\:/drawable-hdpi/widget_2x_green.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat net.micode.notes.app-main-10\:/layout/note_item.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat net.micode.notes.app-main-10\:/menu/call_record_folder.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat net.micode.notes.app-main-10\:/xml/widget_2x_info.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_blue.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat -<<<<<<< HEAD -net.micode.notes.app-main-10\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/font_large.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat -net.micode.notes.app-main-10\:/drawable/butto_read.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable_butto_read.xml.flat -net.micode.notes.app-main-10\:/drawable-hdpi/bg_btn_set_color.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_yellow_down.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat -net.micode.notes.app-main-10\:/drawable-hdpi/edit_title_white.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat -======= net.micode.notes.app-main-13\:/drawable-hdpi/list_white_middle.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat net.micode.notes.app-main-13\:/drawable-hdpi/title_alert.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat net.micode.notes.app-main-13\:/drawable-hdpi/list_white_single.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat @@ -275,19 +187,11 @@ net.micode.notes.app-main-13\:/drawable-hdpi/widget_2x_white.png=D\:\\Notes-mast net.micode.notes.app-main-13\:/drawable/new_note.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat net.micode.notes.app-main-10\:/drawable-hdpi/list_yellow_down.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat net.micode.notes.app-main-13\:/menu/note_list_options.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat ->>>>>>> xiaojinchi_branch net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_green.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat net.micode.notes.app-main-10\:/drawable-hdpi/search_result.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_yellow.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat net.micode.notes.app-main-10\:/drawable-hdpi/widget_2x_yellow.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat net.micode.notes.app-main-10\:/layout/note_list.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat -<<<<<<< HEAD -net.micode.notes.app-main-10\:/xml/searchable.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat -net.micode.notes.app-main-10\:/drawable-hdpi/menu_delete.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat -net.micode.notes.app-main-10\:/menu/note_edit.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat -net.micode.notes.app-main-10\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat -======= net.micode.notes.app-main-10\:/drawable-hdpi/menu_delete.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat net.micode.notes.app-main-10\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat net.micode.notes.app-main-10\:/menu/note_edit.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat ->>>>>>> xiaojinchi_branch diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml index 0697add..030e267 100644 --- a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml +++ b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml @@ -700,7 +700,7 @@ true "999+""999+""999+""999+""999+" -======= "999+""999+""999+""999+""999+" ->>>>>>> xiaojinchi_branch @@ -191,11 +179,7 @@ truefalsetrue@android:color/black#7fa87f@android:color/black@android:color/black@color/material_deep_teal_200@color/material_deep_teal_500@color/material_grey_800@android:color/white@color/material_grey_850@color/material_grey_50#80ffffff#80000000@color/bright_foreground_material_light@color/bright_foreground_material_dark@android:color/white@android:color/black#ff5a595b#ffd6d7d7#80bebebe#80323232#ffbebebe#ff323232#ff7043#ff5722@android:color/white@android:color/black#6680cbc4#66009688#ff37474f#ff263238#ff21272b#ff80cbc4#ff009688#fff5f5f5#ffe0e0e0#fffafafa#ff757575#ff424242#ff303030#ff212121@android:color/black@color/material_grey_600@color/material_grey_900@color/material_grey_100#ffffffff#de000000#4Dffffff#39000000#33ffffff#1f000000#b3ffffff#8a000000#36ffffff#24000000#ff616161#ffbdbdbd#ffbdbdbd#fff1f1f1#e6616161#e6FFFFFF -======= truefalsetrue@android:color/black#7fa87f@android:color/black@android:color/black@color/material_deep_teal_200@color/material_deep_teal_500@color/material_grey_800@android:color/white@color/material_grey_850@color/material_grey_50#80ffffff#80000000@color/bright_foreground_material_light@color/bright_foreground_material_dark@android:color/white@android:color/black#ff5a595b#ffd6d7d7#80bebebe#80323232#ffbebebe#ff323232#ff7043#ff5722@android:color/white@android:color/black#6680cbc4#66009688#ff37474f#ff263238#ff21272b#ff80cbc4#ff009688#fff5f5f5#ffe0e0e0#fffafafa#ff757575#ff424242#ff303030#ff212121@android:color/black@color/material_grey_600@color/material_grey_900@color/material_grey_100#ffffffff#de000000#4Dffffff#39000000#33ffffff#1f000000#b3ffffff#8a000000#36ffffff#24000000#ff616161#ffbdbdbd#ffbdbdbd#fff1f1f1#e6616161#e6FFFFFF ->>>>>>> xiaojinchi_branch @@ -1454,11 +1438,7 @@ true "होम पेज पर जाएं""ऊपर जाएं""ज़्यादा विकल्प""हो गया""सभी देखें""कोई एप्‍लिकेशन चुनें""बंद""चालू""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""space""Sym+""Menu+""खोजा जा रहा है…""क्‍वेरी साफ़ करें""सर्च क्वेरी""सर्च करें""क्वेरी सबमिट करें""आवाज़ सर्च""इसके साथ शेयर करें""%s के साथ शेयर करें""छोटा करें""सर्च""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""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""Ուղղվել տուն""Ուղղվել վերև""Այլ ընտրանքներ""Պատրաստ է""Տեսնել բոլորը""Ընտրել ծրագիր""ԱՆՋԱՏՎԱԾ""ՄԻԱՑՎԱԾ""Alt+""Ctrl+""Delete""Enter""Function+""Meta+""Shift+""բացատ""Sym+""Menu+""Որոնում...""Մաքրել հարցումը""Որոնման հարցում""Որոնել""Ուղարկել հարցումը""Ձայնային որոնում""Կիսվել""Ուղարկել %s-ին""Թաքցնել""Որոնել""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""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""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""נווט לדף הבית""נווט למעלה""עוד אפשרויות""בוצע""ראה הכל""בחר אפליקציה""כבוי""פועל""Alt+""Ctrl+‎""delete""Enter""Function+""Meta+""Shift+""מקש רווח""Sym+""תפריט+""חיפוש…""מחק שאילתה""שאילתת חיפוש""חיפוש""שלח שאילתה""חיפוש קולי""שתף עם""שתף עם %s""כווץ""חיפוש""ホームへ移動""上へ移動""その他のオプション""完了""すべて表示""アプリの選択""OFF""ON""Alt+""Ctrl+""Delete""Enter""Function+""Meta+""Shift+""Space""Sym+""Menu+""検索…""検索キーワードを削除""検索キーワード""検索""検索キーワードを送信""音声検索""共有""%sと共有""折りたたむ""検索""მთავარზე ნავიგაცია""ზემოთ ნავიგაცია""მეტი ვარიანტები""დასრულდა""ყველას ნახვა""აპის არჩევა""გამორთულია""ჩართულია""Alt+""Ctrl+""წაშლა""შეყვანა""Function+""Meta+""Shift+""space""Sym+""Menu+""ძიება...""მოთხოვნის გასუფთავება""ძიების მოთხოვნა""ძიება""მოთხოვნის გადაგზავნა""ხმოვანი ძიება""გაზიარება:""გაუზიარეთ %s-ს""აკეცვა""ძიება""Негізгі бетте қозғалу""Жоғары қозғалу""Басқа опциялар""Дайын""Барлығын көру""Қолданбаны таңдау""ӨШІРУЛІ""ҚОСУЛЫ""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""бос орын""Sym+""Mәзір+""Іздеу…""Сұрақты жою""Сұрақты іздеу""Іздеу""Сұрақты жіберу""Дауыс арқылы іздеу""Бөлісу""%s қолданбасымен бөлісу""Тасалау""Іздеу""រកមើល​ទៅ​ដើម""រកមើល​ឡើងលើ""ជម្រើស​ច្រើន​ទៀត""រួចរាល់""មើល​ទាំងអស់""ជ្រើស​កម្មវិធី​​""បិទ""បើក""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""space""Sym+""Menu+""ស្វែងរក…""សម្អាត​សំណួរ""ស្វែងរក​សំណួរ""ស្វែងរក""ដាក់​​​ស្នើ​សំណួរ""ការស្វែងរក​សំឡេង""ចែករំលែក​ជាមួយ""ចែក​រំលែក​ជា​មួយ %s""បង្រួម""ស្វែងរក""ಮುಖಪುಟವನ್ನು ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ""ಮೇಲಕ್ಕೆ ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ""ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳು""ಮುಗಿದಿದೆ""ಎಲ್ಲವನ್ನೂ ನೋಡಿ""ಒಂದು ಅಪ್ಲಿಕೇಶನ್ ಆಯ್ಕೆಮಾಡಿ""ಆಫ್""ಆನ್""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""space""Sym+""Menu+""ಹುಡುಕಿ…""ಪ್ರಶ್ನೆಯನ್ನು ತೆರವುಗೊಳಿಸು""ಪ್ರಶ್ನೆಯನ್ನು ಹುಡುಕಿ""ಹುಡುಕಿ""ಪ್ರಶ್ನೆಯನ್ನು ಸಲ್ಲಿಸು""ಧ್ವನಿ ಹುಡುಕಾಟ""ಇವರೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಿ""%s ನೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಿ""ಸಂಕುಚಿಸು""ಹುಡುಕಿ""홈 탐색""위로 탐색""옵션 더보기""완료""전체 보기""앱 선택""사용 안함""사용""Alt+""Ctrl+""삭제""입력""Function+""Meta+""Shift+""스페이스바""Sym+""Menu+""검색...""검색어 삭제""검색어""검색""검색어 보내기""음성 검색""공유 대상""%s와(과) 공유""접기""검색""Үйгө багыттоо""Жогору""Көбүрөөк мүмкүнчүлүктөр""Даяр""Бардыгын көрүү""Колдонмо тандоо""ӨЧҮК""КҮЙҮК""Alt+""Ctrl+""Delete""Enter""Function+""Meta+""Shift+""боштук""Sym+""Menu+""Издөө…""Талаптарды тазалоо""Издөө талаптары""Издөө""Талап жөнөтүү""Үн аркылуу издөө""Бөлүшүү""%s аркылуу бөлүшүү""Жыйнап коюу""Издөө"48dp12dp14dp440dp60%90%60%90%55%80%0px0px"Đ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""Đ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"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"BaseAsr ->>>>>>> xiaojinchi_branch -%s --%s --%s diff --git a/src/Notes-master3/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties b/src/Notes-master3/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties index 1b075d8..696594b 100644 --- a/src/Notes-master3/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties +++ b/src/Notes-master3/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties @@ -1 +1 @@ -#Wed Sep 07 15:54:53 CST 2022 +#Tue Nov 01 08:36:48 CST 2022 diff --git a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index 9183e5a..8df75f6 100644 --- a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml @@ -1,6 +1,2 @@ -<<<<<<< HEAD - -======= - ->>>>>>> xiaojinchi_branch + \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index bab87ce..db9558e 100644 --- a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -1,6 +1,2 @@ -<<<<<<< HEAD - -======= - ->>>>>>> xiaojinchi_branch + \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 6f5efff..cc235e6 100644 --- a/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,31 +1,4 @@ -<<<<<<< HEAD -#Thu Oct 13 08:37:59 CST 2022 -path.4=13/classes.dex -path.3=12/classes.dex -path.2=11/classes.dex -path.1=0/classes.dex -path.7=5/classes.dex -path.6=4/classes.dex -path.5=15/classes.dex -path.0=classes.dex -base.4=D\:\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\13\\classes.dex -base.3=D\:\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\12\\classes.dex -base.2=D\:\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\11\\classes.dex -base.1=D\:\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex -base.0=D\:\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex -renamed.3=classes4.dex -renamed.2=classes3.dex -renamed.1=classes2.dex -renamed.0=classes.dex -renamed.7=classes8.dex -renamed.6=classes7.dex -base.7=D\:\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\5\\classes.dex -renamed.5=classes6.dex -base.6=D\:\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\4\\classes.dex -renamed.4=classes5.dex -base.5=D\:\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\15\\classes.dex -======= -#Sun Oct 23 00:18:33 CST 2022 +#Tue Nov 01 09:00:57 CST 2022 path.4=1/classes.dex path.3=15/classes.dex path.2=13/classes.dex @@ -71,4 +44,3 @@ base.13=D\:\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeProjectD base.12=D\:\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\3\\classes.dex base.11=D\:\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\15\\classes.dex base.10=D\:\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\13\\classes.dex ->>>>>>> xiaojinchi_branch diff --git a/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index 9a75db8..bcae9a5 100644 Binary files a/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 b/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 index 22dc26c..e5e9341 100644 Binary files a/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 and b/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class index d4e7deb..2d8e953 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class index 69ac9b5..9d66d07 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class index 480bc5c..2ff9aa1 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AccessToken.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/AccessToken.class similarity index 56% rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AccessToken.class rename to src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/AccessToken.class index 3adec4a..9614c67 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AccessToken.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/AccessToken.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/Base64Util.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/Base64Util.class similarity index 69% rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/Base64Util.class rename to src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/Base64Util.class index a71f4b1..cabff3e 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/Base64Util.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/Base64Util.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FileUtil.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/FileUtil.class similarity index 66% rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FileUtil.class rename to src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/FileUtil.class index 9d0b672..bbc758f 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FileUtil.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/FileUtil.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/HttpUtil.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/HttpUtil.class similarity index 82% rename from src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/HttpUtil.class rename to src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/HttpUtil.class index 137db2f..21091d0 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/HttpUtil.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/HttpUtil.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ImageFactory.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ImageFactory.class new file mode 100644 index 0000000..a93c409 Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ImageFactory.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class index 612f6d3..55ddb35 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class index 4b323e9..271fb53 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DimenUtils.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DimenUtils.class deleted file mode 100644 index f5f92db..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DimenUtils.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class index 7844765..5d928cb 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/GsonUtils.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/GsonUtils.class deleted file mode 100644 index 803d438..0000000 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/GsonUtils.class and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class index 427f35f..3fff5cf 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$10.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$10.class index 8fe456d..c9f3e64 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$10.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$10.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$11.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$11.class index a942040..ce94b18 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$11.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$11.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$12.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$12.class index 05b8b60..fa9844f 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$12.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$12.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class index 2d9900b..271efc0 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class index 2265968..26d8f55 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class index 6aade00..482d176 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class index 4ec7bc8..d7a3d34 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$6.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$6.class index 3d09415..5097865 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$6.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$6.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$7.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$7.class index ae949c6..dcb08bb 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$7.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$7.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$8.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$8.class index 2f723b7..ba2a2ab 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$8.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$8.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$9.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$9.class index 47e19f7..622066b 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$9.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$9.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class index 546ffed..cc271a2 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class index a515ca5..f428f96 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class index cb0ab18..73909db 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class index 0852037..4f7e607 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class index 4121fa5..817fae7 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class index ef08b7a..bbf3f12 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class index ddfa2db..73ee7d4 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class index b5c33b1..d22a792 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class index dc95b7b..6496cbc 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class index d1e38db..259f8fa 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class index c347793..a29cab1 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class index 0352b26..7269429 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class index 04bd75e..ad36039 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class index c419509..6cd9194 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class index 4ec2047..3ef97cc 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class index fb094fd..2cce5c1 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class index 0157483..1c752da 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class index 3cd4c7a..52efe7b 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class index 4e4568b..0233daf 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class index bc3ce1c..c57b951 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class index 5aca3aa..1b6ac93 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class index fd53acc..754d681 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class index d8f9172..8efed9a 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class index 0efd747..419a2cd 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class index d0b0f81..cef52f8 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class differ diff --git a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class index b4abaa8..005ab51 100644 Binary files a/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class and b/src/Notes-master3/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class differ diff --git a/src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index 6f2f58d..bc35609 100644 --- a/src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -23,11 +23,7 @@ 22-->D:\Notes-master3\app\src\main\AndroidManifest.xml:23:5-44 23 android:minSdkVersion="21" 23-->D:\Notes-master3\app\src\main\AndroidManifest.xml:23:15-41 -<<<<<<< HEAD -24 android:targetSdkVersion="8" /> -======= 24 android:targetSdkVersion="23" /> ->>>>>>> xiaojinchi_branch 24-->D:\Notes-master3\app\src\main\AndroidManifest.xml:23:5-44 25 26 @@ -66,495 +62,266 @@ 37 37-->D:\Notes-master3\app\src\main\AndroidManifest.xml:25:5-81 37-->D:\Notes-master3\app\src\main\AndroidManifest.xml:25:22-78 -<<<<<<< HEAD -38 -39 D:\Notes-master3\app\src\main\AndroidManifest.xml:38:5-152:19 -40 android:appComponentFactory="android.support.v4.app.CoreComponentFactory" -40-->[com.android.support:support-compat:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\e96a7038b1f110461df5bc852ca33ca3\transformed\support-compat-28.0.0\AndroidManifest.xml:22:18-91 -41 android:debuggable="true" -42 android:icon="@drawable/icon_app" -42-->D:\Notes-master3\app\src\main\AndroidManifest.xml:39:9-42 -43 android:label="@string/app_name" -43-->D:\Notes-master3\app\src\main\AndroidManifest.xml:40:9-41 -44 android:testOnly="true" > -45 D:\Notes-master3\app\src\main\AndroidManifest.xml:41:9-54:20 -46 android:name="net.micode.notes.ui.NotesListActivity" -46-->D:\Notes-master3\app\src\main\AndroidManifest.xml:42:13-49 -47 android:configChanges="keyboardHidden|orientation|screenSize" -47-->D:\Notes-master3\app\src\main\AndroidManifest.xml:43:13-74 -48 android:label="@string/app_name" -48-->D:\Notes-master3\app\src\main\AndroidManifest.xml:44:13-45 -49 android:launchMode="singleTop" -49-->D:\Notes-master3\app\src\main\AndroidManifest.xml:45:13-43 -50 android:theme="@style/Theme.AppCompat.Light.DarkActionBar" -50-->D:\Notes-master3\app\src\main\AndroidManifest.xml:46:13-71 -51 android:uiOptions="splitActionBarWhenNarrow" -51-->D:\Notes-master3\app\src\main\AndroidManifest.xml:47:13-57 -52 android:windowSoftInputMode="adjustPan" > -52-->D:\Notes-master3\app\src\main\AndroidManifest.xml:48:13-52 -53 -53-->D:\Notes-master3\app\src\main\AndroidManifest.xml:50:13-53:29 -54 -54-->D:\Notes-master3\app\src\main\AndroidManifest.xml:51:17-69 -54-->D:\Notes-master3\app\src\main\AndroidManifest.xml:51:25-66 -55 -56 -56-->D:\Notes-master3\app\src\main\AndroidManifest.xml:52:17-77 -56-->D:\Notes-master3\app\src\main\AndroidManifest.xml:52:27-74 -57 -58 -59 D:\Notes-master3\app\src\main\AndroidManifest.xml:56:9-84:20 -60 android:name="net.micode.notes.ui.NoteEditActivity" -60-->D:\Notes-master3\app\src\main\AndroidManifest.xml:57:13-48 -61 android:configChanges="keyboardHidden|orientation|screenSize" -61-->D:\Notes-master3\app\src\main\AndroidManifest.xml:58:13-74 -62 android:launchMode="singleTop" -62-->D:\Notes-master3\app\src\main\AndroidManifest.xml:59:13-43 -63 android:theme="@style/Theme.AppCompat.Light.DarkActionBar" > -63-->D:\Notes-master3\app\src\main\AndroidManifest.xml:60:13-71 -64 -64-->D:\Notes-master3\app\src\main\AndroidManifest.xml:62:13-67:29 -65 -65-->D:\Notes-master3\app\src\main\AndroidManifest.xml:63:17-69 -65-->D:\Notes-master3\app\src\main\AndroidManifest.xml:63:25-66 -66 -67 -67-->D:\Notes-master3\app\src\main\AndroidManifest.xml:64:17-76 -67-->D:\Notes-master3\app\src\main\AndroidManifest.xml:64:27-73 -68 -69 -69-->D:\Notes-master3\app\src\main\AndroidManifest.xml:65:17-78 -69-->D:\Notes-master3\app\src\main\AndroidManifest.xml:65:23-75 -70 -70-->D:\Notes-master3\app\src\main\AndroidManifest.xml:65:17-78 -70-->D:\Notes-master3\app\src\main\AndroidManifest.xml:65:23-75 -71 -72 -72-->D:\Notes-master3\app\src\main\AndroidManifest.xml:69:13-74:29 -73 -73-->D:\Notes-master3\app\src\main\AndroidManifest.xml:70:17-79 -73-->D:\Notes-master3\app\src\main\AndroidManifest.xml:70:25-76 -74 -75 -75-->D:\Notes-master3\app\src\main\AndroidManifest.xml:64:17-76 -75-->D:\Notes-master3\app\src\main\AndroidManifest.xml:64:27-73 -76 -77 -77-->D:\Notes-master3\app\src\main\AndroidManifest.xml:65:17-78 -77-->D:\Notes-master3\app\src\main\AndroidManifest.xml:65:23-75 -78 -78-->D:\Notes-master3\app\src\main\AndroidManifest.xml:65:17-78 -78-->D:\Notes-master3\app\src\main\AndroidManifest.xml:65:23-75 -79 -80 -80-->D:\Notes-master3\app\src\main\AndroidManifest.xml:76:13-79:29 -81 -81-->D:\Notes-master3\app\src\main\AndroidManifest.xml:77:17-71 -81-->D:\Notes-master3\app\src\main\AndroidManifest.xml:77:25-68 -82 -83 -83-->D:\Notes-master3\app\src\main\AndroidManifest.xml:64:17-76 -83-->D:\Notes-master3\app\src\main\AndroidManifest.xml:64:27-73 -84 -85 -86 D:\Notes-master3\app\src\main\AndroidManifest.xml:81:13-83:54 -87 android:name="android.app.searchable" -87-->D:\Notes-master3\app\src\main\AndroidManifest.xml:82:17-54 -88 android:resource="@xml/searchable" /> -88-->D:\Notes-master3\app\src\main\AndroidManifest.xml:83:17-51 -89 -90 -91 D:\Notes-master3\app\src\main\AndroidManifest.xml:86:9-89:43 -92 android:name="net.micode.notes.data.NotesProvider" -92-->D:\Notes-master3\app\src\main\AndroidManifest.xml:87:13-63 -93 android:authorities="micode_notes" -93-->D:\Notes-master3\app\src\main\AndroidManifest.xml:88:13-47 -94 android:multiprocess="true" /> -94-->D:\Notes-master3\app\src\main\AndroidManifest.xml:89:13-40 -95 -96 D:\Notes-master3\app\src\main\AndroidManifest.xml:91:9-103:20 -97 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -97-->D:\Notes-master3\app\src\main\AndroidManifest.xml:92:13-57 -98 android:label="@string/app_widget2x2" > -98-->D:\Notes-master3\app\src\main\AndroidManifest.xml:93:13-50 -99 -99-->D:\Notes-master3\app\src\main\AndroidManifest.xml:94:13-98:29 -100 -100-->D:\Notes-master3\app\src\main\AndroidManifest.xml:95:17-84 -100-->D:\Notes-master3\app\src\main\AndroidManifest.xml:95:25-81 -101 -101-->D:\Notes-master3\app\src\main\AndroidManifest.xml:96:17-85 -101-->D:\Notes-master3\app\src\main\AndroidManifest.xml:96:25-82 -102 -102-->D:\Notes-master3\app\src\main\AndroidManifest.xml:97:17-85 -102-->D:\Notes-master3\app\src\main\AndroidManifest.xml:97:25-82 -103 -104 -105 D:\Notes-master3\app\src\main\AndroidManifest.xml:100:13-102:58 -106 android:name="android.appwidget.provider" -106-->D:\Notes-master3\app\src\main\AndroidManifest.xml:101:17-58 -107 android:resource="@xml/widget_2x_info" /> -107-->D:\Notes-master3\app\src\main\AndroidManifest.xml:102:17-55 -108 -109 D:\Notes-master3\app\src\main\AndroidManifest.xml:104:9-117:20 -110 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -110-->D:\Notes-master3\app\src\main\AndroidManifest.xml:105:13-57 -111 android:label="@string/app_widget4x4" > -111-->D:\Notes-master3\app\src\main\AndroidManifest.xml:106:13-50 -112 -112-->D:\Notes-master3\app\src\main\AndroidManifest.xml:94:13-98:29 -113 -113-->D:\Notes-master3\app\src\main\AndroidManifest.xml:95:17-84 -113-->D:\Notes-master3\app\src\main\AndroidManifest.xml:95:25-81 -114 -114-->D:\Notes-master3\app\src\main\AndroidManifest.xml:96:17-85 -114-->D:\Notes-master3\app\src\main\AndroidManifest.xml:96:25-82 -115 -115-->D:\Notes-master3\app\src\main\AndroidManifest.xml:97:17-85 -115-->D:\Notes-master3\app\src\main\AndroidManifest.xml:97:25-82 -116 -117 -118 D:\Notes-master3\app\src\main\AndroidManifest.xml:100:13-102:58 -119 android:name="android.appwidget.provider" -119-->D:\Notes-master3\app\src\main\AndroidManifest.xml:101:17-58 -120 android:resource="@xml/widget_4x_info" /> -120-->D:\Notes-master3\app\src\main\AndroidManifest.xml:102:17-55 -121 -122 -122-->D:\Notes-master3\app\src\main\AndroidManifest.xml:119:9-123:20 -122-->D:\Notes-master3\app\src\main\AndroidManifest.xml:119:19-55 -123 -123-->D:\Notes-master3\app\src\main\AndroidManifest.xml:120:13-122:29 -124 -124-->D:\Notes-master3\app\src\main\AndroidManifest.xml:121:17-79 -124-->D:\Notes-master3\app\src\main\AndroidManifest.xml:121:25-76 -125 -126 -127 D:\Notes-master3\app\src\main\AndroidManifest.xml:125:9-128:20 -128 android:name="net.micode.notes.ui.AlarmReceiver" -128-->D:\Notes-master3\app\src\main\AndroidManifest.xml:126:13-61 -129 android:process=":remote" > -129-->D:\Notes-master3\app\src\main\AndroidManifest.xml:127:13-38 -130 -131 -132 D:\Notes-master3\app\src\main\AndroidManifest.xml:130:9-135:20 -133 android:name="net.micode.notes.ui.AlarmAlertActivity" -133-->D:\Notes-master3\app\src\main\AndroidManifest.xml:131:13-50 -134 android:label="@string/app_name" -134-->D:\Notes-master3\app\src\main\AndroidManifest.xml:132:13-45 -135 android:launchMode="singleInstance" -135-->D:\Notes-master3\app\src\main\AndroidManifest.xml:133:13-48 -136 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -136-->D:\Notes-master3\app\src\main\AndroidManifest.xml:134:13-75 -137 -138 D:\Notes-master3\app\src\main\AndroidManifest.xml:137:9-142:20 -139 android:name="net.micode.notes.ui.NotesPreferenceActivity" -139-->D:\Notes-master3\app\src\main\AndroidManifest.xml:138:13-71 -140 android:label="@string/preferences_title" -140-->D:\Notes-master3\app\src\main\AndroidManifest.xml:139:13-54 -141 android:launchMode="singleTop" -141-->D:\Notes-master3\app\src\main\AndroidManifest.xml:140:13-43 -142 android:theme="@android:style/Theme.Holo.Light" > -142-->D:\Notes-master3\app\src\main\AndroidManifest.xml:141:13-60 -143 -144 -145 D:\Notes-master3\app\src\main\AndroidManifest.xml:144:9-147:19 -146 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -146-->D:\Notes-master3\app\src\main\AndroidManifest.xml:145:13-74 -147 android:exported="false" > -147-->D:\Notes-master3\app\src\main\AndroidManifest.xml:146:13-37 -148 -149 -150 D:\Notes-master3\app\src\main\AndroidManifest.xml:149:9-151:52 -151 android:name="android.app.default_searchable" -151-->D:\Notes-master3\app\src\main\AndroidManifest.xml:150:13-58 -152 android:value=".ui.NoteEditActivity" /> -152-->D:\Notes-master3\app\src\main\AndroidManifest.xml:151:13-49 -153 -154 -155 -======= 38 38-->D:\Notes-master3\app\src\main\AndroidManifest.xml:27:5-67 38-->D:\Notes-master3\app\src\main\AndroidManifest.xml:27:22-64 39 39-->D:\Notes-master3\app\src\main\AndroidManifest.xml:38:5-71 39-->D:\Notes-master3\app\src\main\AndroidManifest.xml:38:22-68 -40 -40-->D:\Notes-master3\app\src\main\AndroidManifest.xml:38:5-71 -40-->D:\Notes-master3\app\src\main\AndroidManifest.xml:38:22-68 -41 -41-->D:\Notes-master3\app\src\main\AndroidManifest.xml:40:5-79 -41-->D:\Notes-master3\app\src\main\AndroidManifest.xml:40:22-76 -42 -42-->D:\Notes-master3\app\src\main\AndroidManifest.xml:27:5-67 -42-->D:\Notes-master3\app\src\main\AndroidManifest.xml:27:22-64 -43 -43-->D:\Notes-master3\app\src\main\AndroidManifest.xml:25:5-81 -43-->D:\Notes-master3\app\src\main\AndroidManifest.xml:25:22-78 -44 -45 -45-->[:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:15:5-75 -45-->[:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:15:22-72 -46 -46-->[:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:16:5-68 -46-->[:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:16:22-65 -47 -47-->[:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:17:5-80 -47-->[:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:17:22-77 -48 -48-->[:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:18:5-74 -48-->[:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:18:22-71 -49 -50 D:\Notes-master3\app\src\main\AndroidManifest.xml:44:5-158:19 -51 android:appComponentFactory="androidx.core.app.CoreComponentFactory" -51-->[androidx.core:core:1.0.1] C:\Users\87334\.gradle\caches\transforms-3\6953185b4efad95e57bf8cc13b145959\transformed\core-1.0.1\AndroidManifest.xml:22:18-86 -52 android:debuggable="true" -53 android:icon="@drawable/icon_app" -53-->D:\Notes-master3\app\src\main\AndroidManifest.xml:45:9-42 -54 android:label="@string/app_name" -54-->D:\Notes-master3\app\src\main\AndroidManifest.xml:46:9-41 -55 android:testOnly="true" > -56 D:\Notes-master3\app\src\main\AndroidManifest.xml:47:9-60:20 -57 android:name="net.micode.notes.ui.NotesListActivity" -57-->D:\Notes-master3\app\src\main\AndroidManifest.xml:48:13-49 -58 android:configChanges="keyboardHidden|orientation|screenSize" -58-->D:\Notes-master3\app\src\main\AndroidManifest.xml:49:13-74 -59 android:label="@string/app_name" -59-->D:\Notes-master3\app\src\main\AndroidManifest.xml:50:13-45 -60 android:launchMode="singleTop" -60-->D:\Notes-master3\app\src\main\AndroidManifest.xml:51:13-43 -61 android:theme="@style/Theme.AppCompat.Light.DarkActionBar" -61-->D:\Notes-master3\app\src\main\AndroidManifest.xml:52:13-71 -62 android:uiOptions="splitActionBarWhenNarrow" -62-->D:\Notes-master3\app\src\main\AndroidManifest.xml:53:13-57 -63 android:windowSoftInputMode="adjustPan" > -63-->D:\Notes-master3\app\src\main\AndroidManifest.xml:54:13-52 -64 -64-->D:\Notes-master3\app\src\main\AndroidManifest.xml:56:13-59:29 -65 -65-->D:\Notes-master3\app\src\main\AndroidManifest.xml:57:17-69 -65-->D:\Notes-master3\app\src\main\AndroidManifest.xml:57:25-66 -66 -67 -67-->D:\Notes-master3\app\src\main\AndroidManifest.xml:58:17-77 -67-->D:\Notes-master3\app\src\main\AndroidManifest.xml:58:27-74 -68 -69 -70 D:\Notes-master3\app\src\main\AndroidManifest.xml:62:9-90:20 -71 android:name="net.micode.notes.ui.NoteEditActivity" -71-->D:\Notes-master3\app\src\main\AndroidManifest.xml:63:13-48 -72 android:configChanges="keyboardHidden|orientation|screenSize" -72-->D:\Notes-master3\app\src\main\AndroidManifest.xml:64:13-74 -73 android:launchMode="singleTop" -73-->D:\Notes-master3\app\src\main\AndroidManifest.xml:65:13-43 -74 android:theme="@style/Theme.AppCompat.Light.DarkActionBar" > -74-->D:\Notes-master3\app\src\main\AndroidManifest.xml:66:13-71 -75 -75-->D:\Notes-master3\app\src\main\AndroidManifest.xml:68:13-73:29 -76 -76-->D:\Notes-master3\app\src\main\AndroidManifest.xml:69:17-69 -76-->D:\Notes-master3\app\src\main\AndroidManifest.xml:69:25-66 +40 +40-->D:\Notes-master3\app\src\main\AndroidManifest.xml:39:5-79 +40-->D:\Notes-master3\app\src\main\AndroidManifest.xml:39:22-76 +41 +41-->D:\Notes-master3\app\src\main\AndroidManifest.xml:27:5-67 +41-->D:\Notes-master3\app\src\main\AndroidManifest.xml:27:22-64 +42 +43 +43-->[:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:15:5-75 +43-->[:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:15:22-72 +44 +44-->[:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:16:5-68 +44-->[:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:16:22-65 +45 +45-->[:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:17:5-80 +45-->[:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:17:22-77 +46 +46-->[:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:18:5-74 +46-->[:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:18:22-71 +47 +48 D:\Notes-master3\app\src\main\AndroidManifest.xml:42:5-156:19 +49 android:appComponentFactory="androidx.core.app.CoreComponentFactory" +49-->[androidx.core:core:1.0.1] C:\Users\87334\.gradle\caches\transforms-3\6953185b4efad95e57bf8cc13b145959\transformed\core-1.0.1\AndroidManifest.xml:22:18-86 +50 android:debuggable="true" +51 android:icon="@drawable/icon_app" +51-->D:\Notes-master3\app\src\main\AndroidManifest.xml:43:9-42 +52 android:label="@string/app_name" +52-->D:\Notes-master3\app\src\main\AndroidManifest.xml:44:9-41 +53 android:testOnly="true" > +54 D:\Notes-master3\app\src\main\AndroidManifest.xml:45:9-58:20 +55 android:name="net.micode.notes.ui.NotesListActivity" +55-->D:\Notes-master3\app\src\main\AndroidManifest.xml:46:13-49 +56 android:configChanges="keyboardHidden|orientation|screenSize" +56-->D:\Notes-master3\app\src\main\AndroidManifest.xml:47:13-74 +57 android:label="@string/app_name" +57-->D:\Notes-master3\app\src\main\AndroidManifest.xml:48:13-45 +58 android:launchMode="singleTop" +58-->D:\Notes-master3\app\src\main\AndroidManifest.xml:49:13-43 +59 android:theme="@style/Theme.AppCompat.Light.DarkActionBar" +59-->D:\Notes-master3\app\src\main\AndroidManifest.xml:50:13-71 +60 android:uiOptions="splitActionBarWhenNarrow" +60-->D:\Notes-master3\app\src\main\AndroidManifest.xml:51:13-57 +61 android:windowSoftInputMode="adjustPan" > +61-->D:\Notes-master3\app\src\main\AndroidManifest.xml:52:13-52 +62 +62-->D:\Notes-master3\app\src\main\AndroidManifest.xml:54:13-57:29 +63 +63-->D:\Notes-master3\app\src\main\AndroidManifest.xml:55:17-69 +63-->D:\Notes-master3\app\src\main\AndroidManifest.xml:55:25-66 +64 +65 +65-->D:\Notes-master3\app\src\main\AndroidManifest.xml:56:17-77 +65-->D:\Notes-master3\app\src\main\AndroidManifest.xml:56:27-74 +66 +67 +68 D:\Notes-master3\app\src\main\AndroidManifest.xml:60:9-88:20 +69 android:name="net.micode.notes.ui.NoteEditActivity" +69-->D:\Notes-master3\app\src\main\AndroidManifest.xml:61:13-48 +70 android:configChanges="keyboardHidden|orientation|screenSize" +70-->D:\Notes-master3\app\src\main\AndroidManifest.xml:62:13-74 +71 android:launchMode="singleTop" +71-->D:\Notes-master3\app\src\main\AndroidManifest.xml:63:13-43 +72 android:theme="@style/Theme.AppCompat.Light.DarkActionBar" > +72-->D:\Notes-master3\app\src\main\AndroidManifest.xml:64:13-71 +73 +73-->D:\Notes-master3\app\src\main\AndroidManifest.xml:66:13-71:29 +74 +74-->D:\Notes-master3\app\src\main\AndroidManifest.xml:67:17-69 +74-->D:\Notes-master3\app\src\main\AndroidManifest.xml:67:25-66 +75 +76 +76-->D:\Notes-master3\app\src\main\AndroidManifest.xml:68:17-76 +76-->D:\Notes-master3\app\src\main\AndroidManifest.xml:68:27-73 77 -78 -78-->D:\Notes-master3\app\src\main\AndroidManifest.xml:70:17-76 -78-->D:\Notes-master3\app\src\main\AndroidManifest.xml:70:27-73 -79 -80 -80-->D:\Notes-master3\app\src\main\AndroidManifest.xml:71:17-78 -80-->D:\Notes-master3\app\src\main\AndroidManifest.xml:71:23-75 -81 -81-->D:\Notes-master3\app\src\main\AndroidManifest.xml:71:17-78 -81-->D:\Notes-master3\app\src\main\AndroidManifest.xml:71:23-75 -82 -83 -83-->D:\Notes-master3\app\src\main\AndroidManifest.xml:75:13-80:29 -84 -84-->D:\Notes-master3\app\src\main\AndroidManifest.xml:76:17-79 -84-->D:\Notes-master3\app\src\main\AndroidManifest.xml:76:25-76 +78 +78-->D:\Notes-master3\app\src\main\AndroidManifest.xml:69:17-78 +78-->D:\Notes-master3\app\src\main\AndroidManifest.xml:69:23-75 +79 +79-->D:\Notes-master3\app\src\main\AndroidManifest.xml:69:17-78 +79-->D:\Notes-master3\app\src\main\AndroidManifest.xml:69:23-75 +80 +81 +81-->D:\Notes-master3\app\src\main\AndroidManifest.xml:73:13-78:29 +82 +82-->D:\Notes-master3\app\src\main\AndroidManifest.xml:74:17-79 +82-->D:\Notes-master3\app\src\main\AndroidManifest.xml:74:25-76 +83 +84 +84-->D:\Notes-master3\app\src\main\AndroidManifest.xml:68:17-76 +84-->D:\Notes-master3\app\src\main\AndroidManifest.xml:68:27-73 85 -86 -86-->D:\Notes-master3\app\src\main\AndroidManifest.xml:70:17-76 -86-->D:\Notes-master3\app\src\main\AndroidManifest.xml:70:27-73 -87 -88 -88-->D:\Notes-master3\app\src\main\AndroidManifest.xml:71:17-78 -88-->D:\Notes-master3\app\src\main\AndroidManifest.xml:71:23-75 -89 -89-->D:\Notes-master3\app\src\main\AndroidManifest.xml:71:17-78 -89-->D:\Notes-master3\app\src\main\AndroidManifest.xml:71:23-75 -90 -91 -91-->D:\Notes-master3\app\src\main\AndroidManifest.xml:82:13-85:29 -92 -92-->D:\Notes-master3\app\src\main\AndroidManifest.xml:83:17-71 -92-->D:\Notes-master3\app\src\main\AndroidManifest.xml:83:25-68 -93 -94 -94-->D:\Notes-master3\app\src\main\AndroidManifest.xml:70:17-76 -94-->D:\Notes-master3\app\src\main\AndroidManifest.xml:70:27-73 -95 -96 -97 D:\Notes-master3\app\src\main\AndroidManifest.xml:87:13-89:54 -98 android:name="android.app.searchable" -98-->D:\Notes-master3\app\src\main\AndroidManifest.xml:88:17-54 -99 android:resource="@xml/searchable" /> -99-->D:\Notes-master3\app\src\main\AndroidManifest.xml:89:17-51 -100 -101 -102 D:\Notes-master3\app\src\main\AndroidManifest.xml:92:9-95:43 -103 android:name="net.micode.notes.data.NotesProvider" -103-->D:\Notes-master3\app\src\main\AndroidManifest.xml:93:13-63 -104 android:authorities="micode_notes" -104-->D:\Notes-master3\app\src\main\AndroidManifest.xml:94:13-47 -105 android:multiprocess="true" /> -105-->D:\Notes-master3\app\src\main\AndroidManifest.xml:95:13-40 -106 -107 D:\Notes-master3\app\src\main\AndroidManifest.xml:97:9-109:20 -108 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -108-->D:\Notes-master3\app\src\main\AndroidManifest.xml:98:13-57 -109 android:label="@string/app_widget2x2" > -109-->D:\Notes-master3\app\src\main\AndroidManifest.xml:99:13-50 -110 -110-->D:\Notes-master3\app\src\main\AndroidManifest.xml:100:13-104:29 -111 -111-->D:\Notes-master3\app\src\main\AndroidManifest.xml:101:17-84 -111-->D:\Notes-master3\app\src\main\AndroidManifest.xml:101:25-81 -112 -112-->D:\Notes-master3\app\src\main\AndroidManifest.xml:102:17-85 -112-->D:\Notes-master3\app\src\main\AndroidManifest.xml:102:25-82 -113 -113-->D:\Notes-master3\app\src\main\AndroidManifest.xml:103:17-85 -113-->D:\Notes-master3\app\src\main\AndroidManifest.xml:103:25-82 -114 -115 -116 D:\Notes-master3\app\src\main\AndroidManifest.xml:106:13-108:58 -117 android:name="android.appwidget.provider" -117-->D:\Notes-master3\app\src\main\AndroidManifest.xml:107:17-58 -118 android:resource="@xml/widget_2x_info" /> -118-->D:\Notes-master3\app\src\main\AndroidManifest.xml:108:17-55 -119 -120 D:\Notes-master3\app\src\main\AndroidManifest.xml:110:9-123:20 -121 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -121-->D:\Notes-master3\app\src\main\AndroidManifest.xml:111:13-57 -122 android:label="@string/app_widget4x4" > -122-->D:\Notes-master3\app\src\main\AndroidManifest.xml:112:13-50 -123 -123-->D:\Notes-master3\app\src\main\AndroidManifest.xml:100:13-104:29 -124 -124-->D:\Notes-master3\app\src\main\AndroidManifest.xml:101:17-84 -124-->D:\Notes-master3\app\src\main\AndroidManifest.xml:101:25-81 -125 -125-->D:\Notes-master3\app\src\main\AndroidManifest.xml:102:17-85 -125-->D:\Notes-master3\app\src\main\AndroidManifest.xml:102:25-82 -126 -126-->D:\Notes-master3\app\src\main\AndroidManifest.xml:103:17-85 -126-->D:\Notes-master3\app\src\main\AndroidManifest.xml:103:25-82 -127 -128 -129 D:\Notes-master3\app\src\main\AndroidManifest.xml:106:13-108:58 -130 android:name="android.appwidget.provider" -130-->D:\Notes-master3\app\src\main\AndroidManifest.xml:107:17-58 -131 android:resource="@xml/widget_4x_info" /> -131-->D:\Notes-master3\app\src\main\AndroidManifest.xml:108:17-55 -132 -133 -133-->D:\Notes-master3\app\src\main\AndroidManifest.xml:125:9-129:20 -133-->D:\Notes-master3\app\src\main\AndroidManifest.xml:125:19-55 -134 -134-->D:\Notes-master3\app\src\main\AndroidManifest.xml:126:13-128:29 -135 -135-->D:\Notes-master3\app\src\main\AndroidManifest.xml:127:17-79 -135-->D:\Notes-master3\app\src\main\AndroidManifest.xml:127:25-76 -136 -137 -138 D:\Notes-master3\app\src\main\AndroidManifest.xml:131:9-134:20 -139 android:name="net.micode.notes.ui.AlarmReceiver" -139-->D:\Notes-master3\app\src\main\AndroidManifest.xml:132:13-61 -140 android:process=":remote" > -140-->D:\Notes-master3\app\src\main\AndroidManifest.xml:133:13-38 -141 -142 -143 D:\Notes-master3\app\src\main\AndroidManifest.xml:136:9-141:20 -144 android:name="net.micode.notes.ui.AlarmAlertActivity" -144-->D:\Notes-master3\app\src\main\AndroidManifest.xml:137:13-50 -145 android:label="@string/app_name" -145-->D:\Notes-master3\app\src\main\AndroidManifest.xml:138:13-45 -146 android:launchMode="singleInstance" -146-->D:\Notes-master3\app\src\main\AndroidManifest.xml:139:13-48 -147 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -147-->D:\Notes-master3\app\src\main\AndroidManifest.xml:140:13-75 -148 -149 D:\Notes-master3\app\src\main\AndroidManifest.xml:143:9-148:20 -150 android:name="net.micode.notes.ui.NotesPreferenceActivity" -150-->D:\Notes-master3\app\src\main\AndroidManifest.xml:144:13-71 -151 android:label="@string/preferences_title" -151-->D:\Notes-master3\app\src\main\AndroidManifest.xml:145:13-54 -152 android:launchMode="singleTop" -152-->D:\Notes-master3\app\src\main\AndroidManifest.xml:146:13-43 -153 android:theme="@android:style/Theme.Holo.Light" > -153-->D:\Notes-master3\app\src\main\AndroidManifest.xml:147:13-60 -154 -155 -156 D:\Notes-master3\app\src\main\AndroidManifest.xml:150:9-153:19 -157 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -157-->D:\Notes-master3\app\src\main\AndroidManifest.xml:151:13-74 -158 android:exported="false" > -158-->D:\Notes-master3\app\src\main\AndroidManifest.xml:152:13-37 -159 -160 -161 D:\Notes-master3\app\src\main\AndroidManifest.xml:155:9-157:52 -162 android:name="android.app.default_searchable" -162-->D:\Notes-master3\app\src\main\AndroidManifest.xml:156:13-58 -163 android:value=".ui.NoteEditActivity" /> -163-->D:\Notes-master3\app\src\main\AndroidManifest.xml:157:13-49 -164 [:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:21:9-23:41 -165 android:name="com.baidu.speech.APP_ID" -165-->[:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:22:13-51 -166 android:value=" 27985621" /> -166-->[:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:23:13-38 -167 [:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:24:9-26:56 -168 android:name="com.baidu.speech.API_KEY" -168-->[:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:25:13-52 -169 android:value="wq2slYwe9DBBVypi6nC2I2aL" /> -169-->[:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:26:13-53 -170 [:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:27:9-29:64 -171 android:name="com.baidu.speech.SECRET_KEY" -171-->[:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:28:13-55 -172 android:value="rrzYQZerUCNGW2UYK1KEyKfzeWbNePWA" /> -172-->[:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:29:13-61 -173 -174 -175 ->>>>>>> xiaojinchi_branch +86 +86-->D:\Notes-master3\app\src\main\AndroidManifest.xml:69:17-78 +86-->D:\Notes-master3\app\src\main\AndroidManifest.xml:69:23-75 +87 +87-->D:\Notes-master3\app\src\main\AndroidManifest.xml:69:17-78 +87-->D:\Notes-master3\app\src\main\AndroidManifest.xml:69:23-75 +88 +89 +89-->D:\Notes-master3\app\src\main\AndroidManifest.xml:80:13-83:29 +90 +90-->D:\Notes-master3\app\src\main\AndroidManifest.xml:81:17-71 +90-->D:\Notes-master3\app\src\main\AndroidManifest.xml:81:25-68 +91 +92 +92-->D:\Notes-master3\app\src\main\AndroidManifest.xml:68:17-76 +92-->D:\Notes-master3\app\src\main\AndroidManifest.xml:68:27-73 +93 +94 +95 D:\Notes-master3\app\src\main\AndroidManifest.xml:85:13-87:54 +96 android:name="android.app.searchable" +96-->D:\Notes-master3\app\src\main\AndroidManifest.xml:86:17-54 +97 android:resource="@xml/searchable" /> +97-->D:\Notes-master3\app\src\main\AndroidManifest.xml:87:17-51 +98 +99 +100 D:\Notes-master3\app\src\main\AndroidManifest.xml:90:9-93:43 +101 android:name="net.micode.notes.data.NotesProvider" +101-->D:\Notes-master3\app\src\main\AndroidManifest.xml:91:13-63 +102 android:authorities="micode_notes" +102-->D:\Notes-master3\app\src\main\AndroidManifest.xml:92:13-47 +103 android:multiprocess="true" /> +103-->D:\Notes-master3\app\src\main\AndroidManifest.xml:93:13-40 +104 +105 D:\Notes-master3\app\src\main\AndroidManifest.xml:95:9-107:20 +106 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" +106-->D:\Notes-master3\app\src\main\AndroidManifest.xml:96:13-57 +107 android:label="@string/app_widget2x2" > +107-->D:\Notes-master3\app\src\main\AndroidManifest.xml:97:13-50 +108 +108-->D:\Notes-master3\app\src\main\AndroidManifest.xml:98:13-102:29 +109 +109-->D:\Notes-master3\app\src\main\AndroidManifest.xml:99:17-84 +109-->D:\Notes-master3\app\src\main\AndroidManifest.xml:99:25-81 +110 +110-->D:\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85 +110-->D:\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82 +111 +111-->D:\Notes-master3\app\src\main\AndroidManifest.xml:101:17-85 +111-->D:\Notes-master3\app\src\main\AndroidManifest.xml:101:25-82 +112 +113 +114 D:\Notes-master3\app\src\main\AndroidManifest.xml:104:13-106:58 +115 android:name="android.appwidget.provider" +115-->D:\Notes-master3\app\src\main\AndroidManifest.xml:105:17-58 +116 android:resource="@xml/widget_2x_info" /> +116-->D:\Notes-master3\app\src\main\AndroidManifest.xml:106:17-55 +117 +118 D:\Notes-master3\app\src\main\AndroidManifest.xml:108:9-121:20 +119 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" +119-->D:\Notes-master3\app\src\main\AndroidManifest.xml:109:13-57 +120 android:label="@string/app_widget4x4" > +120-->D:\Notes-master3\app\src\main\AndroidManifest.xml:110:13-50 +121 +121-->D:\Notes-master3\app\src\main\AndroidManifest.xml:98:13-102:29 +122 +122-->D:\Notes-master3\app\src\main\AndroidManifest.xml:99:17-84 +122-->D:\Notes-master3\app\src\main\AndroidManifest.xml:99:25-81 +123 +123-->D:\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85 +123-->D:\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82 +124 +124-->D:\Notes-master3\app\src\main\AndroidManifest.xml:101:17-85 +124-->D:\Notes-master3\app\src\main\AndroidManifest.xml:101:25-82 +125 +126 +127 D:\Notes-master3\app\src\main\AndroidManifest.xml:104:13-106:58 +128 android:name="android.appwidget.provider" +128-->D:\Notes-master3\app\src\main\AndroidManifest.xml:105:17-58 +129 android:resource="@xml/widget_4x_info" /> +129-->D:\Notes-master3\app\src\main\AndroidManifest.xml:106:17-55 +130 +131 +131-->D:\Notes-master3\app\src\main\AndroidManifest.xml:123:9-127:20 +131-->D:\Notes-master3\app\src\main\AndroidManifest.xml:123:19-55 +132 +132-->D:\Notes-master3\app\src\main\AndroidManifest.xml:124:13-126:29 +133 +133-->D:\Notes-master3\app\src\main\AndroidManifest.xml:125:17-79 +133-->D:\Notes-master3\app\src\main\AndroidManifest.xml:125:25-76 +134 +135 +136 D:\Notes-master3\app\src\main\AndroidManifest.xml:129:9-132:20 +137 android:name="net.micode.notes.ui.AlarmReceiver" +137-->D:\Notes-master3\app\src\main\AndroidManifest.xml:130:13-61 +138 android:process=":remote" > +138-->D:\Notes-master3\app\src\main\AndroidManifest.xml:131:13-38 +139 +140 +141 D:\Notes-master3\app\src\main\AndroidManifest.xml:134:9-139:20 +142 android:name="net.micode.notes.ui.AlarmAlertActivity" +142-->D:\Notes-master3\app\src\main\AndroidManifest.xml:135:13-50 +143 android:label="@string/app_name" +143-->D:\Notes-master3\app\src\main\AndroidManifest.xml:136:13-45 +144 android:launchMode="singleInstance" +144-->D:\Notes-master3\app\src\main\AndroidManifest.xml:137:13-48 +145 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > +145-->D:\Notes-master3\app\src\main\AndroidManifest.xml:138:13-75 +146 +147 D:\Notes-master3\app\src\main\AndroidManifest.xml:141:9-146:20 +148 android:name="net.micode.notes.ui.NotesPreferenceActivity" +148-->D:\Notes-master3\app\src\main\AndroidManifest.xml:142:13-71 +149 android:label="@string/preferences_title" +149-->D:\Notes-master3\app\src\main\AndroidManifest.xml:143:13-54 +150 android:launchMode="singleTop" +150-->D:\Notes-master3\app\src\main\AndroidManifest.xml:144:13-43 +151 android:theme="@android:style/Theme.Holo.Light" > +151-->D:\Notes-master3\app\src\main\AndroidManifest.xml:145:13-60 +152 +153 +154 D:\Notes-master3\app\src\main\AndroidManifest.xml:148:9-151:19 +155 android:name="net.micode.notes.gtask.remote.GTaskSyncService" +155-->D:\Notes-master3\app\src\main\AndroidManifest.xml:149:13-74 +156 android:exported="false" > +156-->D:\Notes-master3\app\src\main\AndroidManifest.xml:150:13-37 +157 +158 +159 D:\Notes-master3\app\src\main\AndroidManifest.xml:153:9-155:52 +160 android:name="android.app.default_searchable" +160-->D:\Notes-master3\app\src\main\AndroidManifest.xml:154:13-58 +161 android:value=".ui.NoteEditActivity" /> +161-->D:\Notes-master3\app\src\main\AndroidManifest.xml:155:13-49 +162 [:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:21:9-23:41 +163 android:name="com.baidu.speech.APP_ID" +163-->[:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:22:13-51 +164 android:value=" 27985621" /> +164-->[:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:23:13-38 +165 [:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:24:9-26:56 +166 android:name="com.baidu.speech.API_KEY" +166-->[:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:25:13-52 +167 android:value="wq2slYwe9DBBVypi6nC2I2aL" /> +167-->[:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:26:13-53 +168 [:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:27:9-29:64 +169 android:name="com.baidu.speech.SECRET_KEY" +169-->[:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:28:13-55 +170 android:value="rrzYQZerUCNGW2UYK1KEyKfzeWbNePWA" /> +170-->[:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:29:13-61 +171 +172 +173 diff --git a/src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt b/src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt index a93b962..1ad7965 100644 --- a/src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt +++ b/src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt @@ -3,30 +3,30 @@ 3 package="net.micode.notes.test" > 4 5 D:\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5833144996092685450.xml:5:5-74 -6 android:minSdkVersion="14" -6-->D:\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5833144996092685450.xml:5:15-41 -7 android:targetSdkVersion="14" /> -7-->D:\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5833144996092685450.xml:5:42-71 +5-->D:\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5702350942585695744.xml:5:5-74 +6 android:minSdkVersion="21" +6-->D:\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5702350942585695744.xml:5:15-41 +7 android:targetSdkVersion="23" /> +7-->D:\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5702350942585695744.xml:5:42-71 8 9 D:\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5833144996092685450.xml:11:5-15:66 +9-->D:\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5702350942585695744.xml:11:5-15:66 10 android:name="android.test.InstrumentationTestRunner" -10-->D:\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5833144996092685450.xml:11:22-75 +10-->D:\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5702350942585695744.xml:11:22-75 11 android:functionalTest="false" -11-->D:\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5833144996092685450.xml:14:22-52 +11-->D:\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5702350942585695744.xml:14:22-52 12 android:handleProfiling="false" -12-->D:\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5833144996092685450.xml:13:22-53 +12-->D:\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5702350942585695744.xml:13:22-53 13 android:label="Tests for net.micode.notes" -13-->D:\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5833144996092685450.xml:15:22-64 +13-->D:\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5702350942585695744.xml:15:22-64 14 android:targetPackage="net.micode.notes" /> -14-->D:\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5833144996092685450.xml:12:22-62 +14-->D:\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5702350942585695744.xml:12:22-62 15 16 -16-->D:\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5833144996092685450.xml:7:5-9:19 +16-->D:\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5702350942585695744.xml:7:5-9:19 17 -17-->D:\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5833144996092685450.xml:8:9-60 -17-->D:\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5833144996092685450.xml:8:23-57 +17-->D:\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5702350942585695744.xml:8:9-60 +17-->D:\Notes-master3\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5702350942585695744.xml:8:23-57 18 19 20 diff --git a/src/Notes-master3/app/build/intermediates/merged_java_res/debug/base.jar b/src/Notes-master3/app/build/intermediates/merged_java_res/debug/base.jar index b996a6d..c8dae7c 100644 Binary files a/src/Notes-master3/app/build/intermediates/merged_java_res/debug/base.jar and b/src/Notes-master3/app/build/intermediates/merged_java_res/debug/base.jar differ diff --git a/src/Notes-master3/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/src/Notes-master3/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml index a166b6a..a44eeea 100644 --- a/src/Notes-master3/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml +++ b/src/Notes-master3/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml @@ -21,11 +21,7 @@ -======= android:targetSdkVersion="23" /> ->>>>>>> xiaojinchi_branch @@ -39,17 +35,10 @@ -<<<<<<< HEAD - - - - @@ -58,7 +47,6 @@ >>>>>> xiaojinchi_branch android:debuggable="true" android:icon="@drawable/icon_app" android:label="@string/app_name" @@ -171,8 +159,6 @@ -<<<<<<< HEAD -======= @@ -182,7 +168,6 @@ ->>>>>>> xiaojinchi_branch \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/src/Notes-master3/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml index a166b6a..a44eeea 100644 --- a/src/Notes-master3/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml +++ b/src/Notes-master3/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml @@ -21,11 +21,7 @@ -======= android:targetSdkVersion="23" /> ->>>>>>> xiaojinchi_branch @@ -39,17 +35,10 @@ -<<<<<<< HEAD - - - - @@ -58,7 +47,6 @@ >>>>>> xiaojinchi_branch android:debuggable="true" android:icon="@drawable/icon_app" android:label="@string/app_name" @@ -171,8 +159,6 @@ -<<<<<<< HEAD -======= @@ -182,7 +168,6 @@ ->>>>>>> xiaojinchi_branch \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat index 7e53b5d..a1116f4 100644 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat and b/src/Notes-master3/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat index fb5354e..e784552 100644 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat and b/src/Notes-master3/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/values_values.arsc.flat index 8b699ad..29d2c06 100644 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/values_values.arsc.flat and b/src/Notes-master3/app/build/intermediates/merged_res/debug/values_values.arsc.flat differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json index 97ce165..1eaee59 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -1,2833 +1,36 @@ { "logs": [ { -<<<<<<< HEAD "outputFile": "net.micode.notes.app-merged_res-8:/values-watch-v21_values-watch-v21.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-watch-v21\\values-watch-v21.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" -======= - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-v26_values-v26.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-v26\\values-v26.xml", - "from": { - "startLines": "2,3,4,8,12,16", - "startColumns": "4,4,4,4,4,4", - "startOffsets": "55,130,217,431,657,896", - "endLines": "2,3,7,11,15,16", - "endColumns": "74,86,12,12,12,92", - "endOffsets": "125,212,426,652,891,984" - }, - "to": { - "startLines": "2,3,4,8,12,16", - "startColumns": "4,4,4,4,4,4", - "startOffsets": "55,130,217,381,557,796", - "endLines": "2,3,7,11,15,16", - "endColumns": "74,86,12,12,12,92", - "endOffsets": "125,212,376,552,791,884" ->>>>>>> xiaojinchi_branch - } - } - ] - }, - { -<<<<<<< HEAD - "outputFile": "net.micode.notes.app-merged_res-8:/values-uk_values-uk.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-uk\\values-uk.xml", -======= - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-my_values-my.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-my\\values-my.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2979", - "endColumns": "100", - "endOffsets": "3075" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-nl_values-nl.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-nl\\values-nl.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2921", - "endColumns": "100", - "endOffsets": "3017" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-fa_values-fa.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-fa\\values-fa.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2903", - "endColumns": "100", - "endOffsets": "2999" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-ur_values-ur.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-ur\\values-ur.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2904", - "endColumns": "100", - "endOffsets": "3000" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-ur\\values-ur.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,215,321,430,516,620,740,816,892,984,1078,1174,1268,1370,1464,1560,1654,1746,1838,1923,2031,2140,2242,2353,2453,2561,2726,2824", - "endColumns": "109,105,108,85,103,119,75,75,91,93,95,93,101,93,95,93,91,91,84,107,108,101,110,99,107,164,97,79", - "endOffsets": "210,316,425,511,615,735,811,887,979,1073,1169,1263,1365,1459,1555,1649,1741,1833,1918,2026,2135,2237,2348,2448,2556,2721,2819,2899" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-hdpi-v4_values-hdpi-v4.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-hdpi-v4\\values-hdpi-v4.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endLines": "6", - "endColumns": "13", - "endOffsets": "327" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-de_values-de.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-de\\values-de.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2925", - "endColumns": "100", - "endOffsets": "3021" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-tr_values-tr.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-tr\\values-tr.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,210,309,421,506,612,732,811,887,978,1071,1164,1258,1356,1449,1551,1646,1737,1828,1907,2014,2119,2215,2322,2424,2532,2688,2786", - "endColumns": "104,98,111,84,105,119,78,75,90,92,92,93,97,92,101,94,90,90,78,106,104,95,106,101,107,155,97,78", - "endOffsets": "205,304,416,501,607,727,806,882,973,1066,1159,1253,1351,1444,1546,1641,1732,1823,1902,2009,2114,2210,2317,2419,2527,2683,2781,2860" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-tr\\values-tr.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2865", - "endColumns": "100", - "endOffsets": "2961" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-sv_values-sv.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-sv\\values-sv.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2863", - "endColumns": "100", - "endOffsets": "2959" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-sv\\values-sv.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,211,314,425,510,612,725,801,877,970,1065,1161,1255,1358,1453,1550,1648,1744,1837,1917,2023,2123,2219,2324,2426,2528,2682,2784", - "endColumns": "105,102,110,84,101,112,75,75,92,94,95,93,102,94,96,97,95,92,79,105,99,95,104,101,101,153,101,78", - "endOffsets": "206,309,420,505,607,720,796,872,965,1060,1156,1250,1353,1448,1545,1643,1739,1832,1912,2018,2118,2214,2319,2421,2523,2677,2779,2858" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-kk_values-kk.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-kk\\values-kk.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,217,320,430,515,621,740,821,901,992,1085,1181,1275,1376,1469,1564,1661,1752,1844,1925,2028,2133,2231,2338,2447,2547,2713,2812", - "endColumns": "111,102,109,84,105,118,80,79,90,92,95,93,100,92,94,96,90,91,80,102,104,97,106,108,99,165,98,80", - "endOffsets": "212,315,425,510,616,735,816,896,987,1080,1176,1270,1371,1464,1559,1656,1747,1839,1920,2023,2128,2226,2333,2442,2542,2708,2807,2888" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-kk\\values-kk.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2893", - "endColumns": "100", - "endOffsets": "2989" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-lt_values-lt.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-lt\\values-lt.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,221,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\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-lt\\values-lt.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2978", - "endColumns": "100", - "endOffsets": "3074" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-pl_values-pl.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-pl\\values-pl.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,221,323,431,517,626,745,823,900,991,1084,1180,1274,1376,1469,1564,1659,1750,1841,1923,2032,2141,2240,2349,2460,2568,2731,2827", - "endColumns": "115,101,107,85,108,118,77,76,90,92,95,93,101,92,94,94,90,90,81,108,108,98,108,110,107,162,95,81", - "endOffsets": "216,318,426,512,621,740,818,895,986,1079,1175,1269,1371,1464,1559,1654,1745,1836,1918,2027,2136,2235,2344,2455,2563,2726,2822,2904" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-pl\\values-pl.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2909", - "endColumns": "100", - "endOffsets": "3005" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-am_values-am.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-am\\values-am.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2817", - "endColumns": "100", - "endOffsets": "2913" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-si_values-si.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-si\\values-si.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2903", - "endColumns": "100", - "endOffsets": "2999" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-si\\values-si.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,215,322,429,517,622,738,827,914,1005,1098,1193,1287,1388,1481,1576,1670,1761,1852,1936,2045,2150,2248,2358,2457,2563,2722,2821", - "endColumns": "109,106,106,87,104,115,88,86,90,92,94,93,100,92,94,93,90,90,83,108,104,97,109,98,105,158,98,81", - "endOffsets": "210,317,424,512,617,733,822,909,1000,1093,1188,1282,1383,1476,1571,1665,1756,1847,1931,2040,2145,2243,2353,2452,2558,2717,2816,2898" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-be_values-be.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-be\\values-be.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,225,328,444,530,638,756,835,913,1005,1099,1195,1289,1385,1479,1575,1670,1762,1854,1937,2043,2149,2247,2355,2460,2565,2734,2834", - "endColumns": "119,102,115,85,107,117,78,77,91,93,95,93,95,93,95,94,91,91,82,105,105,97,107,104,104,168,99,80", - "endOffsets": "220,323,439,525,633,751,830,908,1000,1094,1190,1284,1380,1474,1570,1665,1757,1849,1932,2038,2144,2242,2350,2455,2560,2729,2829,2910" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-be\\values-be.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2915", - "endColumns": "100", - "endOffsets": "3011" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-ar_values-ar.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\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" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-night-v8_values-night-v8.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-night-v8\\values-night-v8.xml", - "from": { - "startLines": "2,3,4,5,6,7,8", - "startColumns": "4,4,4,4,4,4,4", - "startOffsets": "55,125,209,293,389,491,593", - "endColumns": "69,83,83,95,101,101,93", - "endOffsets": "120,204,288,384,486,588,682" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-sq_values-sq.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-sq\\values-sq.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2907", - "endColumns": "100", - "endOffsets": "3003" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-v17_values-v17.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-v17\\values-v17.xml", - "from": { - "startLines": "2,5,9,12,15,18,22,25,29,33,37,40,43,46,50,53,57", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "55,228,456,614,764,936,1161,1331,1559,1783,2025,2196,2370,2539,2812,3012,3216", - "endLines": "4,8,11,14,17,21,24,28,32,36,39,42,45,49,52,56,60", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "223,451,609,759,931,1156,1326,1554,1778,2020,2191,2365,2534,2807,3007,3211,3540" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-te_values-te.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-te\\values-te.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2946", - "endColumns": "100", - "endOffsets": "3042" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-te\\values-te.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,219,328,439,529,634,759,841,923,1014,1107,1203,1297,1398,1491,1586,1681,1772,1863,1947,2060,2168,2267,2378,2480,2597,2763,2864", - "endColumns": "113,108,110,89,104,124,81,81,90,92,95,93,100,92,94,94,90,90,83,112,107,98,110,101,116,165,100,81", - "endOffsets": "214,323,434,524,629,754,836,918,1009,1102,1198,1292,1393,1486,1581,1676,1767,1858,1942,2055,2163,2262,2373,2475,2592,2758,2859,2941" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-ko_values-ko.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-ko\\values-ko.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,200,294,396,478,576,682,761,837,928,1021,1113,1204,1305,1398,1493,1587,1678,1769,1849,1947,2042,2137,2237,2333,2432,2584,2678", - "endColumns": "94,93,101,81,97,105,78,75,90,92,91,90,100,92,94,93,90,90,79,97,94,94,99,95,98,151,93,77", - "endOffsets": "195,289,391,473,571,677,756,832,923,1016,1108,1199,1300,1393,1488,1582,1673,1764,1844,1942,2037,2132,2232,2328,2427,2579,2673,2751" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\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" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-v16_values-v16.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-v16\\values-v16.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "65", - "endOffsets": "116" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-v16\\values-v16.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endLines": "5", - "endColumns": "12", - "endOffsets": "223" - }, - "to": { - "startLines": "3", - "startColumns": "4", - "startOffsets": "121", - "endLines": "6", - "endColumns": "12", - "endOffsets": "289" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-az_values-az.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-az\\values-az.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2903", - "endColumns": "100", - "endOffsets": "2999" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-es_values-es.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-es\\values-es.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2924", - "endColumns": "100", - "endOffsets": "3020" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-cs_values-cs.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-cs\\values-cs.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2891", - "endColumns": "100", - "endOffsets": "2987" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-ky_values-ky.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-ky\\values-ky.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,209,304,423,507,614,731,809,888,979,1072,1168,1262,1363,1456,1551,1646,1737,1828,1909,2019,2126,2224,2330,2437,2538,2699,2802", - "endColumns": "103,94,118,83,106,116,77,78,90,92,95,93,100,92,94,94,90,90,80,109,106,97,105,106,100,160,102,80", - "endOffsets": "204,299,418,502,609,726,804,883,974,1067,1163,1257,1358,1451,1546,1641,1732,1823,1904,2014,2121,2219,2325,2432,2533,2694,2797,2878" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-ky\\values-ky.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2883", - "endColumns": "100", - "endOffsets": "2979" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-bn_values-bn.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-bn\\values-bn.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2939", - "endColumns": "100", - "endOffsets": "3035" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-mk_values-mk.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-mk\\values-mk.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,213,317,425,511,616,735,818,900,997,1096,1193,1293,1400,1499,1600,1696,1793,1884,1971,2077,2184,2285,2392,2503,2607,2763,2861", - "endColumns": "107,103,107,85,104,118,82,81,96,98,96,99,106,98,100,95,96,90,86,105,106,100,106,110,103,155,97,83", - "endOffsets": "208,312,420,506,611,730,813,895,992,1091,1188,1288,1395,1494,1595,1691,1788,1879,1966,2072,2179,2280,2387,2498,2602,2758,2856,2940" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-mk\\values-mk.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2945", - "endColumns": "100", - "endOffsets": "3041" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-ja_values-ja.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-ja\\values-ja.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2771", - "endColumns": "100", - "endOffsets": "2867" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-it_values-it.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-it\\values-it.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2906", - "endColumns": "100", - "endOffsets": "3002" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-it\\values-it.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,214,314,423,507,616,741,818,894,986,1080,1174,1268,1370,1464,1561,1667,1759,1851,1932,2038,2146,2244,2348,2453,2560,2723,2823", - "endColumns": "108,99,108,83,108,124,76,75,91,93,93,93,101,93,96,105,91,91,80,105,107,97,103,104,106,162,99,82", - "endOffsets": "209,309,418,502,611,736,813,889,981,1075,1169,1263,1365,1459,1556,1662,1754,1846,1927,2033,2141,2239,2343,2448,2555,2718,2818,2901" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-hy_values-hy.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-hy\\values-hy.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,208,309,419,508,614,729,811,892,983,1076,1172,1266,1367,1460,1555,1649,1740,1831,1916,2023,2130,2229,2339,2446,2546,2703,2802", - "endColumns": "102,100,109,88,105,114,81,80,90,92,95,93,100,92,94,93,90,90,84,106,106,98,109,106,99,156,98,81", - "endOffsets": "203,304,414,503,609,724,806,887,978,1071,1167,1261,1362,1455,1550,1644,1735,1826,1911,2018,2125,2224,2334,2441,2541,2698,2797,2879" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-hy\\values-hy.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2884", - "endColumns": "100", - "endOffsets": "2980" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-iw_values-iw.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-iw\\values-iw.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,209,308,416,500,600,714,792,870,961,1055,1151,1245,1346,1439,1534,1631,1722,1814,1895,1997,2101,2199,2302,2403,2503,2655,2751", - "endColumns": "103,98,107,83,99,113,77,77,90,93,95,93,100,92,94,96,90,91,80,101,103,97,102,100,99,151,95,80", - "endOffsets": "204,303,411,495,595,709,787,865,956,1050,1146,1240,1341,1434,1529,1626,1717,1809,1890,1992,2096,2194,2297,2398,2498,2650,2746,2827" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-iw\\values-iw.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2832", - "endColumns": "100", - "endOffsets": "2928" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-v25_values-v25.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-sl_values-sl.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-sl\\values-sl.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2936", - "endColumns": "100", - "endOffsets": "3032" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-bs_values-bs.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-bs\\values-bs.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,224,333,440,526,630,752,834,915,1006,1099,1195,1289,1390,1483,1578,1677,1768,1859,1945,2048,2153,2251,2356,2469,2572,2745,2842", - "endColumns": "118,108,106,85,103,121,81,80,90,92,95,93,100,92,94,98,90,90,85,102,104,97,104,112,102,172,96,83", - "endOffsets": "219,328,435,521,625,747,829,910,1001,1094,1190,1284,1385,1478,1573,1672,1763,1854,1940,2043,2148,2246,2351,2464,2567,2740,2837,2921" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\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": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-h720dp-v13_values-h720dp-v13.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-h720dp-v13\\values-h720dp-v13.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "66", - "endOffsets": "117" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-zh-rTW_values-zh-rTW.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-zh-rTW\\values-zh-rTW.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "124", - "startColumns": "4", - "startOffsets": "8012", - "endColumns": "100", - "endOffsets": "8108" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,121", - "startColumns": "4,4,4,4,4,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,7815", - "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,7888" - } - }, - { - "source": "D:\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endLines": "21", - "endColumns": "19", - "endOffsets": "817" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - }, - { - "source": "D:\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", - "from": { - "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", - "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "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,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": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" - }, - "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,122,123,125,126,127,128,129,130,131,132,133,134,135", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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,6121,6170,6217,6264,6311,6356,6407,6460,6535,6594,6651,6725,6789,6858,6936,7046,7150,7223,7289,7344,7409,7474,7523,7606,7684,7722,7767,7893,7955,8113,8168,8227,8294,8352,8414,8462,8507,8555,8606,8672", - "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,122,123,125,126,127,128,129,130,131,132,133,134,135", - "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,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,6116,6165,6212,6259,6306,6351,6402,6455,6530,6589,6646,6720,6784,6853,6931,7041,7145,7218,7284,7339,7404,7469,7518,7601,7679,7717,7762,7810,7950,8007,8163,8222,8289,8347,8409,8457,8502,8550,8601,8667,8733" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-nb_values-nb.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-nb\\values-nb.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,213,308,422,508,608,721,797,873,964,1057,1153,1247,1348,1441,1536,1634,1725,1816,1896,1999,2098,2194,2298,2396,2497,2650,2747", - "endColumns": "107,94,113,85,99,112,75,75,90,92,95,93,100,92,94,97,90,90,79,102,98,95,103,97,100,152,96,78", - "endOffsets": "208,303,417,503,603,716,792,868,959,1052,1148,1242,1343,1436,1531,1629,1720,1811,1891,1994,2093,2189,2293,2391,2492,2645,2742,2821" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-nb\\values-nb.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2826", - "endColumns": "100", - "endOffsets": "2922" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-uz_values-uz.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-uz\\values-uz.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,210,314,428,514,614,730,810,889,980,1073,1169,1263,1358,1451,1546,1641,1732,1824,1908,2017,2124,2225,2333,2438,2545,2706,2805", - "endColumns": "104,103,113,85,99,115,79,78,90,92,95,93,94,92,94,94,90,91,83,108,106,100,107,104,106,160,98,83", - "endOffsets": "205,309,423,509,609,725,805,884,975,1068,1164,1258,1353,1446,1541,1636,1727,1819,1903,2012,2119,2220,2328,2433,2540,2701,2800,2884" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-uz\\values-uz.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2889", - "endColumns": "100", - "endOffsets": "2985" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-en-rAU_values-en-rAU.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-en-rAU\\values-en-rAU.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764", - "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81", - "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-en-rAU\\values-en-rAU.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2846", - "endColumns": "100", - "endOffsets": "2942" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-land_values-land.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-land\\values-land.xml", - "from": { - "startLines": "2,3,4", - "startColumns": "4,4,4", - "startOffsets": "55,125,196", - "endColumns": "69,70,67", - "endOffsets": "120,191,259" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-th_values-th.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-th\\values-th.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2845", - "endColumns": "100", - "endOffsets": "2941" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-en-rGB_values-en-rGB.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-en-rGB\\values-en-rGB.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764", - "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81", - "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-en-rGB\\values-en-rGB.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2846", - "endColumns": "100", - "endOffsets": "2942" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-pt-rPT_values-pt-rPT.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-pt-rPT\\values-pt-rPT.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2949", - "endColumns": "100", - "endOffsets": "3045" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-lv_values-lv.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-lv\\values-lv.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "3076", - "endColumns": "100", - "endOffsets": "3172" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-zh-rCN_values-zh-rCN.arsc.flat", - "map": [ - { - "source": "D:\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endLines": "21", - "endColumns": "19", - "endOffsets": "817" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - }, - { - "source": "D:\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", - "from": { - "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", - "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "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,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": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" - }, - "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,122,123,125,126,127,128,129,130,131,132,133,134,135", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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,6114,6163,6210,6257,6304,6349,6400,6453,6528,6587,6644,6718,6782,6851,6929,7039,7143,7216,7282,7337,7402,7467,7516,7599,7677,7715,7760,7886,7948,8106,8161,8220,8287,8345,8407,8455,8500,8548,8599,8665", - "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,122,123,125,126,127,128,129,130,131,132,133,134,135", - "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,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,6109,6158,6205,6252,6299,6344,6395,6448,6523,6582,6639,6713,6777,6846,6924,7034,7138,7211,7277,7332,7397,7462,7511,7594,7672,7710,7755,7803,7943,8000,8156,8215,8282,8340,8402,8450,8495,8543,8594,8660,8726" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-zh-rCN\\values-zh-rCN.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,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,121", - "startColumns": "4,4,4,4,4,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,7808", - "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,7881" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-zh-rCN\\values-zh-rCN.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "124", - "startColumns": "4", - "startOffsets": "8005", - "endColumns": "100", - "endOffsets": "8101" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-ms_values-ms.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-ms\\values-ms.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,216,321,429,516,620,731,809,888,979,1072,1167,1261,1360,1453,1548,1642,1733,1824,1904,2016,2125,2222,2331,2434,2541,2700,2801", - "endColumns": "110,104,107,86,103,110,77,78,90,92,94,93,98,92,94,93,90,90,79,111,108,96,108,102,106,158,100,79", - "endOffsets": "211,316,424,511,615,726,804,883,974,1067,1162,1256,1355,1448,1543,1637,1728,1819,1899,2011,2120,2217,2326,2429,2536,2695,2796,2876" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-ms\\values-ms.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2881", - "endColumns": "100", - "endOffsets": "2977" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-is_values-is.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-is\\values-is.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2865", - "endColumns": "100", - "endOffsets": "2961" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-kn_values-kn.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-kn\\values-kn.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,223,335,448,536,643,770,847,924,1015,1108,1204,1298,1399,1492,1587,1681,1772,1863,1945,2061,2172,2271,2384,2488,2602,2766,2866", - "endColumns": "117,111,112,87,106,126,76,76,90,92,95,93,100,92,94,93,90,90,81,115,110,98,112,103,113,163,99,81", - "endOffsets": "218,330,443,531,638,765,842,919,1010,1103,1199,1293,1394,1487,1582,1676,1767,1858,1940,2056,2167,2266,2379,2483,2597,2761,2861,2943" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-kn\\values-kn.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2948", - "endColumns": "100", - "endOffsets": "3044" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-uk_values-uk.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-uk\\values-uk.xml", ->>>>>>> xiaojinchi_branch - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2900", - "endColumns": "100", - "endOffsets": "2996" - } -<<<<<<< HEAD - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,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" - } -======= ->>>>>>> xiaojinchi_branch - } - ] - }, - { -<<<<<<< HEAD - "outputFile": "net.micode.notes.app-merged_res-8:/values-mr_values-mr.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-mr\\values-mr.xml", -======= - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-vi_values-vi.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-vi\\values-vi.xml", ->>>>>>> xiaojinchi_branch - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", -<<<<<<< HEAD - "startOffsets": "2887", - "endColumns": "100", - "endOffsets": "2983" -======= - "startOffsets": "2901", - "endColumns": "100", - "endOffsets": "2997" ->>>>>>> xiaojinchi_branch - } - } - ] - }, - { -<<<<<<< HEAD - "outputFile": "net.micode.notes.app-merged_res-8:/values-zu_values-zu.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,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\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-zu\\values-zu.xml", -======= - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-v21_values-v21.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\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,18633,18749,18875,19001,19129,19301", - "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,18744,18870,18996,19124,19296,19634" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,8697,8882,11746,11943,12142,12265,12388,12501,12684,12815,13016,13105,13216,13449,13550,13645,13768,13897,14014,14191,14290,14425,14568,14703,14822,15023,15142,15235,15346,15402,15509,15704,15815,15948,16043,16134,16225,16342,16481,16552,16635,17258,17315,17373,17997", - "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,8692,8877,11741,11938,12137,12260,12383,12496,12679,12810,13011,13100,13211,13444,13545,13640,13763,13892,14009,14186,14285,14420,14563,14698,14817,15018,15137,15230,15341,15397,15504,15699,15810,15943,16038,16129,16220,16337,16476,16547,16630,17253,17310,17368,17992,18628" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-v23_values-v23.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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" - }, - "to": { - "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,1131,1787,1914,2019,2134,2241", - "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,1126,1782,1909,2014,2129,2236,2349" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-watch-v21_values-watch-v21.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-watch-v21\\values-watch-v21.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" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-sk_values-sk.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-sk\\values-sk.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,212,312,423,509,617,735,816,897,988,1081,1180,1274,1375,1468,1563,1661,1752,1843,1927,2032,2141,2240,2346,2457,2566,2732,2830", - "endColumns": "106,99,110,85,107,117,80,80,90,92,98,93,100,92,94,97,90,90,83,104,108,98,105,110,108,165,97,87", - "endOffsets": "207,307,418,504,612,730,811,892,983,1076,1175,1269,1370,1463,1558,1656,1747,1838,1922,2027,2136,2235,2341,2452,2561,2727,2825,2913" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-sk\\values-sk.xml", ->>>>>>> xiaojinchi_branch - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", -<<<<<<< HEAD - "startOffsets": "2898", - "endColumns": "100", - "endOffsets": "2994" -======= - "startOffsets": "2918", - "endColumns": "100", - "endOffsets": "3014" ->>>>>>> xiaojinchi_branch - } - } - ] - }, - { -<<<<<<< HEAD - "outputFile": "net.micode.notes.app-merged_res-8:/values-v17_values-v17.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-v17\\values-v17.xml", - "from": { - "startLines": "2,5,9,12,15,18,22,25,29,33,37,40,43,46,50,53,57", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "55,228,456,614,764,936,1161,1331,1559,1783,2025,2196,2370,2539,2812,3012,3216", - "endLines": "4,8,11,14,17,21,24,28,32,36,39,42,45,49,52,56,60", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "223,451,609,759,931,1156,1326,1554,1778,2020,2191,2365,2534,2807,3007,3211,3540" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-8:/values-km_values-km.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,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" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-km\\values-km.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2882", - "endColumns": "100", - "endOffsets": "2978" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-8:/values_values.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\fa718d1bfa54ce85ab7d4c953f045f5d\\transformed\\coordinatorlayout-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" - }, - "to": { - "startLines": "12,1878,2501,2507", - "startColumns": "4,4,4,4", - "startOffsets": "420,124714,145114,145325", - "endLines": "12,1880,2506,2590", - "endColumns": "60,12,24,24", - "endOffsets": "476,124854,145320,149836" - } - }, - { -======= - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values_values.arsc.flat", - "map": [ - { ->>>>>>> xiaojinchi_branch - "source": "D:\\Notes-master3\\app\\src\\main\\res\\values\\colors.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endColumns": "56", - "endOffsets": "764" - }, - "to": { - "startLines": "82", - "startColumns": "4", - "startOffsets": "5146", - "endColumns": "56", - "endOffsets": "5198" - } - }, - { - "source": "D:\\Notes-master3\\app\\src\\main\\res\\values\\dimens.xml", - "from": { - "startLines": "19,20,21,22,18", - "startColumns": "4,4,4,4,4", - "startOffsets": "764,816,869,922,712", - "endColumns": "51,52,52,51,51", - "endOffsets": "811,864,917,969,759" - }, - "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" - } - }, - { -<<<<<<< HEAD -======= - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values\\values.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,1303,1304,1305,1306,1307,1308,1309,1310,1311,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325,1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,1360,1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1390,1391,1392,1393,1394,1395,1396,1397,1398,1399,1400,1401,1402,1403,1404,1405,1406,1407,1408,1409,1410,1411,1412,1413,1414,1415,1416,1417,1418,1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1453,1461,1462,1466,1470,1474,1479,1485,1492,1496,1500,1505,1509,1513,1517,1521,1525,1529,1535,1539,1545,1549,1555,1559,1564,1568,1571,1575,1581,1585,1591,1595,1601,1604,1608,1612,1616,1620,1624,1625,1626,1627,1630,1633,1636,1639,1643,1644,1645,1646,1647,1650,1652,1654,1656,1661,1662,1666,1672,1676,1677,1679,1690,1691,1695,1701,1705,1706,1707,1711,1738,1742,1743,1747,1775,1943,1969,2138,2164,2195,2203,2209,2223,2245,2250,2255,2265,2274,2283,2287,2294,2302,2309,2310,2319,2322,2325,2329,2333,2337,2340,2341,2345,2349,2359,2364,2371,2377,2378,2381,2385,2390,2392,2394,2397,2400,2402,2406,2409,2416,2419,2422,2426,2428,2432,2434,2436,2438,2442,2450,2458,2470,2476,2485,2488,2499,2502,2507,2508,2513,2571,2630,2631,2641,2650,2651,2653,2657,2660,2663,2666,2669,2672,2675,2678,2682,2685,2688,2691,2695,2698,2702,2706,2707,2708,2709,2710,2711,2712,2713,2714,2715,2716,2717,2718,2719,2720,2721,2722,2723,2724,2725,2726,2728,2730,2731,2732,2733,2734,2735,2736,2737,2739,2740,2742,2743,2745,2747,2748,2750,2751,2752,2753,2754,2755,2757,2758,2759,2760,2761,2762,2764,2766,2768,2769,2770,2771,2772,2773,2774,2775,2776,2777,2778,2779,2780,2782,2783,2784,2785,2786,2787,2789,2793,2797,2798,2799,2800,2801,2802,2803,2804,2806,2808,2810,2812,2814,2815,2816,2817,2819,2821,2823,2824,2825,2826,2827,2828,2829,2830,2831,2832,2833,2834,2837,2838,2839,2840,2842,2844,2845,2847,2848,2850,2852,2854,2855,2856,2857,2858,2859,2860,2861,2862,2863,2864,2865,2867,2868,2869,2870,2872,2873,2874,2875,2876,2878,2880,2882,2884,2885,2886,2887,2888,2889,2890,2891,2892,2893,2894,2895,2896,2897,69,152,155,158,161,175,186,196,223,230,241,271,298,307,344,725,730,756,774,810,816,822,845,986,1006,1012,1016,1022,1059,1071,1098,1103,1169,1184,1249,1268,1294", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,160,205,254,295,350,409,471,552,613,688,764,841,919,1004,1086,1162,1238,1315,1393,1499,1605,1684,1764,1821,1879,1953,2028,2093,2159,2219,2280,2352,2425,2492,2560,2619,2678,2737,2796,2855,2909,2963,3016,3070,3124,3178,3232,3306,3385,3458,3532,3603,3675,3747,3820,3877,3935,4008,4082,4156,4231,4303,4376,4446,4517,4577,70911,70980,71049,71119,71193,71269,71333,71410,71486,71563,71628,71697,71774,71849,71918,71986,72063,72129,72190,72287,72352,72421,72520,72591,72650,72708,72765,72824,72888,72959,73031,73103,73175,73247,73314,73382,73450,73509,73572,73636,73726,73817,73877,73943,74010,74076,74146,74210,74263,74376,74434,74497,74562,74627,74702,74775,74847,74896,74957,75018,75079,75141,75205,75269,75333,75398,75461,75521,75582,75648,75707,75767,75829,75900,75960,76028,76114,76201,76291,76378,76466,76548,76631,76721,76812,76864,76922,76967,77033,77097,77154,77211,77265,77322,77370,77419,77470,77504,77551,77600,77646,77678,77742,77804,77864,77921,77995,78065,78143,78197,78267,78352,78400,78446,78517,78595,78673,78745,78819,78893,78967,79047,79120,79189,79261,79338,79399,79462,79528,79592,79663,79726,79791,79855,79916,79977,80029,80102,80176,80245,80320,80394,80468,80609,80679,80732,80810,80900,80988,81084,81174,81756,81845,82092,82373,82625,82910,83303,83780,84002,84224,84500,84727,84957,85187,85417,85647,85874,86293,86519,86944,87174,87602,87821,88104,88312,88443,88670,89096,89321,89748,89969,90394,90514,90790,91091,91415,91706,92020,92157,92288,92393,92635,92802,93006,93214,93485,93597,93709,93814,93931,94145,94291,94431,94517,94865,94953,95199,95617,95866,95948,96046,96663,96763,97015,97439,97694,97788,97877,98114,100166,100408,100510,100763,102947,113668,115184,126004,127532,129289,129915,130335,131396,132661,132917,133153,133700,134194,134799,134997,135577,136141,136516,136634,137172,137329,137525,137798,138054,138224,138365,138429,138711,138997,139673,139937,140275,140628,140722,140908,141214,141476,141601,141728,141967,142178,142297,142490,142667,143122,143303,143425,143684,143797,143984,144086,144193,144322,144597,145105,145601,146478,146772,147342,147491,148223,148395,148731,148823,149101,153445,157932,157994,158624,159238,159329,159442,159671,159831,159983,160154,160320,160489,160656,160819,161062,161232,161405,161576,161850,162049,162254,162584,162668,162764,162860,162958,163058,163160,163262,163364,163466,163568,163668,163764,163876,164005,164128,164259,164390,164488,164602,164696,164836,164970,165066,165178,165278,165394,165490,165602,165702,165842,165978,166142,166272,166430,166580,166721,166865,167000,167112,167262,167390,167518,167654,167786,167916,168046,168158,168298,168444,168588,168726,168792,168882,168958,169062,169152,169254,169362,169470,169570,169650,169742,169840,169950,170028,170134,170226,170330,170440,170562,170725,170882,170962,171062,171152,171262,171356,171462,171554,171654,171766,171880,171996,172112,172206,172320,172432,172534,172654,172776,172858,172962,173082,173208,173306,173400,173488,173600,173716,173838,173950,174125,174241,174327,174419,174531,174655,174722,174848,174916,175044,175188,175316,175385,175480,175595,175708,175807,175916,176027,176138,176239,176344,176444,176574,176665,176788,176882,176994,177080,177184,177280,177368,177486,177590,177694,177820,177908,178016,178116,178206,178316,178400,178502,178586,178640,178704,178810,178920,179004,4638,9782,9900,10015,10147,10862,11554,12071,13718,14103,14700,16299,17832,18220,20527,40045,40305,41697,42730,44743,45005,45361,46191,52973,54107,54401,54624,54951,57001,57649,59282,59552,63403,64004,67813,69028,70437", - "endLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,1303,1304,1305,1306,1307,1308,1309,1310,1311,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325,1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,1360,1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1390,1391,1392,1393,1394,1395,1396,1397,1398,1399,1400,1401,1402,1403,1404,1405,1406,1407,1408,1409,1410,1411,1412,1413,1414,1415,1416,1417,1418,1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1460,1461,1465,1469,1473,1478,1484,1491,1495,1499,1504,1508,1512,1516,1520,1524,1528,1534,1538,1544,1548,1554,1558,1563,1567,1570,1574,1580,1584,1590,1594,1600,1603,1607,1611,1615,1619,1623,1624,1625,1626,1629,1632,1635,1638,1642,1643,1644,1645,1646,1649,1651,1653,1655,1660,1661,1665,1671,1675,1676,1678,1689,1690,1694,1700,1704,1705,1706,1710,1737,1741,1742,1746,1774,1942,1968,2137,2163,2194,2202,2208,2222,2244,2249,2254,2264,2273,2282,2286,2293,2301,2308,2309,2318,2321,2324,2328,2332,2336,2339,2340,2344,2348,2358,2363,2370,2376,2377,2380,2384,2389,2391,2393,2396,2399,2401,2405,2408,2415,2418,2421,2425,2427,2431,2433,2435,2437,2441,2449,2457,2469,2475,2484,2487,2498,2501,2506,2507,2512,2570,2629,2630,2640,2649,2650,2652,2656,2659,2662,2665,2668,2671,2674,2677,2681,2684,2687,2690,2694,2697,2701,2705,2706,2707,2708,2709,2710,2711,2712,2713,2714,2715,2716,2717,2718,2719,2720,2721,2722,2723,2724,2725,2727,2729,2730,2731,2732,2733,2734,2735,2736,2738,2739,2741,2742,2744,2746,2747,2749,2750,2751,2752,2753,2754,2756,2757,2758,2759,2760,2761,2763,2765,2767,2768,2769,2770,2771,2772,2773,2774,2775,2776,2777,2778,2779,2781,2782,2783,2784,2785,2786,2788,2792,2796,2797,2798,2799,2800,2801,2802,2803,2805,2807,2809,2811,2813,2814,2815,2816,2818,2820,2822,2823,2824,2825,2826,2827,2828,2829,2830,2831,2832,2833,2836,2837,2838,2839,2841,2843,2844,2846,2847,2849,2851,2853,2854,2855,2856,2857,2858,2859,2860,2861,2862,2863,2864,2866,2867,2868,2869,2871,2872,2873,2874,2875,2877,2879,2881,2883,2884,2885,2886,2887,2888,2889,2890,2891,2892,2893,2894,2895,2896,2897,151,154,157,160,174,185,195,222,229,240,270,297,306,343,724,729,755,773,809,815,821,844,985,1005,1011,1015,1021,1058,1070,1097,1102,1168,1183,1248,1267,1293,1302", - "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,63,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,91,12,12,12,61,12,12,90,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24", - "endOffsets": "155,200,249,290,345,404,466,547,608,683,759,836,914,999,1081,1157,1233,1310,1388,1494,1600,1679,1759,1816,1874,1948,2023,2088,2154,2214,2275,2347,2420,2487,2555,2614,2673,2732,2791,2850,2904,2958,3011,3065,3119,3173,3227,3301,3380,3453,3527,3598,3670,3742,3815,3872,3930,4003,4077,4151,4226,4298,4371,4441,4512,4572,4633,70975,71044,71114,71188,71264,71328,71405,71481,71558,71623,71692,71769,71844,71913,71981,72058,72124,72185,72282,72347,72416,72515,72586,72645,72703,72760,72819,72883,72954,73026,73098,73170,73242,73309,73377,73445,73504,73567,73631,73721,73812,73872,73938,74005,74071,74141,74205,74258,74371,74429,74492,74557,74622,74697,74770,74842,74891,74952,75013,75074,75136,75200,75264,75328,75393,75456,75516,75577,75643,75702,75762,75824,75895,75955,76023,76109,76196,76286,76373,76461,76543,76626,76716,76807,76859,76917,76962,77028,77092,77149,77206,77260,77317,77365,77414,77465,77499,77546,77595,77641,77673,77737,77799,77859,77916,77990,78060,78138,78192,78262,78347,78395,78441,78512,78590,78668,78740,78814,78888,78962,79042,79115,79184,79256,79333,79394,79457,79523,79587,79658,79721,79786,79850,79911,79972,80024,80097,80171,80240,80315,80389,80463,80604,80674,80727,80805,80895,80983,81079,81169,81751,81840,82087,82368,82620,82905,83298,83775,83997,84219,84495,84722,84952,85182,85412,85642,85869,86288,86514,86939,87169,87597,87816,88099,88307,88438,88665,89091,89316,89743,89964,90389,90509,90785,91086,91410,91701,92015,92152,92283,92388,92630,92797,93001,93209,93480,93592,93704,93809,93926,94140,94286,94426,94512,94860,94948,95194,95612,95861,95943,96041,96658,96758,97010,97434,97689,97783,97872,98109,100161,100403,100505,100758,102942,113663,115179,125999,127527,129284,129910,130330,131391,132656,132912,133148,133695,134189,134794,134992,135572,136136,136511,136629,137167,137324,137520,137793,138049,138219,138360,138424,138706,138992,139668,139932,140270,140623,140717,140903,141209,141471,141596,141723,141962,142173,142292,142485,142662,143117,143298,143420,143679,143792,143979,144081,144188,144317,144592,145100,145596,146473,146767,147337,147486,148218,148390,148726,148818,149096,153440,157927,157989,158619,159233,159324,159437,159666,159826,159978,160149,160315,160484,160651,160814,161057,161227,161400,161571,161845,162044,162249,162579,162663,162759,162855,162953,163053,163155,163257,163359,163461,163563,163663,163759,163871,164000,164123,164254,164385,164483,164597,164691,164831,164965,165061,165173,165273,165389,165485,165597,165697,165837,165973,166137,166267,166425,166575,166716,166860,166995,167107,167257,167385,167513,167649,167781,167911,168041,168153,168293,168439,168583,168721,168787,168877,168953,169057,169147,169249,169357,169465,169565,169645,169737,169835,169945,170023,170129,170221,170325,170435,170557,170720,170877,170957,171057,171147,171257,171351,171457,171549,171649,171761,171875,171991,172107,172201,172315,172427,172529,172649,172771,172853,172957,173077,173203,173301,173395,173483,173595,173711,173833,173945,174120,174236,174322,174414,174526,174650,174717,174843,174911,175039,175183,175311,175380,175475,175590,175703,175802,175911,176022,176133,176234,176339,176439,176569,176660,176783,176877,176989,177075,177179,177275,177363,177481,177585,177689,177815,177903,178011,178111,178201,178311,178395,178497,178581,178635,178699,178805,178915,178999,179119,9777,9895,10010,10142,10857,11549,12066,13713,14098,14695,16294,17827,18215,20522,40040,40300,41692,42725,44738,45000,45356,46186,52968,54102,54396,54619,54946,56996,57644,59277,59547,63398,63999,67808,69023,70432,70906" - }, - "to": { - "startLines": "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,359,374,375,376,377,378,379,387,388,392,396,400,405,411,418,422,426,431,435,439,443,447,451,455,461,465,471,475,481,485,490,494,497,501,507,511,517,521,527,530,534,538,542,546,550,551,552,553,556,559,562,565,569,570,571,572,573,576,578,580,582,587,588,592,598,602,603,605,616,617,621,627,631,632,633,637,664,668,669,673,701,868,894,1062,1088,1119,1127,1133,1147,1169,1174,1179,1189,1198,1207,1211,1218,1226,1233,1234,1243,1246,1249,1253,1257,1261,1264,1265,1269,1273,1283,1288,1295,1301,1302,1305,1309,1314,1316,1318,1321,1324,1326,1330,1333,1340,1343,1346,1350,1352,1356,1358,1360,1362,1366,1374,1382,1394,1400,1409,1412,1423,1426,1431,1432,1452,1510,1569,1570,1580,1589,1590,1592,1596,1599,1602,1605,1608,1611,1614,1617,1621,1624,1627,1630,1634,1637,1641,1645,1646,1647,1648,1649,1650,1651,1652,1653,1654,1655,1656,1657,1658,1659,1660,1661,1662,1663,1664,1665,1667,1669,1670,1671,1672,1673,1674,1675,1676,1678,1679,1681,1682,1684,1686,1687,1689,1690,1691,1692,1693,1694,1696,1697,1698,1699,1700,1712,1714,1716,1746,1747,1748,1749,1750,1751,1752,1753,1754,1755,1756,1757,1758,1760,1761,1762,1763,1764,1765,1767,1771,1775,1776,1777,1778,1779,1780,1781,1782,1784,1786,1788,1790,1792,1793,1794,1795,1797,1799,1801,1802,1803,1804,1805,1806,1807,1808,1809,1810,1811,1812,1815,1816,1817,1818,1820,1822,1823,1825,1826,1828,1830,1832,1833,1834,1835,1836,1837,1838,1839,1840,1841,1842,1843,1845,1846,1847,1848,1850,1851,1852,1853,1854,1856,1858,1860,1862,1863,1864,1865,1866,1867,1868,1869,1870,1871,1872,1873,1874,1875,1881,1956,1959,1962,1965,1979,1985,1995,2011,2017,2027,2056,2083,2092,2121,2464,2475,2591,2700,2724,2730,2736,2757,2881,2901,2907,2911,2917,2952,2964,2980,2984,3050,3065,3116,3128,3154", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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,14854,14928,14998,15076,15130,15200,15285,15333,15379,15450,15528,15606,15678,15752,15826,15900,15980,16053,16122,16194,16271,16332,16395,16461,16525,16596,16659,16724,16788,16849,16910,16962,17035,17109,17178,17253,17327,17401,17542,23672,24768,24846,24936,25024,25120,25210,25792,25881,26128,26409,26661,26946,27339,27816,28038,28260,28536,28763,28993,29223,29453,29683,29910,30329,30555,30980,31210,31638,31857,32140,32348,32479,32706,33132,33357,33784,34005,34430,34550,34826,35127,35451,35742,36056,36193,36324,36429,36671,36838,37042,37250,37521,37633,37745,37850,37967,38181,38327,38467,38553,38901,38989,39235,39653,39902,39984,40082,40674,40774,41026,41450,41705,41799,41888,42125,44149,44391,44493,44746,46902,57031,58547,68775,70303,72060,72686,73106,74167,75432,75688,75924,76471,76965,77570,77768,78348,78912,79287,79405,79943,80100,80296,80569,80825,80995,81136,81200,81482,81768,82444,82708,83046,83399,83493,83679,83985,84247,84372,84499,84738,84949,85068,85261,85438,85893,86074,86196,86455,86568,86755,86857,86964,87093,87368,87876,88372,89249,89543,90113,90262,90994,91166,91502,91594,92654,96936,101361,101423,102001,102585,102676,102789,103018,103178,103330,103501,103667,103836,104003,104166,104409,104579,104752,104923,105197,105396,105601,105931,106015,106111,106207,106305,106405,106507,106609,106711,106813,106915,107015,107111,107223,107352,107475,107606,107737,107835,107949,108043,108183,108317,108413,108525,108625,108741,108837,108949,109049,109189,109325,109489,109619,109777,109927,110068,110212,110347,110459,110609,110737,110865,111001,111133,111263,111393,111505,112403,112549,112693,114177,114243,114333,114409,114513,114603,114705,114813,114921,115021,115101,115193,115291,115401,115479,115585,115677,115781,115891,116013,116176,116333,116413,116513,116603,116713,116807,116913,117005,117105,117217,117331,117447,117563,117657,117771,117883,117985,118105,118227,118309,118413,118533,118659,118757,118851,118939,119051,119167,119289,119401,119576,119692,119778,119870,119982,120106,120173,120299,120367,120495,120639,120767,120836,120931,121046,121159,121258,121367,121478,121589,121690,121795,121895,122025,122116,122239,122333,122445,122531,122635,122731,122819,122937,123041,123145,123271,123359,123467,123567,123657,123767,123851,123953,124037,124091,124155,124261,124371,124455,124859,127475,127593,127708,127788,128149,128382,128899,129324,129502,129786,131130,132491,132879,133957,143475,143821,149841,153597,154348,154610,154810,155189,159467,160073,160302,160453,160668,161751,162063,162474,162601,165627,166228,168149,168489,169800", - "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,359,374,375,376,377,378,386,387,391,395,399,404,410,417,421,425,430,434,438,442,446,450,454,460,464,470,474,480,484,489,493,496,500,506,510,516,520,526,529,533,537,541,545,549,550,551,552,555,558,561,564,568,569,570,571,572,575,577,579,581,586,587,591,597,601,602,604,615,616,620,626,630,631,632,636,663,667,668,672,700,867,893,1061,1087,1118,1126,1132,1146,1168,1173,1178,1188,1197,1206,1210,1217,1225,1232,1233,1242,1245,1248,1252,1256,1260,1263,1264,1268,1272,1282,1287,1294,1300,1301,1304,1308,1313,1315,1317,1320,1323,1325,1329,1332,1339,1342,1345,1349,1351,1355,1357,1359,1361,1365,1373,1381,1393,1399,1408,1411,1422,1425,1430,1431,1436,1509,1568,1569,1579,1588,1589,1591,1595,1598,1601,1604,1607,1610,1613,1616,1620,1623,1626,1629,1633,1636,1640,1644,1645,1646,1647,1648,1649,1650,1651,1652,1653,1654,1655,1656,1657,1658,1659,1660,1661,1662,1663,1664,1666,1668,1669,1670,1671,1672,1673,1674,1675,1677,1678,1680,1681,1683,1685,1686,1688,1689,1690,1691,1692,1693,1695,1696,1697,1698,1699,1700,1713,1715,1717,1746,1747,1748,1749,1750,1751,1752,1753,1754,1755,1756,1757,1759,1760,1761,1762,1763,1764,1766,1770,1774,1775,1776,1777,1778,1779,1780,1781,1783,1785,1787,1789,1791,1792,1793,1794,1796,1798,1800,1801,1802,1803,1804,1805,1806,1807,1808,1809,1810,1811,1814,1815,1816,1817,1819,1821,1822,1824,1825,1827,1829,1831,1832,1833,1834,1835,1836,1837,1838,1839,1840,1841,1842,1844,1845,1846,1847,1849,1850,1851,1852,1853,1855,1857,1859,1861,1862,1863,1864,1865,1866,1867,1868,1869,1870,1871,1872,1873,1874,1875,1955,1958,1961,1964,1978,1984,1994,2010,2016,2026,2055,2082,2091,2120,2463,2467,2500,2608,2723,2729,2735,2756,2880,2900,2906,2910,2916,2951,2963,2979,2983,3049,3064,3115,3127,3153,3160", - "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": "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,14923,14993,15071,15125,15195,15280,15328,15374,15445,15523,15601,15673,15747,15821,15895,15975,16048,16117,16189,16266,16327,16390,16456,16520,16591,16654,16719,16783,16844,16905,16957,17030,17104,17173,17248,17322,17396,17537,17607,23720,24841,24931,25019,25115,25205,25787,25876,26123,26404,26656,26941,27334,27811,28033,28255,28531,28758,28988,29218,29448,29678,29905,30324,30550,30975,31205,31633,31852,32135,32343,32474,32701,33127,33352,33779,34000,34425,34545,34821,35122,35446,35737,36051,36188,36319,36424,36666,36833,37037,37245,37516,37628,37740,37845,37962,38176,38322,38462,38548,38896,38984,39230,39648,39897,39979,40077,40669,40769,41021,41445,41700,41794,41883,42120,44144,44386,44488,44741,46897,57026,58542,68770,70298,72055,72681,73101,74162,75427,75683,75919,76466,76960,77565,77763,78343,78907,79282,79400,79938,80095,80291,80564,80820,80990,81131,81195,81477,81763,82439,82703,83041,83394,83488,83674,83980,84242,84367,84494,84733,84944,85063,85256,85433,85888,86069,86191,86450,86563,86750,86852,86959,87088,87363,87871,88367,89244,89538,90108,90257,90989,91161,91497,91589,91867,96931,101356,101418,101996,102580,102671,102784,103013,103173,103325,103496,103662,103831,103998,104161,104404,104574,104747,104918,105192,105391,105596,105926,106010,106106,106202,106300,106400,106502,106604,106706,106808,106910,107010,107106,107218,107347,107470,107601,107732,107830,107944,108038,108178,108312,108408,108520,108620,108736,108832,108944,109044,109184,109320,109484,109614,109772,109922,110063,110207,110342,110454,110604,110732,110860,110996,111128,111258,111388,111500,111640,112544,112688,112826,114238,114328,114404,114508,114598,114700,114808,114916,115016,115096,115188,115286,115396,115474,115580,115672,115776,115886,116008,116171,116328,116408,116508,116598,116708,116802,116908,117000,117100,117212,117326,117442,117558,117652,117766,117878,117980,118100,118222,118304,118408,118528,118654,118752,118846,118934,119046,119162,119284,119396,119571,119687,119773,119865,119977,120101,120168,120294,120362,120490,120634,120762,120831,120926,121041,121154,121253,121362,121473,121584,121685,121790,121890,122020,122111,122234,122328,122440,122526,122630,122726,122814,122932,123036,123140,123266,123354,123462,123562,123652,123762,123846,123948,124032,124086,124150,124256,124366,124450,124570,127470,127588,127703,127783,128144,128377,128894,129319,129497,129781,131125,132486,132874,133952,143470,143605,145109,150408,154343,154605,154805,155184,159462,160068,160297,160448,160663,161746,162058,162469,162596,165622,166223,168144,168484,169795,169998" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\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,362,1701,1702,1706,1707,1711,1876,1877,2468,2609,2640,2661,2694", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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,23864,111645,111762,111963,112073,112274,124575,124647,143610,150413,152067,152748,153430", - "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,362,1701,1705,1706,1710,1711,1876,1877,2474,2639,2660,2693,2699", - "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": "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,23930,111757,111958,112068,112269,112398,124642,124709,143816,152062,152743,153425,153592" - } - }, - { ->>>>>>> xiaojinchi_branch - "source": "D:\\Notes-master3\\app\\src\\main\\res\\values\\arrays.xml", - "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "739,1047", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1041,1162" - }, - "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,300", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "295,415" - } - }, - { - "source": "D:\\Notes-master3\\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": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", - "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": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" - }, - "to": { - "startLines": "1437,1441,1445,1449,1718,1722,1726,1730,1734,1738,1742", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "91872,92076,92287,92494,112831,113014,113199,113384,113587,113793,113976", - "endLines": "1440,1444,1448,1451,1721,1725,1729,1733,1737,1741,1745", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "92071,92282,92489,92649,113009,113194,113379,113582,113788,113971,114172" - } - }, - { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-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,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,1303,1304,1305,1306,1307,1308,1309,1310,1311,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325,1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,1360,1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1390,1391,1392,1393,1394,1395,1396,1397,1398,1399,1400,1401,1402,1403,1404,1405,1406,1407,1408,1409,1410,1411,1412,1413,1414,1415,1416,1417,1418,1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1453,1461,1462,1466,1470,1474,1479,1485,1492,1496,1500,1505,1509,1513,1517,1521,1525,1529,1535,1539,1545,1549,1555,1559,1564,1568,1571,1575,1581,1585,1591,1595,1601,1604,1608,1612,1616,1620,1624,1625,1626,1627,1630,1633,1636,1639,1643,1644,1645,1646,1647,1650,1652,1654,1656,1661,1662,1666,1672,1676,1677,1679,1690,1691,1695,1701,1705,1706,1707,1711,1738,1742,1743,1747,1775,1943,1969,2138,2164,2195,2203,2209,2223,2245,2250,2255,2265,2274,2283,2287,2294,2302,2309,2310,2319,2322,2325,2329,2333,2337,2340,2341,2345,2349,2359,2364,2371,2377,2378,2381,2385,2390,2392,2394,2397,2400,2402,2406,2409,2416,2419,2422,2426,2428,2432,2434,2436,2438,2442,2450,2458,2470,2476,2485,2488,2499,2502,2507,2508,2513,2571,2630,2631,2641,2650,2651,2653,2657,2660,2663,2666,2669,2672,2675,2678,2682,2685,2688,2691,2695,2698,2702,2706,2707,2708,2709,2710,2711,2712,2713,2714,2715,2716,2717,2718,2719,2720,2721,2722,2723,2724,2725,2726,2728,2730,2731,2732,2733,2734,2735,2736,2737,2739,2740,2742,2743,2745,2747,2748,2750,2751,2752,2753,2754,2755,2757,2758,2759,2760,2761,2762,2764,2766,2768,2769,2770,2771,2772,2773,2774,2775,2776,2777,2778,2779,2780,2782,2783,2784,2785,2786,2787,2789,2793,2797,2798,2799,2800,2801,2802,2803,2804,2806,2808,2810,2812,2814,2815,2816,2817,2819,2821,2823,2824,2825,2826,2827,2828,2829,2830,2831,2832,2833,2834,2837,2838,2839,2840,2842,2844,2845,2847,2848,2850,2852,2854,2855,2856,2857,2858,2859,2860,2861,2862,2863,2864,2865,2867,2868,2869,2870,2872,2873,2874,2875,2876,2878,2880,2882,2884,2885,2886,2887,2888,2889,2890,2891,2892,2893,2894,2895,2896,2897,69,152,155,158,161,175,186,196,223,230,241,271,298,307,344,725,730,756,774,810,816,822,845,986,1006,1012,1016,1022,1059,1071,1098,1103,1169,1184,1249,1268,1294", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,160,205,254,295,350,409,471,552,613,688,764,841,919,1004,1086,1162,1238,1315,1393,1499,1605,1684,1764,1821,1879,1953,2028,2093,2159,2219,2280,2352,2425,2492,2560,2619,2678,2737,2796,2855,2909,2963,3016,3070,3124,3178,3232,3306,3385,3458,3532,3603,3675,3747,3820,3877,3935,4008,4082,4156,4231,4303,4376,4446,4517,4577,70911,70980,71049,71119,71193,71269,71333,71410,71486,71563,71628,71697,71774,71849,71918,71986,72063,72129,72190,72287,72352,72421,72520,72591,72650,72708,72765,72824,72888,72959,73031,73103,73175,73247,73314,73382,73450,73509,73572,73636,73726,73817,73877,73943,74010,74076,74146,74210,74263,74376,74434,74497,74562,74627,74702,74775,74847,74896,74957,75018,75079,75141,75205,75269,75333,75398,75461,75521,75582,75648,75707,75767,75829,75900,75960,76028,76114,76201,76291,76378,76466,76548,76631,76721,76812,76864,76922,76967,77033,77097,77154,77211,77265,77322,77370,77419,77470,77504,77551,77600,77646,77678,77742,77804,77864,77921,77995,78065,78143,78197,78267,78352,78400,78446,78517,78595,78673,78745,78819,78893,78967,79047,79120,79189,79261,79338,79399,79462,79528,79592,79663,79726,79791,79855,79916,79977,80029,80102,80176,80245,80320,80394,80468,80609,80679,80732,80810,80900,80988,81084,81174,81756,81845,82092,82373,82625,82910,83303,83780,84002,84224,84500,84727,84957,85187,85417,85647,85874,86293,86519,86944,87174,87602,87821,88104,88312,88443,88670,89096,89321,89748,89969,90394,90514,90790,91091,91415,91706,92020,92157,92288,92393,92635,92802,93006,93214,93485,93597,93709,93814,93931,94145,94291,94431,94517,94865,94953,95199,95617,95866,95948,96046,96663,96763,97015,97439,97694,97788,97877,98114,100166,100408,100510,100763,102947,113668,115184,126004,127532,129289,129915,130335,131396,132661,132917,133153,133700,134194,134799,134997,135577,136141,136516,136634,137172,137329,137525,137798,138054,138224,138365,138429,138711,138997,139673,139937,140275,140628,140722,140908,141214,141476,141601,141728,141967,142178,142297,142490,142667,143122,143303,143425,143684,143797,143984,144086,144193,144322,144597,145105,145601,146478,146772,147342,147491,148223,148395,148731,148823,149101,153445,157932,157994,158624,159238,159329,159442,159671,159831,159983,160154,160320,160489,160656,160819,161062,161232,161405,161576,161850,162049,162254,162584,162668,162764,162860,162958,163058,163160,163262,163364,163466,163568,163668,163764,163876,164005,164128,164259,164390,164488,164602,164696,164836,164970,165066,165178,165278,165394,165490,165602,165702,165842,165978,166142,166272,166430,166580,166721,166865,167000,167112,167262,167390,167518,167654,167786,167916,168046,168158,168298,168444,168588,168726,168792,168882,168958,169062,169152,169254,169362,169470,169570,169650,169742,169840,169950,170028,170134,170226,170330,170440,170562,170725,170882,170962,171062,171152,171262,171356,171462,171554,171654,171766,171880,171996,172112,172206,172320,172432,172534,172654,172776,172858,172962,173082,173208,173306,173400,173488,173600,173716,173838,173950,174125,174241,174327,174419,174531,174655,174722,174848,174916,175044,175188,175316,175385,175480,175595,175708,175807,175916,176027,176138,176239,176344,176444,176574,176665,176788,176882,176994,177080,177184,177280,177368,177486,177590,177694,177820,177908,178016,178116,178206,178316,178400,178502,178586,178640,178704,178810,178920,179004,4638,9782,9900,10015,10147,10862,11554,12071,13718,14103,14700,16299,17832,18220,20527,40045,40305,41697,42730,44743,45005,45361,46191,52973,54107,54401,54624,54951,57001,57649,59282,59552,63403,64004,67813,69028,70437", - "endLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,1303,1304,1305,1306,1307,1308,1309,1310,1311,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325,1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,1360,1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1390,1391,1392,1393,1394,1395,1396,1397,1398,1399,1400,1401,1402,1403,1404,1405,1406,1407,1408,1409,1410,1411,1412,1413,1414,1415,1416,1417,1418,1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1460,1461,1465,1469,1473,1478,1484,1491,1495,1499,1504,1508,1512,1516,1520,1524,1528,1534,1538,1544,1548,1554,1558,1563,1567,1570,1574,1580,1584,1590,1594,1600,1603,1607,1611,1615,1619,1623,1624,1625,1626,1629,1632,1635,1638,1642,1643,1644,1645,1646,1649,1651,1653,1655,1660,1661,1665,1671,1675,1676,1678,1689,1690,1694,1700,1704,1705,1706,1710,1737,1741,1742,1746,1774,1942,1968,2137,2163,2194,2202,2208,2222,2244,2249,2254,2264,2273,2282,2286,2293,2301,2308,2309,2318,2321,2324,2328,2332,2336,2339,2340,2344,2348,2358,2363,2370,2376,2377,2380,2384,2389,2391,2393,2396,2399,2401,2405,2408,2415,2418,2421,2425,2427,2431,2433,2435,2437,2441,2449,2457,2469,2475,2484,2487,2498,2501,2506,2507,2512,2570,2629,2630,2640,2649,2650,2652,2656,2659,2662,2665,2668,2671,2674,2677,2681,2684,2687,2690,2694,2697,2701,2705,2706,2707,2708,2709,2710,2711,2712,2713,2714,2715,2716,2717,2718,2719,2720,2721,2722,2723,2724,2725,2727,2729,2730,2731,2732,2733,2734,2735,2736,2738,2739,2741,2742,2744,2746,2747,2749,2750,2751,2752,2753,2754,2756,2757,2758,2759,2760,2761,2763,2765,2767,2768,2769,2770,2771,2772,2773,2774,2775,2776,2777,2778,2779,2781,2782,2783,2784,2785,2786,2788,2792,2796,2797,2798,2799,2800,2801,2802,2803,2805,2807,2809,2811,2813,2814,2815,2816,2818,2820,2822,2823,2824,2825,2826,2827,2828,2829,2830,2831,2832,2833,2836,2837,2838,2839,2841,2843,2844,2846,2847,2849,2851,2853,2854,2855,2856,2857,2858,2859,2860,2861,2862,2863,2864,2866,2867,2868,2869,2871,2872,2873,2874,2875,2877,2879,2881,2883,2884,2885,2886,2887,2888,2889,2890,2891,2892,2893,2894,2895,2896,2897,151,154,157,160,174,185,195,222,229,240,270,297,306,343,724,729,755,773,809,815,821,844,985,1005,1011,1015,1021,1058,1070,1097,1102,1168,1183,1248,1267,1293,1302", - "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,63,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,91,12,12,12,61,12,12,90,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24", - "endOffsets": "155,200,249,290,345,404,466,547,608,683,759,836,914,999,1081,1157,1233,1310,1388,1494,1600,1679,1759,1816,1874,1948,2023,2088,2154,2214,2275,2347,2420,2487,2555,2614,2673,2732,2791,2850,2904,2958,3011,3065,3119,3173,3227,3301,3380,3453,3527,3598,3670,3742,3815,3872,3930,4003,4077,4151,4226,4298,4371,4441,4512,4572,4633,70975,71044,71114,71188,71264,71328,71405,71481,71558,71623,71692,71769,71844,71913,71981,72058,72124,72185,72282,72347,72416,72515,72586,72645,72703,72760,72819,72883,72954,73026,73098,73170,73242,73309,73377,73445,73504,73567,73631,73721,73812,73872,73938,74005,74071,74141,74205,74258,74371,74429,74492,74557,74622,74697,74770,74842,74891,74952,75013,75074,75136,75200,75264,75328,75393,75456,75516,75577,75643,75702,75762,75824,75895,75955,76023,76109,76196,76286,76373,76461,76543,76626,76716,76807,76859,76917,76962,77028,77092,77149,77206,77260,77317,77365,77414,77465,77499,77546,77595,77641,77673,77737,77799,77859,77916,77990,78060,78138,78192,78262,78347,78395,78441,78512,78590,78668,78740,78814,78888,78962,79042,79115,79184,79256,79333,79394,79457,79523,79587,79658,79721,79786,79850,79911,79972,80024,80097,80171,80240,80315,80389,80463,80604,80674,80727,80805,80895,80983,81079,81169,81751,81840,82087,82368,82620,82905,83298,83775,83997,84219,84495,84722,84952,85182,85412,85642,85869,86288,86514,86939,87169,87597,87816,88099,88307,88438,88665,89091,89316,89743,89964,90389,90509,90785,91086,91410,91701,92015,92152,92283,92388,92630,92797,93001,93209,93480,93592,93704,93809,93926,94140,94286,94426,94512,94860,94948,95194,95612,95861,95943,96041,96658,96758,97010,97434,97689,97783,97872,98109,100161,100403,100505,100758,102942,113663,115179,125999,127527,129284,129910,130330,131391,132656,132912,133148,133695,134189,134794,134992,135572,136136,136511,136629,137167,137324,137520,137793,138049,138219,138360,138424,138706,138992,139668,139932,140270,140623,140717,140903,141209,141471,141596,141723,141962,142173,142292,142485,142662,143117,143298,143420,143679,143792,143979,144081,144188,144317,144592,145100,145596,146473,146767,147337,147486,148218,148390,148726,148818,149096,153440,157927,157989,158619,159233,159324,159437,159666,159826,159978,160149,160315,160484,160651,160814,161057,161227,161400,161571,161845,162044,162249,162579,162663,162759,162855,162953,163053,163155,163257,163359,163461,163563,163663,163759,163871,164000,164123,164254,164385,164483,164597,164691,164831,164965,165061,165173,165273,165389,165485,165597,165697,165837,165973,166137,166267,166425,166575,166716,166860,166995,167107,167257,167385,167513,167649,167781,167911,168041,168153,168293,168439,168583,168721,168787,168877,168953,169057,169147,169249,169357,169465,169565,169645,169737,169835,169945,170023,170129,170221,170325,170435,170557,170720,170877,170957,171057,171147,171257,171351,171457,171549,171649,171761,171875,171991,172107,172201,172315,172427,172529,172649,172771,172853,172957,173077,173203,173301,173395,173483,173595,173711,173833,173945,174120,174236,174322,174414,174526,174650,174717,174843,174911,175039,175183,175311,175380,175475,175590,175703,175802,175911,176022,176133,176234,176339,176439,176569,176660,176783,176877,176989,177075,177179,177275,177363,177481,177585,177689,177815,177903,178011,178111,178201,178311,178395,178497,178581,178635,178699,178805,178915,178999,179119,9777,9895,10010,10142,10857,11549,12066,13713,14098,14695,16294,17827,18215,20522,40040,40300,41692,42725,44738,45000,45356,46186,52968,54102,54396,54619,54946,56996,57644,59277,59547,63398,63999,67808,69023,70432,70906" - }, - "to": { - "startLines": "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,359,374,375,376,377,378,379,387,388,392,396,400,405,411,418,422,426,431,435,439,443,447,451,455,461,465,471,475,481,485,490,494,497,501,507,511,517,521,527,530,534,538,542,546,550,551,552,553,556,559,562,565,569,570,571,572,573,576,578,580,582,587,588,592,598,602,603,605,616,617,621,627,631,632,633,637,664,668,669,673,701,868,894,1062,1088,1119,1127,1133,1147,1169,1174,1179,1189,1198,1207,1211,1218,1226,1233,1234,1243,1246,1249,1253,1257,1261,1264,1265,1269,1273,1283,1288,1295,1301,1302,1305,1309,1314,1316,1318,1321,1324,1326,1330,1333,1340,1343,1346,1350,1352,1356,1358,1360,1362,1366,1374,1382,1394,1400,1409,1412,1423,1426,1431,1432,1452,1510,1569,1570,1580,1589,1590,1592,1596,1599,1602,1605,1608,1611,1614,1617,1621,1624,1627,1630,1634,1637,1641,1645,1646,1647,1648,1649,1650,1651,1652,1653,1654,1655,1656,1657,1658,1659,1660,1661,1662,1663,1664,1665,1667,1669,1670,1671,1672,1673,1674,1675,1676,1678,1679,1681,1682,1684,1686,1687,1689,1690,1691,1692,1693,1694,1696,1697,1698,1699,1700,1712,1714,1716,1746,1747,1748,1749,1750,1751,1752,1753,1754,1755,1756,1757,1758,1760,1761,1762,1763,1764,1765,1767,1771,1775,1776,1777,1778,1779,1780,1781,1782,1784,1786,1788,1790,1792,1793,1794,1795,1797,1799,1801,1802,1803,1804,1805,1806,1807,1808,1809,1810,1811,1812,1815,1816,1817,1818,1820,1822,1823,1825,1826,1828,1830,1832,1833,1834,1835,1836,1837,1838,1839,1840,1841,1842,1843,1845,1846,1847,1848,1850,1851,1852,1853,1854,1856,1858,1860,1862,1863,1864,1865,1866,1867,1868,1869,1870,1871,1872,1873,1874,1875,1881,1956,1959,1962,1965,1979,1985,1995,2011,2017,2027,2056,2083,2092,2121,2464,2475,2591,2700,2724,2730,2736,2757,2881,2901,2907,2911,2917,2952,2964,2980,2984,3050,3065,3116,3128,3154", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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,14854,14928,14998,15076,15130,15200,15285,15333,15379,15450,15528,15606,15678,15752,15826,15900,15980,16053,16122,16194,16271,16332,16395,16461,16525,16596,16659,16724,16788,16849,16910,16962,17035,17109,17178,17253,17327,17401,17542,23672,24768,24846,24936,25024,25120,25210,25792,25881,26128,26409,26661,26946,27339,27816,28038,28260,28536,28763,28993,29223,29453,29683,29910,30329,30555,30980,31210,31638,31857,32140,32348,32479,32706,33132,33357,33784,34005,34430,34550,34826,35127,35451,35742,36056,36193,36324,36429,36671,36838,37042,37250,37521,37633,37745,37850,37967,38181,38327,38467,38553,38901,38989,39235,39653,39902,39984,40082,40674,40774,41026,41450,41705,41799,41888,42125,44149,44391,44493,44746,46902,57031,58547,68775,70303,72060,72686,73106,74167,75432,75688,75924,76471,76965,77570,77768,78348,78912,79287,79405,79943,80100,80296,80569,80825,80995,81136,81200,81482,81768,82444,82708,83046,83399,83493,83679,83985,84247,84372,84499,84738,84949,85068,85261,85438,85893,86074,86196,86455,86568,86755,86857,86964,87093,87368,87876,88372,89249,89543,90113,90262,90994,91166,91502,91594,92654,96936,101361,101423,102001,102585,102676,102789,103018,103178,103330,103501,103667,103836,104003,104166,104409,104579,104752,104923,105197,105396,105601,105931,106015,106111,106207,106305,106405,106507,106609,106711,106813,106915,107015,107111,107223,107352,107475,107606,107737,107835,107949,108043,108183,108317,108413,108525,108625,108741,108837,108949,109049,109189,109325,109489,109619,109777,109927,110068,110212,110347,110459,110609,110737,110865,111001,111133,111263,111393,111505,112403,112549,112693,114177,114243,114333,114409,114513,114603,114705,114813,114921,115021,115101,115193,115291,115401,115479,115585,115677,115781,115891,116013,116176,116333,116413,116513,116603,116713,116807,116913,117005,117105,117217,117331,117447,117563,117657,117771,117883,117985,118105,118227,118309,118413,118533,118659,118757,118851,118939,119051,119167,119289,119401,119576,119692,119778,119870,119982,120106,120173,120299,120367,120495,120639,120767,120836,120931,121046,121159,121258,121367,121478,121589,121690,121795,121895,122025,122116,122239,122333,122445,122531,122635,122731,122819,122937,123041,123145,123271,123359,123467,123567,123657,123767,123851,123953,124037,124091,124155,124261,124371,124455,124859,127475,127593,127708,127788,128149,128382,128899,129324,129502,129786,131130,132491,132879,133957,143475,143821,149841,153597,154348,154610,154810,155189,159467,160073,160302,160453,160668,161751,162063,162474,162601,165627,166228,168149,168489,169800", - "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,359,374,375,376,377,378,386,387,391,395,399,404,410,417,421,425,430,434,438,442,446,450,454,460,464,470,474,480,484,489,493,496,500,506,510,516,520,526,529,533,537,541,545,549,550,551,552,555,558,561,564,568,569,570,571,572,575,577,579,581,586,587,591,597,601,602,604,615,616,620,626,630,631,632,636,663,667,668,672,700,867,893,1061,1087,1118,1126,1132,1146,1168,1173,1178,1188,1197,1206,1210,1217,1225,1232,1233,1242,1245,1248,1252,1256,1260,1263,1264,1268,1272,1282,1287,1294,1300,1301,1304,1308,1313,1315,1317,1320,1323,1325,1329,1332,1339,1342,1345,1349,1351,1355,1357,1359,1361,1365,1373,1381,1393,1399,1408,1411,1422,1425,1430,1431,1436,1509,1568,1569,1579,1588,1589,1591,1595,1598,1601,1604,1607,1610,1613,1616,1620,1623,1626,1629,1633,1636,1640,1644,1645,1646,1647,1648,1649,1650,1651,1652,1653,1654,1655,1656,1657,1658,1659,1660,1661,1662,1663,1664,1666,1668,1669,1670,1671,1672,1673,1674,1675,1677,1678,1680,1681,1683,1685,1686,1688,1689,1690,1691,1692,1693,1695,1696,1697,1698,1699,1700,1713,1715,1717,1746,1747,1748,1749,1750,1751,1752,1753,1754,1755,1756,1757,1759,1760,1761,1762,1763,1764,1766,1770,1774,1775,1776,1777,1778,1779,1780,1781,1783,1785,1787,1789,1791,1792,1793,1794,1796,1798,1800,1801,1802,1803,1804,1805,1806,1807,1808,1809,1810,1811,1814,1815,1816,1817,1819,1821,1822,1824,1825,1827,1829,1831,1832,1833,1834,1835,1836,1837,1838,1839,1840,1841,1842,1844,1845,1846,1847,1849,1850,1851,1852,1853,1855,1857,1859,1861,1862,1863,1864,1865,1866,1867,1868,1869,1870,1871,1872,1873,1874,1875,1955,1958,1961,1964,1978,1984,1994,2010,2016,2026,2055,2082,2091,2120,2463,2467,2500,2608,2723,2729,2735,2756,2880,2900,2906,2910,2916,2951,2963,2979,2983,3049,3064,3115,3127,3153,3160", - "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": "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,14923,14993,15071,15125,15195,15280,15328,15374,15445,15523,15601,15673,15747,15821,15895,15975,16048,16117,16189,16266,16327,16390,16456,16520,16591,16654,16719,16783,16844,16905,16957,17030,17104,17173,17248,17322,17396,17537,17607,23720,24841,24931,25019,25115,25205,25787,25876,26123,26404,26656,26941,27334,27811,28033,28255,28531,28758,28988,29218,29448,29678,29905,30324,30550,30975,31205,31633,31852,32135,32343,32474,32701,33127,33352,33779,34000,34425,34545,34821,35122,35446,35737,36051,36188,36319,36424,36666,36833,37037,37245,37516,37628,37740,37845,37962,38176,38322,38462,38548,38896,38984,39230,39648,39897,39979,40077,40669,40769,41021,41445,41700,41794,41883,42120,44144,44386,44488,44741,46897,57026,58542,68770,70298,72055,72681,73101,74162,75427,75683,75919,76466,76960,77565,77763,78343,78907,79282,79400,79938,80095,80291,80564,80820,80990,81131,81195,81477,81763,82439,82703,83041,83394,83488,83674,83980,84242,84367,84494,84733,84944,85063,85256,85433,85888,86069,86191,86450,86563,86750,86852,86959,87088,87363,87871,88367,89244,89538,90108,90257,90989,91161,91497,91589,91867,96931,101356,101418,101996,102580,102671,102784,103013,103173,103325,103496,103662,103831,103998,104161,104404,104574,104747,104918,105192,105391,105596,105926,106010,106106,106202,106300,106400,106502,106604,106706,106808,106910,107010,107106,107218,107347,107470,107601,107732,107830,107944,108038,108178,108312,108408,108520,108620,108736,108832,108944,109044,109184,109320,109484,109614,109772,109922,110063,110207,110342,110454,110604,110732,110860,110996,111128,111258,111388,111500,111640,112544,112688,112826,114238,114328,114404,114508,114598,114700,114808,114916,115016,115096,115188,115286,115396,115474,115580,115672,115776,115886,116008,116171,116328,116408,116508,116598,116708,116802,116908,117000,117100,117212,117326,117442,117558,117652,117766,117878,117980,118100,118222,118304,118408,118528,118654,118752,118846,118934,119046,119162,119284,119396,119571,119687,119773,119865,119977,120101,120168,120294,120362,120490,120634,120762,120831,120926,121041,121154,121253,121362,121473,121584,121685,121790,121890,122020,122111,122234,122328,122440,122526,122630,122726,122814,122932,123036,123140,123266,123354,123462,123562,123652,123762,123846,123948,124032,124086,124150,124256,124366,124450,124570,127470,127588,127703,127783,128144,128377,128894,129319,129497,129781,131125,132486,132874,133952,143470,143605,145109,150408,154343,154605,154805,155184,159462,160068,160297,160448,160663,161746,162058,162469,162596,165622,166223,168144,168484,169795,169998" - } - }, - { -======= ->>>>>>> xiaojinchi_branch - "source": "D:\\Notes-master3\\app\\src\\main\\res\\values\\strings.xml", - "from": { - "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", - "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" - }, - "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,360,361,363,364,365,366,367,368,369,370,371,372,373", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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,17612,17708,17791,17887,17956,17999,18051,18103,18152,18215,18273,18324,18408,18502,18610,18681,18765,18848,18914,18997,19099,19160,19222,19273,19351,19404,19464,19569,19628,19730,19785,19856,19905,19963,20010,20069,20126,20197,20258,20315,20365,20417,20470,20520,20570,20630,20683,20749,20811,20874,20921,20976,21064,21122,21184,21234,21279,21322,21382,21449,21504,21559,21612,21659,21712,21768,21816,21871,21924,22008,22075,22139,22235,22309,22390,22479,22642,22786,22865,22940,23022,23081,23161,23241,23296,23418,23521,23562,23615,23725,23799,23935,24003,24089,24169,24238,24332,24391,24446,24508,24568,24678", - "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,360,361,363,364,365,366,367,368,369,370,371,372,373", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "14849,17703,17786,17882,17951,17994,18046,18098,18147,18210,18268,18319,18403,18497,18605,18676,18760,18843,18909,18992,19094,19155,19217,19268,19346,19399,19459,19564,19623,19725,19780,19851,19900,19958,20005,20064,20121,20192,20253,20310,20360,20412,20465,20515,20565,20625,20678,20744,20806,20869,20916,20971,21059,21117,21179,21229,21274,21317,21377,21444,21499,21554,21607,21654,21707,21763,21811,21866,21919,22003,22070,22134,22230,22304,22385,22474,22637,22781,22860,22935,23017,23076,23156,23236,23291,23413,23516,23557,23610,23667,23794,23859,23998,24084,24164,24233,24327,24386,24441,24503,24563,24673,24763" - } - }, - { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\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,362,1701,1702,1706,1707,1711,1876,1877,2468,2609,2640,2661,2694", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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,23864,111645,111762,111963,112073,112274,124575,124647,143610,150413,152067,152748,153430", - "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,362,1701,1705,1706,1710,1711,1876,1877,2474,2639,2660,2693,2699", - "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": "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,23930,111757,111958,112068,112269,112398,124642,124709,143816,152062,152743,153425,153592" -======= - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\2504d03dceb2ecea0f7a3eb651ec8485\\transformed\\coordinatorlayout-1.0.0\\res\\values\\values.xml", - "from": { - "startLines": "2,102,3,13", - "startColumns": "4,4,4,4", - "startOffsets": "55,5935,116,724", - "endLines": "2,104,12,101", - "endColumns": "60,12,24,24", - "endOffsets": "111,6075,719,5930" - }, - "to": { - "startLines": "12,1878,2501,2507", - "startColumns": "4,4,4,4", - "startOffsets": "420,124714,145114,145325", - "endLines": "12,1880,2506,2590", - "endColumns": "60,12,24,24", - "endOffsets": "476,124854,145320,149836" ->>>>>>> xiaojinchi_branch - } - } - ] - }, - { -<<<<<<< HEAD - "outputFile": "net.micode.notes.app-merged_res-8:/values-hu_values-hu.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-hu\\values-hu.xml", -======= - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-da_values-da.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-da\\values-da.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2844", - "endColumns": "100", - "endOffsets": "2940" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-in_values-in.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-in\\values-in.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2887", - "endColumns": "100", - "endOffsets": "2983" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-hu_values-hu.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-hu\\values-hu.xml", ->>>>>>> xiaojinchi_branch - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,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" - } - }, - { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-hu\\values-hu.xml", -======= - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-hu\\values-hu.xml", ->>>>>>> xiaojinchi_branch - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2961", - "endColumns": "100", - "endOffsets": "3057" - } - } - ] - }, - { -<<<<<<< HEAD - "outputFile": "net.micode.notes.app-merged_res-8:/values-lv_values-lv.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-lv\\values-lv.xml", -======= - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-el_values-el.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-el\\values-el.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,223,334,451,536,641,767,855,941,1032,1125,1221,1315,1416,1509,1604,1701,1792,1883,1968,2079,2189,2291,2402,2511,2619,2779,2879", - "endColumns": "117,110,116,84,104,125,87,85,90,92,95,93,100,92,94,96,90,90,84,110,109,101,110,108,107,159,99,84", - "endOffsets": "218,329,446,531,636,762,850,936,1027,1120,1216,1310,1411,1504,1599,1696,1787,1878,1963,2074,2184,2286,2397,2506,2614,2774,2874,2959" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-el\\values-el.xml", ->>>>>>> xiaojinchi_branch - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", -<<<<<<< HEAD - "startOffsets": "3076", - "endColumns": "100", - "endOffsets": "3172" -======= - "startOffsets": "2964", - "endColumns": "100", - "endOffsets": "3060" ->>>>>>> xiaojinchi_branch - } - } - ] - }, - { -<<<<<<< HEAD - "outputFile": "net.micode.notes.app-merged_res-8:/values-h720dp-v13_values-h720dp-v13.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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": "net.micode.notes.app-merged_res-8:/values-large-v4_values-large-v4.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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": "net.micode.notes.app-merged_res-8:/values-gu_values-gu.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-gu\\values-gu.xml", -======= - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-ro_values-ro.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-ro\\values-ro.xml", ->>>>>>> xiaojinchi_branch - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", -<<<<<<< HEAD - "startOffsets": "2882", - "endColumns": "100", - "endOffsets": "2978" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-8:/values-pa_values-pa.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-pa\\values-pa.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2839", - "endColumns": "100", - "endOffsets": "2935" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-8:/values-b+sr+Latn_values-b+sr+Latn.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,214,318,424,510,614,732,814,895,986,1079,1175,1269,1370,1463,1558,1663,1754,1845,1933,2039,2147,2248,2353,2461,2562,2731,2828", - "endColumns": "108,103,105,85,103,117,81,80,90,92,95,93,100,92,94,104,90,90,87,105,107,100,104,107,100,168,96,83", - "endOffsets": "209,313,419,505,609,727,809,890,981,1074,1170,1264,1365,1458,1553,1658,1749,1840,1928,2034,2142,2243,2348,2456,2557,2726,2823,2907" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2912", - "endColumns": "100", - "endOffsets": "3008" -======= - "startOffsets": "2953", - "endColumns": "100", - "endOffsets": "3049" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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" ->>>>>>> xiaojinchi_branch - } - } - ] - }, - { -<<<<<<< HEAD - "outputFile": "net.micode.notes.app-merged_res-8:/values-v23_values-v23.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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" - }, - "to": { - "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,1131,1787,1914,2019,2134,2241", - "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,1126,1782,1909,2014,2129,2236,2349" -======= - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-v24_values-v24.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-v24\\values-v24.xml", - "from": { - "startLines": "2,3", - "startColumns": "4,4", - "startOffsets": "55,212", - "endColumns": "156,134", - "endOffsets": "207,342" ->>>>>>> xiaojinchi_branch - } - } - ] - }, - { -<<<<<<< HEAD - "outputFile": "net.micode.notes.app-merged_res-8:/values-bg_values-bg.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-bg\\values-bg.xml", -======= - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-bg_values-bg.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-bg\\values-bg.xml", ->>>>>>> xiaojinchi_branch - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,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" - } - }, - { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-bg\\values-bg.xml", -======= - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-bg\\values-bg.xml", ->>>>>>> xiaojinchi_branch - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2930", - "endColumns": "100", - "endOffsets": "3026" - } - } - ] - }, - { -<<<<<<< HEAD - "outputFile": "net.micode.notes.app-merged_res-8:/values-v26_values-v26.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-v26\\values-v26.xml", - "from": { - "startLines": "2,3,4,8,12,16", - "startColumns": "4,4,4,4,4,4", - "startOffsets": "55,130,217,431,657,896", - "endLines": "2,3,7,11,15,16", - "endColumns": "74,86,12,12,12,92", - "endOffsets": "125,212,426,652,891,984" - }, - "to": { - "startLines": "2,3,4,8,12,16", - "startColumns": "4,4,4,4,4,4", - "startOffsets": "55,130,217,381,557,796", - "endLines": "2,3,7,11,15,16", - "endColumns": "74,86,12,12,12,92", - "endOffsets": "125,212,376,552,791,884" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-8:/values-zh-rHK_values-zh-rHK.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rHK\\values-zh-rHK.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,200,293,393,475,572,680,756,832,924,1018,1110,1206,1302,1396,1492,1584,1676,1768,1846,1942,2038,2133,2230,2325,2423,2574,2668", - "endColumns": "94,92,99,81,96,107,75,75,91,93,91,95,95,93,95,91,91,91,77,95,95,94,96,94,97,150,93,77", - "endOffsets": "195,288,388,470,567,675,751,827,919,1013,1105,1201,1297,1391,1487,1579,1671,1763,1841,1937,2033,2128,2225,2320,2418,2569,2663,2741" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-zh-rHK\\values-zh-rHK.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2746", - "endColumns": "100", - "endOffsets": "2842" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-8:/values-sw600dp-v13_values-sw600dp-v13.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-sw600dp-v13\\values-sw600dp-v13.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9", - "startColumns": "4,4,4,4,4,4,4,4", - "startOffsets": "55,124,193,263,337,413,472,543", - "endColumns": "68,68,69,73,75,58,70,67", - "endOffsets": "119,188,258,332,408,467,538,606" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-8:/values-sk_values-sk.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-sk\\values-sk.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2918", - "endColumns": "100", - "endOffsets": "3014" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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": "net.micode.notes.app-merged_res-8:/values-et_values-et.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-et\\values-et.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2942", - "endColumns": "100", - "endOffsets": "3038" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-8:/values-watch-v20_values-watch-v20.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-watch-v20\\values-watch-v20.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" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-8:/values-port_values-port.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-port\\values-port.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "55", - "endOffsets": "106" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-8:/values-as_values-as.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,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\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-as\\values-as.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2950", - "endColumns": "100", - "endOffsets": "3046" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-8:/values-mn_values-mn.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-mn\\values-mn.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2876", - "endColumns": "100", - "endOffsets": "2972" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,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" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-8:/values-zh-rCN_values-zh-rCN.arsc.flat", - "map": [ - { - "source": "D:\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endLines": "21", - "endColumns": "19", - "endOffsets": "817" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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", - "startColumns": "4,4,4,4,4,4,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,121", - "startColumns": "4,4,4,4,4,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,7808", - "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,7881" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "124", - "startColumns": "4", - "startOffsets": "8005", - "endColumns": "100", - "endOffsets": "8101" - } - }, - { - "source": "D:\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", - "from": { - "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", - "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "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,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": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" - }, - "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,122,123,125,126,127,128,129,130,131,132,133,134,135", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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,6114,6163,6210,6257,6304,6349,6400,6453,6528,6587,6644,6718,6782,6851,6929,7039,7143,7216,7282,7337,7402,7467,7516,7599,7677,7715,7760,7886,7948,8106,8161,8220,8287,8345,8407,8455,8500,8548,8599,8665", - "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,122,123,125,126,127,128,129,130,131,132,133,134,135", - "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,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,6109,6158,6205,6252,6299,6344,6395,6448,6523,6582,6639,6713,6777,6846,6924,7034,7138,7211,7277,7332,7397,7462,7511,7594,7672,7710,7755,7803,7943,8000,8156,8215,8282,8340,8402,8450,8495,8543,8594,8660,8726" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-8:/values-ro_values-ro.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-ro\\values-ro.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2953", - "endColumns": "100", - "endOffsets": "3049" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-ro\\values-ro.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-watch-v21\\values-watch-v21.xml", "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,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" + "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": "net.micode.notes.app-merged_res-8:/values-ta_values-ta.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-uk_values-uk.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-ta\\values-ta.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,219,317,432,521,628,754,832,909,1009,1114,1210,1305,1412,1514,1618,1713,1815,1913,1995,2097,2201,2298,2408,2510,2617,2774,2874", - "endColumns": "113,97,114,88,106,125,77,76,99,104,95,94,106,101,103,94,101,97,81,101,103,96,109,101,106,156,99,79", - "endOffsets": "214,312,427,516,623,749,827,904,1004,1109,1205,1300,1407,1509,1613,1708,1810,1908,1990,2092,2196,2293,2403,2505,2612,2769,2869,2949" + "startOffsets": "105,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" } }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-ta\\values-ta.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-uk\\values-uk.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2838,28 +41,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2954", + "startOffsets": "2900", "endColumns": "100", - "endOffsets": "3050" + "endOffsets": "2996" } } ] }, { - "outputFile": "net.micode.notes.app-merged_res-8:/values-ms_values-ms.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-mr_values-mr.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-ms\\values-ms.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,216,321,429,516,620,731,809,888,979,1072,1167,1261,1360,1453,1548,1642,1733,1824,1904,2016,2125,2222,2331,2434,2541,2700,2801", - "endColumns": "110,104,107,86,103,110,77,78,90,92,94,93,98,92,94,93,90,90,79,111,108,96,108,102,106,158,100,79", - "endOffsets": "211,316,424,511,615,726,804,883,974,1067,1162,1256,1355,1448,1543,1637,1728,1819,1899,2011,2120,2217,2326,2429,2536,2695,2796,2876" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-ms\\values-ms.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-mr\\values-mr.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2870,60 +63,38 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2881", + "startOffsets": "2887", "endColumns": "100", - "endOffsets": "2977" + "endOffsets": "2983" } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-8:/values-ne_values-ne.arsc.flat", - "map": [ + }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-ne\\values-ne.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-ne\\values-ne.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2988", - "endColumns": "100", - "endOffsets": "3084" + "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": "net.micode.notes.app-merged_res-8:/values-kn_values-kn.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-zu_values-zu.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-kn\\values-kn.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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" + "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\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-kn\\values-kn.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-zu\\values-zu.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2934,43 +105,44 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2948", + "startOffsets": "2898", "endColumns": "100", - "endOffsets": "3044" + "endOffsets": "2994" } } ] }, { - "outputFile": "net.micode.notes.app-merged_res-8:/values-v18_values-v18.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-v17_values-v17.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-v18\\values-v18.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-v17\\values-v17.xml", "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "48", - "endOffsets": "99" + "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": "net.micode.notes.app-merged_res-8:/values-fr-rCA_values-fr-rCA.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-km_values-km.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-fr-rCA\\values-fr-rCA.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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,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" } }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-fr-rCA\\values-fr-rCA.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-km\\values-km.xml", "from": { "startLines": "2", "startColumns": "4", @@ -2981,188 +153,181 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2965", + "startOffsets": "2882", "endColumns": "100", - "endOffsets": "3061" + "endOffsets": "2978" } } ] }, { - "outputFile": "net.micode.notes.app-merged_res-8:/values-pt_values-pt.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values_values.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-pt\\values-pt.xml", + "source": "D:\\Notes-master3\\app\\src\\main\\res\\values\\colors.xml", "from": { - "startLines": "2", + "startLines": "18", "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" + "startOffsets": "712", + "endColumns": "56", + "endOffsets": "764" }, "to": { - "startLines": "30", + "startLines": "82", "startColumns": "4", - "startOffsets": "2929", - "endColumns": "100", - "endOffsets": "3025" + "startOffsets": "5146", + "endColumns": "56", + "endOffsets": "5198" } }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,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": "net.micode.notes.app-merged_res-8:/values-hi_values-hi.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-hi\\values-hi.xml", + "source": "D:\\Notes-master3\\app\\src\\main\\res\\values\\dimens.xml", "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" + "startLines": "19,20,21,22,18", + "startColumns": "4,4,4,4,4", + "startOffsets": "764,816,869,922,712", + "endColumns": "51,52,52,51,51", + "endOffsets": "811,864,917,969,759" }, "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2892", - "endColumns": "100", - "endOffsets": "2988" + "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" } }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-hi\\values-hi.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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" + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,1303,1304,1305,1306,1307,1308,1309,1310,1311,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325,1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,1360,1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1390,1391,1392,1393,1394,1395,1396,1397,1398,1399,1400,1401,1402,1403,1404,1405,1406,1407,1408,1409,1410,1411,1412,1413,1414,1415,1416,1417,1418,1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1453,1461,1462,1466,1470,1474,1479,1485,1492,1496,1500,1505,1509,1513,1517,1521,1525,1529,1535,1539,1545,1549,1555,1559,1564,1568,1571,1575,1581,1585,1591,1595,1601,1604,1608,1612,1616,1620,1624,1625,1626,1627,1630,1633,1636,1639,1643,1644,1645,1646,1647,1650,1652,1654,1656,1661,1662,1666,1672,1676,1677,1679,1690,1691,1695,1701,1705,1706,1707,1711,1738,1742,1743,1747,1775,1943,1969,2138,2164,2195,2203,2209,2223,2245,2250,2255,2265,2274,2283,2287,2294,2302,2309,2310,2319,2322,2325,2329,2333,2337,2340,2341,2345,2349,2359,2364,2371,2377,2378,2381,2385,2390,2392,2394,2397,2400,2402,2406,2409,2416,2419,2422,2426,2428,2432,2434,2436,2438,2442,2450,2458,2470,2476,2485,2488,2499,2502,2507,2508,2513,2571,2630,2631,2641,2650,2651,2653,2657,2660,2663,2666,2669,2672,2675,2678,2682,2685,2688,2691,2695,2698,2702,2706,2707,2708,2709,2710,2711,2712,2713,2714,2715,2716,2717,2718,2719,2720,2721,2722,2723,2724,2725,2726,2728,2730,2731,2732,2733,2734,2735,2736,2737,2739,2740,2742,2743,2745,2747,2748,2750,2751,2752,2753,2754,2755,2757,2758,2759,2760,2761,2762,2764,2766,2768,2769,2770,2771,2772,2773,2774,2775,2776,2777,2778,2779,2780,2782,2783,2784,2785,2786,2787,2789,2793,2797,2798,2799,2800,2801,2802,2803,2804,2806,2808,2810,2812,2814,2815,2816,2817,2819,2821,2823,2824,2825,2826,2827,2828,2829,2830,2831,2832,2833,2834,2837,2838,2839,2840,2842,2844,2845,2847,2848,2850,2852,2854,2855,2856,2857,2858,2859,2860,2861,2862,2863,2864,2865,2867,2868,2869,2870,2872,2873,2874,2875,2876,2878,2880,2882,2884,2885,2886,2887,2888,2889,2890,2891,2892,2893,2894,2895,2896,2897,69,152,155,158,161,175,186,196,223,230,241,271,298,307,344,725,730,756,774,810,816,822,845,986,1006,1012,1016,1022,1059,1071,1098,1103,1169,1184,1249,1268,1294", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "105,160,205,254,295,350,409,471,552,613,688,764,841,919,1004,1086,1162,1238,1315,1393,1499,1605,1684,1764,1821,1879,1953,2028,2093,2159,2219,2280,2352,2425,2492,2560,2619,2678,2737,2796,2855,2909,2963,3016,3070,3124,3178,3232,3306,3385,3458,3532,3603,3675,3747,3820,3877,3935,4008,4082,4156,4231,4303,4376,4446,4517,4577,70911,70980,71049,71119,71193,71269,71333,71410,71486,71563,71628,71697,71774,71849,71918,71986,72063,72129,72190,72287,72352,72421,72520,72591,72650,72708,72765,72824,72888,72959,73031,73103,73175,73247,73314,73382,73450,73509,73572,73636,73726,73817,73877,73943,74010,74076,74146,74210,74263,74376,74434,74497,74562,74627,74702,74775,74847,74896,74957,75018,75079,75141,75205,75269,75333,75398,75461,75521,75582,75648,75707,75767,75829,75900,75960,76028,76114,76201,76291,76378,76466,76548,76631,76721,76812,76864,76922,76967,77033,77097,77154,77211,77265,77322,77370,77419,77470,77504,77551,77600,77646,77678,77742,77804,77864,77921,77995,78065,78143,78197,78267,78352,78400,78446,78517,78595,78673,78745,78819,78893,78967,79047,79120,79189,79261,79338,79399,79462,79528,79592,79663,79726,79791,79855,79916,79977,80029,80102,80176,80245,80320,80394,80468,80609,80679,80732,80810,80900,80988,81084,81174,81756,81845,82092,82373,82625,82910,83303,83780,84002,84224,84500,84727,84957,85187,85417,85647,85874,86293,86519,86944,87174,87602,87821,88104,88312,88443,88670,89096,89321,89748,89969,90394,90514,90790,91091,91415,91706,92020,92157,92288,92393,92635,92802,93006,93214,93485,93597,93709,93814,93931,94145,94291,94431,94517,94865,94953,95199,95617,95866,95948,96046,96663,96763,97015,97439,97694,97788,97877,98114,100166,100408,100510,100763,102947,113668,115184,126004,127532,129289,129915,130335,131396,132661,132917,133153,133700,134194,134799,134997,135577,136141,136516,136634,137172,137329,137525,137798,138054,138224,138365,138429,138711,138997,139673,139937,140275,140628,140722,140908,141214,141476,141601,141728,141967,142178,142297,142490,142667,143122,143303,143425,143684,143797,143984,144086,144193,144322,144597,145105,145601,146478,146772,147342,147491,148223,148395,148731,148823,149101,153445,157932,157994,158624,159238,159329,159442,159671,159831,159983,160154,160320,160489,160656,160819,161062,161232,161405,161576,161850,162049,162254,162584,162668,162764,162860,162958,163058,163160,163262,163364,163466,163568,163668,163764,163876,164005,164128,164259,164390,164488,164602,164696,164836,164970,165066,165178,165278,165394,165490,165602,165702,165842,165978,166142,166272,166430,166580,166721,166865,167000,167112,167262,167390,167518,167654,167786,167916,168046,168158,168298,168444,168588,168726,168792,168882,168958,169062,169152,169254,169362,169470,169570,169650,169742,169840,169950,170028,170134,170226,170330,170440,170562,170725,170882,170962,171062,171152,171262,171356,171462,171554,171654,171766,171880,171996,172112,172206,172320,172432,172534,172654,172776,172858,172962,173082,173208,173306,173400,173488,173600,173716,173838,173950,174125,174241,174327,174419,174531,174655,174722,174848,174916,175044,175188,175316,175385,175480,175595,175708,175807,175916,176027,176138,176239,176344,176444,176574,176665,176788,176882,176994,177080,177184,177280,177368,177486,177590,177694,177820,177908,178016,178116,178206,178316,178400,178502,178586,178640,178704,178810,178920,179004,4638,9782,9900,10015,10147,10862,11554,12071,13718,14103,14700,16299,17832,18220,20527,40045,40305,41697,42730,44743,45005,45361,46191,52973,54107,54401,54624,54951,57001,57649,59282,59552,63403,64004,67813,69028,70437", + "endLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,1303,1304,1305,1306,1307,1308,1309,1310,1311,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325,1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,1360,1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1390,1391,1392,1393,1394,1395,1396,1397,1398,1399,1400,1401,1402,1403,1404,1405,1406,1407,1408,1409,1410,1411,1412,1413,1414,1415,1416,1417,1418,1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1460,1461,1465,1469,1473,1478,1484,1491,1495,1499,1504,1508,1512,1516,1520,1524,1528,1534,1538,1544,1548,1554,1558,1563,1567,1570,1574,1580,1584,1590,1594,1600,1603,1607,1611,1615,1619,1623,1624,1625,1626,1629,1632,1635,1638,1642,1643,1644,1645,1646,1649,1651,1653,1655,1660,1661,1665,1671,1675,1676,1678,1689,1690,1694,1700,1704,1705,1706,1710,1737,1741,1742,1746,1774,1942,1968,2137,2163,2194,2202,2208,2222,2244,2249,2254,2264,2273,2282,2286,2293,2301,2308,2309,2318,2321,2324,2328,2332,2336,2339,2340,2344,2348,2358,2363,2370,2376,2377,2380,2384,2389,2391,2393,2396,2399,2401,2405,2408,2415,2418,2421,2425,2427,2431,2433,2435,2437,2441,2449,2457,2469,2475,2484,2487,2498,2501,2506,2507,2512,2570,2629,2630,2640,2649,2650,2652,2656,2659,2662,2665,2668,2671,2674,2677,2681,2684,2687,2690,2694,2697,2701,2705,2706,2707,2708,2709,2710,2711,2712,2713,2714,2715,2716,2717,2718,2719,2720,2721,2722,2723,2724,2725,2727,2729,2730,2731,2732,2733,2734,2735,2736,2738,2739,2741,2742,2744,2746,2747,2749,2750,2751,2752,2753,2754,2756,2757,2758,2759,2760,2761,2763,2765,2767,2768,2769,2770,2771,2772,2773,2774,2775,2776,2777,2778,2779,2781,2782,2783,2784,2785,2786,2788,2792,2796,2797,2798,2799,2800,2801,2802,2803,2805,2807,2809,2811,2813,2814,2815,2816,2818,2820,2822,2823,2824,2825,2826,2827,2828,2829,2830,2831,2832,2833,2836,2837,2838,2839,2841,2843,2844,2846,2847,2849,2851,2853,2854,2855,2856,2857,2858,2859,2860,2861,2862,2863,2864,2866,2867,2868,2869,2871,2872,2873,2874,2875,2877,2879,2881,2883,2884,2885,2886,2887,2888,2889,2890,2891,2892,2893,2894,2895,2896,2897,151,154,157,160,174,185,195,222,229,240,270,297,306,343,724,729,755,773,809,815,821,844,985,1005,1011,1015,1021,1058,1070,1097,1102,1168,1183,1248,1267,1293,1302", + "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,63,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,91,12,12,12,61,12,12,90,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24", + "endOffsets": "155,200,249,290,345,404,466,547,608,683,759,836,914,999,1081,1157,1233,1310,1388,1494,1600,1679,1759,1816,1874,1948,2023,2088,2154,2214,2275,2347,2420,2487,2555,2614,2673,2732,2791,2850,2904,2958,3011,3065,3119,3173,3227,3301,3380,3453,3527,3598,3670,3742,3815,3872,3930,4003,4077,4151,4226,4298,4371,4441,4512,4572,4633,70975,71044,71114,71188,71264,71328,71405,71481,71558,71623,71692,71769,71844,71913,71981,72058,72124,72185,72282,72347,72416,72515,72586,72645,72703,72760,72819,72883,72954,73026,73098,73170,73242,73309,73377,73445,73504,73567,73631,73721,73812,73872,73938,74005,74071,74141,74205,74258,74371,74429,74492,74557,74622,74697,74770,74842,74891,74952,75013,75074,75136,75200,75264,75328,75393,75456,75516,75577,75643,75702,75762,75824,75895,75955,76023,76109,76196,76286,76373,76461,76543,76626,76716,76807,76859,76917,76962,77028,77092,77149,77206,77260,77317,77365,77414,77465,77499,77546,77595,77641,77673,77737,77799,77859,77916,77990,78060,78138,78192,78262,78347,78395,78441,78512,78590,78668,78740,78814,78888,78962,79042,79115,79184,79256,79333,79394,79457,79523,79587,79658,79721,79786,79850,79911,79972,80024,80097,80171,80240,80315,80389,80463,80604,80674,80727,80805,80895,80983,81079,81169,81751,81840,82087,82368,82620,82905,83298,83775,83997,84219,84495,84722,84952,85182,85412,85642,85869,86288,86514,86939,87169,87597,87816,88099,88307,88438,88665,89091,89316,89743,89964,90389,90509,90785,91086,91410,91701,92015,92152,92283,92388,92630,92797,93001,93209,93480,93592,93704,93809,93926,94140,94286,94426,94512,94860,94948,95194,95612,95861,95943,96041,96658,96758,97010,97434,97689,97783,97872,98109,100161,100403,100505,100758,102942,113663,115179,125999,127527,129284,129910,130330,131391,132656,132912,133148,133695,134189,134794,134992,135572,136136,136511,136629,137167,137324,137520,137793,138049,138219,138360,138424,138706,138992,139668,139932,140270,140623,140717,140903,141209,141471,141596,141723,141962,142173,142292,142485,142662,143117,143298,143420,143679,143792,143979,144081,144188,144317,144592,145100,145596,146473,146767,147337,147486,148218,148390,148726,148818,149096,153440,157927,157989,158619,159233,159324,159437,159666,159826,159978,160149,160315,160484,160651,160814,161057,161227,161400,161571,161845,162044,162249,162579,162663,162759,162855,162953,163053,163155,163257,163359,163461,163563,163663,163759,163871,164000,164123,164254,164385,164483,164597,164691,164831,164965,165061,165173,165273,165389,165485,165597,165697,165837,165973,166137,166267,166425,166575,166716,166860,166995,167107,167257,167385,167513,167649,167781,167911,168041,168153,168293,168439,168583,168721,168787,168877,168953,169057,169147,169249,169357,169465,169565,169645,169737,169835,169945,170023,170129,170221,170325,170435,170557,170720,170877,170957,171057,171147,171257,171351,171457,171549,171649,171761,171875,171991,172107,172201,172315,172427,172529,172649,172771,172853,172957,173077,173203,173301,173395,173483,173595,173711,173833,173945,174120,174236,174322,174414,174526,174650,174717,174843,174911,175039,175183,175311,175380,175475,175590,175703,175802,175911,176022,176133,176234,176339,176439,176569,176660,176783,176877,176989,177075,177179,177275,177363,177481,177585,177689,177815,177903,178011,178111,178201,178311,178395,178497,178581,178635,178699,178805,178915,178999,179119,9777,9895,10010,10142,10857,11549,12066,13713,14098,14695,16294,17827,18215,20522,40040,40300,41692,42725,44738,45000,45356,46186,52968,54102,54396,54619,54946,56996,57644,59277,59547,63398,63999,67808,69023,70432,70906" + }, + "to": { + "startLines": "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,359,374,375,376,377,378,379,387,388,392,396,400,405,411,418,422,426,431,435,439,443,447,451,455,461,465,471,475,481,485,490,494,497,501,507,511,517,521,527,530,534,538,542,546,550,551,552,553,556,559,562,565,569,570,571,572,573,576,578,580,582,587,588,592,598,602,603,605,616,617,621,627,631,632,633,637,664,668,669,673,701,868,894,1062,1088,1119,1127,1133,1147,1169,1174,1179,1189,1198,1207,1211,1218,1226,1233,1234,1243,1246,1249,1253,1257,1261,1264,1265,1269,1273,1283,1288,1295,1301,1302,1305,1309,1314,1316,1318,1321,1324,1326,1330,1333,1340,1343,1346,1350,1352,1356,1358,1360,1362,1366,1374,1382,1394,1400,1409,1412,1423,1426,1431,1432,1452,1510,1569,1570,1580,1589,1590,1592,1596,1599,1602,1605,1608,1611,1614,1617,1621,1624,1627,1630,1634,1637,1641,1645,1646,1647,1648,1649,1650,1651,1652,1653,1654,1655,1656,1657,1658,1659,1660,1661,1662,1663,1664,1665,1667,1669,1670,1671,1672,1673,1674,1675,1676,1678,1679,1681,1682,1684,1686,1687,1689,1690,1691,1692,1693,1694,1696,1697,1698,1699,1700,1712,1714,1716,1746,1747,1748,1749,1750,1751,1752,1753,1754,1755,1756,1757,1758,1760,1761,1762,1763,1764,1765,1767,1771,1775,1776,1777,1778,1779,1780,1781,1782,1784,1786,1788,1790,1792,1793,1794,1795,1797,1799,1801,1802,1803,1804,1805,1806,1807,1808,1809,1810,1811,1812,1815,1816,1817,1818,1820,1822,1823,1825,1826,1828,1830,1832,1833,1834,1835,1836,1837,1838,1839,1840,1841,1842,1843,1845,1846,1847,1848,1850,1851,1852,1853,1854,1856,1858,1860,1862,1863,1864,1865,1866,1867,1868,1869,1870,1871,1872,1873,1874,1875,1881,1956,1959,1962,1965,1979,1985,1995,2011,2017,2027,2056,2083,2092,2121,2464,2475,2591,2700,2724,2730,2736,2757,2881,2901,2907,2911,2917,2952,2964,2980,2984,3050,3065,3116,3128,3154", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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,14854,14928,14998,15076,15130,15200,15285,15333,15379,15450,15528,15606,15678,15752,15826,15900,15980,16053,16122,16194,16271,16332,16395,16461,16525,16596,16659,16724,16788,16849,16910,16962,17035,17109,17178,17253,17327,17401,17542,23672,24768,24846,24936,25024,25120,25210,25792,25881,26128,26409,26661,26946,27339,27816,28038,28260,28536,28763,28993,29223,29453,29683,29910,30329,30555,30980,31210,31638,31857,32140,32348,32479,32706,33132,33357,33784,34005,34430,34550,34826,35127,35451,35742,36056,36193,36324,36429,36671,36838,37042,37250,37521,37633,37745,37850,37967,38181,38327,38467,38553,38901,38989,39235,39653,39902,39984,40082,40674,40774,41026,41450,41705,41799,41888,42125,44149,44391,44493,44746,46902,57031,58547,68775,70303,72060,72686,73106,74167,75432,75688,75924,76471,76965,77570,77768,78348,78912,79287,79405,79943,80100,80296,80569,80825,80995,81136,81200,81482,81768,82444,82708,83046,83399,83493,83679,83985,84247,84372,84499,84738,84949,85068,85261,85438,85893,86074,86196,86455,86568,86755,86857,86964,87093,87368,87876,88372,89249,89543,90113,90262,90994,91166,91502,91594,92654,96936,101361,101423,102001,102585,102676,102789,103018,103178,103330,103501,103667,103836,104003,104166,104409,104579,104752,104923,105197,105396,105601,105931,106015,106111,106207,106305,106405,106507,106609,106711,106813,106915,107015,107111,107223,107352,107475,107606,107737,107835,107949,108043,108183,108317,108413,108525,108625,108741,108837,108949,109049,109189,109325,109489,109619,109777,109927,110068,110212,110347,110459,110609,110737,110865,111001,111133,111263,111393,111505,112403,112549,112693,114177,114243,114333,114409,114513,114603,114705,114813,114921,115021,115101,115193,115291,115401,115479,115585,115677,115781,115891,116013,116176,116333,116413,116513,116603,116713,116807,116913,117005,117105,117217,117331,117447,117563,117657,117771,117883,117985,118105,118227,118309,118413,118533,118659,118757,118851,118939,119051,119167,119289,119401,119576,119692,119778,119870,119982,120106,120173,120299,120367,120495,120639,120767,120836,120931,121046,121159,121258,121367,121478,121589,121690,121795,121895,122025,122116,122239,122333,122445,122531,122635,122731,122819,122937,123041,123145,123271,123359,123467,123567,123657,123767,123851,123953,124037,124091,124155,124261,124371,124455,124859,127475,127593,127708,127788,128149,128382,128899,129324,129502,129786,131130,132491,132879,133957,143475,143821,149841,153597,154348,154610,154810,155189,159467,160073,160302,160453,160668,161751,162063,162474,162601,165627,166228,168149,168489,169800", + "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,359,374,375,376,377,378,386,387,391,395,399,404,410,417,421,425,430,434,438,442,446,450,454,460,464,470,474,480,484,489,493,496,500,506,510,516,520,526,529,533,537,541,545,549,550,551,552,555,558,561,564,568,569,570,571,572,575,577,579,581,586,587,591,597,601,602,604,615,616,620,626,630,631,632,636,663,667,668,672,700,867,893,1061,1087,1118,1126,1132,1146,1168,1173,1178,1188,1197,1206,1210,1217,1225,1232,1233,1242,1245,1248,1252,1256,1260,1263,1264,1268,1272,1282,1287,1294,1300,1301,1304,1308,1313,1315,1317,1320,1323,1325,1329,1332,1339,1342,1345,1349,1351,1355,1357,1359,1361,1365,1373,1381,1393,1399,1408,1411,1422,1425,1430,1431,1436,1509,1568,1569,1579,1588,1589,1591,1595,1598,1601,1604,1607,1610,1613,1616,1620,1623,1626,1629,1633,1636,1640,1644,1645,1646,1647,1648,1649,1650,1651,1652,1653,1654,1655,1656,1657,1658,1659,1660,1661,1662,1663,1664,1666,1668,1669,1670,1671,1672,1673,1674,1675,1677,1678,1680,1681,1683,1685,1686,1688,1689,1690,1691,1692,1693,1695,1696,1697,1698,1699,1700,1713,1715,1717,1746,1747,1748,1749,1750,1751,1752,1753,1754,1755,1756,1757,1759,1760,1761,1762,1763,1764,1766,1770,1774,1775,1776,1777,1778,1779,1780,1781,1783,1785,1787,1789,1791,1792,1793,1794,1796,1798,1800,1801,1802,1803,1804,1805,1806,1807,1808,1809,1810,1811,1814,1815,1816,1817,1819,1821,1822,1824,1825,1827,1829,1831,1832,1833,1834,1835,1836,1837,1838,1839,1840,1841,1842,1844,1845,1846,1847,1849,1850,1851,1852,1853,1855,1857,1859,1861,1862,1863,1864,1865,1866,1867,1868,1869,1870,1871,1872,1873,1874,1875,1955,1958,1961,1964,1978,1984,1994,2010,2016,2026,2055,2082,2091,2120,2463,2467,2500,2608,2723,2729,2735,2756,2880,2900,2906,2910,2916,2951,2963,2979,2983,3049,3064,3115,3127,3153,3160", + "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": "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,14923,14993,15071,15125,15195,15280,15328,15374,15445,15523,15601,15673,15747,15821,15895,15975,16048,16117,16189,16266,16327,16390,16456,16520,16591,16654,16719,16783,16844,16905,16957,17030,17104,17173,17248,17322,17396,17537,17607,23720,24841,24931,25019,25115,25205,25787,25876,26123,26404,26656,26941,27334,27811,28033,28255,28531,28758,28988,29218,29448,29678,29905,30324,30550,30975,31205,31633,31852,32135,32343,32474,32701,33127,33352,33779,34000,34425,34545,34821,35122,35446,35737,36051,36188,36319,36424,36666,36833,37037,37245,37516,37628,37740,37845,37962,38176,38322,38462,38548,38896,38984,39230,39648,39897,39979,40077,40669,40769,41021,41445,41700,41794,41883,42120,44144,44386,44488,44741,46897,57026,58542,68770,70298,72055,72681,73101,74162,75427,75683,75919,76466,76960,77565,77763,78343,78907,79282,79400,79938,80095,80291,80564,80820,80990,81131,81195,81477,81763,82439,82703,83041,83394,83488,83674,83980,84242,84367,84494,84733,84944,85063,85256,85433,85888,86069,86191,86450,86563,86750,86852,86959,87088,87363,87871,88367,89244,89538,90108,90257,90989,91161,91497,91589,91867,96931,101356,101418,101996,102580,102671,102784,103013,103173,103325,103496,103662,103831,103998,104161,104404,104574,104747,104918,105192,105391,105596,105926,106010,106106,106202,106300,106400,106502,106604,106706,106808,106910,107010,107106,107218,107347,107470,107601,107732,107830,107944,108038,108178,108312,108408,108520,108620,108736,108832,108944,109044,109184,109320,109484,109614,109772,109922,110063,110207,110342,110454,110604,110732,110860,110996,111128,111258,111388,111500,111640,112544,112688,112826,114238,114328,114404,114508,114598,114700,114808,114916,115016,115096,115188,115286,115396,115474,115580,115672,115776,115886,116008,116171,116328,116408,116508,116598,116708,116802,116908,117000,117100,117212,117326,117442,117558,117652,117766,117878,117980,118100,118222,118304,118408,118528,118654,118752,118846,118934,119046,119162,119284,119396,119571,119687,119773,119865,119977,120101,120168,120294,120362,120490,120634,120762,120831,120926,121041,121154,121253,121362,121473,121584,121685,121790,121890,122020,122111,122234,122328,122440,122526,122630,122726,122814,122932,123036,123140,123266,123354,123462,123562,123652,123762,123846,123948,124032,124086,124150,124256,124366,124450,124570,127470,127588,127703,127783,128144,128377,128894,129319,129497,129781,131125,132486,132874,133952,143470,143605,145109,150408,154343,154605,154805,155184,159462,160068,160297,160448,160663,161746,162058,162469,162596,165622,166223,168144,168484,169795,169998" } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-8:/values-ca_values-ca.arsc.flat", - "map": [ + }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-ca\\values-ca.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\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,329,436,519,627,753,837,918,1009,1102,1196,1291,1390,1483,1576,1670,1761,1852,1935,2046,2155,2253,2363,2467,2575,2735,2834", - "endColumns": "117,105,106,82,107,125,83,80,90,92,93,94,98,92,92,93,90,90,82,110,108,97,109,103,107,159,98,80", - "endOffsets": "218,324,431,514,622,748,832,913,1004,1097,1191,1286,1385,1478,1571,1665,1756,1847,1930,2041,2150,2248,2358,2462,2570,2730,2829,2910" + "startLines": "2,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,362,1701,1702,1706,1707,1711,1876,1877,2468,2609,2640,2661,2694", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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,23864,111645,111762,111963,112073,112274,124575,124647,143610,150413,152067,152748,153430", + "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,362,1701,1705,1706,1710,1711,1876,1877,2474,2639,2660,2693,2699", + "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": "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,23930,111757,111958,112068,112269,112398,124642,124709,143816,152062,152743,153425,153592" } }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-ca\\values-ca.xml", + "source": "D:\\Notes-master3\\app\\src\\main\\res\\values\\arrays.xml", "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "739,1047", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1041,1162" }, "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2915", - "endColumns": "100", - "endOffsets": "3011" + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-8:/values-bn_values-bn.arsc.flat", - "map": [ + }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-bn\\values-bn.xml", + "source": "D:\\Notes-master3\\app\\src\\main\\res\\values\\styles.xml", "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,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" + "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": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", + "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": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" + }, + "to": { + "startLines": "1437,1441,1445,1449,1718,1722,1726,1730,1734,1738,1742", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "91872,92076,92287,92494,112831,113014,113199,113384,113587,113793,113976", + "endLines": "1440,1444,1448,1451,1721,1725,1729,1733,1737,1741,1745", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "92071,92282,92489,92649,113009,113194,113379,113582,113788,113971,114172" } }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-bn\\values-bn.xml", + "source": "D:\\Notes-master3\\app\\src\\main\\res\\values\\strings.xml", "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" + "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", + "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" }, "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2939", - "endColumns": "100", - "endOffsets": "3035" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-8:/values-sw_values-sw.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,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" + "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,360,361,363,364,365,366,367,368,369,370,371,372,373", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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,17612,17708,17791,17887,17956,17999,18051,18103,18152,18215,18273,18324,18408,18502,18610,18681,18765,18848,18914,18997,19099,19160,19222,19273,19351,19404,19464,19569,19628,19730,19785,19856,19905,19963,20010,20069,20126,20197,20258,20315,20365,20417,20470,20520,20570,20630,20683,20749,20811,20874,20921,20976,21064,21122,21184,21234,21279,21322,21382,21449,21504,21559,21612,21659,21712,21768,21816,21871,21924,22008,22075,22139,22235,22309,22390,22479,22642,22786,22865,22940,23022,23081,23161,23241,23296,23418,23521,23562,23615,23725,23799,23935,24003,24089,24169,24238,24332,24391,24446,24508,24568,24678", + "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,360,361,363,364,365,366,367,368,369,370,371,372,373", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "14849,17703,17786,17882,17951,17994,18046,18098,18147,18210,18268,18319,18403,18497,18605,18676,18760,18843,18909,18992,19094,19155,19217,19268,19346,19399,19459,19564,19623,19725,19780,19851,19900,19958,20005,20064,20121,20192,20253,20310,20360,20412,20465,20515,20565,20625,20678,20744,20806,20869,20916,20971,21059,21117,21179,21229,21274,21317,21377,21444,21499,21554,21607,21654,21707,21763,21811,21866,21919,22003,22070,22134,22230,22304,22385,22474,22637,22781,22860,22935,23017,23076,23156,23236,23291,23413,23516,23557,23610,23667,23794,23859,23998,24084,24164,24233,24327,24386,24441,24503,24563,24673,24763" } }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-sw\\values-sw.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\2504d03dceb2ecea0f7a3eb651ec8485\\transformed\\coordinatorlayout-1.0.0\\res\\values\\values.xml", "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" + "startLines": "2,102,3,13", + "startColumns": "4,4,4,4", + "startOffsets": "55,5935,116,724", + "endLines": "2,104,12,101", + "endColumns": "60,12,24,24", + "endOffsets": "111,6075,719,5930" }, "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2883", - "endColumns": "100", - "endOffsets": "2979" + "startLines": "12,1878,2501,2507", + "startColumns": "4,4,4,4", + "startOffsets": "420,124714,145114,145325", + "endLines": "12,1880,2506,2590", + "endColumns": "60,12,24,24", + "endOffsets": "476,124854,145320,149836" } } ] }, { - "outputFile": "net.micode.notes.app-merged_res-8:/values-hy_values-hy.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-hu_values-hu.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-hy\\values-hy.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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,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\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-hy\\values-hy.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-hu\\values-hu.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3173,28 +338,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2884", + "startOffsets": "2961", "endColumns": "100", - "endOffsets": "2980" + "endOffsets": "3057" } } ] }, { - "outputFile": "net.micode.notes.app-merged_res-8:/values-fi_values-fi.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-lv_values-lv.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-fi\\values-fi.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-lv\\values-lv.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3205,80 +360,58 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2872", + "startOffsets": "3076", "endColumns": "100", - "endOffsets": "2968" + "endOffsets": "3172" } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-8:/values-en-rAU_values-en-rAU.arsc.flat", - "map": [ + }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rAU\\values-en-rAU.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-en-rAU\\values-en-rAU.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2846", - "endColumns": "100", - "endOffsets": "2942" + "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": "net.micode.notes.app-merged_res-8:/values-night-v8_values-night-v8.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-h720dp-v13_values-h720dp-v13.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-night-v8\\values-night-v8.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-h720dp-v13\\values-h720dp-v13.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", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "66", + "endOffsets": "117" } } ] }, { - "outputFile": "net.micode.notes.app-merged_res-8:/values-land_values-land.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-large-v4_values-large-v4.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-land\\values-land.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-large-v4\\values-large-v4.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", + "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": "net.micode.notes.app-merged_res-8:/values-bs_values-bs.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-gu_values-gu.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-bs\\values-bs.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-gu\\values-gu.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3289,28 +422,38 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2926", + "startOffsets": "2882", "endColumns": "100", - "endOffsets": "3022" + "endOffsets": "2978" } }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-bs\\values-bs.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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,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": "net.micode.notes.app-merged_res-8:/values-lo_values-lo.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-pa_values-pa.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-lo\\values-lo.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-pa\\values-pa.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3321,53 +464,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2836", + "startOffsets": "2839", "endColumns": "100", - "endOffsets": "2932" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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": "net.micode.notes.app-merged_res-8:/values-ldltr-v21_values-ldltr-v21.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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" + "endOffsets": "2935" } } ] }, { - "outputFile": "net.micode.notes.app-merged_res-8:/values-ja_values-ja.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-b+sr+Latn_values-b+sr+Latn.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-ja\\values-ja.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,202,295,400,482,580,688,765,841,932,1025,1121,1215,1316,1409,1504,1598,1689,1780,1858,1960,2059,2154,2257,2352,2448,2596,2693", - "endColumns": "96,92,104,81,97,107,76,75,90,92,95,93,100,92,94,93,90,90,77,101,98,94,102,94,95,147,96,77", - "endOffsets": "197,290,395,477,575,683,760,836,927,1020,1116,1210,1311,1404,1499,1593,1684,1775,1853,1955,2054,2149,2252,2347,2443,2591,2688,2766" + "startOffsets": "105,214,318,424,510,614,732,814,895,986,1079,1175,1269,1370,1463,1558,1663,1754,1845,1933,2039,2147,2248,2353,2461,2562,2731,2828", + "endColumns": "108,103,105,85,103,117,81,80,90,92,95,93,100,92,94,104,90,90,87,105,107,100,104,107,100,168,96,83", + "endOffsets": "209,313,419,505,609,727,809,890,981,1074,1170,1264,1365,1458,1553,1658,1749,1840,1928,2034,2142,2243,2348,2456,2557,2726,2823,2907" } }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-ja\\values-ja.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3378,60 +496,52 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2771", + "startOffsets": "2912", "endColumns": "100", - "endOffsets": "2867" + "endOffsets": "3008" } } ] }, { - "outputFile": "net.micode.notes.app-merged_res-8:/values-ru_values-ru.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-v23_values-v23.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,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\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-ru\\values-ru.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-v23\\values-v23.xml", "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" + "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" }, "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2913", - "endColumns": "100", - "endOffsets": "3009" + "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,1131,1787,1914,2019,2134,2241", + "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,1126,1782,1909,2014,2129,2236,2349" } } ] }, { - "outputFile": "net.micode.notes.app-merged_res-8:/values-si_values-si.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-bg_values-bg.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-si\\values-si.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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,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\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-si\\values-si.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-bg\\values-bg.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3442,82 +552,52 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2903", + "startOffsets": "2930", "endColumns": "100", - "endOffsets": "2999" + "endOffsets": "3026" } } ] }, { - "outputFile": "net.micode.notes.app-merged_res-8:/values-or_values-or.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-v26_values-v26.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,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\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-or\\values-or.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-v26\\values-v26.xml", "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" + "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" }, "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2936", - "endColumns": "100", - "endOffsets": "3032" + "startLines": "2,3,4,8,12,16", + "startColumns": "4,4,4,4,4,4", + "startOffsets": "55,130,217,381,557,796", + "endLines": "2,3,7,11,15,16", + "endColumns": "74,86,12,12,12,92", + "endOffsets": "125,212,376,552,791,884" } } ] }, { - "outputFile": "net.micode.notes.app-merged_res-8:/values-el_values-el.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-zh-rHK_values-zh-rHK.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-el\\values-el.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2964", - "endColumns": "100", - "endOffsets": "3060" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-el\\values-el.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-zh-rHK\\values-zh-rHK.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "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,200,293,393,475,572,680,756,832,924,1018,1110,1206,1302,1396,1492,1584,1676,1768,1846,1942,2038,2133,2230,2325,2423,2574,2668", + "endColumns": "94,92,99,81,96,107,75,75,91,93,91,95,95,93,95,91,91,91,77,95,95,94,96,94,97,150,93,77", + "endOffsets": "195,288,388,470,567,675,751,827,919,1013,1105,1201,1297,1391,1487,1579,1671,1763,1841,1937,2033,2128,2225,2320,2418,2569,2663,2741" } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-8:/values-eu_values-eu.arsc.flat", - "map": [ + }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-eu\\values-eu.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-zh-rHK\\values-zh-rHK.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3528,38 +608,43 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2938", + "startOffsets": "2746", "endColumns": "100", - "endOffsets": "3034" + "endOffsets": "2842" } - }, + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-8:/values-sw600dp-v13_values-sw600dp-v13.arsc.flat", + "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-eu\\values-eu.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-sw600dp-v13\\values-sw600dp-v13.xml", "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,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" + "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": "net.micode.notes.app-merged_res-8:/values-af_values-af.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-sk_values-sk.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-af\\values-af.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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,212,312,423,509,617,735,816,897,988,1081,1180,1274,1375,1468,1563,1661,1752,1843,1927,2032,2141,2240,2346,2457,2566,2732,2830", + "endColumns": "106,99,110,85,107,117,80,80,90,92,98,93,100,92,94,97,90,90,83,104,108,98,105,110,108,165,97,87", + "endOffsets": "207,307,418,504,612,730,811,892,983,1076,1175,1269,1370,1463,1558,1656,1747,1838,1922,2027,2136,2235,2341,2452,2561,2727,2825,2913" } }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-af\\values-af.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-sk\\values-sk.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3570,28 +655,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2856", + "startOffsets": "2918", "endColumns": "100", - "endOffsets": "2952" + "endOffsets": "3014" } } ] }, { - "outputFile": "net.micode.notes.app-merged_res-8:/values-tl_values-tl.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-et_values-et.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-tl\\values-tl.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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,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\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-tl\\values-tl.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-et\\values-et.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3602,60 +687,59 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2949", + "startOffsets": "2942", "endColumns": "100", - "endOffsets": "3045" + "endOffsets": "3038" } } ] }, { - "outputFile": "net.micode.notes.app-merged_res-8:/values-gl_values-gl.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-watch-v20_values-watch-v20.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-gl\\values-gl.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-watch-v20\\values-watch-v20.xml", "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,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" + "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": "net.micode.notes.app-merged_res-8:/values-port_values-port.arsc.flat", + "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-gl\\values-gl.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-port\\values-port.xml", "from": { "startLines": "2", "startColumns": "4", "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2920", - "endColumns": "100", - "endOffsets": "3016" + "endColumns": "55", + "endOffsets": "106" } } ] }, { - "outputFile": "net.micode.notes.app-merged_res-8:/values-en-rIN_values-en-rIN.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-as_values-as.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rIN\\values-en-rIN.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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,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\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-en-rIN\\values-en-rIN.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-as\\values-as.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3666,18 +750,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2846", + "startOffsets": "2950", "endColumns": "100", - "endOffsets": "2942" + "endOffsets": "3046" } } ] }, { - "outputFile": "net.micode.notes.app-merged_res-8:/values-am_values-am.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-mn_values-mn.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-am\\values-am.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-mn\\values-mn.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "105,218,318,431,518,624,736,818,900,991,1084,1180,1276,1374,1467,1562,1654,1745,1835,1917,2026,2130,2227,2335,2436,2539,2698,2795", + "endColumns": "112,99,112,86,105,111,81,81,90,92,95,95,97,92,94,91,90,89,81,108,103,96,107,100,102,158,96,80", + "endOffsets": "213,313,426,513,619,731,813,895,986,1079,1175,1271,1369,1462,1557,1649,1740,1830,1912,2021,2125,2222,2330,2431,2534,2693,2790,2871" + } + }, + { + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-mn\\values-mn.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3688,70 +782,73 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2817", + "startOffsets": "2876", "endColumns": "100", - "endOffsets": "2913" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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": "2972" } } ] }, { - "outputFile": "net.micode.notes.app-merged_res-8:/values-en-rXC_values-en-rXC.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-zh-rCN_values-zh-rCN.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rXC\\values-en-rXC.xml", + "source": "D:\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,310,510,719,904,1106,1321,1494,1671,1862,2055,2253,2449,2652,2847,3044,3239,3432,3623,3807,4011,4216,4417,4624,4826,5031,5303,5503", - "endColumns": "204,199,208,184,201,214,172,176,190,192,197,195,202,194,196,194,192,190,183,203,204,200,206,201,204,271,199,178", - "endOffsets": "305,505,714,899,1101,1316,1489,1666,1857,2050,2248,2444,2647,2842,3039,3234,3427,3618,3802,4006,4211,4412,4619,4821,5026,5298,5498,5677" + "startLines": "18", + "startColumns": "4", + "startOffsets": "712", + "endLines": "21", + "endColumns": "19", + "endOffsets": "817" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" } }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-en-rXC\\values-en-rXC.xml", + "source": "D:\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "202", - "endOffsets": "253" + "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", + "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "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,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": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" }, "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "5682", - "endColumns": "202", - "endOffsets": "5880" + "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,122,123,125,126,127,128,129,130,131,132,133,134,135", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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,6114,6163,6210,6257,6304,6349,6400,6453,6528,6587,6644,6718,6782,6851,6929,7039,7143,7216,7282,7337,7402,7467,7516,7599,7677,7715,7760,7886,7948,8106,8161,8220,8287,8345,8407,8455,8500,8548,8599,8665", + "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,122,123,125,126,127,128,129,130,131,132,133,134,135", + "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,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,6109,6158,6205,6252,6299,6344,6395,6448,6523,6582,6639,6713,6777,6846,6924,7034,7138,7211,7277,7332,7397,7462,7511,7594,7672,7710,7755,7803,7943,8000,8156,8215,8282,8340,8402,8450,8495,8543,8594,8660,8726" } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-8:/values-lt_values-lt.arsc.flat", - "map": [ + }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-lt\\values-lt.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-zh-rCN\\values-zh-rCN.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,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,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,121", + "startColumns": "4,4,4,4,4,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,7808", + "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,7881" } }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-lt\\values-lt.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-zh-rCN\\values-zh-rCN.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3760,20 +857,20 @@ "endOffsets": "151" }, "to": { - "startLines": "30", + "startLines": "124", "startColumns": "4", - "startOffsets": "2978", + "startOffsets": "8005", "endColumns": "100", - "endOffsets": "3074" + "endOffsets": "8101" } } ] }, { - "outputFile": "net.micode.notes.app-merged_res-8:/values-pl_values-pl.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-ro_values-ro.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-pl\\values-pl.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-ro\\values-ro.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3784,38 +881,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2909", + "startOffsets": "2953", "endColumns": "100", - "endOffsets": "3005" + "endOffsets": "3049" } }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-pl\\values-pl.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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,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" } } ] }, { - "outputFile": "net.micode.notes.app-merged_res-8:/values-vi_values-vi.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-ta_values-ta.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-vi\\values-vi.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-ta\\values-ta.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3826,71 +913,38 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2901", + "startOffsets": "2954", "endColumns": "100", - "endOffsets": "2997" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-8:/values-v21_values-v21.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,8697,8882,11746,11943,12142,12265,12388,12501,12684,12815,13016,13105,13216,13449,13550,13645,13768,13897,14014,14191,14290,14425,14568,14703,14822,15023,15142,15235,15346,15402,15509,15704,15815,15948,16043,16134,16225,16342,16481,16552,16635,17258,17315,17373,17997", - "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,8692,8877,11741,11938,12137,12260,12383,12496,12679,12810,13011,13100,13211,13444,13545,13640,13763,13892,14009,14186,14285,14420,14563,14698,14817,15018,15137,15230,15341,15397,15504,15699,15810,15943,16038,16129,16220,16337,16476,16547,16630,17253,17310,17368,17992,18628" + "endOffsets": "3050" } }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-v21\\values-v21.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-ta\\values-ta.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,18633,18749,18875,19001,19129,19301", - "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,18744,18870,18996,19124,19296,19634" + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "startColumns": "4,4,4,4,4,4,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" } } ] }, { - "outputFile": "net.micode.notes.app-merged_res-8:/values-sq_values-sq.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-ms_values-ms.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-sq\\values-sq.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-ms\\values-ms.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,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,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" } }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-sq\\values-sq.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-ms\\values-ms.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3901,33 +955,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2907", + "startOffsets": "2881", "endColumns": "100", - "endOffsets": "3003" + "endOffsets": "2977" } } ] }, { - "outputFile": "net.micode.notes.app-merged_res-8:/values-xlarge-v4_values-xlarge-v4.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-ne_values-ne.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-xlarge-v4\\values-xlarge-v4.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-ne\\values-ne.xml", "from": { - "startLines": "2,3,4,5,6,7", - "startColumns": "4,4,4,4,4,4", - "startOffsets": "55,126,197,267,337,405", - "endColumns": "70,70,69,69,67,67", - "endOffsets": "121,192,262,332,400,468" + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "105,210,314,422,513,620,747,841,931,1022,1115,1211,1305,1406,1499,1594,1688,1779,1870,1958,2068,2184,2287,2402,2504,2619,2790,2902", + "endColumns": "104,103,107,90,106,126,93,89,90,92,95,93,100,92,94,93,90,90,87,109,115,102,114,101,114,170,111,85", + "endOffsets": "205,309,417,508,615,742,836,926,1017,1110,1206,1300,1401,1494,1589,1683,1774,1865,1953,2063,2179,2282,2397,2499,2614,2785,2897,2983" } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-8:/values-kk_values-kk.arsc.flat", - "map": [ + }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-kk\\values-kk.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-ne\\values-ne.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3938,28 +987,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2893", + "startOffsets": "2988", "endColumns": "100", - "endOffsets": "2989" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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": "3084" } } ] }, { - "outputFile": "net.micode.notes.app-merged_res-8:/values-sv_values-sv.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-kn_values-kn.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-sv\\values-sv.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-kn\\values-kn.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "105,223,335,448,536,643,770,847,924,1015,1108,1204,1298,1399,1492,1587,1681,1772,1863,1945,2061,2172,2271,2384,2488,2602,2766,2866", + "endColumns": "117,111,112,87,106,126,76,76,90,92,95,93,100,92,94,93,90,90,81,115,110,98,112,103,113,163,99,81", + "endOffsets": "218,330,443,531,638,765,842,919,1010,1103,1199,1293,1394,1487,1582,1676,1767,1858,1940,2056,2167,2266,2379,2483,2597,2761,2861,2943" + } + }, + { + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-kn\\values-kn.xml", "from": { "startLines": "2", "startColumns": "4", @@ -3970,60 +1019,33 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2863", + "startOffsets": "2948", "endColumns": "100", - "endOffsets": "2959" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,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" + "endOffsets": "3044" } } ] }, { - "outputFile": "net.micode.notes.app-merged_res-8:/values-de_values-de.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-v18_values-v18.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,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" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-de\\values-de.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-v18\\values-v18.xml", "from": { "startLines": "2", "startColumns": "4", "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2925", - "endColumns": "100", - "endOffsets": "3021" + "endColumns": "48", + "endOffsets": "99" } } ] }, { - "outputFile": "net.micode.notes.app-merged_res-8:/values-is_values-is.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-fr-rCA_values-fr-rCA.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-is\\values-is.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-fr-rCA\\values-fr-rCA.xml", "from": { "startLines": "2", "startColumns": "4", @@ -4034,28 +1056,38 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2865", + "startOffsets": "2965", "endColumns": "100", - "endOffsets": "2961" + "endOffsets": "3061" } }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-is\\values-is.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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,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" } } ] }, { - "outputFile": "net.micode.notes.app-merged_res-8:/values-az_values-az.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-pt_values-pt.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-az\\values-az.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-pt\\values-pt.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "105,225,331,438,527,628,746,829,909,1000,1093,1189,1283,1384,1477,1572,1667,1758,1849,1936,2043,2155,2257,2365,2472,2582,2744,2844", + "endColumns": "119,105,106,88,100,117,82,79,90,92,95,93,100,92,94,94,90,90,86,106,111,101,107,106,109,161,99,84", + "endOffsets": "220,326,433,522,623,741,824,904,995,1088,1184,1278,1379,1472,1567,1662,1753,1844,1931,2038,2150,2252,2360,2467,2577,2739,2839,2924" + } + }, + { + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-pt\\values-pt.xml", "from": { "startLines": "2", "startColumns": "4", @@ -4066,28 +1098,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2903", + "startOffsets": "2929", "endColumns": "100", - "endOffsets": "2999" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,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" + "endOffsets": "3025" } } ] }, { - "outputFile": "net.micode.notes.app-merged_res-8:/values-tr_values-tr.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-hi_values-hi.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-tr\\values-tr.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-hi\\values-hi.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "105,211,308,418,504,606,728,805,883,974,1067,1163,1257,1358,1451,1546,1640,1731,1822,1912,2021,2124,2226,2336,2437,2549,2711,2812", + "endColumns": "105,96,109,85,101,121,76,77,90,92,95,93,100,92,94,93,90,90,89,108,102,101,109,100,111,161,100,79", + "endOffsets": "206,303,413,499,601,723,800,878,969,1062,1158,1252,1353,1446,1541,1635,1726,1817,1907,2016,2119,2221,2331,2432,2544,2706,2807,2887" + } + }, + { + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-hi\\values-hi.xml", "from": { "startLines": "2", "startColumns": "4", @@ -4098,38 +1130,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2865", + "startOffsets": "2892", "endColumns": "100", - "endOffsets": "2961" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-tr\\values-tr.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,210,309,421,506,612,732,811,887,978,1071,1164,1258,1356,1449,1551,1646,1737,1828,1907,2014,2119,2215,2322,2424,2532,2688,2786", - "endColumns": "104,98,111,84,105,119,78,75,90,92,92,93,97,92,101,94,90,90,78,106,104,95,106,101,107,155,97,78", - "endOffsets": "205,304,416,501,607,727,806,882,973,1066,1159,1253,1351,1444,1546,1641,1732,1823,1902,2009,2114,2210,2317,2419,2527,2683,2781,2860" + "endOffsets": "2988" } } ] }, { - "outputFile": "net.micode.notes.app-merged_res-8:/values-nb_values-nb.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-ca_values-ca.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-nb\\values-nb.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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,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\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-nb\\values-nb.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-ca\\values-ca.xml", "from": { "startLines": "2", "startColumns": "4", @@ -4140,44 +1162,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2826", + "startOffsets": "2915", "endColumns": "100", - "endOffsets": "2922" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-8:/values-v25_values-v25.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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" + "endOffsets": "3011" } } ] }, { - "outputFile": "net.micode.notes.app-merged_res-8:/values-fr_values-fr.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-bn_values-bn.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-fr\\values-fr.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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,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\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-fr\\values-fr.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-bn\\values-bn.xml", "from": { "startLines": "2", "startColumns": "4", @@ -4188,18 +1194,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2945", + "startOffsets": "2939", "endColumns": "100", - "endOffsets": "3041" + "endOffsets": "3035" } } ] }, { - "outputFile": "net.micode.notes.app-merged_res-8:/values-da_values-da.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-sw_values-sw.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-da\\values-da.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-sw\\values-sw.xml", "from": { "startLines": "2", "startColumns": "4", @@ -4210,28 +1216,38 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2844", + "startOffsets": "2883", "endColumns": "100", - "endOffsets": "2940" + "endOffsets": "2979" } }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-da\\values-da.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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,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" } } ] }, { - "outputFile": "net.micode.notes.app-merged_res-8:/values-be_values-be.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-hy_values-hy.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-be\\values-be.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-hy\\values-hy.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "105,208,309,419,508,614,729,811,892,983,1076,1172,1266,1367,1460,1555,1649,1740,1831,1916,2023,2130,2229,2339,2446,2546,2703,2802", + "endColumns": "102,100,109,88,105,114,81,80,90,92,95,93,100,92,94,93,90,90,84,106,106,98,109,106,99,156,98,81", + "endOffsets": "203,304,414,503,609,724,806,887,978,1071,1167,1261,1362,1455,1550,1644,1735,1826,1911,2018,2125,2224,2334,2441,2541,2698,2797,2879" + } + }, + { + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-hy\\values-hy.xml", "from": { "startLines": "2", "startColumns": "4", @@ -4242,28 +1258,60 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2915", + "startOffsets": "2884", "endColumns": "100", - "endOffsets": "3011" + "endOffsets": "2980" } - }, + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-8:/values-fi_values-fi.arsc.flat", + "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-be\\values-be.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,225,328,444,530,638,756,835,913,1005,1099,1195,1289,1385,1479,1575,1670,1762,1854,1937,2043,2149,2247,2355,2460,2565,2734,2834", - "endColumns": "119,102,115,85,107,117,78,77,91,93,95,93,95,93,95,94,91,91,82,105,105,97,107,104,104,168,99,80", - "endOffsets": "220,323,439,525,633,751,830,908,1000,1094,1190,1284,1380,1474,1570,1665,1757,1849,1932,2038,2144,2242,2350,2455,2560,2729,2829,2910" + "startOffsets": "105,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\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-fi\\values-fi.xml", + "from": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "100", + "endOffsets": "151" + }, + "to": { + "startLines": "30", + "startColumns": "4", + "startOffsets": "2872", + "endColumns": "100", + "endOffsets": "2968" } } ] }, { - "outputFile": "net.micode.notes.app-merged_res-8:/values-en-rCA_values-en-rCA.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-en-rAU_values-en-rAU.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-en-rCA\\values-en-rCA.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-en-rAU\\values-en-rAU.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764", + "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81", + "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841" + } + }, + { + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-en-rAU\\values-en-rAU.xml", "from": { "startLines": "2", "startColumns": "4", @@ -4278,24 +1326,54 @@ "endColumns": "100", "endOffsets": "2942" } - }, + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-8:/values-night-v8_values-night-v8.arsc.flat", + "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rCA\\values-en-rCA.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-night-v8\\values-night-v8.xml", "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764", - "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81", - "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841" + "startLines": "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": "net.micode.notes.app-merged_res-8:/values-th_values-th.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-land_values-land.arsc.flat", + "map": [ + { + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-land\\values-land.xml", + "from": { + "startLines": "2,3,4", + "startColumns": "4,4,4", + "startOffsets": "55,125,196", + "endColumns": "69,70,67", + "endOffsets": "120,191,259" + } + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-8:/values-bs_values-bs.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-th\\values-th.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-bs\\values-bs.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "105,224,333,440,526,630,752,834,915,1006,1099,1195,1289,1390,1483,1578,1677,1768,1859,1945,2048,2153,2251,2356,2469,2572,2745,2842", + "endColumns": "118,108,106,85,103,121,81,80,90,92,95,93,100,92,94,98,90,90,85,102,104,97,104,112,102,172,96,83", + "endOffsets": "219,328,435,521,625,747,829,910,1001,1094,1190,1284,1385,1478,1573,1672,1763,1854,1940,2043,2148,2246,2351,2464,2567,2740,2837,2921" + } + }, + { + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-bs\\values-bs.xml", "from": { "startLines": "2", "startColumns": "4", @@ -4306,28 +1384,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2845", + "startOffsets": "2926", "endColumns": "100", - "endOffsets": "2941" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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": "3022" } } ] }, { - "outputFile": "net.micode.notes.app-merged_res-8:/values-es-rUS_values-es-rUS.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-lo_values-lo.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-es-rUS\\values-es-rUS.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-lo\\values-lo.xml", "from": { "startLines": "2", "startColumns": "4", @@ -4338,75 +1406,53 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2920", + "startOffsets": "2836", "endColumns": "100", - "endOffsets": "3016" + "endOffsets": "2932" } }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-es-rUS\\values-es-rUS.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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" + "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": "net.micode.notes.app-merged_res-8:/values-v28_values-v28.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-v28\\values-v28.xml", -======= - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-v28_values-v28.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-ldltr-v21_values-ldltr-v21.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-v28\\values-v28.xml", ->>>>>>> xiaojinchi_branch + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-ldltr-v21\\values-ldltr-v21.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" - }, - "to": { - "startLines": "2,3,4,8", - "startColumns": "4,4,4,4", - "startOffsets": "55,130,217,397", - "endLines": "2,3,7,11", - "endColumns": "74,86,12,12", - "endOffsets": "125,212,392,584" + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "112", + "endOffsets": "163" } } ] }, { -<<<<<<< HEAD - "outputFile": "net.micode.notes.app-merged_res-8:/values-iw_values-iw.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-iw\\values-iw.xml", -======= - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-ne_values-ne.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-ja_values-ja.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-ne\\values-ne.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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,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\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-ne\\values-ne.xml", ->>>>>>> xiaojinchi_branch + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-ja\\values-ja.xml", "from": { "startLines": "2", "startColumns": "4", @@ -4417,98 +1463,82 @@ "to": { "startLines": "30", "startColumns": "4", -<<<<<<< HEAD - "startOffsets": "2832", - "endColumns": "100", - "endOffsets": "2928" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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" -======= - "startOffsets": "2988", + "startOffsets": "2771", "endColumns": "100", - "endOffsets": "3084" ->>>>>>> xiaojinchi_branch + "endOffsets": "2867" } } ] }, { -<<<<<<< HEAD - "outputFile": "net.micode.notes.app-merged_res-8:/values-sr_values-sr.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-ru_values-ru.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-sr\\values-sr.xml", -======= - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-port_values-port.arsc.flat", - "map": [ + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-ru\\values-ru.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "105,220,322,434,520,625,745,824,902,994,1088,1184,1277,1373,1467,1563,1658,1750,1842,1922,2028,2136,2234,2343,2449,2557,2732,2832", + "endColumns": "114,101,111,85,104,119,78,77,91,93,95,92,95,93,95,94,91,91,79,105,107,97,108,105,107,174,99,80", + "endOffsets": "215,317,429,515,620,740,819,897,989,1083,1179,1272,1368,1462,1558,1653,1745,1837,1917,2023,2131,2229,2338,2444,2552,2727,2827,2908" + } + }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-port\\values-port.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-ru\\values-ru.xml", "from": { "startLines": "2", "startColumns": "4", "startOffsets": "55", - "endColumns": "55", - "endOffsets": "106" + "endColumns": "100", + "endOffsets": "151" + }, + "to": { + "startLines": "30", + "startColumns": "4", + "startOffsets": "2913", + "endColumns": "100", + "endOffsets": "3009" } } ] }, { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-en-rXC_values-en-rXC.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-si_values-si.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-en-rXC\\values-en-rXC.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-si\\values-si.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": "2903", + "endColumns": "100", + "endOffsets": "2999" } }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-en-rXC\\values-en-rXC.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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,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": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-zu_values-zu.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-or_values-or.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-zu\\values-zu.xml", ->>>>>>> xiaojinchi_branch + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-or\\values-or.xml", "from": { "startLines": "2", "startColumns": "4", @@ -4519,61 +1549,38 @@ "to": { "startLines": "30", "startColumns": "4", -<<<<<<< HEAD - "startOffsets": "2905", + "startOffsets": "2936", "endColumns": "100", - "endOffsets": "3001" + "endOffsets": "3032" } }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-sr\\values-sr.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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": "2898", - "endColumns": "100", - "endOffsets": "2994" ->>>>>>> xiaojinchi_branch + "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" } } ] }, { -<<<<<<< HEAD - "outputFile": "net.micode.notes.app-merged_res-8:/values-ur_values-ur.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,215,321,430,516,620,740,816,892,984,1078,1174,1268,1370,1464,1560,1654,1746,1838,1923,2031,2140,2242,2353,2453,2561,2726,2824", - "endColumns": "109,105,108,85,103,119,75,75,91,93,95,93,101,93,95,93,91,91,84,107,108,101,110,99,107,164,97,79", - "endOffsets": "210,316,425,511,615,735,811,887,979,1073,1169,1263,1365,1459,1555,1649,1741,1833,1918,2026,2135,2237,2348,2448,2556,2721,2819,2899" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-ur\\values-ur.xml", -======= - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-mn_values-mn.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-el_values-el.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-mn\\values-mn.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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,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\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-mn\\values-mn.xml", ->>>>>>> xiaojinchi_branch + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-el\\values-el.xml", "from": { "startLines": "2", "startColumns": "4", @@ -4584,27 +1591,15 @@ "to": { "startLines": "30", "startColumns": "4", -<<<<<<< HEAD - "startOffsets": "2904", - "endColumns": "100", - "endOffsets": "3000" -======= - "startOffsets": "2876", + "startOffsets": "2964", "endColumns": "100", - "endOffsets": "2972" ->>>>>>> xiaojinchi_branch + "endOffsets": "3060" } } ] }, { -<<<<<<< HEAD - "outputFile": "net.micode.notes.app-merged_res-8:/values-fa_values-fa.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-fa\\values-fa.xml", -======= - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-eu_values-eu.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-eu_values-eu.arsc.flat", "map": [ { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-eu\\values-eu.xml", @@ -4618,7 +1613,6 @@ }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-eu\\values-eu.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -4629,53 +1623,79 @@ "to": { "startLines": "30", "startColumns": "4", -<<<<<<< HEAD - "startOffsets": "2903", + "startOffsets": "2938", "endColumns": "100", - "endOffsets": "2999" + "endOffsets": "3034" + } + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-8:/values-af_values-af.arsc.flat", + "map": [ + { + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-af\\values-af.xml", + "from": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "100", + "endOffsets": "151" + }, + "to": { + "startLines": "30", + "startColumns": "4", + "startOffsets": "2856", + "endColumns": "100", + "endOffsets": "2952" } }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-fa\\values-fa.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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": "2938", - "endColumns": "100", - "endOffsets": "3034" ->>>>>>> xiaojinchi_branch + "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" } } ] }, { -<<<<<<< HEAD - "outputFile": "net.micode.notes.app-merged_res-8:/values-nl_values-nl.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-tl_values-tl.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-nl\\values-nl.xml", -======= - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-watch-v20_values-watch-v20.arsc.flat", - "map": [ + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-tl\\values-tl.xml", + "from": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "100", + "endOffsets": "151" + }, + "to": { + "startLines": "30", + "startColumns": "4", + "startOffsets": "2949", + "endColumns": "100", + "endOffsets": "3045" + } + }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-watch-v20\\values-watch-v20.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-tl\\values-tl.xml", "from": { - "startLines": "2,5,8", - "startColumns": "4,4,4", - "startOffsets": "55,214,385", - "endLines": "4,7,10", - "endColumns": "12,12,12", - "endOffsets": "209,380,553" + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "startColumns": "4,4,4,4,4,4,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" } } ] }, { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-gl_values-gl.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-gl_values-gl.arsc.flat", "map": [ { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-gl\\values-gl.xml", @@ -4689,7 +1709,6 @@ }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-gl\\values-gl.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -4700,101 +1719,124 @@ "to": { "startLines": "30", "startColumns": "4", -<<<<<<< HEAD - "startOffsets": "2921", + "startOffsets": "2920", "endColumns": "100", - "endOffsets": "3017" + "endOffsets": "3016" + } + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-8:/values-en-rIN_values-en-rIN.arsc.flat", + "map": [ + { + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-en-rIN\\values-en-rIN.xml", + "from": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "100", + "endOffsets": "151" + }, + "to": { + "startLines": "30", + "startColumns": "4", + "startOffsets": "2846", + "endColumns": "100", + "endOffsets": "2942" } }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-nl\\values-nl.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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": "2920", - "endColumns": "100", - "endOffsets": "3016" ->>>>>>> xiaojinchi_branch + "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" } } ] }, { -<<<<<<< HEAD - "outputFile": "net.micode.notes.app-merged_res-8:/values-hdpi-v4_values-hdpi-v4.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-am_values-am.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-hdpi-v4\\values-hdpi-v4.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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" + } + }, + { + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-am\\values-am.xml", "from": { "startLines": "2", "startColumns": "4", "startOffsets": "55", - "endLines": "6", - "endColumns": "13", - "endOffsets": "327" + "endColumns": "100", + "endOffsets": "151" + }, + "to": { + "startLines": "30", + "startColumns": "4", + "startOffsets": "2817", + "endColumns": "100", + "endOffsets": "2913" } } ] }, { - "outputFile": "net.micode.notes.app-merged_res-8:/values-v16_values-v16.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-en-rXC_values-en-rXC.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-v16\\values-v16.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-en-rXC\\values-en-rXC.xml", "from": { "startLines": "2", "startColumns": "4", "startOffsets": "55", - "endLines": "5", - "endColumns": "12", - "endOffsets": "223" + "endColumns": "202", + "endOffsets": "253" }, "to": { - "startLines": "3", + "startLines": "30", "startColumns": "4", - "startOffsets": "121", - "endLines": "6", - "endColumns": "12", - "endOffsets": "289" + "startOffsets": "5682", + "endColumns": "202", + "endOffsets": "5880" } }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-v16\\values-v16.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-en-rXC\\values-en-rXC.xml", "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "65", - "endOffsets": "116" + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "105,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" } } ] }, { - "outputFile": "net.micode.notes.app-merged_res-8:/values-ml_values-ml.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-lt_values-lt.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-ml\\values-ml.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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,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\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-ml\\values-ml.xml", -======= - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-mr_values-mr.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-mr\\values-mr.xml", ->>>>>>> xiaojinchi_branch + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-lt\\values-lt.xml", "from": { "startLines": "2", "startColumns": "4", @@ -4805,56 +1847,28 @@ "to": { "startLines": "30", "startColumns": "4", -<<<<<<< HEAD - "startOffsets": "2955", - "endColumns": "100", - "endOffsets": "3051" -======= - "startOffsets": "2887", + "startOffsets": "2978", "endColumns": "100", - "endOffsets": "2983" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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" ->>>>>>> xiaojinchi_branch + "endOffsets": "3074" } } ] }, { -<<<<<<< HEAD - "outputFile": "net.micode.notes.app-merged_res-8:/values-en-rGB_values-en-rGB.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-en-rGB\\values-en-rGB.xml", -======= - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-v18_values-v18.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-pl_values-pl.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-v18\\values-v18.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-pl\\values-pl.xml", "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "48", - "endOffsets": "99" + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "startColumns": "4,4,4,4,4,4,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" } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-fr-rCA_values-fr-rCA.arsc.flat", - "map": [ + }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-fr-rCA\\values-fr-rCA.xml", ->>>>>>> xiaojinchi_branch + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-pl\\values-pl.xml", "from": { "startLines": "2", "startColumns": "4", @@ -4865,61 +1879,28 @@ "to": { "startLines": "30", "startColumns": "4", -<<<<<<< HEAD - "startOffsets": "2846", - "endColumns": "100", - "endOffsets": "2942" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,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": "2965", + "startOffsets": "2909", "endColumns": "100", - "endOffsets": "3061" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-fr-rCA\\values-fr-rCA.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,216,331,442,529,645,775,858,938,1029,1122,1221,1316,1417,1510,1603,1698,1789,1880,1976,2086,2198,2301,2412,2519,2621,2780,2879", - "endColumns": "110,114,110,86,115,129,82,79,90,92,98,94,100,92,92,94,90,90,95,109,111,102,110,106,101,158,98,85", - "endOffsets": "211,326,437,524,640,770,853,933,1024,1117,1216,1311,1412,1505,1598,1693,1784,1875,1971,2081,2193,2296,2407,2514,2616,2775,2874,2960" ->>>>>>> xiaojinchi_branch + "endOffsets": "3005" } } ] }, { -<<<<<<< HEAD - "outputFile": "net.micode.notes.app-merged_res-8:/values-hr_values-hr.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-hr\\values-hr.xml", -======= - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-km_values-km.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-vi_values-vi.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-km\\values-km.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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" + "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\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-km\\values-km.xml", ->>>>>>> xiaojinchi_branch + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-vi\\values-vi.xml", "from": { "startLines": "2", "startColumns": "4", @@ -4930,35 +1911,71 @@ "to": { "startLines": "30", "startColumns": "4", -<<<<<<< HEAD - "startOffsets": "2926", + "startOffsets": "2901", "endColumns": "100", - "endOffsets": "3022" + "endOffsets": "2997" + } + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-8:/values-v21_values-v21.arsc.flat", + "map": [ + { + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\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,18633,18749,18875,19001,19129,19301", + "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,18744,18870,18996,19124,19296,19634" } }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-hr\\values-hr.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-v21\\values-v21.xml", "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,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": "2882", - "endColumns": "100", - "endOffsets": "2978" ->>>>>>> xiaojinchi_branch + "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,8697,8882,11746,11943,12142,12265,12388,12501,12684,12815,13016,13105,13216,13449,13550,13645,13768,13897,14014,14191,14290,14425,14568,14703,14822,15023,15142,15235,15346,15402,15509,15704,15815,15948,16043,16134,16225,16342,16481,16552,16635,17258,17315,17373,17997", + "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,8692,8877,11741,11938,12137,12260,12383,12496,12679,12810,13011,13100,13211,13444,13545,13640,13763,13892,14009,14186,14285,14420,14563,14698,14817,15018,15137,15230,15341,15397,15504,15699,15810,15943,16038,16129,16220,16337,16476,16547,16630,17253,17310,17368,17992,18628" } } ] }, { -<<<<<<< HEAD - "outputFile": "net.micode.notes.app-merged_res-8:/values-cs_values-cs.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-sq_values-sq.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-cs\\values-cs.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-sq\\values-sq.xml", "from": { "startLines": "2", "startColumns": "4", @@ -4969,48 +1986,43 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2891", + "startOffsets": "2907", "endColumns": "100", - "endOffsets": "2987" + "endOffsets": "3003" } - }, + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-8:/values-xlarge-v4_values-xlarge-v4.arsc.flat", + "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-cs\\values-cs.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-xlarge-v4\\values-xlarge-v4.xml", "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,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" + "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": "net.micode.notes.app-merged_res-8:/values-ka_values-ka.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-ka\\values-ka.xml", -======= - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-ka_values-ka.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-kk_values-kk.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-ka\\values-ka.xml", ->>>>>>> xiaojinchi_branch + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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,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" } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-ka\\values-ka.xml", -======= - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-ka\\values-ka.xml", ->>>>>>> xiaojinchi_branch + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-kk\\values-kk.xml", "from": { "startLines": "2", "startColumns": "4", @@ -5021,24 +2033,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2899", + "startOffsets": "2893", "endColumns": "100", - "endOffsets": "2995" + "endOffsets": "2989" } } ] }, { -<<<<<<< HEAD - "outputFile": "net.micode.notes.app-merged_res-8:/values-pt-rPT_values-pt-rPT.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-pt-rPT\\values-pt-rPT.xml", -======= - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-ta_values-ta.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-sv_values-sv.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-ta\\values-ta.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-sv\\values-sv.xml", "from": { "startLines": "2", "startColumns": "4", @@ -5049,28 +2055,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2954", + "startOffsets": "2863", "endColumns": "100", - "endOffsets": "3050" + "endOffsets": "2959" } }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-ta\\values-ta.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,219,317,432,521,628,754,832,909,1009,1114,1210,1305,1412,1514,1618,1713,1815,1913,1995,2097,2201,2298,2408,2510,2617,2774,2874", - "endColumns": "113,97,114,88,106,125,77,76,99,104,95,94,106,101,103,94,101,97,81,101,103,96,109,101,106,156,99,79", - "endOffsets": "214,312,427,516,623,749,827,904,1004,1109,1205,1300,1407,1509,1613,1708,1810,1908,1990,2092,2196,2293,2403,2505,2612,2769,2869,2949" + "startOffsets": "105,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": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-sw_values-sw.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-de_values-de.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-sw\\values-sw.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-de\\values-de.xml", "from": { "startLines": "2", "startColumns": "4", @@ -5081,38 +2087,70 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2883", + "startOffsets": "2925", "endColumns": "100", - "endOffsets": "2979" + "endOffsets": "3021" } }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-sw\\values-sw.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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,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": "net.micode.notes.app-merged_res-8:/values-is_values-is.arsc.flat", + "map": [ + { + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-is\\values-is.xml", + "from": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "100", + "endOffsets": "151" + }, + "to": { + "startLines": "30", + "startColumns": "4", + "startOffsets": "2865", + "endColumns": "100", + "endOffsets": "2961" } } ] }, { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-as_values-as.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-az_values-az.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-as\\values-as.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-as\\values-as.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-az\\values-az.xml", "from": { "startLines": "2", "startColumns": "4", @@ -5123,18 +2161,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2950", + "startOffsets": "2903", "endColumns": "100", - "endOffsets": "3046" + "endOffsets": "2999" } } ] }, { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-fr_values-fr.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-tr_values-tr.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-fr\\values-fr.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-tr\\values-tr.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "105,210,309,421,506,612,732,811,887,978,1071,1164,1258,1356,1449,1551,1646,1737,1828,1907,2014,2119,2215,2322,2424,2532,2688,2786", + "endColumns": "104,98,111,84,105,119,78,75,90,92,92,93,97,92,101,94,90,90,78,106,104,95,106,101,107,155,97,78", + "endOffsets": "205,304,416,501,607,727,806,882,973,1066,1159,1253,1351,1444,1546,1641,1732,1823,1902,2009,2114,2210,2317,2419,2527,2683,2781,2860" + } + }, + { + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-tr\\values-tr.xml", "from": { "startLines": "2", "startColumns": "4", @@ -5145,38 +2193,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2945", + "startOffsets": "2865", "endColumns": "100", - "endOffsets": "3041" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-fr\\values-fr.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,216,331,442,524,630,760,843,923,1014,1107,1206,1301,1402,1495,1588,1683,1774,1865,1951,2061,2173,2276,2387,2494,2601,2760,2859", - "endColumns": "110,114,110,81,105,129,82,79,90,92,98,94,100,92,92,94,90,90,85,109,111,102,110,106,106,158,98,85", - "endOffsets": "211,326,437,519,625,755,838,918,1009,1102,1201,1296,1397,1490,1583,1678,1769,1860,1946,2056,2168,2271,2382,2489,2596,2755,2854,2940" + "endOffsets": "2961" } } ] }, { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-fi_values-fi.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-nb_values-nb.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-fi\\values-fi.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-nb\\values-nb.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,213,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,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\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-fi\\values-fi.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-nb\\values-nb.xml", "from": { "startLines": "2", "startColumns": "4", @@ -5187,19 +2225,34 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2872", + "startOffsets": "2826", "endColumns": "100", - "endOffsets": "2968" + "endOffsets": "2922" } } ] }, { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-tl_values-tl.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-v25_values-v25.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-tl\\values-tl.xml", ->>>>>>> xiaojinchi_branch + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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": "net.micode.notes.app-merged_res-8:/values-fr_values-fr.arsc.flat", + "map": [ + { + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-fr\\values-fr.xml", "from": { "startLines": "2", "startColumns": "4", @@ -5210,80 +2263,38 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2949", + "startOffsets": "2945", "endColumns": "100", - "endOffsets": "3045" + "endOffsets": "3041" } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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" -======= - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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" ->>>>>>> xiaojinchi_branch - } - } - ] - }, - { -<<<<<<< HEAD - "outputFile": "net.micode.notes.app-merged_res-8:/values-te_values-te.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-te\\values-te.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,219,328,439,529,634,759,841,923,1014,1107,1203,1297,1398,1491,1586,1681,1772,1863,1947,2060,2168,2267,2378,2480,2597,2763,2864", - "endColumns": "113,108,110,89,104,124,81,81,90,92,95,93,100,92,94,94,90,90,83,112,107,98,110,101,116,165,100,81", - "endOffsets": "214,323,434,524,629,754,836,918,1009,1102,1198,1292,1393,1486,1581,1676,1767,1858,1942,2055,2163,2262,2373,2475,2592,2758,2859,2941" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-te\\values-te.xml", -======= - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-xlarge-v4_values-xlarge-v4.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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" + "startOffsets": "105,216,331,442,524,630,760,843,923,1014,1107,1206,1301,1402,1495,1588,1683,1774,1865,1951,2061,2173,2276,2387,2494,2601,2760,2859", + "endColumns": "110,114,110,81,105,129,82,79,90,92,98,94,100,92,92,94,90,90,85,109,111,102,110,106,106,158,98,85", + "endOffsets": "211,326,437,519,625,755,838,918,1009,1102,1201,1296,1397,1490,1583,1678,1769,1860,1946,2056,2168,2271,2382,2489,2596,2755,2854,2940" } } ] }, { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-es-rUS_values-es-rUS.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-da_values-da.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-es-rUS\\values-es-rUS.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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" + "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\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-es-rUS\\values-es-rUS.xml", ->>>>>>> xiaojinchi_branch + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-da\\values-da.xml", "from": { "startLines": "2", "startColumns": "4", @@ -5294,40 +2305,28 @@ "to": { "startLines": "30", "startColumns": "4", -<<<<<<< HEAD - "startOffsets": "2946", - "endColumns": "100", - "endOffsets": "3042" -======= - "startOffsets": "2920", + "startOffsets": "2844", "endColumns": "100", - "endOffsets": "3016" ->>>>>>> xiaojinchi_branch + "endOffsets": "2940" } } ] }, { -<<<<<<< HEAD - "outputFile": "net.micode.notes.app-merged_res-8:/values-pt-rBR_values-pt-rBR.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-pt-rBR\\values-pt-rBR.xml", -======= - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-hr_values-hr.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-be_values-be.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-hr\\values-hr.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-be\\values-be.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,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,225,328,444,530,638,756,835,913,1005,1099,1195,1289,1385,1479,1575,1670,1762,1854,1937,2043,2149,2247,2355,2460,2565,2734,2834", + "endColumns": "119,102,115,85,107,117,78,77,91,93,95,93,95,93,95,94,91,91,82,105,105,97,107,104,104,168,99,80", + "endOffsets": "220,323,439,525,633,751,830,908,1000,1094,1190,1284,1380,1474,1570,1665,1757,1849,1932,2038,2144,2242,2350,2455,2560,2729,2829,2910" } }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-hr\\values-hr.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-be\\values-be.xml", "from": { "startLines": "2", "startColumns": "4", @@ -5338,18 +2337,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2926", + "startOffsets": "2915", "endColumns": "100", - "endOffsets": "3022" + "endOffsets": "3011" } } ] }, { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-lo_values-lo.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-en-rCA_values-en-rCA.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-lo\\values-lo.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-en-rCA\\values-en-rCA.xml", "from": { "startLines": "2", "startColumns": "4", @@ -5360,38 +2359,38 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2836", + "startOffsets": "2846", "endColumns": "100", - "endOffsets": "2932" + "endOffsets": "2942" } }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-lo\\values-lo.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,208,305,412,497,602,714,791,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1888,1995,2092,2190,2295,2398,2502,2659,2755", - "endColumns": "102,96,106,84,104,111,76,77,90,92,95,93,100,92,94,93,90,90,79,106,96,97,104,102,103,156,95,80", - "endOffsets": "203,300,407,492,597,709,786,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1883,1990,2087,2185,2290,2393,2497,2654,2750,2831" + "startOffsets": "105,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": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-zh-rHK_values-zh-rHK.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-th_values-th.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-zh-rHK\\values-zh-rHK.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,200,293,393,475,572,680,756,832,924,1018,1110,1206,1302,1396,1492,1584,1676,1768,1846,1942,2038,2133,2230,2325,2423,2574,2668", - "endColumns": "94,92,99,81,96,107,75,75,91,93,91,95,95,93,95,91,91,91,77,95,95,94,96,94,97,150,93,77", - "endOffsets": "195,288,388,470,567,675,751,827,919,1013,1105,1201,1297,1391,1487,1579,1671,1763,1841,1937,2033,2128,2225,2320,2418,2569,2663,2741" + "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" } }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-zh-rHK\\values-zh-rHK.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-th\\values-th.xml", "from": { "startLines": "2", "startColumns": "4", @@ -5402,28 +2401,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2746", + "startOffsets": "2845", "endColumns": "100", - "endOffsets": "2842" + "endOffsets": "2941" } } ] }, { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-b+sr+Latn_values-b+sr+Latn.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-es-rUS_values-es-rUS.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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,225,334,442,527,628,751,836,918,1009,1102,1198,1292,1392,1485,1584,1680,1771,1862,1944,2056,2156,2257,2365,2472,2579,2738,2838", + "endColumns": "119,108,107,84,100,122,84,81,90,92,95,93,99,92,98,95,90,90,81,111,99,100,107,106,106,158,99,81", + "endOffsets": "220,329,437,522,623,746,831,913,1004,1097,1193,1287,1387,1480,1579,1675,1766,1857,1939,2051,2151,2252,2360,2467,2574,2733,2833,2915" } }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-es-rUS\\values-es-rUS.xml", "from": { "startLines": "2", "startColumns": "4", @@ -5434,90 +2433,84 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2912", + "startOffsets": "2920", "endColumns": "100", - "endOffsets": "3008" + "endOffsets": "3016" } } ] }, { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-et_values-et.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-v28_values-v28.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-et\\values-et.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-v28\\values-v28.xml", "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" + "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" }, "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2942", - "endColumns": "100", - "endOffsets": "3038" + "startLines": "2,3,4,8", + "startColumns": "4,4,4,4", + "startOffsets": "55,130,217,397", + "endLines": "2,3,7,11", + "endColumns": "74,86,12,12", + "endOffsets": "125,212,392,584" } } ] }, { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-large-v4_values-large-v4.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-iw_values-iw.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-large-v4\\values-large-v4.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-iw\\values-iw.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,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": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-ldltr-v21_values-ldltr-v21.arsc.flat", - "map": [ + }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-ldltr-v21\\values-ldltr-v21.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-iw\\values-iw.xml", "from": { "startLines": "2", "startColumns": "4", "startOffsets": "55", - "endColumns": "112", - "endOffsets": "163" + "endColumns": "100", + "endOffsets": "151" + }, + "to": { + "startLines": "30", + "startColumns": "4", + "startOffsets": "2832", + "endColumns": "100", + "endOffsets": "2928" } } ] }, { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-ru_values-ru.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-sr_values-sr.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-ru\\values-ru.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,220,322,434,520,625,745,824,902,994,1088,1184,1277,1373,1467,1563,1658,1750,1842,1922,2028,2136,2234,2343,2449,2557,2732,2832", - "endColumns": "114,101,111,85,104,119,78,77,91,93,95,92,95,93,95,94,91,91,79,105,107,97,108,105,107,174,99,80", - "endOffsets": "215,317,429,515,620,740,819,897,989,1083,1179,1272,1368,1462,1558,1653,1745,1837,1917,2023,2131,2229,2338,2444,2552,2727,2827,2908" + "startOffsets": "105,214,317,423,509,613,731,812,892,983,1076,1172,1266,1367,1460,1555,1660,1751,1842,1930,2035,2143,2244,2348,2456,2557,2724,2821", + "endColumns": "108,102,105,85,103,117,80,79,90,92,95,93,100,92,94,104,90,90,87,104,107,100,103,107,100,166,96,83", + "endOffsets": "209,312,418,504,608,726,807,887,978,1071,1167,1261,1362,1455,1550,1655,1746,1837,1925,2030,2138,2239,2343,2451,2552,2719,2816,2900" } }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-ru\\values-ru.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-sr\\values-sr.xml", "from": { "startLines": "2", "startColumns": "4", @@ -5528,18 +2521,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2913", + "startOffsets": "2905", "endColumns": "100", - "endOffsets": "3009" + "endOffsets": "3001" } } ] }, { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-af_values-af.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-ur_values-ur.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-af\\values-af.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-ur\\values-ur.xml", "from": { "startLines": "2", "startColumns": "4", @@ -5550,28 +2543,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2856", + "startOffsets": "2904", "endColumns": "100", - "endOffsets": "2952" + "endOffsets": "3000" } }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-af\\values-af.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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,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": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-or_values-or.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-fa_values-fa.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-or\\values-or.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-fa\\values-fa.xml", "from": { "startLines": "2", "startColumns": "4", @@ -5582,53 +2575,38 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2936", + "startOffsets": "2903", "endColumns": "100", - "endOffsets": "3032" + "endOffsets": "2999" } }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-or\\values-or.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,224,334,441,527,631,751,828,905,996,1089,1186,1281,1382,1475,1570,1666,1757,1847,1929,2039,2144,2250,2361,2464,2582,2745,2847", - "endColumns": "118,109,106,85,103,119,76,76,90,92,96,94,100,92,94,95,90,89,81,109,104,105,110,102,117,162,101,88", - "endOffsets": "219,329,436,522,626,746,823,900,991,1084,1181,1276,1377,1470,1565,1661,1752,1842,1924,2034,2139,2245,2356,2459,2577,2740,2842,2931" - } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-sw600dp-v13_values-sw600dp-v13.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-sw600dp-v13\\values-sw600dp-v13.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9", - "startColumns": "4,4,4,4,4,4,4,4", - "startOffsets": "55,124,193,263,337,413,472,543", - "endColumns": "68,68,69,73,75,58,70,67", - "endOffsets": "119,188,258,332,408,467,538,606" + "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": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-ca_values-ca.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-nl_values-nl.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-ca\\values-ca.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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,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\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-ca\\values-ca.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-nl\\values-nl.xml", "from": { "startLines": "2", "startColumns": "4", @@ -5639,50 +2617,78 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2915", + "startOffsets": "2921", "endColumns": "100", - "endOffsets": "3011" + "endOffsets": "3017" } } ] }, { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-sr_values-sr.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-hdpi-v4_values-hdpi-v4.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-sr\\values-sr.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-hdpi-v4\\values-hdpi-v4.xml", "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,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" + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endLines": "6", + "endColumns": "13", + "endOffsets": "327" + } + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-8:/values-v16_values-v16.arsc.flat", + "map": [ + { + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-v16\\values-v16.xml", + "from": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "65", + "endOffsets": "116" } }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-sr\\values-sr.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-v16\\values-v16.xml", "from": { "startLines": "2", "startColumns": "4", "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" + "endLines": "5", + "endColumns": "12", + "endOffsets": "223" }, "to": { - "startLines": "30", + "startLines": "3", "startColumns": "4", - "startOffsets": "2905", - "endColumns": "100", - "endOffsets": "3001" + "startOffsets": "121", + "endLines": "6", + "endColumns": "12", + "endOffsets": "289" } } ] }, { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-pt-rBR_values-pt-rBR.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-ml_values-ml.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-pt-rBR\\values-pt-rBR.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-ml\\values-ml.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "105,224,342,457,550,655,787,864,940,1031,1124,1226,1320,1421,1515,1610,1709,1800,1891,1973,2084,2190,2288,2402,2502,2613,2772,2873", + "endColumns": "118,117,114,92,104,131,76,75,90,92,101,93,100,93,94,98,90,90,81,110,105,97,113,99,110,158,100,81", + "endOffsets": "219,337,452,545,650,782,859,935,1026,1119,1221,1315,1416,1510,1605,1704,1795,1886,1968,2079,2185,2283,2397,2497,2608,2767,2868,2950" + } + }, + { + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-ml\\values-ml.xml", "from": { "startLines": "2", "startColumns": "4", @@ -5693,28 +2699,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2929", + "startOffsets": "2955", "endColumns": "100", - "endOffsets": "3025" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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" + "endOffsets": "3051" } } ] }, { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-en-rCA_values-en-rCA.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-en-rGB_values-en-rGB.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-en-rCA\\values-en-rCA.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-en-rGB\\values-en-rGB.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764", + "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81", + "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841" + } + }, + { + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-en-rGB\\values-en-rGB.xml", "from": { "startLines": "2", "startColumns": "4", @@ -5729,24 +2735,24 @@ "endColumns": "100", "endOffsets": "2942" } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-en-rCA\\values-en-rCA.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764", - "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81", - "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841" - } } ] }, { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-gu_values-gu.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-hr_values-hr.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-gu\\values-gu.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-hr\\values-hr.xml", "from": { "startLines": "2", "startColumns": "4", @@ -5757,38 +2763,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2882", + "startOffsets": "2926", "endColumns": "100", - "endOffsets": "2978" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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": "3022" } } ] }, { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-ml_values-ml.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-cs_values-cs.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-ml\\values-ml.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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,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" } }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-ml\\values-ml.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-cs\\values-cs.xml", "from": { "startLines": "2", "startColumns": "4", @@ -5799,28 +2795,50 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2955", + "startOffsets": "2891", "endColumns": "100", - "endOffsets": "3051" + "endOffsets": "2987" } } ] }, { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-pa_values-pa.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-ka_values-ka.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-pa\\values-pa.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,208,305,410,496,596,709,786,862,953,1046,1142,1236,1337,1430,1525,1619,1710,1801,1880,1981,2085,2182,2291,2390,2500,2659,2759", - "endColumns": "102,96,104,85,99,112,76,75,90,92,95,93,100,92,94,93,90,90,78,100,103,96,108,98,109,158,99,79", - "endOffsets": "203,300,405,491,591,704,781,857,948,1041,1137,1231,1332,1425,1520,1614,1705,1796,1875,1976,2080,2177,2286,2385,2495,2654,2754,2834" + "startOffsets": "105,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\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-pa\\values-pa.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-ka\\values-ka.xml", + "from": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "100", + "endOffsets": "151" + }, + "to": { + "startLines": "30", + "startColumns": "4", + "startOffsets": "2899", + "endColumns": "100", + "endOffsets": "2995" + } + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-8:/values-pt-rPT_values-pt-rPT.arsc.flat", + "map": [ + { + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-pt-rPT\\values-pt-rPT.xml", "from": { "startLines": "2", "startColumns": "4", @@ -5831,33 +2849,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2839", + "startOffsets": "2949", "endColumns": "100", - "endOffsets": "2935" + "endOffsets": "3045" } - } - ] - }, - { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-pt_values-pt.arsc.flat", - "map": [ + }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-pt\\values-pt.xml", ->>>>>>> xiaojinchi_branch + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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,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": "net.micode.notes.app-merged_res-8:/values-te_values-te.arsc.flat", + "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-pt-rBR\\values-pt-rBR.xml", -======= - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-pt\\values-pt.xml", ->>>>>>> xiaojinchi_branch + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-te\\values-te.xml", "from": { "startLines": "2", "startColumns": "4", @@ -5868,35 +2881,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2929", + "startOffsets": "2946", "endColumns": "100", - "endOffsets": "3025" + "endOffsets": "3042" } - } - ] - }, - { -<<<<<<< HEAD - "outputFile": "net.micode.notes.app-merged_res-8:/values-in_values-in.arsc.flat", - "map": [ + }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-in\\values-in.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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,219,328,439,529,634,759,841,923,1014,1107,1203,1297,1398,1491,1586,1681,1772,1863,1947,2060,2168,2267,2378,2480,2597,2763,2864", + "endColumns": "113,108,110,89,104,124,81,81,90,92,95,93,100,92,94,94,90,90,83,112,107,98,110,101,116,165,100,81", + "endOffsets": "214,323,434,524,629,754,836,918,1009,1102,1198,1292,1393,1486,1581,1676,1767,1858,1942,2055,2163,2262,2373,2475,2592,2758,2859,2941" } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-in\\values-in.xml", -======= - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-en-rIN_values-en-rIN.arsc.flat", + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-8:/values-pt-rBR_values-pt-rBR.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-en-rIN\\values-en-rIN.xml", ->>>>>>> xiaojinchi_branch + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-pt-rBR\\values-pt-rBR.xml", "from": { "startLines": "2", "startColumns": "4", @@ -5907,50 +2913,38 @@ "to": { "startLines": "30", "startColumns": "4", -<<<<<<< HEAD - "startOffsets": "2887", - "endColumns": "100", - "endOffsets": "2983" -======= - "startOffsets": "2846", + "startOffsets": "2929", "endColumns": "100", - "endOffsets": "2942" + "endOffsets": "3025" } }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-en-rIN\\values-en-rIN.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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" ->>>>>>> xiaojinchi_branch + "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" } } ] }, { -<<<<<<< HEAD - "outputFile": "net.micode.notes.app-merged_res-8:/values-v22_values-v22.arsc.flat", - "map": [ - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-v22\\values-v22.xml", -======= - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-hi_values-hi.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-in_values-in.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-hi\\values-hi.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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,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\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-hi\\values-hi.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-in\\values-in.xml", "from": { "startLines": "2", "startColumns": "4", @@ -5961,19 +2955,18 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2892", + "startOffsets": "2887", "endColumns": "100", - "endOffsets": "2988" + "endOffsets": "2983" } } ] }, { - "outputFile": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\values-v22_values-v22.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-8:/values-v22_values-v22.arsc.flat", "map": [ { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-v22\\values-v22.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,9", "startColumns": "4,4,4,4", @@ -5992,13 +2985,12 @@ } } ] -<<<<<<< HEAD }, { "outputFile": "net.micode.notes.app-merged_res-8:/values-zh-rTW_values-zh-rTW.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-zh-rTW\\values-zh-rTW.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-zh-rTW\\values-zh-rTW.xml", "from": { "startLines": "2", "startColumns": "4", @@ -6014,6 +3006,23 @@ "endOffsets": "8108" } }, + { + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,121", + "startColumns": "4,4,4,4,4,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,7815", + "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,7888" + } + }, { "source": "D:\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { @@ -6033,23 +3042,6 @@ "endOffsets": "210" } }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,121", - "startColumns": "4,4,4,4,4,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,7815", - "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,7888" - } - }, { "source": "D:\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "from": { @@ -6075,7 +3067,7 @@ "outputFile": "net.micode.notes.app-merged_res-8:/values-v24_values-v24.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-v24\\values-v24.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-v24\\values-v24.xml", "from": { "startLines": "2,3", "startColumns": "4,4", @@ -6090,7 +3082,7 @@ "outputFile": "net.micode.notes.app-merged_res-8:/values-ar_values-ar.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-ar\\values-ar.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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", @@ -6100,7 +3092,7 @@ } }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-ar\\values-ar.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-ar\\values-ar.xml", "from": { "startLines": "2", "startColumns": "4", @@ -6122,7 +3114,7 @@ "outputFile": "net.micode.notes.app-merged_res-8:/values-uz_values-uz.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-uz\\values-uz.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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", @@ -6132,7 +3124,7 @@ } }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-uz\\values-uz.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-uz\\values-uz.xml", "from": { "startLines": "2", "startColumns": "4", @@ -6154,17 +3146,7 @@ "outputFile": "net.micode.notes.app-merged_res-8:/values-es_values-es.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,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" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-es\\values-es.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-es\\values-es.xml", "from": { "startLines": "2", "startColumns": "4", @@ -6179,6 +3161,16 @@ "endColumns": "100", "endOffsets": "3020" } + }, + { + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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" + } } ] }, @@ -6186,17 +3178,7 @@ "outputFile": "net.micode.notes.app-merged_res-8:/values-sl_values-sl.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,212,319,427,514,617,736,821,905,997,1091,1187,1281,1377,1471,1567,1667,1759,1851,1935,2043,2152,2252,2365,2472,2576,2756,2853", - "endColumns": "106,106,107,86,102,118,84,83,91,93,95,93,95,93,95,99,91,91,83,107,108,99,112,106,103,179,96,82", - "endOffsets": "207,314,422,509,612,731,816,900,992,1086,1182,1276,1372,1466,1562,1662,1754,1846,1930,2038,2147,2247,2360,2467,2571,2751,2848,2931" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-sl\\values-sl.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-sl\\values-sl.xml", "from": { "startLines": "2", "startColumns": "4", @@ -6211,6 +3193,16 @@ "endColumns": "100", "endOffsets": "3032" } + }, + { + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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,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" + } } ] }, @@ -6218,7 +3210,7 @@ "outputFile": "net.micode.notes.app-merged_res-8:/values-it_values-it.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-it\\values-it.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-it\\values-it.xml", "from": { "startLines": "2", "startColumns": "4", @@ -6235,7 +3227,7 @@ } }, { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-it\\values-it.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-it\\values-it.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -6250,7 +3242,17 @@ "outputFile": "net.micode.notes.app-merged_res-8:/values-ky_values-ky.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-ky\\values-ky.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-ky\\values-ky.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "105,209,304,423,507,614,731,809,888,979,1072,1168,1262,1363,1456,1551,1646,1737,1828,1909,2019,2126,2224,2330,2437,2538,2699,2802", + "endColumns": "103,94,118,83,106,116,77,78,90,92,95,93,100,92,94,94,90,90,80,109,106,97,105,106,100,160,102,80", + "endOffsets": "204,299,418,502,609,726,804,883,974,1067,1163,1257,1358,1451,1546,1641,1732,1823,1904,2014,2121,2219,2325,2432,2533,2694,2797,2878" + } + }, + { + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-ky\\values-ky.xml", "from": { "startLines": "2", "startColumns": "4", @@ -6265,16 +3267,6 @@ "endColumns": "100", "endOffsets": "2979" } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-ky\\values-ky.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,209,304,423,507,614,731,809,888,979,1072,1168,1262,1363,1456,1551,1646,1737,1828,1909,2019,2126,2224,2330,2437,2538,2699,2802", - "endColumns": "103,94,118,83,106,116,77,78,90,92,95,93,100,92,94,94,90,90,80,109,106,97,105,106,100,160,102,80", - "endOffsets": "204,299,418,502,609,726,804,883,974,1067,1163,1257,1358,1451,1546,1641,1732,1823,1904,2014,2121,2219,2325,2432,2533,2694,2797,2878" - } } ] }, @@ -6282,7 +3274,17 @@ "outputFile": "net.micode.notes.app-merged_res-8:/values-mk_values-mk.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-mk\\values-mk.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-mk\\values-mk.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "105,213,317,425,511,616,735,818,900,997,1096,1193,1293,1400,1499,1600,1696,1793,1884,1971,2077,2184,2285,2392,2503,2607,2763,2861", + "endColumns": "107,103,107,85,104,118,82,81,96,98,96,99,106,98,100,95,96,90,86,105,106,100,106,110,103,155,97,83", + "endOffsets": "208,312,420,506,611,730,813,895,992,1091,1188,1288,1395,1494,1595,1691,1788,1879,1966,2072,2179,2280,2387,2498,2602,2758,2856,2940" + } + }, + { + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-mk\\values-mk.xml", "from": { "startLines": "2", "startColumns": "4", @@ -6297,16 +3299,6 @@ "endColumns": "100", "endOffsets": "3041" } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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" - } } ] }, @@ -6314,17 +3306,7 @@ "outputFile": "net.micode.notes.app-merged_res-8:/values-my_values-my.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-my\\values-my.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-my\\values-my.xml", "from": { "startLines": "2", "startColumns": "4", @@ -6339,6 +3321,16 @@ "endColumns": "100", "endOffsets": "3075" } + }, + { + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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" + } } ] }, @@ -6346,7 +3338,17 @@ "outputFile": "net.micode.notes.app-merged_res-8:/values-ko_values-ko.arsc.flat", "map": [ { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-ko\\values-ko.xml", + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-ko\\values-ko.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "105,200,294,396,478,576,682,761,837,928,1021,1113,1204,1305,1398,1493,1587,1678,1769,1849,1947,2042,2137,2237,2333,2432,2584,2678", + "endColumns": "94,93,101,81,97,105,78,75,90,92,91,90,100,92,94,93,90,90,79,97,94,94,99,95,98,151,93,77", + "endOffsets": "195,289,391,473,571,677,756,832,923,1016,1108,1199,1300,1393,1488,1582,1673,1764,1844,1942,2037,2132,2232,2328,2427,2579,2673,2751" + } + }, + { + "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-ko\\values-ko.xml", "from": { "startLines": "2", "startColumns": "4", @@ -6361,20 +3363,8 @@ "endColumns": "100", "endOffsets": "2852" } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,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" - } } ] -======= ->>>>>>> xiaojinchi_branch } ] } \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json index 6823c50..37b9773 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json @@ -4,21 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-af/values-af.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,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\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-af\\values-af.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-af\\values-af.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,8 +19,6 @@ "endColumns": "100", "endOffsets": "2952" } -<<<<<<< HEAD -======= }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-af\\values-af.xml", @@ -45,7 +29,6 @@ "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" } ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json index 795c6b9..3d86ffc 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json @@ -4,9 +4,6 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-am/values-am.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-am\\values-am.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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", @@ -18,7 +15,6 @@ }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-am\\values-am.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,19 +29,6 @@ "endColumns": "100", "endOffsets": "2913" } -<<<<<<< HEAD - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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" - } -======= ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json index ad2a7bd..0ec9b0a 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-ar/values-ar.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-ar\\values-ar.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-ar\\values-ar.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -18,11 +14,7 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-ar\\values-ar.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-ar\\values-ar.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json index 61e9fca..b15aa63 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-as/values-as.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-as\\values-as.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-as\\values-as.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -18,11 +14,7 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-as\\values-as.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-as\\values-as.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json index cff186d..d2acd71 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json @@ -4,9 +4,6 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-az/values-az.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-az\\values-az.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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", @@ -18,7 +15,6 @@ }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-az\\values-az.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,19 +29,6 @@ "endColumns": "100", "endOffsets": "2999" } -<<<<<<< HEAD - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,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" - } -======= ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+sr+Latn.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+sr+Latn.json index 524c272..f770707 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+sr+Latn.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+sr+Latn.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-b+sr+Latn/values-b+sr+Latn.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -18,11 +14,7 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json index bab6183..de528e0 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json @@ -4,9 +4,6 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-be/values-be.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-be\\values-be.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-be\\values-be.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", @@ -18,7 +15,6 @@ }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-be\\values-be.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,19 +29,6 @@ "endColumns": "100", "endOffsets": "3011" } -<<<<<<< HEAD - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-be\\values-be.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,225,328,444,530,638,756,835,913,1005,1099,1195,1289,1385,1479,1575,1670,1762,1854,1937,2043,2149,2247,2355,2460,2565,2734,2834", - "endColumns": "119,102,115,85,107,117,78,77,91,93,95,93,95,93,95,94,91,91,82,105,105,97,107,104,104,168,99,80", - "endOffsets": "220,323,439,525,633,751,830,908,1000,1094,1190,1284,1380,1474,1570,1665,1757,1849,1932,2038,2144,2242,2350,2455,2560,2729,2829,2910" - } -======= ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json index 1582942..69b1a90 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-bg/values-bg.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-bg\\values-bg.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-bg\\values-bg.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -18,11 +14,7 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-bg\\values-bg.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-bg\\values-bg.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json index 67dda08..b09b3eb 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-bn/values-bn.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-bn\\values-bn.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-bn\\values-bn.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -18,11 +14,7 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-bn\\values-bn.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-bn\\values-bn.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json index 0462086..84665f7 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json @@ -4,9 +4,6 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-bs/values-bs.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-bs\\values-bs.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-bs\\values-bs.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", @@ -18,7 +15,6 @@ }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-bs\\values-bs.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,19 +29,6 @@ "endColumns": "100", "endOffsets": "3022" } -<<<<<<< HEAD - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-bs\\values-bs.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "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" - } -======= ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json index bd67b82..225580c 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-ca/values-ca.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-ca\\values-ca.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-ca\\values-ca.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -18,11 +14,7 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-ca\\values-ca.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-ca\\values-ca.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json index 595d51a..7a0f5b9 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json @@ -4,9 +4,6 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-cs/values-cs.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-cs\\values-cs.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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", @@ -18,7 +15,6 @@ }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-cs\\values-cs.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,19 +29,6 @@ "endColumns": "100", "endOffsets": "2987" } -<<<<<<< HEAD - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,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" - } -======= ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json index 897c7fa..b62f114 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json @@ -4,9 +4,6 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-da/values-da.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-da\\values-da.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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", @@ -18,7 +15,6 @@ }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-da\\values-da.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,19 +29,6 @@ "endColumns": "100", "endOffsets": "2940" } -<<<<<<< HEAD - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,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" - } -======= ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json index aeeb9bc..b7776a4 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json @@ -4,21 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-de/values-de.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,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" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-de\\values-de.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-de\\values-de.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,8 +19,6 @@ "endColumns": "100", "endOffsets": "3021" } -<<<<<<< HEAD -======= }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-de\\values-de.xml", @@ -45,7 +29,6 @@ "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" } ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json index 625853b..66301d8 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json @@ -4,9 +4,6 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-el/values-el.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-el\\values-el.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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", @@ -18,7 +15,6 @@ }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-el\\values-el.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,19 +29,6 @@ "endColumns": "100", "endOffsets": "3060" } -<<<<<<< HEAD - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,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" - } -======= ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rAU.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rAU.json index 5133bdf..5b031f9 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rAU.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rAU.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-en-rAU/values-en-rAU.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rAU\\values-en-rAU.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-en-rAU\\values-en-rAU.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -18,11 +14,7 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-en-rAU\\values-en-rAU.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-en-rAU\\values-en-rAU.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rCA.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rCA.json index d0d65f9..f4fda7e 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rCA.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rCA.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-en-rCA/values-en-rCA.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-en-rCA\\values-en-rCA.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-en-rCA\\values-en-rCA.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -25,11 +21,7 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-en-rCA\\values-en-rCA.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-en-rCA\\values-en-rCA.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rGB.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rGB.json index 634b917..fb11b98 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rGB.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rGB.json @@ -4,9 +4,6 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-en-rGB/values-en-rGB.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-en-rGB\\values-en-rGB.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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", @@ -18,7 +15,6 @@ }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-en-rGB\\values-en-rGB.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,19 +29,6 @@ "endColumns": "100", "endOffsets": "2942" } -<<<<<<< HEAD - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,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" - } -======= ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rIN.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rIN.json index fa861c4..79550d8 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rIN.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rIN.json @@ -4,21 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-en-rIN/values-en-rIN.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,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\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-en-rIN\\values-en-rIN.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-en-rIN\\values-en-rIN.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,8 +19,6 @@ "endColumns": "100", "endOffsets": "2942" } -<<<<<<< HEAD -======= }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-en-rIN\\values-en-rIN.xml", @@ -45,7 +29,6 @@ "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" } ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rXC.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rXC.json index de28d5f..8faa4d7 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rXC.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rXC.json @@ -4,21 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-en-rXC/values-en-rXC.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,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\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-en-rXC\\values-en-rXC.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-en-rXC\\values-en-rXC.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,8 +19,6 @@ "endColumns": "202", "endOffsets": "5880" } -<<<<<<< HEAD -======= }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-en-rXC\\values-en-rXC.xml", @@ -45,7 +29,6 @@ "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" } ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es-rUS.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es-rUS.json index b910017..f95cf3e 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es-rUS.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es-rUS.json @@ -4,9 +4,6 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-es-rUS/values-es-rUS.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-es-rUS\\values-es-rUS.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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", @@ -18,7 +15,6 @@ }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-es-rUS\\values-es-rUS.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,19 +29,6 @@ "endColumns": "100", "endOffsets": "3016" } -<<<<<<< HEAD - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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" - } -======= ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json index 16edf1b..d7ba3cc 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json @@ -4,21 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-es/values-es.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,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" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-es\\values-es.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-es\\values-es.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,8 +19,6 @@ "endColumns": "100", "endOffsets": "3020" } -<<<<<<< HEAD -======= }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-es\\values-es.xml", @@ -45,7 +29,6 @@ "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" } ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json index ec001c3..5a56f3b 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-et/values-et.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-et\\values-et.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-et\\values-et.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -18,11 +14,7 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-et\\values-et.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-et\\values-et.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json index 2605670..e0eaa14 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json @@ -4,9 +4,6 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-eu/values-eu.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-eu\\values-eu.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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", @@ -18,7 +15,6 @@ }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-eu\\values-eu.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,19 +29,6 @@ "endColumns": "100", "endOffsets": "3034" } -<<<<<<< HEAD - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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" - } -======= ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json index fb2c7a9..fe5e9e7 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-fa/values-fa.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-fa\\values-fa.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-fa\\values-fa.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -25,11 +21,7 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-fa\\values-fa.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-fa\\values-fa.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json index 1b1fa32..a2e8b35 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-fi/values-fi.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-fi\\values-fi.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-fi\\values-fi.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -18,11 +14,7 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-fi\\values-fi.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-fi\\values-fi.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr-rCA.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr-rCA.json index 93ffc8a..d3dd6f5 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr-rCA.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr-rCA.json @@ -4,21 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-fr-rCA/values-fr-rCA.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,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\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-fr-rCA\\values-fr-rCA.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-fr-rCA\\values-fr-rCA.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,8 +19,6 @@ "endColumns": "100", "endOffsets": "3061" } -<<<<<<< HEAD -======= }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-fr-rCA\\values-fr-rCA.xml", @@ -45,7 +29,6 @@ "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" } ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json index 0ef146a..40beadd 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json @@ -4,21 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-fr/values-fr.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,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\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-fr\\values-fr.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-fr\\values-fr.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,8 +19,6 @@ "endColumns": "100", "endOffsets": "3041" } -<<<<<<< HEAD -======= }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-fr\\values-fr.xml", @@ -45,7 +29,6 @@ "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" } ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json index e014181..e5a7db3 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-gl/values-gl.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-gl\\values-gl.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-gl\\values-gl.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -18,11 +14,7 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-gl\\values-gl.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-gl\\values-gl.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gu.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gu.json index 3f3f973..034eb89 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gu.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gu.json @@ -4,21 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-gu/values-gu.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-gu\\values-gu.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-gu\\values-gu.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,8 +19,6 @@ "endColumns": "100", "endOffsets": "2978" } -<<<<<<< HEAD -======= }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-gu\\values-gu.xml", @@ -45,7 +29,6 @@ "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" } ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h720dp-v13.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h720dp-v13.json index 1e4591d..46a1b07 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h720dp-v13.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h720dp-v13.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-h720dp-v13/values-h720dp-v13.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-h720dp-v13\\values-h720dp-v13.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-h720dp-v13\\values-h720dp-v13.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hdpi-v4.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hdpi-v4.json index 4c54108..8337ba4 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hdpi-v4.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hdpi-v4.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-hdpi-v4/values-hdpi-v4.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-hdpi-v4\\values-hdpi-v4.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-hdpi-v4\\values-hdpi-v4.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hi.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hi.json index f1b68ae..b0752fe 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hi.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hi.json @@ -4,9 +4,6 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-hi/values-hi.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-hi\\values-hi.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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", @@ -18,7 +15,6 @@ }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-hi\\values-hi.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,19 +29,6 @@ "endColumns": "100", "endOffsets": "2988" } -<<<<<<< HEAD - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,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" - } -======= ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hr.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hr.json index dc16c4e..31f6dc9 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hr.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hr.json @@ -4,9 +4,6 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-hr/values-hr.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-hr\\values-hr.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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", @@ -18,7 +15,6 @@ }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-hr\\values-hr.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,19 +29,6 @@ "endColumns": "100", "endOffsets": "3022" } -<<<<<<< HEAD - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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" - } -======= ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hu.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hu.json index 7ad2636..f37e744 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hu.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hu.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-hu/values-hu.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-hu\\values-hu.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-hu\\values-hu.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -18,11 +14,7 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-hu\\values-hu.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-hu\\values-hu.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hy.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hy.json index d625441..f7ce8e2 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hy.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hy.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-hy/values-hy.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-hy\\values-hy.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-hy\\values-hy.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -18,11 +14,7 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-hy\\values-hy.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-hy\\values-hy.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-in.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-in.json index d9f0334..80c5ccc 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-in.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-in.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-in/values-in.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-in\\values-in.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-in\\values-in.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -18,11 +14,7 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-in\\values-in.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-in\\values-in.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-is.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-is.json index 95dfd30..dd72530 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-is.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-is.json @@ -4,9 +4,6 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-is/values-is.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-is\\values-is.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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", @@ -18,7 +15,6 @@ }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-is\\values-is.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,19 +29,6 @@ "endColumns": "100", "endOffsets": "2961" } -<<<<<<< HEAD - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,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" - } -======= ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-it.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-it.json index 6341581..b880db5 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-it.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-it.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-it/values-it.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-it\\values-it.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-it\\values-it.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -25,11 +21,7 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-it\\values-it.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-it\\values-it.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-iw.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-iw.json index f2aed7a..b75d44c 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-iw.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-iw.json @@ -4,9 +4,6 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-iw/values-iw.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-iw\\values-iw.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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", @@ -18,7 +15,6 @@ }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-iw\\values-iw.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,19 +29,6 @@ "endColumns": "100", "endOffsets": "2928" } -<<<<<<< HEAD - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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" - } -======= ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json index c77c789..900e741 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-ja/values-ja.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-ja\\values-ja.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-ja\\values-ja.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -18,11 +14,7 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-ja\\values-ja.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-ja\\values-ja.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ka.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ka.json index 008dd74..6f284c0 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ka.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ka.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-ka/values-ka.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-ka\\values-ka.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-ka\\values-ka.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -18,11 +14,7 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-ka\\values-ka.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-ka\\values-ka.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kk.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kk.json index 3a597c2..a829825 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kk.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kk.json @@ -4,9 +4,6 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-kk/values-kk.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-kk\\values-kk.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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", @@ -18,7 +15,6 @@ }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-kk\\values-kk.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,19 +29,6 @@ "endColumns": "100", "endOffsets": "2989" } -<<<<<<< HEAD - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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" - } -======= ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-km.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-km.json index 2f44556..dd2975a 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-km.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-km.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-km/values-km.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-km\\values-km.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-km\\values-km.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -18,11 +14,7 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-km\\values-km.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-km\\values-km.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kn.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kn.json index d75544f..3b8c1cb 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kn.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kn.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-kn/values-kn.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-kn\\values-kn.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-kn\\values-kn.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -18,11 +14,7 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-kn\\values-kn.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-kn\\values-kn.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ko.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ko.json index 2c6f40f..d97b71f 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ko.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ko.json @@ -4,9 +4,6 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-ko/values-ko.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-ko\\values-ko.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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", @@ -18,7 +15,6 @@ }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-ko\\values-ko.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,19 +29,6 @@ "endColumns": "100", "endOffsets": "2852" } -<<<<<<< HEAD - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,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" - } -======= ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ky.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ky.json index 80acf1f..6b943b7 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ky.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ky.json @@ -4,9 +4,6 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-ky/values-ky.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-ky\\values-ky.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-ky\\values-ky.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", @@ -18,7 +15,6 @@ }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-ky\\values-ky.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,19 +29,6 @@ "endColumns": "100", "endOffsets": "2979" } -<<<<<<< HEAD - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-ky\\values-ky.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,209,304,423,507,614,731,809,888,979,1072,1168,1262,1363,1456,1551,1646,1737,1828,1909,2019,2126,2224,2330,2437,2538,2699,2802", - "endColumns": "103,94,118,83,106,116,77,78,90,92,95,93,100,92,94,94,90,90,80,109,106,97,105,106,100,160,102,80", - "endOffsets": "204,299,418,502,609,726,804,883,974,1067,1163,1257,1358,1451,1546,1641,1732,1823,1904,2014,2121,2219,2325,2432,2533,2694,2797,2878" - } -======= ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-land.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-land.json index 1455be2..0509b57 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-land.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-land.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-land/values-land.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-land\\values-land.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-land\\values-land.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4", "startColumns": "4,4,4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-large-v4.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-large-v4.json index 8347b37..0457d38 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-large-v4.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-large-v4.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-large-v4/values-large-v4.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-large-v4\\values-large-v4.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-large-v4\\values-large-v4.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8,9,10", "startColumns": "4,4,4,4,4,4,4,4,4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ldltr-v21.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ldltr-v21.json index 3efdb18..e36c5d1 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ldltr-v21.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ldltr-v21.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-ldltr-v21/values-ldltr-v21.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-ldltr-v21\\values-ldltr-v21.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-ldltr-v21\\values-ldltr-v21.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lo.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lo.json index d0dd28e..c01ad33 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lo.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lo.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-lo/values-lo.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-lo\\values-lo.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-lo\\values-lo.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -25,11 +21,7 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-lo\\values-lo.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-lo\\values-lo.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lt.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lt.json index 7166a77..c339681 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lt.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lt.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-lt/values-lt.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-lt\\values-lt.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-lt\\values-lt.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -18,11 +14,7 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-lt\\values-lt.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-lt\\values-lt.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lv.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lv.json index 3336f07..4057155 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lv.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lv.json @@ -4,21 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-lv/values-lv.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-lv\\values-lv.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-lv\\values-lv.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,8 +19,6 @@ "endColumns": "100", "endOffsets": "3172" } -<<<<<<< HEAD -======= }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-lv\\values-lv.xml", @@ -45,7 +29,6 @@ "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" } ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mk.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mk.json index ff05bfb..24635db 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mk.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mk.json @@ -4,9 +4,6 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-mk/values-mk.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-mk\\values-mk.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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", @@ -18,7 +15,6 @@ }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-mk\\values-mk.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,19 +29,6 @@ "endColumns": "100", "endOffsets": "3041" } -<<<<<<< HEAD - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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" - } -======= ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ml.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ml.json index 8cb2da8..af9c66d 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ml.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ml.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-ml/values-ml.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-ml\\values-ml.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-ml\\values-ml.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -18,11 +14,7 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-ml\\values-ml.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-ml\\values-ml.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mn.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mn.json index a8e0df1..4a06e1a 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mn.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mn.json @@ -4,9 +4,6 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-mn/values-mn.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-mn\\values-mn.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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", @@ -18,7 +15,6 @@ }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-mn\\values-mn.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,19 +29,6 @@ "endColumns": "100", "endOffsets": "2972" } -<<<<<<< HEAD - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,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" - } -======= ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mr.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mr.json index 60ec8f7..65cf290 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mr.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mr.json @@ -4,21 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-mr/values-mr.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-mr\\values-mr.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-mr\\values-mr.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,8 +19,6 @@ "endColumns": "100", "endOffsets": "2983" } -<<<<<<< HEAD -======= }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-mr\\values-mr.xml", @@ -45,7 +29,6 @@ "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" } ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ms.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ms.json index d3cd4ca..d49ca4a 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ms.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ms.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-ms/values-ms.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-ms\\values-ms.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-ms\\values-ms.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -18,11 +14,7 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-ms\\values-ms.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-ms\\values-ms.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-my.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-my.json index a4606ae..cd58421 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-my.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-my.json @@ -4,21 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-my/values-my.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-my\\values-my.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-my\\values-my.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,8 +19,6 @@ "endColumns": "100", "endOffsets": "3075" } -<<<<<<< HEAD -======= }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-my\\values-my.xml", @@ -45,7 +29,6 @@ "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" } ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nb.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nb.json index 7b75f07..8f337f4 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nb.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nb.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-nb/values-nb.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-nb\\values-nb.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-nb\\values-nb.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -18,11 +14,7 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-nb\\values-nb.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-nb\\values-nb.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ne.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ne.json index cd51c49..5db0d83 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ne.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ne.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-ne/values-ne.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-ne\\values-ne.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-ne\\values-ne.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -18,11 +14,7 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-ne\\values-ne.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-ne\\values-ne.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-night-v8.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-night-v8.json index dde6b04..ed10c53 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-night-v8.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-night-v8.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-night-v8/values-night-v8.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-night-v8\\values-night-v8.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-night-v8\\values-night-v8.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8", "startColumns": "4,4,4,4,4,4,4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nl.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nl.json index ba7229f..61faa3e 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nl.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nl.json @@ -4,9 +4,6 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-nl/values-nl.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-nl\\values-nl.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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", @@ -18,7 +15,6 @@ }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-nl\\values-nl.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,19 +29,6 @@ "endColumns": "100", "endOffsets": "3017" } -<<<<<<< HEAD - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,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" - } -======= ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-or.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-or.json index 14d81e6..f8e2019 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-or.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-or.json @@ -4,21 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-or/values-or.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,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\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-or\\values-or.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-or\\values-or.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,8 +19,6 @@ "endColumns": "100", "endOffsets": "3032" } -<<<<<<< HEAD -======= }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-or\\values-or.xml", @@ -45,7 +29,6 @@ "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" } ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pa.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pa.json index 43bf7cf..ee9de36 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pa.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pa.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-pa/values-pa.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-pa\\values-pa.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-pa\\values-pa.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -18,11 +14,7 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-pa\\values-pa.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-pa\\values-pa.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pl.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pl.json index ad3364a..1261ebd 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pl.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pl.json @@ -4,9 +4,6 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-pl/values-pl.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-pl\\values-pl.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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", @@ -18,7 +15,6 @@ }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-pl\\values-pl.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,19 +29,6 @@ "endColumns": "100", "endOffsets": "3005" } -<<<<<<< HEAD - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,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" - } -======= ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-port.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-port.json index e2ca997..fe7625d 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-port.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-port.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-port/values-port.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-port\\values-port.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-port\\values-port.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rBR.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rBR.json index de9aff3..23a84d0 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rBR.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rBR.json @@ -4,21 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-pt-rBR/values-pt-rBR.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-pt-rBR\\values-pt-rBR.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-pt-rBR\\values-pt-rBR.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,8 +19,6 @@ "endColumns": "100", "endOffsets": "3025" } -<<<<<<< HEAD -======= }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-pt-rBR\\values-pt-rBR.xml", @@ -45,7 +29,6 @@ "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" } ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rPT.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rPT.json index 8a49e0e..f3c9ab6 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rPT.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rPT.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-pt-rPT/values-pt-rPT.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-pt-rPT\\values-pt-rPT.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-pt-rPT\\values-pt-rPT.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -25,11 +21,7 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-pt-rPT\\values-pt-rPT.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-pt-rPT\\values-pt-rPT.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt.json index d3a2629..a2606b2 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt.json @@ -4,9 +4,6 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-pt/values-pt.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-pt\\values-pt.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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", @@ -18,7 +15,6 @@ }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-pt\\values-pt.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,19 +29,6 @@ "endColumns": "100", "endOffsets": "3025" } -<<<<<<< HEAD - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,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" - } -======= ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ro.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ro.json index a2146ab..6a8b703 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ro.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ro.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-ro/values-ro.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-ro\\values-ro.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-ro\\values-ro.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -25,11 +21,7 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-ro\\values-ro.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-ro\\values-ro.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ru.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ru.json index 839b291..884cc3f 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ru.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ru.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-ru/values-ru.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-ru\\values-ru.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-ru\\values-ru.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -18,11 +14,7 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-ru\\values-ru.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-ru\\values-ru.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-si.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-si.json index 0bf4ae7..6f16aac 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-si.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-si.json @@ -4,21 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-si/values-si.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,215,322,429,517,622,738,827,914,1005,1098,1193,1287,1388,1481,1576,1670,1761,1852,1936,2045,2150,2248,2358,2457,2563,2722,2821", - "endColumns": "109,106,106,87,104,115,88,86,90,92,94,93,100,92,94,93,90,90,83,108,104,97,109,98,105,158,98,81", - "endOffsets": "210,317,424,512,617,733,822,909,1000,1093,1188,1282,1383,1476,1571,1665,1756,1847,1931,2040,2145,2243,2353,2452,2558,2717,2816,2898" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-si\\values-si.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-si\\values-si.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,8 +19,6 @@ "endColumns": "100", "endOffsets": "2999" } -<<<<<<< HEAD -======= }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-si\\values-si.xml", @@ -45,7 +29,6 @@ "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" } ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sk.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sk.json index 0d3ea8c..bed5962 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sk.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sk.json @@ -4,9 +4,6 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-sk/values-sk.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-sk\\values-sk.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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", @@ -18,7 +15,6 @@ }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-sk\\values-sk.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,19 +29,6 @@ "endColumns": "100", "endOffsets": "3014" } -<<<<<<< HEAD - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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" - } -======= ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sl.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sl.json index 2be48ea..9c8b89f 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sl.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sl.json @@ -4,21 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-sl/values-sl.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,212,319,427,514,617,736,821,905,997,1091,1187,1281,1377,1471,1567,1667,1759,1851,1935,2043,2152,2252,2365,2472,2576,2756,2853", - "endColumns": "106,106,107,86,102,118,84,83,91,93,95,93,95,93,95,99,91,91,83,107,108,99,112,106,103,179,96,82", - "endOffsets": "207,314,422,509,612,731,816,900,992,1086,1182,1276,1372,1466,1562,1662,1754,1846,1930,2038,2147,2247,2360,2467,2571,2751,2848,2931" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-sl\\values-sl.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-sl\\values-sl.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,8 +19,6 @@ "endColumns": "100", "endOffsets": "3032" } -<<<<<<< HEAD -======= }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-sl\\values-sl.xml", @@ -45,7 +29,6 @@ "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" } ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sq.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sq.json index 375c146..97be95c 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sq.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sq.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-sq/values-sq.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-sq\\values-sq.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-sq\\values-sq.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -18,11 +14,7 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-sq\\values-sq.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-sq\\values-sq.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sr.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sr.json index 776c2f0..6de0d27 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sr.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sr.json @@ -4,9 +4,6 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-sr/values-sr.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-sr\\values-sr.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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", @@ -18,7 +15,6 @@ }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-sr\\values-sr.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,19 +29,6 @@ "endColumns": "100", "endOffsets": "3001" } -<<<<<<< HEAD - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,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" - } -======= ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sv.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sv.json index 32abf27..d25c92d 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sv.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sv.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-sv/values-sv.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-sv\\values-sv.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-sv\\values-sv.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -25,11 +21,7 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-sv\\values-sv.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-sv\\values-sv.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw.json index ccbce57..db6089b 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw.json @@ -4,21 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-sw/values-sw.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,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\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-sw\\values-sw.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-sw\\values-sw.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,8 +19,6 @@ "endColumns": "100", "endOffsets": "2979" } -<<<<<<< HEAD -======= }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-sw\\values-sw.xml", @@ -45,7 +29,6 @@ "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" } ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw600dp-v13.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw600dp-v13.json index 0cdff02..de87f00 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw600dp-v13.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw600dp-v13.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-sw600dp-v13/values-sw600dp-v13.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-sw600dp-v13\\values-sw600dp-v13.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-sw600dp-v13\\values-sw600dp-v13.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8,9", "startColumns": "4,4,4,4,4,4,4,4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ta.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ta.json index 418bc9f..a4a0757 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ta.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ta.json @@ -4,21 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-ta/values-ta.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-ta\\values-ta.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-ta\\values-ta.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,8 +19,6 @@ "endColumns": "100", "endOffsets": "3050" } -<<<<<<< HEAD -======= }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-ta\\values-ta.xml", @@ -45,7 +29,6 @@ "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" } ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-te.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-te.json index 0f722f2..33cfe92 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-te.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-te.json @@ -4,21 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-te/values-te.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,219,328,439,529,634,759,841,923,1014,1107,1203,1297,1398,1491,1586,1681,1772,1863,1947,2060,2168,2267,2378,2480,2597,2763,2864", - "endColumns": "113,108,110,89,104,124,81,81,90,92,95,93,100,92,94,94,90,90,83,112,107,98,110,101,116,165,100,81", - "endOffsets": "214,323,434,524,629,754,836,918,1009,1102,1198,1292,1393,1486,1581,1676,1767,1858,1942,2055,2163,2262,2373,2475,2592,2758,2859,2941" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-te\\values-te.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-te\\values-te.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,8 +19,6 @@ "endColumns": "100", "endOffsets": "3042" } -<<<<<<< HEAD -======= }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-te\\values-te.xml", @@ -45,7 +29,6 @@ "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" } ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-th.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-th.json index 1c9149f..75c4c31 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-th.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-th.json @@ -4,9 +4,6 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-th/values-th.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-th\\values-th.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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", @@ -18,7 +15,6 @@ }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-th\\values-th.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,19 +29,6 @@ "endColumns": "100", "endOffsets": "2941" } -<<<<<<< HEAD - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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" - } -======= ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tl.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tl.json index 9117d19..4dfd471 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tl.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tl.json @@ -4,21 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-tl/values-tl.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,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\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-tl\\values-tl.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-tl\\values-tl.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,8 +19,6 @@ "endColumns": "100", "endOffsets": "3045" } -<<<<<<< HEAD -======= }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-tl\\values-tl.xml", @@ -45,7 +29,6 @@ "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" } ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr.json index 559b1f5..0afc069 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr.json @@ -4,9 +4,6 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-tr/values-tr.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-tr\\values-tr.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-tr\\values-tr.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", @@ -18,7 +15,6 @@ }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-tr\\values-tr.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,19 +29,6 @@ "endColumns": "100", "endOffsets": "2961" } -<<<<<<< HEAD - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-tr\\values-tr.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,210,309,421,506,612,732,811,887,978,1071,1164,1258,1356,1449,1551,1646,1737,1828,1907,2014,2119,2215,2322,2424,2532,2688,2786", - "endColumns": "104,98,111,84,105,119,78,75,90,92,92,93,97,92,101,94,90,90,78,106,104,95,106,101,107,155,97,78", - "endOffsets": "205,304,416,501,607,727,806,882,973,1066,1159,1253,1351,1444,1546,1641,1732,1823,1902,2009,2114,2210,2317,2419,2527,2683,2781,2860" - } -======= ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uk.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uk.json index e67d9e0..070167e 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uk.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uk.json @@ -4,9 +4,6 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-uk/values-uk.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-uk\\values-uk.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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", @@ -18,7 +15,6 @@ }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-uk\\values-uk.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,19 +29,6 @@ "endColumns": "100", "endOffsets": "2996" } -<<<<<<< HEAD - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,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" - } -======= ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ur.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ur.json index dc1601e..52f942b 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ur.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ur.json @@ -4,21 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-ur/values-ur.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,215,321,430,516,620,740,816,892,984,1078,1174,1268,1370,1464,1560,1654,1746,1838,1923,2031,2140,2242,2353,2453,2561,2726,2824", - "endColumns": "109,105,108,85,103,119,75,75,91,93,95,93,101,93,95,93,91,91,84,107,108,101,110,99,107,164,97,79", - "endOffsets": "210,316,425,511,615,735,811,887,979,1073,1169,1263,1365,1459,1555,1649,1741,1833,1918,2026,2135,2237,2348,2448,2556,2721,2819,2899" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-ur\\values-ur.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-ur\\values-ur.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -33,8 +19,6 @@ "endColumns": "100", "endOffsets": "3000" } -<<<<<<< HEAD -======= }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-ur\\values-ur.xml", @@ -45,7 +29,6 @@ "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" } ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uz.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uz.json index 9a034d5..bf5a6b5 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uz.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uz.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-uz/values-uz.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-uz\\values-uz.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-uz\\values-uz.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -18,11 +14,7 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-uz\\values-uz.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-uz\\values-uz.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v16.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v16.json index 8c73c21..349381b 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v16.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v16.json @@ -4,9 +4,6 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-v16/values-v16.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-v16\\values-v16.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-v16\\values-v16.xml", "from": { "startLines": "2", @@ -18,7 +15,6 @@ }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-v16\\values-v16.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -35,19 +31,6 @@ "endColumns": "12", "endOffsets": "289" } -<<<<<<< HEAD - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-v16\\values-v16.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "65", - "endOffsets": "116" - } -======= ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v17.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v17.json index b63e183..78ab7e7 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v17.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v17.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-v17/values-v17.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-v17\\values-v17.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-v17\\values-v17.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,5,9,12,15,18,22,25,29,33,37,40,43,46,50,53,57", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v18.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v18.json index 370618a..28c837b 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v18.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v18.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-v18/values-v18.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-v18\\values-v18.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-v18\\values-v18.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v21.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v21.json index 32d76c7..232f3cb 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v21.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v21.json @@ -4,30 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-v21/values-v21.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,8697,8882,11746,11943,12142,12265,12388,12501,12684,12815,13016,13105,13216,13449,13550,13645,13768,13897,14014,14191,14290,14425,14568,14703,14822,15023,15142,15235,15346,15402,15509,15704,15815,15948,16043,16134,16225,16342,16481,16552,16635,17258,17315,17373,17997", - "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,8692,8877,11741,11938,12137,12260,12383,12496,12679,12810,13011,13100,13211,13444,13545,13640,13763,13892,14009,14186,14285,14420,14563,14698,14817,15018,15137,15230,15341,15397,15504,15699,15810,15943,16038,16129,16220,16337,16476,16547,16630,17253,17310,17368,17992,18628" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-v21\\values-v21.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-v21\\values-v21.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8,9,10,13", "startColumns": "4,4,4,4,4,4,4,4,4,4", @@ -44,8 +21,6 @@ "endColumns": "103,63,66,63,115,125,125,127,12,12", "endOffsets": "154,218,285,349,18744,18870,18996,19124,19296,19634" } -<<<<<<< HEAD -======= }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-v21\\values-v21.xml", @@ -65,7 +40,6 @@ "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,8692,8877,11741,11938,12137,12260,12383,12496,12679,12810,13011,13100,13211,13444,13545,13640,13763,13892,14009,14186,14285,14420,14563,14698,14817,15018,15137,15230,15341,15397,15504,15699,15810,15943,16038,16129,16220,16337,16476,16547,16630,17253,17310,17368,17992,18628" } ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v22.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v22.json index 42e895f..0af81e2 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v22.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v22.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-v22/values-v22.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-v22\\values-v22.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-v22\\values-v22.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,9", "startColumns": "4,4,4,4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v23.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v23.json index b9c14ab..36fdb39 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v23.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v23.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-v23/values-v23.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-v23\\values-v23.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-v23\\values-v23.xml", ->>>>>>> xiaojinchi_branch "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", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v24.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v24.json index 2010d1a..35654a7 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v24.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v24.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-v24/values-v24.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-v24\\values-v24.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-v24\\values-v24.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3", "startColumns": "4,4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v25.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v25.json index 04aebd8..dfc54fb 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v25.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v25.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-v25/values-v25.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-v25\\values-v25.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-v25\\values-v25.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,6", "startColumns": "4,4,4,4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v26.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v26.json index 3af671f..6644e19 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v26.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v26.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-v26/values-v26.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-v26\\values-v26.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-v26\\values-v26.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,8,12,16", "startColumns": "4,4,4,4,4,4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v28.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v28.json index 47d583c..e74b930 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v28.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v28.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-v28/values-v28.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-v28\\values-v28.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-v28\\values-v28.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,8", "startColumns": "4,4,4,4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-vi.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-vi.json index f839f61..333ded7 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-vi.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-vi.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-vi/values-vi.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-vi\\values-vi.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-vi\\values-vi.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -18,11 +14,7 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-vi\\values-vi.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-vi\\values-vi.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v20.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v20.json index 15fa9c7..5f3fa8d 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v20.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v20.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-watch-v20/values-watch-v20.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-watch-v20\\values-watch-v20.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-watch-v20\\values-watch-v20.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,5,8", "startColumns": "4,4,4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v21.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v21.json index 666a49b..3445e14 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v21.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v21.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-watch-v21/values-watch-v21.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-watch-v21\\values-watch-v21.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-watch-v21\\values-watch-v21.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,6,10", "startColumns": "4,4,4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-xlarge-v4.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-xlarge-v4.json index 8e21e50..5135139 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-xlarge-v4.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-xlarge-v4.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-xlarge-v4/values-xlarge-v4.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-xlarge-v4\\values-xlarge-v4.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-xlarge-v4\\values-xlarge-v4.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7", "startColumns": "4,4,4,4,4,4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json index cf92e37..c26686d 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json @@ -23,43 +23,6 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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", - "startColumns": "4,4,4,4,4,4,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,121", - "startColumns": "4,4,4,4,4,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,7808", - "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,7881" - } - }, - { - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "124", - "startColumns": "4", - "startOffsets": "8005", - "endColumns": "100", - "endOffsets": "8101" - } - }, - { -======= ->>>>>>> xiaojinchi_branch "source": "D:\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", "from": { "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", @@ -77,8 +40,6 @@ "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,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,6109,6158,6205,6252,6299,6344,6395,6448,6523,6582,6639,6713,6777,6846,6924,7034,7138,7211,7277,7332,7397,7462,7511,7594,7672,7710,7755,7803,7943,8000,8156,8215,8282,8340,8402,8450,8495,8543,8594,8660,8726" } -<<<<<<< HEAD -======= }, { "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-zh-rCN\\values-zh-rCN.xml", @@ -113,7 +74,6 @@ "endColumns": "100", "endOffsets": "8101" } ->>>>>>> xiaojinchi_branch } ] } diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rHK.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rHK.json index 183bb77..1db4f80 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rHK.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rHK.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-zh-rHK/values-zh-rHK.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-zh-rHK\\values-zh-rHK.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-zh-rHK\\values-zh-rHK.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -18,11 +14,7 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-zh-rHK\\values-zh-rHK.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-zh-rHK\\values-zh-rHK.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json index 6282569..4be8898 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-zh-rTW/values-zh-rTW.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-zh-rTW\\values-zh-rTW.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-zh-rTW\\values-zh-rTW.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", @@ -25,8 +21,6 @@ } }, { -<<<<<<< HEAD -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\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", @@ -44,7 +38,6 @@ } }, { ->>>>>>> xiaojinchi_branch "source": "D:\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", @@ -64,26 +57,6 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\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,121", - "startColumns": "4,4,4,4,4,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,7815", - "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,7888" - } - }, - { -======= ->>>>>>> xiaojinchi_branch "source": "D:\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "from": { "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zu.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zu.json index 6ca4413..0fc9cbd 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zu.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zu.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values-zu/values-zu.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-28.0.0\\res\\values-zu\\values-zu.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values-zu\\values-zu.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -18,11 +14,7 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\transformed\\support-compat-28.0.0\\res\\values-zu\\values-zu.xml", -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\6953185b4efad95e57bf8cc13b145959\\transformed\\core-1.0.1\\res\\values-zu\\values-zu.xml", ->>>>>>> xiaojinchi_branch "from": { "startLines": "2", "startColumns": "4", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json index e0ed2ac..92ad54f 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -4,28 +4,6 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-6:/values/values.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\fa718d1bfa54ce85ab7d4c953f045f5d\\transformed\\coordinatorlayout-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" - }, - "to": { - "startLines": "12,1878,2501,2507", - "startColumns": "4,4,4,4", - "startOffsets": "420,124714,145114,145325", - "endLines": "12,1880,2506,2590", - "endColumns": "60,12,24,24", - "endOffsets": "476,124854,145320,149836" - } - }, - { -======= ->>>>>>> xiaojinchi_branch "source": "D:\\Notes-master3\\app\\src\\main\\res\\values\\colors.xml", "from": { "startLines": "18", @@ -60,8 +38,6 @@ } }, { -<<<<<<< HEAD -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4153cc3e152567bf9af1bb2e27f956d0\\transformed\\appcompat-1.0.2\\res\\values\\values.xml", "from": { "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,1303,1304,1305,1306,1307,1308,1309,1310,1311,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325,1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,1360,1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1390,1391,1392,1393,1394,1395,1396,1397,1398,1399,1400,1401,1402,1403,1404,1405,1406,1407,1408,1409,1410,1411,1412,1413,1414,1415,1416,1417,1418,1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1453,1461,1462,1466,1470,1474,1479,1485,1492,1496,1500,1505,1509,1513,1517,1521,1525,1529,1535,1539,1545,1549,1555,1559,1564,1568,1571,1575,1581,1585,1591,1595,1601,1604,1608,1612,1616,1620,1624,1625,1626,1627,1630,1633,1636,1639,1643,1644,1645,1646,1647,1650,1652,1654,1656,1661,1662,1666,1672,1676,1677,1679,1690,1691,1695,1701,1705,1706,1707,1711,1738,1742,1743,1747,1775,1943,1969,2138,2164,2195,2203,2209,2223,2245,2250,2255,2265,2274,2283,2287,2294,2302,2309,2310,2319,2322,2325,2329,2333,2337,2340,2341,2345,2349,2359,2364,2371,2377,2378,2381,2385,2390,2392,2394,2397,2400,2402,2406,2409,2416,2419,2422,2426,2428,2432,2434,2436,2438,2442,2450,2458,2470,2476,2485,2488,2499,2502,2507,2508,2513,2571,2630,2631,2641,2650,2651,2653,2657,2660,2663,2666,2669,2672,2675,2678,2682,2685,2688,2691,2695,2698,2702,2706,2707,2708,2709,2710,2711,2712,2713,2714,2715,2716,2717,2718,2719,2720,2721,2722,2723,2724,2725,2726,2728,2730,2731,2732,2733,2734,2735,2736,2737,2739,2740,2742,2743,2745,2747,2748,2750,2751,2752,2753,2754,2755,2757,2758,2759,2760,2761,2762,2764,2766,2768,2769,2770,2771,2772,2773,2774,2775,2776,2777,2778,2779,2780,2782,2783,2784,2785,2786,2787,2789,2793,2797,2798,2799,2800,2801,2802,2803,2804,2806,2808,2810,2812,2814,2815,2816,2817,2819,2821,2823,2824,2825,2826,2827,2828,2829,2830,2831,2832,2833,2834,2837,2838,2839,2840,2842,2844,2845,2847,2848,2850,2852,2854,2855,2856,2857,2858,2859,2860,2861,2862,2863,2864,2865,2867,2868,2869,2870,2872,2873,2874,2875,2876,2878,2880,2882,2884,2885,2886,2887,2888,2889,2890,2891,2892,2893,2894,2895,2896,2897,69,152,155,158,161,175,186,196,223,230,241,271,298,307,344,725,730,756,774,810,816,822,845,986,1006,1012,1016,1022,1059,1071,1098,1103,1169,1184,1249,1268,1294", @@ -100,7 +76,6 @@ } }, { ->>>>>>> xiaojinchi_branch "source": "D:\\Notes-master3\\app\\src\\main\\res\\values\\arrays.xml", "from": { "startLines": "19,26", @@ -139,28 +114,6 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\4fdced20544efc90da6c74d19436ed4c\\transformed\\appcompat-v7-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,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,1303,1304,1305,1306,1307,1308,1309,1310,1311,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325,1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,1360,1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1390,1391,1392,1393,1394,1395,1396,1397,1398,1399,1400,1401,1402,1403,1404,1405,1406,1407,1408,1409,1410,1411,1412,1413,1414,1415,1416,1417,1418,1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1453,1461,1462,1466,1470,1474,1479,1485,1492,1496,1500,1505,1509,1513,1517,1521,1525,1529,1535,1539,1545,1549,1555,1559,1564,1568,1571,1575,1581,1585,1591,1595,1601,1604,1608,1612,1616,1620,1624,1625,1626,1627,1630,1633,1636,1639,1643,1644,1645,1646,1647,1650,1652,1654,1656,1661,1662,1666,1672,1676,1677,1679,1690,1691,1695,1701,1705,1706,1707,1711,1738,1742,1743,1747,1775,1943,1969,2138,2164,2195,2203,2209,2223,2245,2250,2255,2265,2274,2283,2287,2294,2302,2309,2310,2319,2322,2325,2329,2333,2337,2340,2341,2345,2349,2359,2364,2371,2377,2378,2381,2385,2390,2392,2394,2397,2400,2402,2406,2409,2416,2419,2422,2426,2428,2432,2434,2436,2438,2442,2450,2458,2470,2476,2485,2488,2499,2502,2507,2508,2513,2571,2630,2631,2641,2650,2651,2653,2657,2660,2663,2666,2669,2672,2675,2678,2682,2685,2688,2691,2695,2698,2702,2706,2707,2708,2709,2710,2711,2712,2713,2714,2715,2716,2717,2718,2719,2720,2721,2722,2723,2724,2725,2726,2728,2730,2731,2732,2733,2734,2735,2736,2737,2739,2740,2742,2743,2745,2747,2748,2750,2751,2752,2753,2754,2755,2757,2758,2759,2760,2761,2762,2764,2766,2768,2769,2770,2771,2772,2773,2774,2775,2776,2777,2778,2779,2780,2782,2783,2784,2785,2786,2787,2789,2793,2797,2798,2799,2800,2801,2802,2803,2804,2806,2808,2810,2812,2814,2815,2816,2817,2819,2821,2823,2824,2825,2826,2827,2828,2829,2830,2831,2832,2833,2834,2837,2838,2839,2840,2842,2844,2845,2847,2848,2850,2852,2854,2855,2856,2857,2858,2859,2860,2861,2862,2863,2864,2865,2867,2868,2869,2870,2872,2873,2874,2875,2876,2878,2880,2882,2884,2885,2886,2887,2888,2889,2890,2891,2892,2893,2894,2895,2896,2897,69,152,155,158,161,175,186,196,223,230,241,271,298,307,344,725,730,756,774,810,816,822,845,986,1006,1012,1016,1022,1059,1071,1098,1103,1169,1184,1249,1268,1294", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,160,205,254,295,350,409,471,552,613,688,764,841,919,1004,1086,1162,1238,1315,1393,1499,1605,1684,1764,1821,1879,1953,2028,2093,2159,2219,2280,2352,2425,2492,2560,2619,2678,2737,2796,2855,2909,2963,3016,3070,3124,3178,3232,3306,3385,3458,3532,3603,3675,3747,3820,3877,3935,4008,4082,4156,4231,4303,4376,4446,4517,4577,70911,70980,71049,71119,71193,71269,71333,71410,71486,71563,71628,71697,71774,71849,71918,71986,72063,72129,72190,72287,72352,72421,72520,72591,72650,72708,72765,72824,72888,72959,73031,73103,73175,73247,73314,73382,73450,73509,73572,73636,73726,73817,73877,73943,74010,74076,74146,74210,74263,74376,74434,74497,74562,74627,74702,74775,74847,74896,74957,75018,75079,75141,75205,75269,75333,75398,75461,75521,75582,75648,75707,75767,75829,75900,75960,76028,76114,76201,76291,76378,76466,76548,76631,76721,76812,76864,76922,76967,77033,77097,77154,77211,77265,77322,77370,77419,77470,77504,77551,77600,77646,77678,77742,77804,77864,77921,77995,78065,78143,78197,78267,78352,78400,78446,78517,78595,78673,78745,78819,78893,78967,79047,79120,79189,79261,79338,79399,79462,79528,79592,79663,79726,79791,79855,79916,79977,80029,80102,80176,80245,80320,80394,80468,80609,80679,80732,80810,80900,80988,81084,81174,81756,81845,82092,82373,82625,82910,83303,83780,84002,84224,84500,84727,84957,85187,85417,85647,85874,86293,86519,86944,87174,87602,87821,88104,88312,88443,88670,89096,89321,89748,89969,90394,90514,90790,91091,91415,91706,92020,92157,92288,92393,92635,92802,93006,93214,93485,93597,93709,93814,93931,94145,94291,94431,94517,94865,94953,95199,95617,95866,95948,96046,96663,96763,97015,97439,97694,97788,97877,98114,100166,100408,100510,100763,102947,113668,115184,126004,127532,129289,129915,130335,131396,132661,132917,133153,133700,134194,134799,134997,135577,136141,136516,136634,137172,137329,137525,137798,138054,138224,138365,138429,138711,138997,139673,139937,140275,140628,140722,140908,141214,141476,141601,141728,141967,142178,142297,142490,142667,143122,143303,143425,143684,143797,143984,144086,144193,144322,144597,145105,145601,146478,146772,147342,147491,148223,148395,148731,148823,149101,153445,157932,157994,158624,159238,159329,159442,159671,159831,159983,160154,160320,160489,160656,160819,161062,161232,161405,161576,161850,162049,162254,162584,162668,162764,162860,162958,163058,163160,163262,163364,163466,163568,163668,163764,163876,164005,164128,164259,164390,164488,164602,164696,164836,164970,165066,165178,165278,165394,165490,165602,165702,165842,165978,166142,166272,166430,166580,166721,166865,167000,167112,167262,167390,167518,167654,167786,167916,168046,168158,168298,168444,168588,168726,168792,168882,168958,169062,169152,169254,169362,169470,169570,169650,169742,169840,169950,170028,170134,170226,170330,170440,170562,170725,170882,170962,171062,171152,171262,171356,171462,171554,171654,171766,171880,171996,172112,172206,172320,172432,172534,172654,172776,172858,172962,173082,173208,173306,173400,173488,173600,173716,173838,173950,174125,174241,174327,174419,174531,174655,174722,174848,174916,175044,175188,175316,175385,175480,175595,175708,175807,175916,176027,176138,176239,176344,176444,176574,176665,176788,176882,176994,177080,177184,177280,177368,177486,177590,177694,177820,177908,178016,178116,178206,178316,178400,178502,178586,178640,178704,178810,178920,179004,4638,9782,9900,10015,10147,10862,11554,12071,13718,14103,14700,16299,17832,18220,20527,40045,40305,41697,42730,44743,45005,45361,46191,52973,54107,54401,54624,54951,57001,57649,59282,59552,63403,64004,67813,69028,70437", - "endLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,1303,1304,1305,1306,1307,1308,1309,1310,1311,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325,1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,1360,1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1390,1391,1392,1393,1394,1395,1396,1397,1398,1399,1400,1401,1402,1403,1404,1405,1406,1407,1408,1409,1410,1411,1412,1413,1414,1415,1416,1417,1418,1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1460,1461,1465,1469,1473,1478,1484,1491,1495,1499,1504,1508,1512,1516,1520,1524,1528,1534,1538,1544,1548,1554,1558,1563,1567,1570,1574,1580,1584,1590,1594,1600,1603,1607,1611,1615,1619,1623,1624,1625,1626,1629,1632,1635,1638,1642,1643,1644,1645,1646,1649,1651,1653,1655,1660,1661,1665,1671,1675,1676,1678,1689,1690,1694,1700,1704,1705,1706,1710,1737,1741,1742,1746,1774,1942,1968,2137,2163,2194,2202,2208,2222,2244,2249,2254,2264,2273,2282,2286,2293,2301,2308,2309,2318,2321,2324,2328,2332,2336,2339,2340,2344,2348,2358,2363,2370,2376,2377,2380,2384,2389,2391,2393,2396,2399,2401,2405,2408,2415,2418,2421,2425,2427,2431,2433,2435,2437,2441,2449,2457,2469,2475,2484,2487,2498,2501,2506,2507,2512,2570,2629,2630,2640,2649,2650,2652,2656,2659,2662,2665,2668,2671,2674,2677,2681,2684,2687,2690,2694,2697,2701,2705,2706,2707,2708,2709,2710,2711,2712,2713,2714,2715,2716,2717,2718,2719,2720,2721,2722,2723,2724,2725,2727,2729,2730,2731,2732,2733,2734,2735,2736,2738,2739,2741,2742,2744,2746,2747,2749,2750,2751,2752,2753,2754,2756,2757,2758,2759,2760,2761,2763,2765,2767,2768,2769,2770,2771,2772,2773,2774,2775,2776,2777,2778,2779,2781,2782,2783,2784,2785,2786,2788,2792,2796,2797,2798,2799,2800,2801,2802,2803,2805,2807,2809,2811,2813,2814,2815,2816,2818,2820,2822,2823,2824,2825,2826,2827,2828,2829,2830,2831,2832,2833,2836,2837,2838,2839,2841,2843,2844,2846,2847,2849,2851,2853,2854,2855,2856,2857,2858,2859,2860,2861,2862,2863,2864,2866,2867,2868,2869,2871,2872,2873,2874,2875,2877,2879,2881,2883,2884,2885,2886,2887,2888,2889,2890,2891,2892,2893,2894,2895,2896,2897,151,154,157,160,174,185,195,222,229,240,270,297,306,343,724,729,755,773,809,815,821,844,985,1005,1011,1015,1021,1058,1070,1097,1102,1168,1183,1248,1267,1293,1302", - "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,63,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,91,12,12,12,61,12,12,90,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24", - "endOffsets": "155,200,249,290,345,404,466,547,608,683,759,836,914,999,1081,1157,1233,1310,1388,1494,1600,1679,1759,1816,1874,1948,2023,2088,2154,2214,2275,2347,2420,2487,2555,2614,2673,2732,2791,2850,2904,2958,3011,3065,3119,3173,3227,3301,3380,3453,3527,3598,3670,3742,3815,3872,3930,4003,4077,4151,4226,4298,4371,4441,4512,4572,4633,70975,71044,71114,71188,71264,71328,71405,71481,71558,71623,71692,71769,71844,71913,71981,72058,72124,72185,72282,72347,72416,72515,72586,72645,72703,72760,72819,72883,72954,73026,73098,73170,73242,73309,73377,73445,73504,73567,73631,73721,73812,73872,73938,74005,74071,74141,74205,74258,74371,74429,74492,74557,74622,74697,74770,74842,74891,74952,75013,75074,75136,75200,75264,75328,75393,75456,75516,75577,75643,75702,75762,75824,75895,75955,76023,76109,76196,76286,76373,76461,76543,76626,76716,76807,76859,76917,76962,77028,77092,77149,77206,77260,77317,77365,77414,77465,77499,77546,77595,77641,77673,77737,77799,77859,77916,77990,78060,78138,78192,78262,78347,78395,78441,78512,78590,78668,78740,78814,78888,78962,79042,79115,79184,79256,79333,79394,79457,79523,79587,79658,79721,79786,79850,79911,79972,80024,80097,80171,80240,80315,80389,80463,80604,80674,80727,80805,80895,80983,81079,81169,81751,81840,82087,82368,82620,82905,83298,83775,83997,84219,84495,84722,84952,85182,85412,85642,85869,86288,86514,86939,87169,87597,87816,88099,88307,88438,88665,89091,89316,89743,89964,90389,90509,90785,91086,91410,91701,92015,92152,92283,92388,92630,92797,93001,93209,93480,93592,93704,93809,93926,94140,94286,94426,94512,94860,94948,95194,95612,95861,95943,96041,96658,96758,97010,97434,97689,97783,97872,98109,100161,100403,100505,100758,102942,113663,115179,125999,127527,129284,129910,130330,131391,132656,132912,133148,133695,134189,134794,134992,135572,136136,136511,136629,137167,137324,137520,137793,138049,138219,138360,138424,138706,138992,139668,139932,140270,140623,140717,140903,141209,141471,141596,141723,141962,142173,142292,142485,142662,143117,143298,143420,143679,143792,143979,144081,144188,144317,144592,145100,145596,146473,146767,147337,147486,148218,148390,148726,148818,149096,153440,157927,157989,158619,159233,159324,159437,159666,159826,159978,160149,160315,160484,160651,160814,161057,161227,161400,161571,161845,162044,162249,162579,162663,162759,162855,162953,163053,163155,163257,163359,163461,163563,163663,163759,163871,164000,164123,164254,164385,164483,164597,164691,164831,164965,165061,165173,165273,165389,165485,165597,165697,165837,165973,166137,166267,166425,166575,166716,166860,166995,167107,167257,167385,167513,167649,167781,167911,168041,168153,168293,168439,168583,168721,168787,168877,168953,169057,169147,169249,169357,169465,169565,169645,169737,169835,169945,170023,170129,170221,170325,170435,170557,170720,170877,170957,171057,171147,171257,171351,171457,171549,171649,171761,171875,171991,172107,172201,172315,172427,172529,172649,172771,172853,172957,173077,173203,173301,173395,173483,173595,173711,173833,173945,174120,174236,174322,174414,174526,174650,174717,174843,174911,175039,175183,175311,175380,175475,175590,175703,175802,175911,176022,176133,176234,176339,176439,176569,176660,176783,176877,176989,177075,177179,177275,177363,177481,177585,177689,177815,177903,178011,178111,178201,178311,178395,178497,178581,178635,178699,178805,178915,178999,179119,9777,9895,10010,10142,10857,11549,12066,13713,14098,14695,16294,17827,18215,20522,40040,40300,41692,42725,44738,45000,45356,46186,52968,54102,54396,54619,54946,56996,57644,59277,59547,63398,63999,67808,69023,70432,70906" - }, - "to": { - "startLines": "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,359,374,375,376,377,378,379,387,388,392,396,400,405,411,418,422,426,431,435,439,443,447,451,455,461,465,471,475,481,485,490,494,497,501,507,511,517,521,527,530,534,538,542,546,550,551,552,553,556,559,562,565,569,570,571,572,573,576,578,580,582,587,588,592,598,602,603,605,616,617,621,627,631,632,633,637,664,668,669,673,701,868,894,1062,1088,1119,1127,1133,1147,1169,1174,1179,1189,1198,1207,1211,1218,1226,1233,1234,1243,1246,1249,1253,1257,1261,1264,1265,1269,1273,1283,1288,1295,1301,1302,1305,1309,1314,1316,1318,1321,1324,1326,1330,1333,1340,1343,1346,1350,1352,1356,1358,1360,1362,1366,1374,1382,1394,1400,1409,1412,1423,1426,1431,1432,1452,1510,1569,1570,1580,1589,1590,1592,1596,1599,1602,1605,1608,1611,1614,1617,1621,1624,1627,1630,1634,1637,1641,1645,1646,1647,1648,1649,1650,1651,1652,1653,1654,1655,1656,1657,1658,1659,1660,1661,1662,1663,1664,1665,1667,1669,1670,1671,1672,1673,1674,1675,1676,1678,1679,1681,1682,1684,1686,1687,1689,1690,1691,1692,1693,1694,1696,1697,1698,1699,1700,1712,1714,1716,1746,1747,1748,1749,1750,1751,1752,1753,1754,1755,1756,1757,1758,1760,1761,1762,1763,1764,1765,1767,1771,1775,1776,1777,1778,1779,1780,1781,1782,1784,1786,1788,1790,1792,1793,1794,1795,1797,1799,1801,1802,1803,1804,1805,1806,1807,1808,1809,1810,1811,1812,1815,1816,1817,1818,1820,1822,1823,1825,1826,1828,1830,1832,1833,1834,1835,1836,1837,1838,1839,1840,1841,1842,1843,1845,1846,1847,1848,1850,1851,1852,1853,1854,1856,1858,1860,1862,1863,1864,1865,1866,1867,1868,1869,1870,1871,1872,1873,1874,1875,1881,1956,1959,1962,1965,1979,1985,1995,2011,2017,2027,2056,2083,2092,2121,2464,2475,2591,2700,2724,2730,2736,2757,2881,2901,2907,2911,2917,2952,2964,2980,2984,3050,3065,3116,3128,3154", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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,14854,14928,14998,15076,15130,15200,15285,15333,15379,15450,15528,15606,15678,15752,15826,15900,15980,16053,16122,16194,16271,16332,16395,16461,16525,16596,16659,16724,16788,16849,16910,16962,17035,17109,17178,17253,17327,17401,17542,23672,24768,24846,24936,25024,25120,25210,25792,25881,26128,26409,26661,26946,27339,27816,28038,28260,28536,28763,28993,29223,29453,29683,29910,30329,30555,30980,31210,31638,31857,32140,32348,32479,32706,33132,33357,33784,34005,34430,34550,34826,35127,35451,35742,36056,36193,36324,36429,36671,36838,37042,37250,37521,37633,37745,37850,37967,38181,38327,38467,38553,38901,38989,39235,39653,39902,39984,40082,40674,40774,41026,41450,41705,41799,41888,42125,44149,44391,44493,44746,46902,57031,58547,68775,70303,72060,72686,73106,74167,75432,75688,75924,76471,76965,77570,77768,78348,78912,79287,79405,79943,80100,80296,80569,80825,80995,81136,81200,81482,81768,82444,82708,83046,83399,83493,83679,83985,84247,84372,84499,84738,84949,85068,85261,85438,85893,86074,86196,86455,86568,86755,86857,86964,87093,87368,87876,88372,89249,89543,90113,90262,90994,91166,91502,91594,92654,96936,101361,101423,102001,102585,102676,102789,103018,103178,103330,103501,103667,103836,104003,104166,104409,104579,104752,104923,105197,105396,105601,105931,106015,106111,106207,106305,106405,106507,106609,106711,106813,106915,107015,107111,107223,107352,107475,107606,107737,107835,107949,108043,108183,108317,108413,108525,108625,108741,108837,108949,109049,109189,109325,109489,109619,109777,109927,110068,110212,110347,110459,110609,110737,110865,111001,111133,111263,111393,111505,112403,112549,112693,114177,114243,114333,114409,114513,114603,114705,114813,114921,115021,115101,115193,115291,115401,115479,115585,115677,115781,115891,116013,116176,116333,116413,116513,116603,116713,116807,116913,117005,117105,117217,117331,117447,117563,117657,117771,117883,117985,118105,118227,118309,118413,118533,118659,118757,118851,118939,119051,119167,119289,119401,119576,119692,119778,119870,119982,120106,120173,120299,120367,120495,120639,120767,120836,120931,121046,121159,121258,121367,121478,121589,121690,121795,121895,122025,122116,122239,122333,122445,122531,122635,122731,122819,122937,123041,123145,123271,123359,123467,123567,123657,123767,123851,123953,124037,124091,124155,124261,124371,124455,124859,127475,127593,127708,127788,128149,128382,128899,129324,129502,129786,131130,132491,132879,133957,143475,143821,149841,153597,154348,154610,154810,155189,159467,160073,160302,160453,160668,161751,162063,162474,162601,165627,166228,168149,168489,169800", - "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,359,374,375,376,377,378,386,387,391,395,399,404,410,417,421,425,430,434,438,442,446,450,454,460,464,470,474,480,484,489,493,496,500,506,510,516,520,526,529,533,537,541,545,549,550,551,552,555,558,561,564,568,569,570,571,572,575,577,579,581,586,587,591,597,601,602,604,615,616,620,626,630,631,632,636,663,667,668,672,700,867,893,1061,1087,1118,1126,1132,1146,1168,1173,1178,1188,1197,1206,1210,1217,1225,1232,1233,1242,1245,1248,1252,1256,1260,1263,1264,1268,1272,1282,1287,1294,1300,1301,1304,1308,1313,1315,1317,1320,1323,1325,1329,1332,1339,1342,1345,1349,1351,1355,1357,1359,1361,1365,1373,1381,1393,1399,1408,1411,1422,1425,1430,1431,1436,1509,1568,1569,1579,1588,1589,1591,1595,1598,1601,1604,1607,1610,1613,1616,1620,1623,1626,1629,1633,1636,1640,1644,1645,1646,1647,1648,1649,1650,1651,1652,1653,1654,1655,1656,1657,1658,1659,1660,1661,1662,1663,1664,1666,1668,1669,1670,1671,1672,1673,1674,1675,1677,1678,1680,1681,1683,1685,1686,1688,1689,1690,1691,1692,1693,1695,1696,1697,1698,1699,1700,1713,1715,1717,1746,1747,1748,1749,1750,1751,1752,1753,1754,1755,1756,1757,1759,1760,1761,1762,1763,1764,1766,1770,1774,1775,1776,1777,1778,1779,1780,1781,1783,1785,1787,1789,1791,1792,1793,1794,1796,1798,1800,1801,1802,1803,1804,1805,1806,1807,1808,1809,1810,1811,1814,1815,1816,1817,1819,1821,1822,1824,1825,1827,1829,1831,1832,1833,1834,1835,1836,1837,1838,1839,1840,1841,1842,1844,1845,1846,1847,1849,1850,1851,1852,1853,1855,1857,1859,1861,1862,1863,1864,1865,1866,1867,1868,1869,1870,1871,1872,1873,1874,1875,1955,1958,1961,1964,1978,1984,1994,2010,2016,2026,2055,2082,2091,2120,2463,2467,2500,2608,2723,2729,2735,2756,2880,2900,2906,2910,2916,2951,2963,2979,2983,3049,3064,3115,3127,3153,3160", - "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": "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,14923,14993,15071,15125,15195,15280,15328,15374,15445,15523,15601,15673,15747,15821,15895,15975,16048,16117,16189,16266,16327,16390,16456,16520,16591,16654,16719,16783,16844,16905,16957,17030,17104,17173,17248,17322,17396,17537,17607,23720,24841,24931,25019,25115,25205,25787,25876,26123,26404,26656,26941,27334,27811,28033,28255,28531,28758,28988,29218,29448,29678,29905,30324,30550,30975,31205,31633,31852,32135,32343,32474,32701,33127,33352,33779,34000,34425,34545,34821,35122,35446,35737,36051,36188,36319,36424,36666,36833,37037,37245,37516,37628,37740,37845,37962,38176,38322,38462,38548,38896,38984,39230,39648,39897,39979,40077,40669,40769,41021,41445,41700,41794,41883,42120,44144,44386,44488,44741,46897,57026,58542,68770,70298,72055,72681,73101,74162,75427,75683,75919,76466,76960,77565,77763,78343,78907,79282,79400,79938,80095,80291,80564,80820,80990,81131,81195,81477,81763,82439,82703,83041,83394,83488,83674,83980,84242,84367,84494,84733,84944,85063,85256,85433,85888,86069,86191,86450,86563,86750,86852,86959,87088,87363,87871,88367,89244,89538,90108,90257,90989,91161,91497,91589,91867,96931,101356,101418,101996,102580,102671,102784,103013,103173,103325,103496,103662,103831,103998,104161,104404,104574,104747,104918,105192,105391,105596,105926,106010,106106,106202,106300,106400,106502,106604,106706,106808,106910,107010,107106,107218,107347,107470,107601,107732,107830,107944,108038,108178,108312,108408,108520,108620,108736,108832,108944,109044,109184,109320,109484,109614,109772,109922,110063,110207,110342,110454,110604,110732,110860,110996,111128,111258,111388,111500,111640,112544,112688,112826,114238,114328,114404,114508,114598,114700,114808,114916,115016,115096,115188,115286,115396,115474,115580,115672,115776,115886,116008,116171,116328,116408,116508,116598,116708,116802,116908,117000,117100,117212,117326,117442,117558,117652,117766,117878,117980,118100,118222,118304,118408,118528,118654,118752,118846,118934,119046,119162,119284,119396,119571,119687,119773,119865,119977,120101,120168,120294,120362,120490,120634,120762,120831,120926,121041,121154,121253,121362,121473,121584,121685,121790,121890,122020,122111,122234,122328,122440,122526,122630,122726,122814,122932,123036,123140,123266,123354,123462,123562,123652,123762,123846,123948,124032,124086,124150,124256,124366,124450,124570,127470,127588,127703,127783,128144,128377,128894,129319,129497,129781,131125,132486,132874,133952,143470,143605,145109,150408,154343,154605,154805,155184,159462,160068,160297,160448,160663,161746,162058,162469,162596,165622,166223,168144,168484,169795,169998" - } - }, - { -======= ->>>>>>> xiaojinchi_branch "source": "D:\\Notes-master3\\app\\src\\main\\res\\values\\strings.xml", "from": { "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", @@ -180,24 +133,6 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\e96a7038b1f110461df5bc852ca33ca3\\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,362,1701,1702,1706,1707,1711,1876,1877,2468,2609,2640,2661,2694", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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,23864,111645,111762,111963,112073,112274,124575,124647,143610,150413,152067,152748,153430", - "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,362,1701,1705,1706,1710,1711,1876,1877,2474,2639,2660,2693,2699", - "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": "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,23930,111757,111958,112068,112269,112398,124642,124709,143816,152062,152743,153425,153592" -======= "source": "C:\\Users\\87334\\.gradle\\caches\\transforms-3\\2504d03dceb2ecea0f7a3eb651ec8485\\transformed\\coordinatorlayout-1.0.0\\res\\values\\values.xml", "from": { "startLines": "2,102,3,13", @@ -214,7 +149,6 @@ "endLines": "12,1880,2506,2590", "endColumns": "60,12,24,24", "endOffsets": "476,124854,145320,149836" ->>>>>>> xiaojinchi_branch } } ] diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json index 3425df6..fcf3fe8 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json @@ -1,6 +1,5 @@ [ { -<<<<<<< HEAD "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_new_note_normal.png.flat", "source": "net.micode.notes.app-main-10:/drawable-hdpi/new_note_normal.png" }, @@ -335,345 +334,12 @@ { "merged": "net.micode.notes.app-merged_res-8:/menu_call_record_folder.xml.flat", "source": "net.micode.notes.app-main-10:/menu/call_record_folder.xml" -======= - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_title_alert.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\title_alert.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\layout_account_dialog_title.xml.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\layout\\account_dialog_title.xml" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\xml_widget_2x_info.xml.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\xml\\widget_2x_info.xml" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_footer_bg.9.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_footer_bg.9.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\layout_note_edit_list_item.xml.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\layout\\note_edit_list_item.xml" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_widget_4x_yellow.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\widget_4x_yellow.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_widget_2x_green.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\widget_2x_green.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\layout_settings_header.xml.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\layout\\settings_header.xml" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\layout_note_list_dropdown_menu.xml.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\layout\\note_list_dropdown_menu.xml" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_search_result.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\search_result.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\layout_note_edit.xml.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\layout\\note_edit.xml" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_note_edit_color_selector_panel.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\note_edit_color_selector_panel.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_edit_green.9.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\edit_green.9.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_widget_2x_yellow.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\widget_2x_yellow.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\raw-zh-rCN_introduction.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\raw-zh-rCN\\introduction" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_font_size_selector_bg.9.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\font_size_selector_bg.9.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_widget_2x_white.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\widget_2x_white.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_edit_yellow.9.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\edit_yellow.9.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\xml_preferences.xml.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\xml\\preferences.xml" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\layout_fafas.xml.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\layout\\fafas.xml" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_font_small.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\font_small.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_blue_up.9.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_blue_up.9.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\layout_note_list.xml.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\layout\\note_list.xml" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\menu_call_record_folder.xml.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\menu\\call_record_folder.xml" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_edit_title_green.9.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\edit_title_green.9.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_bg_color_btn_mask.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\bg_color_btn_mask.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_green_middle.9.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_green_middle.9.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\layout_folder_list_item.xml.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\layout\\folder_list_item.xml" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_delete.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\delete.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\menu_sub_folder.xml.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\menu\\sub_folder.xml" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_edit_title_red.9.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\edit_title_red.9.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_edit_title_blue.9.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\edit_title_blue.9.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\menu_note_list.xml.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\menu\\note_list.xml" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\color_secondary_text_dark.xml.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\color\\secondary_text_dark.xml" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_edit_blue.9.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\edit_blue.9.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_blue_down.9.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_blue_down.9.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_green_up.9.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_green_up.9.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\menu_note_list_options.xml.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\menu\\note_list_options.xml" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_red_down.9.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_red_down.9.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_yellow_middle.9.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_yellow_middle.9.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_yellow_single.9.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_yellow_single.9.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_green_down.9.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_green_down.9.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_red_middle.9.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_red_middle.9.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable_butto_read.xml.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable\\butto_read.xml" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_dropdown_icon.9.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\dropdown_icon.9.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\color_primary_text_dark.xml.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\color\\primary_text_dark.xml" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\layout_note_item.xml.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\layout\\note_item.xml" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\layout_widget_2x.xml.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\layout\\widget_2x.xml" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\menu_call_note_edit.xml.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\menu\\call_note_edit.xml" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_edit_white.9.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\edit_white.9.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_white_down.9.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_white_down.9.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_blue_middle.9.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_blue_middle.9.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_edit_title_yellow.9.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\edit_title_yellow.9.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_red_single.9.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_red_single.9.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_read.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\read.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\menu_note_list_dropdown.xml.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\menu\\note_list_dropdown.xml" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_notification.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\notification.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_menu_delete.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\menu_delete.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_yellow_down.9.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_yellow_down.9.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\raw_introduction.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\raw\\introduction" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_edit_title_white.9.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\edit_title_white.9.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_call_record.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\call_record.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_widget_4x_red.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\widget_4x_red.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\layout_datetime_picker.xml.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\layout\\datetime_picker.xml" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_selected.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\selected.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_clock.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\clock.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_white_single.9.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_white_single.9.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\xml_searchable.xml.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\xml\\searchable.xml" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_bg_btn_set_color.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\bg_btn_set_color.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_font_super.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\font_super.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_widget_4x_blue.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\widget_4x_blue.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_new_note_pressed.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\new_note_pressed.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\layout_dialog_edit_text.xml.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\layout\\dialog_edit_text.xml" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_icon_app.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\icon_app.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_widget_2x_red.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\widget_2x_red.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\menu_note_edit.xml.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\menu\\note_edit.xml" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_red_up.9.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_red_up.9.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_font_normal.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\font_normal.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_widget_4x_white.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\widget_4x_white.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_title_bar_bg.9.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\title_bar_bg.9.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_folder.9.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_folder.9.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_green_single.9.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_green_single.9.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_edit_red.9.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\edit_red.9.png" ->>>>>>> xiaojinchi_branch }, { "merged": "net.micode.notes.app-merged_res-8:/layout_note_edit.xml.flat", "source": "net.micode.notes.app-main-10:/layout/note_edit.xml" }, { -<<<<<<< HEAD "merged": "net.micode.notes.app-merged_res-8:/xml_widget_4x_info.xml.flat", "source": "net.micode.notes.app-main-10:/xml/widget_4x_info.xml" }, @@ -720,69 +386,5 @@ { "merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_list_blue_single.9.png.flat", "source": "net.micode.notes.app-main-10:/drawable-hdpi/list_blue_single.9.png" -======= - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_white_middle.9.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_white_middle.9.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable_new_note.xml.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable\\new_note.xml" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_menu_move.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\menu_move.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\layout_widget_4x.xml.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\layout\\widget_4x.xml" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_yellow_up.9.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_yellow_up.9.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_widget_2x_blue.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\widget_2x_blue.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\layout_add_account_text.xml.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\layout\\add_account_text.xml" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_widget_4x_green.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\widget_4x_green.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_font_large.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\font_large.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_white_up.9.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_white_up.9.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_background.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_background.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_blue_single.9.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_blue_single.9.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\xml_image.xml.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\xml\\image.xml" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_new_note_normal.png.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\drawable-hdpi\\new_note_normal.png" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\layout_note_list_footer.xml.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\layout\\note_list_footer.xml" - }, - { - "merged": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-8:\\xml_widget_4x_info.xml.flat", - "source": "C:\\Users\\87334\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-10:\\xml\\widget_4x_info.xml" ->>>>>>> xiaojinchi_branch } ] \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml b/src/Notes-master3/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml index a166b6a..a44eeea 100644 --- a/src/Notes-master3/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml +++ b/src/Notes-master3/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml @@ -21,11 +21,7 @@ -======= android:targetSdkVersion="23" /> ->>>>>>> xiaojinchi_branch @@ -39,17 +35,10 @@ -<<<<<<< HEAD - - - - @@ -58,7 +47,6 @@ >>>>>> xiaojinchi_branch android:debuggable="true" android:icon="@drawable/icon_app" android:label="@string/app_name" @@ -171,8 +159,6 @@ -<<<<<<< HEAD -======= @@ -182,7 +168,6 @@ ->>>>>>> xiaojinchi_branch \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/packaged_manifests/debugAndroidTest/AndroidManifest.xml b/src/Notes-master3/app/build/intermediates/packaged_manifests/debugAndroidTest/AndroidManifest.xml index edad39a..52d525c 100644 --- a/src/Notes-master3/app/build/intermediates/packaged_manifests/debugAndroidTest/AndroidManifest.xml +++ b/src/Notes-master3/app/build/intermediates/packaged_manifests/debugAndroidTest/AndroidManifest.xml @@ -3,8 +3,8 @@ package="net.micode.notes.test" > + android:minSdkVersion="21" + android:targetSdkVersion="23" /> >>>>>> xiaojinchi_branch int integer abc_config_activityDefaultDur 0x7f090000 int integer abc_config_activityShortDur 0x7f090001 int integer cancel_button_image_alpha 0x7f090002 @@ -1079,30 +907,6 @@ int layout abc_select_dialog_material 0x7f0a001a int layout abc_tooltip 0x7f0a001b int layout account_dialog_title 0x7f0a001c int layout add_account_text 0x7f0a001d -<<<<<<< HEAD -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 common_mini 0x7f0a001e int layout datetime_picker 0x7f0a001f int layout dialog_edit_text 0x7f0a0020 @@ -1126,7 +930,6 @@ int layout settings_header 0x7f0a0031 int layout support_simple_spinner_dropdown_item 0x7f0a0032 int layout widget_2x 0x7f0a0033 int layout widget_4x 0x7f0a0034 ->>>>>>> xiaojinchi_branch int menu call_note_edit 0x7f0b0000 int menu call_record_folder 0x7f0b0001 int menu note_edit 0x7f0b0002 diff --git a/src/Notes-master3/app/build/intermediates/source_set_path_map/debug/file-map.txt b/src/Notes-master3/app/build/intermediates/source_set_path_map/debug/file-map.txt index 255a03f..087d4ad 100644 --- a/src/Notes-master3/app/build/intermediates/source_set_path_map/debug/file-map.txt +++ b/src/Notes-master3/app/build/intermediates/source_set_path_map/debug/file-map.txt @@ -1,12 +1,6 @@ -<<<<<<< HEAD -net.micode.notes.app-appcompat-v7-28.0.0-0 C:\Users\87334\.gradle\caches\transforms-3\4fdced20544efc90da6c74d19436ed4c\transformed\appcompat-v7-28.0.0\res -net.micode.notes.app-support-compat-28.0.0-1 C:\Users\87334\.gradle\caches\transforms-3\e96a7038b1f110461df5bc852ca33ca3\transformed\support-compat-28.0.0\res -net.micode.notes.app-coordinatorlayout-28.0.0-2 C:\Users\87334\.gradle\caches\transforms-3\fa718d1bfa54ce85ab7d4c953f045f5d\transformed\coordinatorlayout-28.0.0\res -======= net.micode.notes.app-coordinatorlayout-1.0.0-0 C:\Users\87334\.gradle\caches\transforms-3\2504d03dceb2ecea0f7a3eb651ec8485\transformed\coordinatorlayout-1.0.0\res net.micode.notes.app-appcompat-1.0.2-1 C:\Users\87334\.gradle\caches\transforms-3\4153cc3e152567bf9af1bb2e27f956d0\transformed\appcompat-1.0.2\res net.micode.notes.app-core-1.0.1-2 C:\Users\87334\.gradle\caches\transforms-3\6953185b4efad95e57bf8cc13b145959\transformed\core-1.0.1\res ->>>>>>> xiaojinchi_branch net.micode.notes.app-pngs-3 D:\Notes-master3\app\build\generated\res\pngs\debug net.micode.notes.app-resValues-4 D:\Notes-master3\app\build\generated\res\resValues\debug net.micode.notes.app-rs-5 D:\Notes-master3\app\build\generated\res\rs\debug @@ -15,7 +9,4 @@ net.micode.notes.app-mergeDebugResources-7 D:\Notes-master3\app\build\intermedia net.micode.notes.app-merged_res-8 D:\Notes-master3\app\build\intermediates\merged_res\debug net.micode.notes.app-debug-9 D:\Notes-master3\app\src\debug\res net.micode.notes.app-main-10 D:\Notes-master3\app\src\main\res -<<<<<<< HEAD -======= net.micode.notes.app-packaged_res-11 D:\Notes-master3\core\build\intermediates\packaged_res\debug ->>>>>>> xiaojinchi_branch diff --git a/src/Notes-master3/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/src/Notes-master3/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt index 48cc303..2ce0173 100644 --- a/src/Notes-master3/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt +++ b/src/Notes-master3/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt @@ -1,282 +1,3 @@ -<<<<<<< HEAD -net.micode.notes:styleable/ViewStubCompat = 0x7f10002b -net.micode.notes:string/abc_font_family_body_1_material = 0x7f0e0008 -net.micode.notes:style/Base.ThemeOverlay.AppCompat = 0x7f0f004a -net.micode.notes:drawable/new_note_normal = 0x7f070085 -net.micode.notes:style/Widget.AppCompat.DropDownItem.Spinner = 0x7f0f0131 -net.micode.notes:style/Base.V7.Widget.AppCompat.Toolbar = 0x7f0f0066 -net.micode.notes:style/Widget.AppCompat.SearchView = 0x7f0f0157 -net.micode.notes:string/note_link_tel = 0x7f0e0065 -net.micode.notes:style/Widget.AppCompat.Light.Spinner.DropDown.ActionBar = 0x7f0f0149 -net.micode.notes:id/search_close_btn = 0x7f08009b -net.micode.notes:styleable/Toolbar = 0x7f100028 -net.micode.notes:style/Base.Theme.AppCompat.Dialog.MinWidth = 0x7f0f0041 -net.micode.notes:layout/abc_cascading_menu_item_layout = 0x7f0a000b -net.micode.notes:style/Widget.AppCompat.Light.ListView.DropDown = 0x7f0f0145 -net.micode.notes:id/menu_alert = 0x7f080069 -net.micode.notes:style/Widget.Compat.NotificationActionContainer = 0x7f0f0162 -net.micode.notes:dimen/abc_edit_text_inset_horizontal_material = 0x7f06002d -net.micode.notes:style/Base.Theme.AppCompat.Light.Dialog.MinWidth = 0x7f0f0048 -net.micode.notes:layout/abc_activity_chooser_view = 0x7f0a0006 -net.micode.notes:dimen/abc_text_size_display_4_material = 0x7f060040 -net.micode.notes:styleable/PopupWindow = 0x7f10001f -net.micode.notes:layout/abc_action_menu_item_layout = 0x7f0a0002 -net.micode.notes:styleable/ActivityChooserView = 0x7f100005 -net.micode.notes:style/Widget.Support.CoordinatorLayout = 0x7f0f0164 -net.micode.notes:style/TextAppearance.Widget.AppCompat.Toolbar.Title = 0x7f0f00f6 -net.micode.notes:id/notification_main_column_container = 0x7f080088 -net.micode.notes:style/Widget.AppCompat.ListPopupWindow = 0x7f0f014b -net.micode.notes:style/Base.TextAppearance.AppCompat.Display1 = 0x7f0f0011 -net.micode.notes:drawable/abc_seekbar_tick_mark_material = 0x7f07003f -net.micode.notes:style/TextAppearance.AppCompat.Title = 0x7f0f00d9 -net.micode.notes:style/Widget.AppCompat.PopupWindow = 0x7f0f0151 -net.micode.notes:string/abc_searchview_description_submit = 0x7f0e0022 -net.micode.notes:dimen/notification_top_pad_large_text = 0x7f060069 -net.micode.notes:style/Widget.AppCompat.Light.DropDownItem.Spinner = 0x7f0f0143 -net.micode.notes:style/Widget.AppCompat.Light.ActivityChooserView = 0x7f0f0141 -net.micode.notes:style/Base.Widget.AppCompat.PopupMenu = 0x7f0f008f -net.micode.notes:id/time = 0x7f0800ba -net.micode.notes:style/Widget.AppCompat.CompoundButton.Switch = 0x7f0f012f -net.micode.notes:style/Base.V21.Theme.AppCompat.Light = 0x7f0f0053 -net.micode.notes:style/Widget.AppCompat.Light.ActionButton = 0x7f0f013d -net.micode.notes:style/Base.Theme.AppCompat.Light.Dialog.Alert = 0x7f0f0046 -net.micode.notes:style/Widget.AppCompat.Light.PopupMenu.Overflow = 0x7f0f0147 -net.micode.notes:style/Base.TextAppearance.Widget.AppCompat.Toolbar.Title = 0x7f0f003b -net.micode.notes:styleable/AnimatedStateListDrawableItem = 0x7f100008 -net.micode.notes:dimen/abc_disabled_alpha_material_light = 0x7f060028 -net.micode.notes:style/Base.Widget.AppCompat.Light.PopupMenu.Overflow = 0x7f0f0089 -net.micode.notes:style/Theme.AppCompat.DayNight.DialogWhenLarge = 0x7f0f0105 -net.micode.notes:style/Widget.AppCompat.ActionBar.Solid = 0x7f0f011b -net.micode.notes:string/file_path = 0x7f0e003d -net.micode.notes:xml/widget_2x_info = 0x7f110002 -net.micode.notes:style/Widget.AppCompat.ListView = 0x7f0f014c -net.micode.notes:id/withText = 0x7f0800cc -net.micode.notes:style/Widget.AppCompat.ButtonBar = 0x7f0f012b -net.micode.notes:style/Base.Widget.AppCompat.CompoundButton.Switch = 0x7f0f007c -net.micode.notes:style/TextAppearance.AppCompat.Widget.ActionBar.Menu = 0x7f0f00dc -net.micode.notes:style/Widget.AppCompat.Light.ActionBar = 0x7f0f0134 -net.micode.notes:id/wrap_content = 0x7f0800cd -net.micode.notes:string/failed_sdcard_export = 0x7f0e003b -net.micode.notes:style/TextAppearanceSuper = 0x7f0f00fc -net.micode.notes:styleable/RecycleListView = 0x7f100021 -net.micode.notes:dimen/notification_main_column_padding_top = 0x7f060061 -net.micode.notes:style/Widget.AppCompat.SearchView.ActionBar = 0x7f0f0158 -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:style/TextAppearanceSecondaryItem = 0x7f0f00fb -net.micode.notes:style/Widget.AppCompat.Button.Borderless = 0x7f0f0126 -net.micode.notes:style/TextAppearance.AppCompat.Subhead.Inverse = 0x7f0f00d8 -net.micode.notes:style/Base.TextAppearance.AppCompat = 0x7f0f000c -net.micode.notes:style/ThemeOverlay.AppCompat.Dialog = 0x7f0f0117 -net.micode.notes:style/TextAppearance.Compat.Notification.Time = 0x7f0f00f2 -net.micode.notes:style/Base.Widget.AppCompat.ProgressBar = 0x7f0f0092 -net.micode.notes:style/Base.Widget.AppCompat.ActionBar.TabText = 0x7f0f006a -net.micode.notes:string/notealert_enter = 0x7f0e0067 -net.micode.notes:id/src_over = 0x7f0800ac -net.micode.notes:style/Platform.ThemeOverlay.AppCompat.Dark = 0x7f0f00a7 -net.micode.notes:style/Platform.V25.AppCompat.Light = 0x7f0f00ac -net.micode.notes:style/Widget.AppCompat.ActionButton.Overflow = 0x7f0f0121 -net.micode.notes:style/TextAppearance.AppCompat.Widget.Button = 0x7f0f00e5 -net.micode.notes:style/Theme.AppCompat.DayNight.Dialog = 0x7f0f0102 -net.micode.notes:drawable/edit_title_white = 0x7f070061 -net.micode.notes:styleable/ViewBackgroundHelper = 0x7f10002a -net.micode.notes:style/Widget.AppCompat.ActionBar.TabBar = 0x7f0f011c -net.micode.notes:style/TextAppearance.AppCompat.Large.Inverse = 0x7f0f00cb -net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.Switch = 0x7f0f0037 -net.micode.notes:style/TextAppearance.Widget.AppCompat.ExpandedMenu.Item = 0x7f0f00f4 -net.micode.notes:styleable/SwitchCompat = 0x7f100026 -net.micode.notes:string/abc_menu_alt_shortcut_label = 0x7f0e0014 -net.micode.notes:style/Widget.AppCompat.CompoundButton.RadioButton = 0x7f0f012e -net.micode.notes:style/TextAppearance.AppCompat.Widget.Button.Colored = 0x7f0f00e7 -net.micode.notes:style/Widget.AppCompat.ActivityChooserView = 0x7f0f0123 -net.micode.notes:style/ThemeOverlay.AppCompat.Dialog.Alert = 0x7f0f0118 -net.micode.notes:id/action_bar_subtitle = 0x7f08000d -net.micode.notes:style/Base.Animation.AppCompat.DropDownUp = 0x7f0f0008 -net.micode.notes:style/Base.Widget.AppCompat.DrawerArrowToggle = 0x7f0f007d -net.micode.notes:style/Theme.AppCompat.Light.Dialog.Alert = 0x7f0f010e -net.micode.notes:id/async = 0x7f080021 -net.micode.notes:attr/colorControlHighlight = 0x7f03004f -net.micode.notes:style/Theme.AppCompat.DayNight.Dialog.MinWidth = 0x7f0f0104 -net.micode.notes:style/Base.V7.Theme.AppCompat = 0x7f0f005f -net.micode.notes:style/TextAppearanceLarge = 0x7f0f00f7 -net.micode.notes:style/TextAppearance.AppCompat.Small.Inverse = 0x7f0f00d6 -net.micode.notes:style/Base.TextAppearance.AppCompat.SearchResult.Subtitle = 0x7f0f001f -net.micode.notes:style/Base.TextAppearance.AppCompat.Display4 = 0x7f0f0014 -net.micode.notes:string/abc_activitychooserview_choose_application = 0x7f0e0005 -net.micode.notes:style/Base.DialogWindowTitle.AppCompat = 0x7f0f000a -net.micode.notes:id/action_bar = 0x7f080008 -net.micode.notes:style/Widget.AppCompat.Toolbar.Button.Navigation = 0x7f0f0161 -net.micode.notes:drawable/list_blue_middle = 0x7f07006d -net.micode.notes:style/TextAppearance.AppCompat.Light.SearchResult.Subtitle = 0x7f0f00cc -net.micode.notes:style/Widget.AppCompat.Light.ActionBar.TabView = 0x7f0f013b -net.micode.notes:dimen/disabled_alpha_material_light = 0x7f060053 -net.micode.notes:layout/widget_2x = 0x7f0a0032 -net.micode.notes:layout/abc_screen_simple = 0x7f0a0015 -net.micode.notes:drawable/notification_bg_normal_pressed = 0x7f07008f -net.micode.notes:drawable/abc_list_pressed_holo_light = 0x7f07002d -net.micode.notes:style/TextAppearance.AppCompat.Inverse = 0x7f0f00c9 -net.micode.notes:style/Base.TextAppearance.AppCompat.Tooltip = 0x7f0f0027 -net.micode.notes:style/TextAppearance.AppCompat.Display3 = 0x7f0f00c6 -net.micode.notes:string/info_note_enter_desktop = 0x7f0e0045 -net.micode.notes:style/TextAppearance.AppCompat.Button = 0x7f0f00c2 -net.micode.notes:id/tag_unhandled_key_event_manager = 0x7f0800b3 -net.micode.notes:style/ThemeOverlay.AppCompat = 0x7f0f0113 -net.micode.notes:id/account_dialog_title = 0x7f080007 -net.micode.notes:string/search_menu_title = 0x7f0e0080 -net.micode.notes:style/TextAppearance.AppCompat.Body2 = 0x7f0f00c1 -net.micode.notes:style/Theme.AppCompat.Light.Dialog = 0x7f0f010d -net.micode.notes:style/Widget.AppCompat.RatingBar = 0x7f0f0154 -net.micode.notes:style/TextAppearance.AppCompat.Body1 = 0x7f0f00c0 -net.micode.notes:style/Base.TextAppearance.AppCompat.Medium = 0x7f0f001b -net.micode.notes:style/RtlOverlay.Widget.AppCompat.Search.DropDown.Icon1 = 0x7f0f00b8 -net.micode.notes:styleable/StateListDrawable = 0x7f100024 -net.micode.notes:layout/abc_popup_menu_item_layout = 0x7f0a0013 -net.micode.notes:style/RtlOverlay.Widget.AppCompat.Search.DropDown = 0x7f0f00b7 -net.micode.notes:style/RtlOverlay.Widget.AppCompat.PopupMenuItem.Title = 0x7f0f00b6 -net.micode.notes:style/Theme.AppCompat.Light.DarkActionBar = 0x7f0f010c -net.micode.notes:style/TextAppearance.Compat.Notification.Line2 = 0x7f0f00f1 -net.micode.notes:style/TextAppearance.AppCompat.SearchResult.Subtitle = 0x7f0f00d3 -net.micode.notes:style/Base.Theme.AppCompat.Light.Dialog.FixedSize = 0x7f0f0047 -net.micode.notes:style/Widget.AppCompat.AutoCompleteTextView = 0x7f0f0124 -net.micode.notes:layout/note_item = 0x7f0a0023 -net.micode.notes:string/preferences_account_title = 0x7f0e006c -net.micode.notes:style/NoteActionBarStyle = 0x7f0f00a2 -net.micode.notes:style/Widget.AppCompat.PopupMenu.Overflow = 0x7f0f0150 -net.micode.notes:style/TextAppearance.AppCompat.Caption = 0x7f0f00c3 -net.micode.notes:style/Base.Widget.AppCompat.Button.Small = 0x7f0f0077 -net.micode.notes:style/Widget.AppCompat.Spinner.Underlined = 0x7f0f015e -net.micode.notes:styleable/MenuGroup = 0x7f10001c -net.micode.notes:style/Theme.AppCompat.NoActionBar = 0x7f0f0112 -net.micode.notes:string/menu_send_to_desktop = 0x7f0e005c -net.micode.notes:styleable/AnimatedStateListDrawableCompat = 0x7f100007 -net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.Button.Inverse = 0x7f0f0032 -net.micode.notes:style/Base.Widget.AppCompat.AutoCompleteTextView = 0x7f0f0071 -net.micode.notes:styleable/CompoundButton = 0x7f100011 -net.micode.notes:style/Base.Widget.AppCompat.SearchView.ActionBar = 0x7f0f0098 -net.micode.notes:string/error_sdcard_unmounted = 0x7f0e0037 -net.micode.notes:id/font_size_selector = 0x7f080043 -net.micode.notes:style/Widget.AppCompat.CompoundButton.CheckBox = 0x7f0f012d -net.micode.notes:dimen/compat_notification_large_icon_max_height = 0x7f060050 -net.micode.notes:style/Base.Widget.AppCompat.SearchView = 0x7f0f0097 -net.micode.notes:dimen/abc_dialog_padding_material = 0x7f060024 -net.micode.notes:id/start = 0x7f0800ad -net.micode.notes:style/Base.Widget.AppCompat.ListView = 0x7f0f008c -net.micode.notes:style/RtlOverlay.Widget.AppCompat.PopupMenuItem.SubmenuArrow = 0x7f0f00b4 -net.micode.notes:style/Widget.AppCompat.Light.SearchView = 0x7f0f0148 -net.micode.notes:style/Base.Widget.AppCompat.Button.Borderless.Colored = 0x7f0f0074 -net.micode.notes:style/TextAppearance.Widget.AppCompat.Toolbar.Subtitle = 0x7f0f00f5 -net.micode.notes:string/format_move_notes_to_folder = 0x7f0e0043 -net.micode.notes:style/Base.Widget.AppCompat.ListPopupWindow = 0x7f0f008b -net.micode.notes:string/ticker_cancel = 0x7f0e0089 -net.micode.notes:style/Base.Widget.AppCompat.Light.ActionBar.TabText.Inverse = 0x7f0f0086 -net.micode.notes:style/RtlUnderlay.Widget.AppCompat.ActionButton.Overflow = 0x7f0f00be -net.micode.notes:style/Base.Widget.AppCompat.DropDownItem.Spinner = 0x7f0f007f -net.micode.notes:string/menu_delete = 0x7f0e0048 -net.micode.notes:style/Base.Widget.AppCompat.ActionButton.CloseMode = 0x7f0f006d -net.micode.notes:style/Base.Widget.AppCompat.Light.ActionBar.TabBar = 0x7f0f0084 -net.micode.notes:id/beginning = 0x7f080022 -net.micode.notes:style/Base.Widget.AppCompat.CompoundButton.RadioButton = 0x7f0f007b -net.micode.notes:style/Base.TextAppearance.AppCompat.Headline = 0x7f0f0015 -net.micode.notes:style/RtlOverlay.Widget.AppCompat.DialogTitle.Icon = 0x7f0f00b0 -net.micode.notes:style/Base.Widget.AppCompat.Spinner = 0x7f0f009b -net.micode.notes:style/Base.Theme.AppCompat.Light = 0x7f0f0043 -net.micode.notes:style/Base.Widget.AppCompat.ActionButton = 0x7f0f006c -net.micode.notes:style/Base.TextAppearance.AppCompat.Large = 0x7f0f0017 -net.micode.notes:dimen/abc_panel_menu_list_width = 0x7f060031 -net.micode.notes:anim/abc_slide_out_top = 0x7f010009 -net.micode.notes:style/Base.Widget.AppCompat.ActionBar.TabBar = 0x7f0f0069 -net.micode.notes:style/Base.Widget.AppCompat.ActionBar = 0x7f0f0067 -net.micode.notes:styleable/View = 0x7f100029 -net.micode.notes:string/abc_font_family_button_material = 0x7f0e000a -net.micode.notes:style/Widget.AppCompat.Light.ActionBar.TabView.Inverse = 0x7f0f013c -net.micode.notes:style/Widget.AppCompat.Light.ActionButton.Overflow = 0x7f0f013f -net.micode.notes:string/menu_folder_change_name = 0x7f0e004b -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.TextAppearance.AppCompat.Display2 = 0x7f0f0012 -net.micode.notes:style/Base.Widget.AppCompat.ImageButton = 0x7f0f0081 -net.micode.notes:style/Base.ThemeOverlay.AppCompat.Light = 0x7f0f0050 -net.micode.notes:style/Base.Theme.AppCompat = 0x7f0f003c -net.micode.notes:style/Widget.AppCompat.Light.ListPopupWindow = 0x7f0f0144 -net.micode.notes:xml/searchable = 0x7f110001 -net.micode.notes:style/TextAppearance.AppCompat.Tooltip = 0x7f0f00db -net.micode.notes:id/content = 0x7f080031 -net.micode.notes:style/Base.ThemeOverlay.AppCompat.Dialog = 0x7f0f004e -net.micode.notes:styleable/AppCompatImageView = 0x7f10000a -net.micode.notes:style/Widget.AppCompat.Button.Colored = 0x7f0f0129 -net.micode.notes:style/Base.DialogWindowTitleBackground.AppCompat = 0x7f0f000b -net.micode.notes:style/Base.ThemeOverlay.AppCompat.Dark.ActionBar = 0x7f0f004d -net.micode.notes:style/Animation.AppCompat.Tooltip = 0x7f0f0004 -net.micode.notes:style/Base.ThemeOverlay.AppCompat.ActionBar = 0x7f0f004b -net.micode.notes:id/iv_bg_blue_select = 0x7f080051 -net.micode.notes:style/RtlOverlay.Widget.AppCompat.Search.DropDown.Icon2 = 0x7f0f00b9 -net.micode.notes:style/Base.Theme.AppCompat.Light.DialogWhenLarge = 0x7f0f0049 -net.micode.notes:dimen/notification_action_icon_size = 0x7f06005b -net.micode.notes:style/Platform.AppCompat = 0x7f0f00a4 -net.micode.notes:style/Base.Theme.AppCompat.CompactMenu = 0x7f0f003d -net.micode.notes:attr/colorPrimary = 0x7f030052 -net.micode.notes:drawable/abc_ic_clear_material = 0x7f070015 -net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.DropDownItem = 0x7f0f0033 -net.micode.notes:string/success_sync_account = 0x7f0e0085 -net.micode.notes:style/Base.TextAppearance.Widget.AppCompat.ExpandedMenu.Item = 0x7f0f0039 -net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.Button = 0x7f0f002f -net.micode.notes:style/Widget.AppCompat.Light.ActionMode.Inverse = 0x7f0f0140 -net.micode.notes:id/tv_time = 0x7f0800c4 -net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0f00fa -net.micode.notes:id/prefenerece_sync_status_textview = 0x7f08008b -net.micode.notes:drawable/abc_ratingbar_indicator_material = 0x7f070036 -net.micode.notes:style/Base.TextAppearance.AppCompat.Small.Inverse = 0x7f0f0022 -net.micode.notes:style/Base.Widget.AppCompat.Light.ActionBar.Solid = 0x7f0f0083 -net.micode.notes:style/Base.V7.Theme.AppCompat.Dialog = 0x7f0f0060 -net.micode.notes:style/Base.TextAppearance.AppCompat.Medium.Inverse = 0x7f0f001c -net.micode.notes:layout/notification_template_part_time = 0x7f0a002c -net.micode.notes:style/Base.TextAppearance.AppCompat.Large.Inverse = 0x7f0f0018 -net.micode.notes:style/Base.Theme.AppCompat.Light.Dialog = 0x7f0f0045 -net.micode.notes:style/Base.TextAppearance.AppCompat.Body1 = 0x7f0f000d -net.micode.notes:style/Base.AlertDialog.AppCompat = 0x7f0f0005 -net.micode.notes:string/search = 0x7f0e007d -net.micode.notes:style/Animation.AppCompat.DropDownUp = 0x7f0f0003 -net.micode.notes:style/TextAppearance.AppCompat.Light.SearchResult.Title = 0x7f0f00cd -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:string/widget_havenot_content = 0x7f0e008d -net.micode.notes:string/notelist_string_info = 0x7f0e006a -net.micode.notes:style/Base.Widget.AppCompat.Light.ActionBar = 0x7f0f0082 -net.micode.notes:string/ticker_success = 0x7f0e008b -net.micode.notes:string/preferences_menu_remove_account = 0x7f0e0079 -net.micode.notes:string/ticker_fail = 0x7f0e008a -net.micode.notes:string/status_bar_notification_info_overflow = 0x7f0e0083 -net.micode.notes:string/menu_select_all = 0x7f0e0059 -net.micode.notes:style/Widget.AppCompat.DrawerArrowToggle = 0x7f0f0130 -net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.Button.Colored = 0x7f0f0031 -net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0e007c -net.micode.notes:layout/abc_dialog_title_material = 0x7f0a000c -net.micode.notes:id/iv_medium_select = 0x7f08005b -net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0e007b -net.micode.notes:style/Theme.AppCompat.DayNight.DarkActionBar = 0x7f0f0101 -net.micode.notes:string/preferences_title = 0x7f0e007a -net.micode.notes:style/Base.TextAppearance.AppCompat.SearchResult = 0x7f0f001e -net.micode.notes:string/preferences_last_sync_time_format = 0x7f0e0076 -net.micode.notes:style/RtlOverlay.Widget.AppCompat.ActionBar.TitleItem = 0x7f0f00af -net.micode.notes:style/TextAppearance.Compat.Notification = 0x7f0f00ef -net.micode.notes:string/preferences_last_sync_time = 0x7f0e0075 -net.micode.notes:style/ThemeOverlay.AppCompat.Light = 0x7f0f0119 -net.micode.notes:style/Base.V7.Widget.AppCompat.AutoCompleteTextView = 0x7f0f0064 -net.micode.notes:string/menu_folder_delete = 0x7f0e004c -net.micode.notes:string/preferences_button_sync_immediately = 0x7f0e0070 -net.micode.notes:drawable/title_alert = 0x7f070098 -net.micode.notes:styleable/GradientColorItem = 0x7f100018 -net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0e006e -net.micode.notes:string/alert_message_delete_notes = 0x7f0e0029 -net.micode.notes:string/preferences_add_account = 0x7f0e006d -net.micode.notes:attr/windowFixedWidthMajor = 0x7f03010b -net.micode.notes:drawable/list_red_up = 0x7f070079 -net.micode.notes:string/preferences_account_summary = 0x7f0e006b -net.micode.notes:string/notealert_ok = 0x7f0e0068 -net.micode.notes:id/right_side = 0x7f080093 -net.micode.notes:string/note_link_web = 0x7f0e0066 -net.micode.notes:id/menu_lock_note = 0x7f08006f -======= net.micode.notes:xml/widget_2x_info = 0x7f110002 net.micode.notes:xml/searchable = 0x7f110001 net.micode.notes:styleable/ViewStubCompat = 0x7f10002b @@ -506,42 +227,11 @@ net.micode.notes:string/notealert_ok = 0x7f0e0068 net.micode.notes:string/note_link_web = 0x7f0e0066 net.micode.notes:string/note_link_tel = 0x7f0e0065 net.micode.notes:string/note_link_email = 0x7f0e0063 ->>>>>>> xiaojinchi_branch net.micode.notes:string/note_alert_expired = 0x7f0e0062 net.micode.notes:style/Base.V23.Theme.AppCompat = 0x7f0f0058 net.micode.notes:string/menu_sync_cancel = 0x7f0e0060 net.micode.notes:string/menu_sync = 0x7f0e005f net.micode.notes:string/menu_share = 0x7f0e005e -<<<<<<< HEAD -net.micode.notes:style/Base.ThemeOverlay.AppCompat.Dialog.Alert = 0x7f0f004f -net.micode.notes:style/Widget.AppCompat.Button.Small = 0x7f0f012a -net.micode.notes:style/TextAppearance.AppCompat.Widget.Button.Inverse = 0x7f0f00e8 -net.micode.notes:string/menu_setting = 0x7f0e005d -net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0f00fd -net.micode.notes:string/menu_search = 0x7f0e0058 -net.micode.notes:style/AlertDialog.AppCompat = 0x7f0f0000 -net.micode.notes:style/Widget.AppCompat.ListView.DropDown = 0x7f0f014d -net.micode.notes:string/error_sync_network = 0x7f0e003a -net.micode.notes:string/abc_font_family_menu_material = 0x7f0e0011 -net.micode.notes:style/TextAppearanceMedium = 0x7f0f00f8 -net.micode.notes:dimen/abc_text_size_body_1_material = 0x7f060039 -net.micode.notes:string/menu_font_super = 0x7f0e0052 -net.micode.notes:string/menu_font_normal = 0x7f0e004f -net.micode.notes:string/menu_font_large = 0x7f0e004e -net.micode.notes:string/search_label = 0x7f0e007f -net.micode.notes:string/menu_export_text = 0x7f0e004a -net.micode.notes:string/format_datetime_mdhm = 0x7f0e0040 -net.micode.notes:string/folder_exist = 0x7f0e003e -net.micode.notes:string/abc_font_family_headline_material = 0x7f0e0010 -net.micode.notes:style/Widget.AppCompat.ActionMode = 0x7f0f0122 -net.micode.notes:string/error_sync_cancelled = 0x7f0e0038 -net.micode.notes:string/error_sdcard_export = 0x7f0e0036 -net.micode.notes:style/Widget.AppCompat.Spinner.DropDown = 0x7f0f015c -net.micode.notes:style/Widget.AppCompat.Button.ButtonBar.AlertDialog = 0x7f0f0128 -net.micode.notes:string/datetime_dialog_ok = 0x7f0e0031 -net.micode.notes:string/app_name = 0x7f0e002b -net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0f00a0 -======= net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0f00fd net.micode.notes:string/menu_setting = 0x7f0e005d net.micode.notes:string/menu_send_to_desktop = 0x7f0e005c @@ -551,291 +241,44 @@ net.micode.notes:string/menu_search = 0x7f0e0058 net.micode.notes:style/Theme.AppCompat.DayNight = 0x7f0f0100 net.micode.notes:string/menu_remove_remind = 0x7f0e0057 net.micode.notes:string/menu_font_super = 0x7f0e0052 -net.micode.notes:string/menu_font_normal = 0x7f0e004f -net.micode.notes:string/menu_font_large = 0x7f0e004e -net.micode.notes:string/menu_folder_delete = 0x7f0e004c -net.micode.notes:string/menu_folder_change_name = 0x7f0e004b -net.micode.notes:string/search_label = 0x7f0e007f -net.micode.notes:string/menu_export_text = 0x7f0e004a -net.micode.notes:string/menu_delete = 0x7f0e0048 -net.micode.notes:string/info_note_enter_desktop = 0x7f0e0045 -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: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: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:style/HighlightTextAppearancePrimary = 0x7f0f00a0 -net.micode.notes:string/app_name = 0x7f0e002b -net.micode.notes:string/alert_message_delete_notes = 0x7f0e0029 ->>>>>>> xiaojinchi_branch -net.micode.notes:style/Base.Widget.AppCompat.ProgressBar.Horizontal = 0x7f0f0093 -net.micode.notes:string/alert_message_delete_folder = 0x7f0e0027 -net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.PopupMenu.Small = 0x7f0f0036 -net.micode.notes:string/abc_toolbar_collapse_description = 0x7f0e0026 -<<<<<<< HEAD -net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.ActionBar.Title = 0x7f0f002b -net.micode.notes:style/TextAppearance.AppCompat.Display2 = 0x7f0f00c5 -net.micode.notes:string/abc_shareactionprovider_share_with_application = 0x7f0e0025 -net.micode.notes:style/RtlOverlay.Widget.AppCompat.Search.DropDown.Text = 0x7f0f00bb -net.micode.notes:style/Widget.AppCompat.Toolbar = 0x7f0f0160 -net.micode.notes:string/success_sdcard_export = 0x7f0e0084 -net.micode.notes:id/title_template = 0x7f0800bd -net.micode.notes:string/abc_searchview_description_query = 0x7f0e0020 -net.micode.notes:style/Base.TextAppearance.AppCompat.Small = 0x7f0f0021 -net.micode.notes:style/TextAppearance.Compat.Notification.Title = 0x7f0f00f3 -net.micode.notes:style/Base.Widget.AppCompat.Button.Colored = 0x7f0f0076 -======= -net.micode.notes:string/abc_shareactionprovider_share_with_application = 0x7f0e0025 -net.micode.notes:string/abc_searchview_description_submit = 0x7f0e0022 -net.micode.notes:style/TextAppearance.Compat.Notification.Title = 0x7f0f00f3 -net.micode.notes:style/Base.TextAppearance.AppCompat.Small = 0x7f0f0021 -net.micode.notes:string/abc_searchview_description_query = 0x7f0e0020 ->>>>>>> xiaojinchi_branch -net.micode.notes:string/abc_searchview_description_clear = 0x7f0e001f -net.micode.notes:string/abc_search_hint = 0x7f0e001e -net.micode.notes:string/sync_progress_login = 0x7f0e0087 -net.micode.notes:string/abc_prepend_shortcut_label = 0x7f0e001d -net.micode.notes:string/abc_menu_shift_shortcut_label = 0x7f0e001a -<<<<<<< HEAD -net.micode.notes:style/TextAppearance.AppCompat.Light.Widget.PopupMenu.Large = 0x7f0f00ce -net.micode.notes:string/abc_menu_function_shortcut_label = 0x7f0e0018 -net.micode.notes:styleable/GradientColor = 0x7f100017 -net.micode.notes:string/abc_font_family_subhead_material = 0x7f0e0012 -net.micode.notes:string/abc_font_family_display_4_material = 0x7f0e000f -net.micode.notes:style/TextAppearance.AppCompat.Display1 = 0x7f0f00c4 -net.micode.notes:string/abc_font_family_display_3_material = 0x7f0e000e -net.micode.notes:id/tabMode = 0x7f0800b1 -net.micode.notes:layout/abc_screen_toolbar = 0x7f0a0017 -net.micode.notes:style/Base.TextAppearance.AppCompat.Caption = 0x7f0f0010 -net.micode.notes:style/Widget.AppCompat.Light.ActionBar.TabBar = 0x7f0f0137 -net.micode.notes:style/Base.V28.Theme.AppCompat = 0x7f0f005d -net.micode.notes:style/Base.TextAppearance.AppCompat.Inverse = 0x7f0f0016 -net.micode.notes:string/abc_font_family_body_2_material = 0x7f0e0009 -net.micode.notes:style/Theme.AppCompat.DayNight = 0x7f0f0100 -net.micode.notes:string/menu_remove_remind = 0x7f0e0057 -net.micode.notes:color/bright_foreground_disabled_material_dark = 0x7f05001e -net.micode.notes:drawable/abc_ic_star_half_black_16dp = 0x7f070022 -net.micode.notes:string/abc_font_family_title_material = 0x7f0e0013 -net.micode.notes:string/abc_action_bar_home_description = 0x7f0e0000 -net.micode.notes:style/Widget.AppCompat.Light.ActionBar.TabText = 0x7f0f0139 -net.micode.notes:style/Widget.AppCompat.ActionBar.TabText = 0x7f0f011d -net.micode.notes:raw/introduction = 0x7f0d0000 -net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0e0073 -net.micode.notes:style/RtlOverlay.Widget.AppCompat.PopupMenuItem.InternalGroup = 0x7f0f00b2 -net.micode.notes:plurals/search_results_title = 0x7f0c0000 -net.micode.notes:menu/sub_folder = 0x7f0b0006 -net.micode.notes:string/set_remind_time_message = 0x7f0e0082 -net.micode.notes:id/action_text = 0x7f080019 -net.micode.notes:menu/note_list_options = 0x7f0b0005 -net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.ActionBar.Menu = 0x7f0f0028 -net.micode.notes:style/Base.Theme.AppCompat.Dialog.Alert = 0x7f0f003f -net.micode.notes:menu/note_list_dropdown = 0x7f0b0004 -net.micode.notes:style/TextAppearance.AppCompat.Widget.TextView.SpinnerItem = 0x7f0f00ee -net.micode.notes:id/tv_title_bar = 0x7f0800c6 -net.micode.notes:menu/note_edit = 0x7f0b0002 -net.micode.notes:menu/call_record_folder = 0x7f0b0001 -net.micode.notes:style/Base.TextAppearance.AppCompat.Title.Inverse = 0x7f0f0026 -net.micode.notes:layout/widget_4x = 0x7f0a0033 -net.micode.notes:string/note_link_email = 0x7f0e0063 -net.micode.notes:layout/notification_template_icon_group = 0x7f0a002a -net.micode.notes:drawable/list_white_down = 0x7f07007a -net.micode.notes:layout/abc_search_dropdown_item_icons_2line = 0x7f0a0018 -net.micode.notes:id/selection_menu = 0x7f0800a3 -net.micode.notes:id/clip_vertical = 0x7f08002f -net.micode.notes:layout/notification_action_tombstone = 0x7f0a0028 -net.micode.notes:style/Theme.AppCompat.Light.DialogWhenLarge = 0x7f0f0110 -net.micode.notes:layout/notification_action = 0x7f0a0027 -net.micode.notes:styleable/ButtonBarLayout = 0x7f10000f -net.micode.notes:layout/abc_alert_dialog_material = 0x7f0a0009 -net.micode.notes:style/Base.Widget.AppCompat.CompoundButton.CheckBox = 0x7f0f007a -net.micode.notes:style/Base.V7.ThemeOverlay.AppCompat.Dialog = 0x7f0f0063 -net.micode.notes:layout/dialog_edit_text = 0x7f0a001f -net.micode.notes:style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse = 0x7f0f00e0 -net.micode.notes:xml/preferences = 0x7f110000 -net.micode.notes:layout/add_account_text = 0x7f0a001d -net.micode.notes:layout/abc_search_view = 0x7f0a0019 -net.micode.notes:styleable/LinearLayoutCompat = 0x7f100019 -net.micode.notes:string/widget_under_visit_mode = 0x7f0e008e -net.micode.notes:layout/abc_list_menu_item_layout = 0x7f0a0010 -net.micode.notes:string/delete_remind_time_message = 0x7f0e0032 -net.micode.notes:id/actions = 0x7f08001a -net.micode.notes:layout/abc_expanded_menu_layout = 0x7f0a000d -net.micode.notes:layout/abc_alert_dialog_button_bar_material = 0x7f0a0008 -net.micode.notes:string/menu_move_parent_folder = 0x7f0e0055 -net.micode.notes:style/Theme.AppCompat.Light = 0x7f0f010b -net.micode.notes:style/Animation.AppCompat.Dialog = 0x7f0f0002 -net.micode.notes:string/error_note_empty_for_clock = 0x7f0e0033 -net.micode.notes:integer/status_bar_notification_info_maxnum = 0x7f090004 -net.micode.notes:layout/abc_action_mode_bar = 0x7f0a0004 -net.micode.notes:styleable/AnimatedStateListDrawableTransition = 0x7f100009 -net.micode.notes:layout/abc_action_bar_up_container = 0x7f0a0001 -net.micode.notes:layout/settings_header = 0x7f0a0030 -net.micode.notes:color/switch_thumb_disabled_material_light = 0x7f05004f -net.micode.notes:id/action_bar_container = 0x7f08000a -net.micode.notes:id/tv_modified_date = 0x7f0800c2 -net.micode.notes:style/TextAppearance.AppCompat.Widget.ActionMode.Subtitle = 0x7f0f00e1 -net.micode.notes:layout/abc_list_menu_item_icon = 0x7f0a000f -net.micode.notes:styleable/MenuItem = 0x7f10001d -net.micode.notes:style/Widget.AppCompat.ListMenuView = 0x7f0f014a -net.micode.notes:string/file_name_txt_format = 0x7f0e003c -net.micode.notes:id/tv_alert_date = 0x7f0800c0 -net.micode.notes:drawable/list_blue_down = 0x7f07006c -net.micode.notes:id/search_button = 0x7f08009a -net.micode.notes:id/textSpacerNoButtons = 0x7f0800b8 -net.micode.notes:style/Theme.AppCompat.DialogWhenLarge = 0x7f0f010a -net.micode.notes:style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle = 0x7f0f00dd -net.micode.notes:style/TextAppearance.AppCompat.Widget.DropDownItem = 0x7f0f00e9 -net.micode.notes:dimen/notification_action_text_size = 0x7f06005c -net.micode.notes:drawable/abc_list_divider_material = 0x7f070028 -net.micode.notes:string/menu_list_mode = 0x7f0e0053 -net.micode.notes:id/note_title = 0x7f080084 -net.micode.notes:id/tag_unhandled_key_listeners = 0x7f0800b4 -net.micode.notes:drawable/abc_scrubber_control_to_pressed_mtrl_005 = 0x7f07003b -net.micode.notes:id/tag_transition_group = 0x7f0800b2 -net.micode.notes:style/TextAppearance.AppCompat.Light.Widget.PopupMenu.Small = 0x7f0f00cf -net.micode.notes:id/submit_area = 0x7f0800af -net.micode.notes:layout/abc_list_menu_item_radio = 0x7f0a0011 -net.micode.notes:id/shortcut = 0x7f0800a4 -net.micode.notes:style/Base.Widget.AppCompat.ActionMode = 0x7f0f006f -net.micode.notes:id/search_plate = 0x7f08009f -net.micode.notes:id/action_container = 0x7f08000f -net.micode.notes:id/search_bar = 0x7f080099 -net.micode.notes:id/scrollIndicatorUp = 0x7f080096 -net.micode.notes:style/Base.TextAppearance.AppCompat.Body2 = 0x7f0f000e -net.micode.notes:styleable/ActionBar = 0x7f100000 -net.micode.notes:id/take_photo = 0x7f0800b5 -net.micode.notes:style/Platform.AppCompat.Light = 0x7f0f00a5 -net.micode.notes:style/Base.TextAppearance.AppCompat.Light.Widget.PopupMenu.Small = 0x7f0f001a -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:id/spacer = 0x7f0800a8 -net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0e0034 -net.micode.notes:id/right_icon = 0x7f080092 -net.micode.notes:layout/abc_alert_dialog_title_material = 0x7f0a000a -net.micode.notes:style/Theme.AppCompat.DayNight.Dialog.Alert = 0x7f0f0103 -net.micode.notes:dimen/notification_content_margin_start = 0x7f06005e -net.micode.notes:id/preference_sync_button = 0x7f08008c -net.micode.notes:string/abc_searchview_description_voice = 0x7f0e0023 -net.micode.notes:styleable/DrawerArrowToggle = 0x7f100014 -net.micode.notes:styleable/ActionMenuView = 0x7f100003 -net.micode.notes:id/open_album = 0x7f080089 -net.micode.notes:style/Widget.AppCompat.ListView.Menu = 0x7f0f014e -net.micode.notes:id/notification_main_column = 0x7f080087 -net.micode.notes:drawable/delete = 0x7f070059 -net.micode.notes:style/Base.Widget.AppCompat.Toolbar.Button.Navigation = 0x7f0f009f -net.micode.notes:style/TextAppearance.AppCompat.Widget.PopupMenu.Small = 0x7f0f00ec -net.micode.notes:id/notification_background = 0x7f080086 -net.micode.notes:attr/actionModeBackground = 0x7f030010 -net.micode.notes:id/normal = 0x7f08007f -net.micode.notes:attr/actionModeSplitBackground = 0x7f03001a -net.micode.notes:id/never = 0x7f08007d -net.micode.notes:color/abc_primary_text_material_dark = 0x7f05000a -net.micode.notes:drawable/list_red_down = 0x7f070076 -net.micode.notes:id/multiply = 0x7f08007b -net.micode.notes:id/middle = 0x7f080078 -net.micode.notes:id/menu_search = 0x7f080072 -net.micode.notes:id/menu_delete_remind = 0x7f08006b -net.micode.notes:id/menu_add_image = 0x7f080068 -net.micode.notes:id/ll_font_super = 0x7f080066 -net.micode.notes:style/Widget.AppCompat.SeekBar = 0x7f0f0159 -net.micode.notes:drawable/notification_bg_normal = 0x7f07008e -net.micode.notes:integer/abc_config_activityShortDur = 0x7f090001 -net.micode.notes:id/list_item = 0x7f080062 -net.micode.notes:dimen/abc_dialog_fixed_width_major = 0x7f06001e -net.micode.notes:id/ll_font_small = 0x7f080065 -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/top = 0x7f0800be -net.micode.notes:id/fill_horizontal = 0x7f080041 -net.micode.notes:id/left = 0x7f08005e -net.micode.notes:id/iv_super_select = 0x7f08005d -net.micode.notes:style/TextAppearance.AppCompat.Display4 = 0x7f0f00c7 -net.micode.notes:drawable/edit_white = 0x7f070063 -net.micode.notes:id/note_edit_view = 0x7f080082 -net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.ActionBar.Subtitle = 0x7f0f0029 -net.micode.notes:id/iv_small_select = 0x7f08005c -net.micode.notes:style/TextAppearanceNormal = 0x7f0f00f9 -net.micode.notes:id/iv_bg_white_select = 0x7f080057 -net.micode.notes:drawable/notification_action_background = 0x7f070089 -net.micode.notes:id/iv_bg_red_select = 0x7f080055 -net.micode.notes:attr/actionModePasteDrawable = 0x7f030016 -net.micode.notes:id/widget_text = 0x7f0800cb -net.micode.notes:id/iv_bg_green_select = 0x7f080053 -net.micode.notes:attr/indeterminateProgressStyle = 0x7f030089 -net.micode.notes:style/TextAppearance.AppCompat.Subhead = 0x7f0f00d7 -net.micode.notes:drawable/widget_4x_yellow = 0x7f0700a5 -net.micode.notes:attr/actionModeCopyDrawable = 0x7f030013 -net.micode.notes:id/image = 0x7f08004c -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:color/secondary_text_dark = 0x7f050049 -net.micode.notes:id/group_divider = 0x7f080045 -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:style/Base.V7.Theme.AppCompat.Light = 0x7f0f0061 -net.micode.notes:id/iv_large_select = 0x7f08005a -net.micode.notes:color/primary_material_light = 0x7f050041 -net.micode.notes:id/expanded_menu = 0x7f08003f -net.micode.notes:style/Widget.AppCompat.ButtonBar.AlertDialog = 0x7f0f012c -net.micode.notes:style/Base.Widget.AppCompat.RatingBar = 0x7f0f0094 -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:style/Theme.AppCompat.Light.Dialog.MinWidth = 0x7f0f010f -net.micode.notes:id/custom = 0x7f080033 -net.micode.notes:id/clip_horizontal = 0x7f08002e -net.micode.notes:dimen/abc_search_view_preferred_width = 0x7f060034 -net.micode.notes:drawable/abc_ic_star_black_16dp = 0x7f07001f -net.micode.notes:id/chronometer = 0x7f08002d -net.micode.notes:id/blocking = 0x7f080023 -net.micode.notes:attr/showText = 0x7f0300c7 -net.micode.notes:attr/popupWindowStyle = 0x7f0300b5 -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:id/note_item = 0x7f080083 -net.micode.notes:style/Base.Theme.AppCompat.Dialog.FixedSize = 0x7f0f0040 -net.micode.notes:id/italic = 0x7f08004e -net.micode.notes:style/Theme.AppCompat.Dialog.MinWidth = 0x7f0f0109 -net.micode.notes:id/homeAsUp = 0x7f080047 -net.micode.notes:drawable/title_bar_bg = 0x7f070099 -net.micode.notes:drawable/abc_text_cursor_material = 0x7f070047 -net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.Button.Borderless.Colored = 0x7f0f0030 -net.micode.notes:style/Base.Theme.AppCompat.Light.DarkActionBar = 0x7f0f0044 -net.micode.notes:id/bottom = 0x7f080024 -net.micode.notes:string/format_folder_files_count = 0x7f0e0042 -net.micode.notes:id/iv_bg_white = 0x7f080056 -net.micode.notes:id/title = 0x7f0800bb -net.micode.notes:id/amPm = 0x7f080020 -net.micode.notes:dimen/compat_button_inset_horizontal_material = 0x7f06004b -net.micode.notes:style/Base.Widget.AppCompat.ButtonBar = 0x7f0f0078 -net.micode.notes:id/always = 0x7f08001f -net.micode.notes:id/alertTitle = 0x7f08001d -net.micode.notes:attr/fontProviderPackage = 0x7f030079 -net.micode.notes:attr/allowStacking = 0x7f030026 -net.micode.notes:id/line3 = 0x7f080060 -net.micode.notes:color/material_grey_50 = 0x7f050037 -net.micode.notes:id/action_mode_close_button = 0x7f080017 -net.micode.notes:string/notelist_menu_new = 0x7f0e0069 -net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.PopupMenu.Header = 0x7f0f0034 -net.micode.notes:id/action_mode_bar = 0x7f080015 -net.micode.notes:attr/actionOverflowButtonStyle = 0x7f03001d -net.micode.notes:id/action_context_bar = 0x7f080010 -net.micode.notes:attr/tooltipText = 0x7f0300ff -net.micode.notes:id/action_bar_title = 0x7f08000e -======= +net.micode.notes:string/menu_font_normal = 0x7f0e004f +net.micode.notes:string/menu_font_large = 0x7f0e004e +net.micode.notes:string/menu_folder_delete = 0x7f0e004c +net.micode.notes:string/menu_folder_change_name = 0x7f0e004b +net.micode.notes:string/search_label = 0x7f0e007f +net.micode.notes:string/menu_export_text = 0x7f0e004a +net.micode.notes:string/menu_delete = 0x7f0e0048 +net.micode.notes:string/info_note_enter_desktop = 0x7f0e0045 +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: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: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:style/HighlightTextAppearancePrimary = 0x7f0f00a0 +net.micode.notes:string/app_name = 0x7f0e002b +net.micode.notes:string/alert_message_delete_notes = 0x7f0e0029 +net.micode.notes:style/Base.Widget.AppCompat.ProgressBar.Horizontal = 0x7f0f0093 +net.micode.notes:string/alert_message_delete_folder = 0x7f0e0027 +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 +net.micode.notes:string/abc_searchview_description_submit = 0x7f0e0022 +net.micode.notes:style/TextAppearance.Compat.Notification.Title = 0x7f0f00f3 +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 = 0x7f0e0087 +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 net.micode.notes:string/abc_menu_alt_shortcut_label = 0x7f0e0014 net.micode.notes:string/abc_font_family_subhead_material = 0x7f0e0012 @@ -919,25 +362,26 @@ net.micode.notes:layout/abc_screen_toolbar = 0x7f0a0017 net.micode.notes:id/tabMode = 0x7f0800b7 net.micode.notes:id/submit_area = 0x7f0800b5 net.micode.notes:string/notealert_enter = 0x7f0e0067 -net.micode.notes:id/src_over = 0x7f0800b1 +net.micode.notes:id/src_over = 0x7f0800b2 net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0e0034 -net.micode.notes:id/spacer = 0x7f0800ad +net.micode.notes:id/spacer = 0x7f0800ae net.micode.notes:style/Base.Widget.AppCompat.ActionMode = 0x7f0f006f -net.micode.notes:id/shortcut = 0x7f0800a9 -net.micode.notes:id/selection_menu = 0x7f0800a8 -net.micode.notes:id/search_plate = 0x7f0800a4 -net.micode.notes:id/search_close_btn = 0x7f0800a0 -net.micode.notes:id/search_bar = 0x7f08009e -net.micode.notes:id/scrollIndicatorUp = 0x7f08009b -net.micode.notes:id/right_side = 0x7f080098 +net.micode.notes:id/shortcut = 0x7f0800aa +net.micode.notes:id/selection_menu = 0x7f0800a9 +net.micode.notes:id/search_plate = 0x7f0800a5 +net.micode.notes:id/search_close_btn = 0x7f0800a1 +net.micode.notes:id/search_bar = 0x7f08009f +net.micode.notes:id/scrollIndicatorUp = 0x7f08009c +net.micode.notes:id/right_side = 0x7f080099 net.micode.notes:layout/abc_alert_dialog_title_material = 0x7f0a000a -net.micode.notes:id/right_icon = 0x7f080097 -net.micode.notes:id/regonize_word = 0x7f080095 +net.micode.notes:id/right_icon = 0x7f080098 +net.micode.notes:id/regonize_word = 0x7f080096 net.micode.notes:string/abc_searchview_description_voice = 0x7f0e0023 -net.micode.notes:id/preference_sync_button = 0x7f080090 +net.micode.notes:id/preference_sync_button = 0x7f080091 net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0f00fa net.micode.notes:id/tv_time = 0x7f0800c9 -net.micode.notes:id/prefenerece_sync_status_textview = 0x7f08008f +net.micode.notes:id/prefenerece_sync_status_textview = 0x7f080090 +net.micode.notes:id/open_camera = 0x7f08008e net.micode.notes:styleable/DrawerArrowToggle = 0x7f100014 net.micode.notes:styleable/ActionMenuView = 0x7f100003 net.micode.notes:id/open_album = 0x7f08008d @@ -1059,26 +503,14 @@ net.micode.notes:id/action_context_bar = 0x7f080010 net.micode.notes:id/action_container = 0x7f08000f net.micode.notes:attr/tooltipText = 0x7f0300ff net.micode.notes:id/action_bar_title = 0x7f08000e -net.micode.notes:id/stop = 0x7f0800b3 net.micode.notes:id/action_bar_subtitle = 0x7f08000d net.micode.notes:color/switch_thumb_disabled_material_light = 0x7f05004f net.micode.notes:id/action_bar_container = 0x7f08000a net.micode.notes:id/account_dialog_title = 0x7f080007 ->>>>>>> xiaojinchi_branch 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 -<<<<<<< HEAD -net.micode.notes:attr/autoSizeMinTextSize = 0x7f03002d -net.micode.notes:id/none = 0x7f08007e -net.micode.notes:drawable/widget_4x_red = 0x7f0700a3 -net.micode.notes:drawable/widget_2x_white = 0x7f07009f -net.micode.notes:drawable/butto_read = 0x7f070056 -net.micode.notes:drawable/widget_2x_green = 0x7f07009d -net.micode.notes:style/Base.Widget.AppCompat.Spinner.Underlined = 0x7f0f009c -net.micode.notes:drawable/tooltip_frame_dark = 0x7f07009a -======= net.micode.notes:id/iv_bg_blue_select = 0x7f080053 net.micode.notes:attr/autoSizeMinTextSize = 0x7f03002d net.micode.notes:id/none = 0x7f080082 @@ -1092,7 +524,6 @@ net.micode.notes:id/homeAsUp = 0x7f080049 net.micode.notes:drawable/abc_text_cursor_material = 0x7f070047 net.micode.notes:drawable/title_bar_bg = 0x7f070099 net.micode.notes:drawable/title_alert = 0x7f070098 ->>>>>>> xiaojinchi_branch net.micode.notes:color/abc_background_cache_hint_selector_material_light = 0x7f050001 net.micode.notes:drawable/selected = 0x7f070097 net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.PopupMenu.Large = 0x7f0f0035 @@ -1101,26 +532,6 @@ net.micode.notes:style/Theme.AppCompat.Dialog = 0x7f0f0107 net.micode.notes:drawable/read = 0x7f070095 net.micode.notes:drawable/abc_ic_search_api_material = 0x7f07001e net.micode.notes:id/SHIFT = 0x7f080004 -<<<<<<< HEAD -net.micode.notes:drawable/notify_panel_notification_icon_bg = 0x7f070094 -net.micode.notes:attr/fontFamily = 0x7f030074 -net.micode.notes:drawable/notification_template_icon_bg = 0x7f070091 -net.micode.notes:string/abc_font_family_caption_material = 0x7f0e000b -net.micode.notes:id/text = 0x7f0800b6 -net.micode.notes:drawable/notification_icon_background = 0x7f070090 -net.micode.notes:string/search_hint = 0x7f0e007e -net.micode.notes:drawable/notification_bg_low_pressed = 0x7f07008d -net.micode.notes:drawable/abc_edit_text_material = 0x7f070012 -net.micode.notes:attr/paddingStart = 0x7f0300ae -net.micode.notes:drawable/notification_bg_low_normal = 0x7f07008c -net.micode.notes:id/src_in = 0x7f0800ab -net.micode.notes:id/note_bg_color_selector = 0x7f080080 -net.micode.notes:style/Base.Widget.AppCompat.Button = 0x7f0f0072 -net.micode.notes:drawable/new_note_pressed = 0x7f070086 -net.micode.notes:anim/abc_tooltip_exit = 0x7f01000b -net.micode.notes:style/Base.TextAppearance.AppCompat.SearchResult.Title = 0x7f0f0020 -net.micode.notes:style/Base.Widget.AppCompat.Button.Borderless = 0x7f0f0073 -======= net.micode.notes:attr/fontFamily = 0x7f030074 net.micode.notes:drawable/notify_panel_notification_icon_bg = 0x7f070094 net.micode.notes:string/abc_font_family_caption_material = 0x7f0e000b @@ -1131,7 +542,7 @@ 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 = 0x7f07008d -net.micode.notes:id/src_in = 0x7f0800b0 +net.micode.notes:id/src_in = 0x7f0800b1 net.micode.notes:attr/paddingStart = 0x7f0300ae net.micode.notes:drawable/notification_bg_low_normal = 0x7f07008c net.micode.notes:style/Base.Widget.AppCompat.Button = 0x7f0f0072 @@ -1141,123 +552,11 @@ net.micode.notes:style/Base.TextAppearance.AppCompat.SearchResult.Title = 0x7f0f net.micode.notes:anim/abc_tooltip_exit = 0x7f01000b net.micode.notes:drawable/new_note_pressed = 0x7f070086 net.micode.notes:drawable/new_note_normal = 0x7f070085 ->>>>>>> xiaojinchi_branch 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 = 0x7f070081 net.micode.notes:drawable/list_yellow_single = 0x7f070080 net.micode.notes:styleable/MenuView = 0x7f10001e -<<<<<<< HEAD -net.micode.notes:drawable/list_yellow_middle = 0x7f07007f -net.micode.notes:string/format_date_ymd = 0x7f0e003f -net.micode.notes:string/abc_activity_chooser_view_see_all = 0x7f0e0004 -net.micode.notes:attr/numericModifiers = 0x7f0300aa -net.micode.notes:color/primary_text_default_material_dark = 0x7f050043 -net.micode.notes:drawable/list_yellow_down = 0x7f07007e -net.micode.notes:id/note_edit_list = 0x7f080081 -net.micode.notes:drawable/list_red_single = 0x7f070078 -net.micode.notes:dimen/abc_text_size_caption_material = 0x7f06003c -net.micode.notes:style/Base.Theme.AppCompat.Dialog = 0x7f0f003e -net.micode.notes:id/right = 0x7f080091 -net.micode.notes:dimen/abc_text_size_large_material = 0x7f060042 -net.micode.notes:drawable/abc_ic_star_half_black_36dp = 0x7f070023 -net.micode.notes:drawable/list_red_middle = 0x7f070077 -net.micode.notes:drawable/abc_textfield_search_default_mtrl_alpha = 0x7f070051 -net.micode.notes:attr/height = 0x7f030080 -net.micode.notes:drawable/list_green_down = 0x7f070072 -net.micode.notes:id/showCustom = 0x7f0800a5 -net.micode.notes:style/Widget.AppCompat.ActionBar = 0x7f0f011a -net.micode.notes:id/disableHome = 0x7f080039 -net.micode.notes:style/Widget.AppCompat.Light.ActionBar.Solid = 0x7f0f0135 -net.micode.notes:drawable/list_footer_bg = 0x7f070071 -net.micode.notes:drawable/list_folder = 0x7f070070 -net.micode.notes:drawable/abc_menu_hardkey_panel_mtrl_mult = 0x7f070034 -net.micode.notes:style/Widget.AppCompat.Light.ActionBar.TabBar.Inverse = 0x7f0f0138 -net.micode.notes:id/ifRoom = 0x7f08004b -net.micode.notes:drawable/list_blue_up = 0x7f07006f -net.micode.notes:id/menu_font_size = 0x7f08006d -net.micode.notes:dimen/tooltip_margin = 0x7f060071 -net.micode.notes:drawable/list_blue_single = 0x7f07006e -net.micode.notes:style/Base.TextAppearance.Widget.AppCompat.Toolbar.Subtitle = 0x7f0f003a -net.micode.notes:attr/actionBarTabStyle = 0x7f030007 -net.micode.notes:dimen/text_font_size_normal = 0x7f06006c -net.micode.notes:styleable/AppCompatTextHelper = 0x7f10000c -net.micode.notes:string/hint_foler_name = 0x7f0e0044 -net.micode.notes:style/TextAppearance.AppCompat.Title.Inverse = 0x7f0f00da -net.micode.notes:drawable/abc_cab_background_top_material = 0x7f07000e -net.micode.notes:drawable/font_super = 0x7f070069 -net.micode.notes:dimen/abc_dialog_padding_top_material = 0x7f060025 -net.micode.notes:id/minute = 0x7f080079 -net.micode.notes:string/menu_deselect_all = 0x7f0e0049 -net.micode.notes:drawable/font_small = 0x7f070068 -net.micode.notes:attr/selectableItemBackgroundBorderless = 0x7f0300c4 -net.micode.notes:drawable/edit_yellow = 0x7f070064 -net.micode.notes:color/highlighted_text_material_light = 0x7f05002f -net.micode.notes:drawable/abc_textfield_default_mtrl_alpha = 0x7f07004f -net.micode.notes:drawable/edit_red = 0x7f07005d -net.micode.notes:drawable/abc_text_select_handle_right_mtrl_dark = 0x7f07004c -net.micode.notes:drawable/clock = 0x7f070058 -net.micode.notes:dimen/abc_text_size_body_2_material = 0x7f06003a -net.micode.notes:style/Base.Widget.AppCompat.ActionBar.Solid = 0x7f0f0068 -net.micode.notes:drawable/abc_list_longpressed_holo = 0x7f07002b -net.micode.notes:layout/abc_list_menu_item_checkbox = 0x7f0a000e -net.micode.notes:id/forever = 0x7f080044 -net.micode.notes:attr/spinnerStyle = 0x7f0300cc -net.micode.notes:drawable/abc_textfield_search_material = 0x7f070052 -net.micode.notes:attr/searchViewStyle = 0x7f0300c1 -net.micode.notes:drawable/widget_4x_green = 0x7f0700a2 -net.micode.notes:drawable/abc_tab_indicator_mtrl_alpha = 0x7f070046 -net.micode.notes:id/topPanel = 0x7f0800bf -net.micode.notes:dimen/abc_edit_text_inset_bottom_material = 0x7f06002c -net.micode.notes:drawable/widget_4x_blue = 0x7f0700a1 -net.micode.notes:id/tv_folder_name = 0x7f0800c1 -net.micode.notes:drawable/abc_switch_track_mtrl_alpha = 0x7f070044 -net.micode.notes:drawable/abc_btn_switch_to_on_mtrl_00012 = 0x7f07000c -net.micode.notes:id/icon = 0x7f080049 -net.micode.notes:string/abc_action_menu_overflow_description = 0x7f0e0002 -net.micode.notes:style/Widget.AppCompat.Spinner.DropDown.ActionBar = 0x7f0f015d -net.micode.notes:id/action_bar_root = 0x7f08000b -net.micode.notes:layout/select_dialog_item_material = 0x7f0a002d -net.micode.notes:dimen/abc_edit_text_inset_top_material = 0x7f06002e -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:style/Widget.AppCompat.Button.Borderless.Colored = 0x7f0f0127 -net.micode.notes:id/info = 0x7f08004d -net.micode.notes:drawable/list_green_up = 0x7f070075 -net.micode.notes:drawable/abc_ic_menu_copy_mtrl_am_alpha = 0x7f070018 -net.micode.notes:drawable/abc_scrubber_track_mtrl_alpha = 0x7f07003d -net.micode.notes:style/Widget.AppCompat.Light.ActionBar.Solid.Inverse = 0x7f0f0136 -net.micode.notes:anim/abc_shrink_fade_out_from_bottom = 0x7f010005 -net.micode.notes:id/add = 0x7f08001c -net.micode.notes:drawable/abc_scrubber_control_to_pressed_mtrl_000 = 0x7f07003a -net.micode.notes:attr/buttonTintMode = 0x7f030043 -net.micode.notes:drawable/widget_4x_white = 0x7f0700a4 -net.micode.notes:drawable/abc_scrubber_control_off_mtrl_alpha = 0x7f070039 -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/menu_new_note = 0x7f080071 -net.micode.notes:id/iv_bg_green = 0x7f080052 -net.micode.notes:string/abc_action_bar_up_description = 0x7f0e0001 -net.micode.notes:drawable/abc_list_selector_holo_light = 0x7f070033 -net.micode.notes:attr/collapseContentDescription = 0x7f030048 -net.micode.notes:drawable/abc_list_selector_disabled_holo_dark = 0x7f070030 -net.micode.notes:drawable/abc_list_selector_holo_dark = 0x7f070032 -net.micode.notes:array/format_for_exported_note = 0x7f020000 -net.micode.notes:drawable/abc_list_selector_background_transition_holo_light = 0x7f07002f -net.micode.notes:attr/autoSizePresetSizes = 0x7f03002e -net.micode.notes:style/Base.V22.Theme.AppCompat.Light = 0x7f0f0057 -net.micode.notes:drawable/abc_ic_star_half_black_48dp = 0x7f070024 -net.micode.notes:dimen/notification_right_side_padding_top = 0x7f060064 -net.micode.notes:drawable/abc_ic_star_black_48dp = 0x7f070021 -net.micode.notes:string/preferences_menu_cancel = 0x7f0e0077 -net.micode.notes:drawable/abc_ic_star_black_36dp = 0x7f070020 -net.micode.notes:drawable/abc_ic_menu_selectall_mtrl_alpha = 0x7f07001c -net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f070087 -net.micode.notes:id/date = 0x7f080035 -net.micode.notes:drawable/abc_ic_menu_paste_mtrl_am_alpha = 0x7f07001b -net.micode.notes:id/search_voice_btn = 0x7f0800a1 -======= net.micode.notes:string/format_date_ymd = 0x7f0e003f net.micode.notes:string/abc_activity_chooser_view_see_all = 0x7f0e0004 net.micode.notes:attr/numericModifiers = 0x7f0300aa @@ -1273,7 +572,7 @@ net.micode.notes:dimen/abc_text_size_caption_material = 0x7f06003c net.micode.notes:drawable/list_red_single = 0x7f070078 net.micode.notes:drawable/list_green_down = 0x7f070072 net.micode.notes:style/Widget.AppCompat.ActionBar = 0x7f0f011a -net.micode.notes:id/showCustom = 0x7f0800aa +net.micode.notes:id/showCustom = 0x7f0800ab net.micode.notes:id/disableHome = 0x7f08003b net.micode.notes:style/Widget.AppCompat.Light.ActionBar.Solid = 0x7f0f0135 net.micode.notes:drawable/list_footer_bg = 0x7f070071 @@ -1343,7 +642,7 @@ 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 = 0x7f08009f +net.micode.notes:id/search_button = 0x7f0800a0 net.micode.notes:drawable/list_blue_down = 0x7f07006c net.micode.notes:id/menu_new_note = 0x7f080075 net.micode.notes:string/abc_action_bar_up_description = 0x7f0e0001 @@ -1374,32 +673,13 @@ 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 = 0x7f070087 net.micode.notes:id/date = 0x7f080037 -net.micode.notes:id/search_voice_btn = 0x7f0800a6 +net.micode.notes:id/search_voice_btn = 0x7f0800a7 net.micode.notes:drawable/abc_ic_menu_paste_mtrl_am_alpha = 0x7f07001b ->>>>>>> xiaojinchi_branch 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 = 0x7f0e006f -<<<<<<< HEAD -net.micode.notes:id/search_edit_frame = 0x7f08009c -net.micode.notes:drawable/abc_ic_go_search_api_material = 0x7f070017 -net.micode.notes:drawable/abc_ic_commit_search_api_mtrl_alpha = 0x7f070016 -net.micode.notes:style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse = 0x7f0f00de -net.micode.notes:drawable/abc_btn_switch_to_on_mtrl_00001 = 0x7f07000b -net.micode.notes:drawable/abc_btn_radio_to_on_mtrl_015 = 0x7f07000a -net.micode.notes:style/ThemeOverlay.AppCompat.ActionBar = 0x7f0f0114 -net.micode.notes:drawable/abc_btn_borderless_material = 0x7f070002 -net.micode.notes:attr/displayOptions = 0x7f030064 -net.micode.notes:layout/abc_screen_simple_overlay_action_mode = 0x7f0a0016 -net.micode.notes:id/action_image = 0x7f080012 -net.micode.notes:drawable/abc_ab_share_pack_mtrl_alpha = 0x7f070000 -net.micode.notes:drawable/abc_action_bar_item_background_material = 0x7f070001 -net.micode.notes:style/Base.Widget.AppCompat.EditText = 0x7f0f0080 -net.micode.notes:dimen/tooltip_y_offset_non_touch = 0x7f060075 -net.micode.notes:attr/alertDialogCenterButtons = 0x7f030023 -======= -net.micode.notes:id/search_edit_frame = 0x7f0800a1 +net.micode.notes:id/search_edit_frame = 0x7f0800a2 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 @@ -1419,52 +699,12 @@ net.micode.notes:drawable/abc_ab_share_pack_mtrl_alpha = 0x7f070000 net.micode.notes:style/Base.Widget.AppCompat.EditText = 0x7f0f0080 net.micode.notes:attr/alertDialogCenterButtons = 0x7f030023 net.micode.notes:dimen/tooltip_y_offset_non_touch = 0x7f060075 ->>>>>>> xiaojinchi_branch net.micode.notes:style/Base.ThemeOverlay.AppCompat.Dark = 0x7f0f004c net.micode.notes:dimen/tooltip_vertical_padding = 0x7f060074 net.micode.notes:style/Base.V26.Theme.AppCompat = 0x7f0f005a 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 -<<<<<<< HEAD -net.micode.notes:drawable/notification_tile_bg = 0x7f070093 -net.micode.notes:style/ThemeOverlay.AppCompat.Dark = 0x7f0f0115 -net.micode.notes:dimen/tooltip_corner_radius = 0x7f06006f -net.micode.notes:attr/elevation = 0x7f030070 -net.micode.notes:attr/collapseIcon = 0x7f030049 -net.micode.notes:attr/coordinatorLayoutStyle = 0x7f03005e -net.micode.notes:dimen/text_font_size_small = 0x7f06006d -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:dimen/text_font_size_large = 0x7f06006a -net.micode.notes:color/material_grey_100 = 0x7f050035 -net.micode.notes:color/abc_tint_default = 0x7f050013 -net.micode.notes:id/menu_delete = 0x7f08006a -net.micode.notes:id/up = 0x7f0800c8 -net.micode.notes:drawable/abc_control_background_material = 0x7f070010 -net.micode.notes:dimen/notification_right_icon_size = 0x7f060063 -net.micode.notes:color/abc_primary_text_disable_only_material_dark = 0x7f050008 -net.micode.notes:id/src_atop = 0x7f0800aa -net.micode.notes:style/TextAppearance.AppCompat.Widget.ActionMode.Subtitle.Inverse = 0x7f0f00e2 -net.micode.notes:dimen/notification_large_icon_width = 0x7f060060 -net.micode.notes:attr/progressBarPadding = 0x7f0300b7 -net.micode.notes:attr/navigationContentDescription = 0x7f0300a7 -net.micode.notes:id/menu_list_mode = 0x7f08006e -net.micode.notes:dimen/hint_alpha_material_dark = 0x7f060057 -net.micode.notes:id/widget_bg_image = 0x7f0800ca -net.micode.notes:dimen/highlight_alpha_material_dark = 0x7f060055 -net.micode.notes:dimen/compat_button_padding_vertical_material = 0x7f06004e -net.micode.notes:drawable/list_green_single = 0x7f070074 -net.micode.notes:attr/colorControlNormal = 0x7f030050 -net.micode.notes:dimen/disabled_alpha_material_dark = 0x7f060052 -net.micode.notes:dimen/abc_search_view_preferred_height = 0x7f060033 -net.micode.notes:id/action_bar_activity_content = 0x7f080009 -net.micode.notes:string/error_note_not_exist = 0x7f0e0035 -net.micode.notes:style/Widget.Compat.NotificationActionText = 0x7f0f0163 -net.micode.notes:dimen/compat_button_padding_horizontal_material = 0x7f06004d -net.micode.notes:layout/notification_template_custom_big = 0x7f0a0029 -======= net.micode.notes:style/ThemeOverlay.AppCompat.Dark = 0x7f0f0115 net.micode.notes:drawable/notification_tile_bg = 0x7f070093 net.micode.notes:attr/elevation = 0x7f030070 @@ -1486,7 +726,7 @@ net.micode.notes:id/up = 0x7f0800cf net.micode.notes:color/abc_tint_default = 0x7f050013 net.micode.notes:id/menu_delete = 0x7f08006e net.micode.notes:drawable/abc_control_background_material = 0x7f070010 -net.micode.notes:id/src_atop = 0x7f0800af +net.micode.notes:id/src_atop = 0x7f0800b0 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 @@ -1517,35 +757,15 @@ net.micode.notes:layout/notification_template_custom_big = 0x7f0a002a 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 ->>>>>>> xiaojinchi_branch net.micode.notes:attr/layout_keyline = 0x7f030095 net.micode.notes:dimen/compat_button_inset_vertical_material = 0x7f06004c 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 -<<<<<<< HEAD -net.micode.notes:id/contentPanel = 0x7f080032 -net.micode.notes:dimen/abc_text_size_menu_material = 0x7f060045 -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:dimen/abc_text_size_button_material = 0x7f06003b -net.micode.notes:attr/progressBarStyle = 0x7f0300b8 -net.micode.notes:styleable/FontFamilyFont = 0x7f100016 -net.micode.notes:style/Base.Widget.AppCompat.ListMenuView = 0x7f0f008a -net.micode.notes:dimen/tooltip_y_offset_touch = 0x7f060076 -net.micode.notes:style/Base.V21.Theme.AppCompat = 0x7f0f0051 -net.micode.notes:dimen/abc_progress_bar_height_material = 0x7f060032 -net.micode.notes:attr/colorBackgroundFloating = 0x7f03004c -net.micode.notes:dimen/abc_dropdownitem_text_padding_left = 0x7f06002a -net.micode.notes:layout/note_list_footer = 0x7f0a0026 -net.micode.notes:dimen/abc_disabled_alpha_material_dark = 0x7f060027 -net.micode.notes:style/TextAppearance.AppCompat.Menu = 0x7f0f00d2 -======= net.micode.notes:id/contentPanel = 0x7f080034 net.micode.notes:dimen/abc_text_size_menu_material = 0x7f060045 -net.micode.notes:id/right = 0x7f080096 +net.micode.notes:id/right = 0x7f080097 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 @@ -1581,11 +801,10 @@ net.micode.notes:style/TextAppearance.AppCompat.Menu = 0x7f0f00d2 net.micode.notes:layout/note_list_footer = 0x7f0a0027 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 = 0x7f0800b2 +net.micode.notes:id/start = 0x7f0800b3 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 ->>>>>>> xiaojinchi_branch 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 @@ -1599,19 +818,11 @@ 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 -<<<<<<< HEAD -net.micode.notes:layout/notification_template_part_chronometer = 0x7f0a002b -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 -net.micode.notes:id/buttonPanel = 0x7f080027 -======= net.micode.notes:layout/notification_template_part_chronometer = 0x7f0a002c 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 net.micode.notes:id/buttonPanel = 0x7f080029 ->>>>>>> xiaojinchi_branch 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 @@ -1644,11 +855,7 @@ net.micode.notes:drawable/font_size_selector_bg = 0x7f070067 net.micode.notes:dimen/notification_media_narrow_margin = 0x7f060062 net.micode.notes:attr/subMenuArrow = 0x7f0300d1 net.micode.notes:color/user_query_highlight = 0x7f050056 -<<<<<<< HEAD -net.micode.notes:id/center_horizontal = 0x7f08002a -======= net.micode.notes:id/center_horizontal = 0x7f08002c ->>>>>>> xiaojinchi_branch 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 @@ -1671,11 +878,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 -<<<<<<< HEAD -net.micode.notes:id/sv_note_edit = 0x7f0800b0 -======= net.micode.notes:id/sv_note_edit = 0x7f0800b6 ->>>>>>> xiaojinchi_branch 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 @@ -1685,23 +888,14 @@ 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 -<<<<<<< HEAD -net.micode.notes:layout/select_dialog_multichoice_material = 0x7f0a002e -net.micode.notes:id/search_badge = 0x7f080098 -======= net.micode.notes:layout/select_dialog_multichoice_material = 0x7f0a002f -net.micode.notes:id/search_badge = 0x7f08009d ->>>>>>> xiaojinchi_branch +net.micode.notes:id/search_badge = 0x7f08009e net.micode.notes:attr/autoCompleteTextViewStyle = 0x7f03002b net.micode.notes:color/foreground_material_dark = 0x7f05002c net.micode.notes:drawable/abc_vector_test = 0x7f070053 net.micode.notes:color/abc_btn_colored_borderless_text_material = 0x7f050002 net.micode.notes:color/error_color_material_dark = 0x7f05002a -<<<<<<< HEAD -net.micode.notes:id/default_activity_button = 0x7f080037 -======= net.micode.notes:id/default_activity_button = 0x7f080039 ->>>>>>> xiaojinchi_branch net.micode.notes:id/activity_chooser_view_content = 0x7f08001b net.micode.notes:attr/font = 0x7f030073 net.micode.notes:drawable/abc_btn_colored_material = 0x7f070006 @@ -1720,11 +914,7 @@ net.micode.notes:style/Widget.AppCompat.ImageButton = 0x7f0f0133 net.micode.notes:dimen/abc_action_bar_default_padding_end_material = 0x7f060003 net.micode.notes:attr/titleMargins = 0x7f0300f7 net.micode.notes:color/material_blue_grey_800 = 0x7f050030 -<<<<<<< HEAD -net.micode.notes:id/customPanel = 0x7f080034 -======= net.micode.notes:id/customPanel = 0x7f080036 ->>>>>>> xiaojinchi_branch net.micode.notes:dimen/hint_alpha_material_light = 0x7f060058 net.micode.notes:drawable/edit_title_yellow = 0x7f070062 net.micode.notes:color/bright_foreground_material_light = 0x7f050023 @@ -1738,17 +928,6 @@ net.micode.notes:string/call_record_folder_name = 0x7f0e002f net.micode.notes:color/background_material_light = 0x7f05001d net.micode.notes:color/background_material_dark = 0x7f05001c net.micode.notes:style/TextAppearance.AppCompat.Small = 0x7f0f00d5 -<<<<<<< HEAD -net.micode.notes:layout/note_list_dropdown_menu = 0x7f0a0025 -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:attr/actionBarStyle = 0x7f030005 -net.micode.notes:string/error_sync_internal = 0x7f0e0039 -net.micode.notes:color/abc_tint_switch_track = 0x7f050017 -net.micode.notes:id/notes_list = 0x7f080085 -======= net.micode.notes:layout/note_list_dropdown_menu = 0x7f0a0026 net.micode.notes:color/background_floating_material_light = 0x7f05001b net.micode.notes:attr/actionBarTabTextStyle = 0x7f030008 @@ -1757,7 +936,6 @@ 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:color/abc_tint_switch_track = 0x7f050017 ->>>>>>> xiaojinchi_branch net.micode.notes:color/abc_tint_spinner = 0x7f050016 net.micode.notes:drawable/abc_ic_ab_back_material = 0x7f070013 net.micode.notes:attr/autoSizeStepGranularity = 0x7f03002f @@ -1769,21 +947,13 @@ 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 -<<<<<<< HEAD -net.micode.notes:id/fill = 0x7f080040 -======= net.micode.notes:id/fill = 0x7f080042 ->>>>>>> xiaojinchi_branch 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 -<<<<<<< HEAD -net.micode.notes:id/submenuarrow = 0x7f0800ae -======= net.micode.notes:id/submenuarrow = 0x7f0800b4 ->>>>>>> xiaojinchi_branch 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 @@ -1809,11 +979,7 @@ 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 -<<<<<<< HEAD -net.micode.notes:id/search_mag_icon = 0x7f08009e -======= -net.micode.notes:id/search_mag_icon = 0x7f0800a3 ->>>>>>> xiaojinchi_branch +net.micode.notes:id/search_mag_icon = 0x7f0800a4 net.micode.notes:array/menu_share_ways = 0x7f020001 net.micode.notes:attr/textAppearanceLargePopupMenu = 0x7f0300dd net.micode.notes:attr/windowFixedHeightMinor = 0x7f03010a @@ -1832,11 +998,7 @@ 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 -<<<<<<< HEAD -net.micode.notes:id/menu_new_folder = 0x7f080070 -======= net.micode.notes:id/menu_new_folder = 0x7f080074 ->>>>>>> xiaojinchi_branch net.micode.notes:string/abc_searchview_description_search = 0x7f0e0021 net.micode.notes:drawable/call_record = 0x7f070057 net.micode.notes:style/TextAppearance.AppCompat.SearchResult.Title = 0x7f0f00d4 @@ -1862,11 +1024,7 @@ 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 -<<<<<<< HEAD -net.micode.notes:id/split_action_bar = 0x7f0800a9 -======= -net.micode.notes:id/split_action_bar = 0x7f0800ae ->>>>>>> xiaojinchi_branch +net.micode.notes:id/split_action_bar = 0x7f0800af net.micode.notes:attr/paddingBottomNoButtons = 0x7f0300ac net.micode.notes:style/Base.Animation.AppCompat.Dialog = 0x7f0f0007 net.micode.notes:attr/buttonPanelSideLayout = 0x7f03003f @@ -1879,19 +1037,11 @@ 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 -<<<<<<< HEAD -net.micode.notes:id/ll_font_large = 0x7f080063 -net.micode.notes:id/cb_edit_item = 0x7f080028 -net.micode.notes:string/button_delete = 0x7f0e002e -net.micode.notes:attr/trackTintMode = 0x7f030102 -net.micode.notes:id/progress_horizontal = 0x7f08008e -======= net.micode.notes:id/ll_font_large = 0x7f080067 net.micode.notes:id/cb_edit_item = 0x7f08002a net.micode.notes:string/button_delete = 0x7f0e002e net.micode.notes:attr/trackTintMode = 0x7f030102 -net.micode.notes:id/progress_horizontal = 0x7f080092 ->>>>>>> xiaojinchi_branch +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 @@ -1899,11 +1049,7 @@ 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 -<<<<<<< HEAD -net.micode.notes:id/scrollIndicatorDown = 0x7f080095 -======= -net.micode.notes:id/scrollIndicatorDown = 0x7f08009a ->>>>>>> xiaojinchi_branch +net.micode.notes:id/scrollIndicatorDown = 0x7f08009b net.micode.notes:attr/textColorSearchUrl = 0x7f0300e6 net.micode.notes:attr/switchPadding = 0x7f0300d9 net.micode.notes:attr/suggestionRowLayout = 0x7f0300d7 @@ -1911,11 +1057,7 @@ net.micode.notes:attr/subtitleTextStyle = 0x7f0300d6 net.micode.notes:string/menu_move = 0x7f0e0054 net.micode.notes:dimen/abc_action_bar_stacked_max_height = 0x7f060009 net.micode.notes:style/Theme.AppCompat.DayNight.NoActionBar = 0x7f0f0106 -<<<<<<< HEAD -net.micode.notes:id/search_go_btn = 0x7f08009d -======= -net.micode.notes:id/search_go_btn = 0x7f0800a2 ->>>>>>> xiaojinchi_branch +net.micode.notes:id/search_go_btn = 0x7f0800a3 net.micode.notes:drawable/notification_template_icon_low_bg = 0x7f070092 net.micode.notes:attr/divider = 0x7f030065 net.micode.notes:attr/subtitleTextColor = 0x7f0300d5 @@ -1926,35 +1068,19 @@ 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 = 0x7f0e0086 net.micode.notes:color/foreground_material_light = 0x7f05002d -<<<<<<< HEAD -net.micode.notes:id/radio = 0x7f08008f -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:attr/srcCompat = 0x7f0300ce -net.micode.notes:drawable/abc_ic_voice_search_api_material = 0x7f070025 -net.micode.notes:id/search_src_text = 0x7f0800a0 -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 = 0x7f0800b7 -net.micode.notes:drawable/abc_btn_radio_material = 0x7f070008 -net.micode.notes:id/menu_share = 0x7f080075 -======= -net.micode.notes:id/radio = 0x7f080093 +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 = 0x7f0a0022 net.micode.notes:attr/srcCompat = 0x7f0300ce net.micode.notes:drawable/abc_ic_voice_search_api_material = 0x7f070025 -net.micode.notes:id/search_src_text = 0x7f0800a5 +net.micode.notes:id/search_src_text = 0x7f0800a6 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 = 0x7f0800bc net.micode.notes:drawable/abc_btn_radio_material = 0x7f070008 net.micode.notes:id/menu_share = 0x7f080079 ->>>>>>> xiaojinchi_branch net.micode.notes:attr/showTitle = 0x7f0300c8 net.micode.notes:attr/isLightTheme = 0x7f03008b net.micode.notes:style/Base.Widget.AppCompat.ActivityChooserView = 0x7f0f0070 @@ -1966,18 +1092,11 @@ net.micode.notes:dimen/notification_big_circle_margin = 0x7f06005d net.micode.notes:style/Base.Widget.AppCompat.Toolbar = 0x7f0f009e net.micode.notes:attr/selectableItemBackground = 0x7f0300c3 net.micode.notes:drawable/abc_btn_radio_to_on_mtrl_000 = 0x7f070009 -<<<<<<< HEAD -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/listen = 0x7f080066 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 = 0x7f080062 ->>>>>>> xiaojinchi_branch 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 @@ -1994,21 +1113,12 @@ 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 -<<<<<<< HEAD -net.micode.notes:layout/folder_list_item = 0x7f0a0020 -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 -net.micode.notes:layout/note_list = 0x7f0a0024 -net.micode.notes:id/menu_Unencrpt = 0x7f080067 -======= net.micode.notes:layout/folder_list_item = 0x7f0a0021 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 net.micode.notes:layout/note_list = 0x7f0a0025 net.micode.notes:id/menu_Unencrpt = 0x7f08006b ->>>>>>> xiaojinchi_branch net.micode.notes:style/TextAppearance.AppCompat.Medium.Inverse = 0x7f0f00d1 net.micode.notes:string/abc_menu_meta_shortcut_label = 0x7f0e0019 net.micode.notes:attr/actionModeCutDrawable = 0x7f030014 @@ -2022,13 +1132,8 @@ net.micode.notes:drawable/abc_item_background_holo_light = 0x7f070027 net.micode.notes:string/menu_folder_view = 0x7f0e004d net.micode.notes:color/ripple_material_light = 0x7f050048 net.micode.notes:attr/navigationMode = 0x7f0300a9 -<<<<<<< HEAD -net.micode.notes:id/menu_export_text = 0x7f08006c -net.micode.notes:id/read = 0x7f080090 -======= net.micode.notes:id/menu_export_text = 0x7f080070 -net.micode.notes:id/read = 0x7f080094 ->>>>>>> xiaojinchi_branch +net.micode.notes:id/read = 0x7f080095 net.micode.notes:attr/logo = 0x7f0300a2 net.micode.notes:attr/listPopupWindowStyle = 0x7f03009c net.micode.notes:style/Widget.AppCompat.RatingBar.Small = 0x7f0f0156 @@ -2068,11 +1173,7 @@ 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 -<<<<<<< HEAD -net.micode.notes:layout/support_simple_spinner_dropdown_item = 0x7f0a0031 -======= net.micode.notes:layout/support_simple_spinner_dropdown_item = 0x7f0a0032 ->>>>>>> xiaojinchi_branch net.micode.notes:attr/tooltipForegroundColor = 0x7f0300fd net.micode.notes:dimen/compat_control_corner_material = 0x7f06004f net.micode.notes:attr/alphabeticModifiers = 0x7f030028 @@ -2081,11 +1182,7 @@ net.micode.notes:color/dim_foreground_material_light = 0x7f050029 net.micode.notes:attr/spinBars = 0x7f0300ca net.micode.notes:id/META = 0x7f080003 net.micode.notes:attr/subtitleTextAppearance = 0x7f0300d4 -<<<<<<< HEAD -net.micode.notes:id/center = 0x7f080029 -======= net.micode.notes:id/center = 0x7f08002b ->>>>>>> xiaojinchi_branch net.micode.notes:attr/iconTintMode = 0x7f030086 net.micode.notes:style/Base.TextAppearance.AppCompat.Light.Widget.PopupMenu.Large = 0x7f0f0019 net.micode.notes:drawable/abc_spinner_textfield_background_material = 0x7f070042 @@ -2097,50 +1194,28 @@ 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 -<<<<<<< HEAD -net.micode.notes:id/tv_name = 0x7f0800c3 -net.micode.notes:attr/icon = 0x7f030084 -net.micode.notes:style/Widget.AppCompat.Button = 0x7f0f0125 -net.micode.notes:id/uniform = 0x7f0800c7 -net.micode.notes:attr/multiChoiceItemLayout = 0x7f0300a6 -net.micode.notes:id/iv_bg_blue = 0x7f080050 -======= net.micode.notes:id/tv_name = 0x7f0800c8 net.micode.notes:attr/icon = 0x7f030084 net.micode.notes:style/Widget.AppCompat.Button = 0x7f0f0125 net.micode.notes:id/uniform = 0x7f0800ce net.micode.notes:attr/multiChoiceItemLayout = 0x7f0300a6 net.micode.notes:id/iv_bg_blue = 0x7f080052 ->>>>>>> xiaojinchi_branch net.micode.notes:attr/colorAccent = 0x7f03004b net.micode.notes:attr/goIcon = 0x7f03007f net.micode.notes:dimen/abc_text_size_menu_header_material = 0x7f060044 net.micode.notes:dimen/abc_select_dialog_padding_start_material = 0x7f060037 net.micode.notes:attr/fontWeight = 0x7f03007d -<<<<<<< HEAD -net.micode.notes:id/checkbox = 0x7f08002c -======= net.micode.notes:id/checkbox = 0x7f08002e ->>>>>>> xiaojinchi_branch net.micode.notes:style/Base.Widget.AppCompat.Light.ActionBar.TabView = 0x7f0f0087 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 -<<<<<<< HEAD -net.micode.notes:id/titleDividerNoCustom = 0x7f0800bc -net.micode.notes:attr/fontVariationSettings = 0x7f03007c -net.micode.notes:layout/note_edit_list_item = 0x7f0a0022 -net.micode.notes:attr/fontStyle = 0x7f03007b -net.micode.notes:style/RtlOverlay.Widget.AppCompat.Search.DropDown.Query = 0x7f0f00ba -net.micode.notes:id/parentPanel = 0x7f08008a -======= net.micode.notes:id/titleDividerNoCustom = 0x7f0800c1 net.micode.notes:attr/fontVariationSettings = 0x7f03007c net.micode.notes:layout/note_edit_list_item = 0x7f0a0023 net.micode.notes:attr/fontStyle = 0x7f03007b net.micode.notes:style/RtlOverlay.Widget.AppCompat.Search.DropDown.Query = 0x7f0f00ba -net.micode.notes:id/parentPanel = 0x7f08008e ->>>>>>> xiaojinchi_branch +net.micode.notes:id/parentPanel = 0x7f08008f net.micode.notes:attr/fontProviderFetchTimeout = 0x7f030078 net.micode.notes:drawable/edit_green = 0x7f07005c net.micode.notes:color/switch_thumb_material_light = 0x7f050051 @@ -2150,23 +1225,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 -<<<<<<< HEAD -net.micode.notes:id/showTitle = 0x7f0800a7 -net.micode.notes:id/progress_circular = 0x7f08008d -net.micode.notes:attr/editTextStyle = 0x7f03006f -net.micode.notes:id/textSpacerNoTitle = 0x7f0800b9 -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/showTitle = 0x7f0800ac -net.micode.notes:id/progress_circular = 0x7f080091 +net.micode.notes:id/showTitle = 0x7f0800ad +net.micode.notes:id/progress_circular = 0x7f080092 net.micode.notes:attr/editTextStyle = 0x7f03006f net.micode.notes:id/textSpacerNoTitle = 0x7f0800be net.micode.notes:attr/editTextColor = 0x7f03006e net.micode.notes:attr/editTextBackground = 0x7f03006d net.micode.notes:id/iv_bg_yellow_select = 0x7f08005b ->>>>>>> xiaojinchi_branch net.micode.notes:color/material_blue_grey_900 = 0x7f050031 net.micode.notes:attr/drawableSize = 0x7f030069 net.micode.notes:drawable/list_white_single = 0x7f07007c @@ -2176,19 +1241,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 -<<<<<<< HEAD -net.micode.notes:id/navigation_bar = 0x7f08007c -net.micode.notes:id/menu_sync = 0x7f080076 -net.micode.notes:style/Widget.AppCompat.ProgressBar = 0x7f0f0152 -net.micode.notes:dimen/abc_text_size_title_material = 0x7f060049 -net.micode.notes:id/menu_setting = 0x7f080074 -======= net.micode.notes:id/navigation_bar = 0x7f080080 net.micode.notes:id/menu_sync = 0x7f08007a net.micode.notes:style/Widget.AppCompat.ProgressBar = 0x7f0f0152 net.micode.notes:dimen/abc_text_size_title_material = 0x7f060049 net.micode.notes:id/menu_setting = 0x7f080078 ->>>>>>> xiaojinchi_branch net.micode.notes:drawable/edit_title_blue = 0x7f07005e net.micode.notes:style/Theme.AppCompat = 0x7f0f00fe net.micode.notes:attr/dialogTheme = 0x7f030063 @@ -2201,11 +1258,7 @@ 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 -<<<<<<< HEAD -net.micode.notes:id/hour = 0x7f080048 -======= net.micode.notes:id/hour = 0x7f08004a ->>>>>>> xiaojinchi_branch net.micode.notes:attr/theme = 0x7f0300e7 net.micode.notes:string/alert_title_delete = 0x7f0e002a net.micode.notes:attr/dialogCornerRadius = 0x7f030061 @@ -2222,11 +1275,7 @@ 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 -<<<<<<< HEAD -net.micode.notes:id/useLogo = 0x7f0800c9 -======= net.micode.notes:id/useLogo = 0x7f0800d0 ->>>>>>> xiaojinchi_branch net.micode.notes:attr/contentInsetStartWithNavigation = 0x7f03005c net.micode.notes:attr/contentInsetStart = 0x7f03005b net.micode.notes:string/menu_select_title = 0x7f0e005b @@ -2237,13 +1286,8 @@ 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 -<<<<<<< HEAD -net.micode.notes:id/menu_send_to_desktop = 0x7f080073 -net.micode.notes:id/end = 0x7f08003b -======= net.micode.notes:id/menu_send_to_desktop = 0x7f080077 net.micode.notes:id/end = 0x7f08003d ->>>>>>> xiaojinchi_branch net.micode.notes:color/bright_foreground_disabled_material_light = 0x7f05001f net.micode.notes:attr/dropDownListViewStyle = 0x7f03006b net.micode.notes:attr/thumbTextPadding = 0x7f0300e9 @@ -2260,11 +1304,7 @@ 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 -<<<<<<< HEAD -net.micode.notes:id/showHome = 0x7f0800a6 -======= -net.micode.notes:id/showHome = 0x7f0800ab ->>>>>>> xiaojinchi_branch +net.micode.notes:id/showHome = 0x7f0800ac net.micode.notes:dimen/abc_action_bar_content_inset_material = 0x7f060000 net.micode.notes:drawable/edit_blue = 0x7f07005b net.micode.notes:style/Widget.AppCompat.TextView.SpinnerItem = 0x7f0f015f @@ -2292,11 +1332,7 @@ net.micode.notes:string/abc_capital_on = 0x7f0e0007 net.micode.notes:drawable/icon_app = 0x7f07006a net.micode.notes:dimen/compat_notification_large_icon_max_width = 0x7f060051 net.micode.notes:attr/textAppearanceSearchResultSubtitle = 0x7f0300e2 -<<<<<<< HEAD -net.micode.notes:id/collapseActionView = 0x7f080030 -======= net.micode.notes:id/collapseActionView = 0x7f080032 ->>>>>>> xiaojinchi_branch net.micode.notes:dimen/abc_dialog_fixed_height_major = 0x7f06001c net.micode.notes:style/TextAppearance.AppCompat.Widget.Button.Borderless.Colored = 0x7f0f00e6 net.micode.notes:dimen/abc_action_bar_subtitle_bottom_margin_material = 0x7f06000b @@ -2307,22 +1343,14 @@ net.micode.notes:string/menu_title_select_folder = 0x7f0e0061 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 -<<<<<<< HEAD -net.micode.notes:id/message = 0x7f080077 -======= net.micode.notes:id/message = 0x7f08007b ->>>>>>> xiaojinchi_branch net.micode.notes:drawable/dropdown_icon = 0x7f07005a net.micode.notes:drawable/abc_scrubber_primary_mtrl_alpha = 0x7f07003c net.micode.notes:style/Widget.AppCompat.Spinner = 0x7f0f015b net.micode.notes:attr/actionBarTabBarStyle = 0x7f030006 net.micode.notes:color/error_color_material_light = 0x7f05002b net.micode.notes:style/RtlOverlay.Widget.AppCompat.PopupMenuItem.Text = 0x7f0f00b5 -<<<<<<< HEAD -net.micode.notes:id/decor_content_parent = 0x7f080036 -======= net.micode.notes:id/decor_content_parent = 0x7f080038 ->>>>>>> xiaojinchi_branch net.micode.notes:attr/buttonStyle = 0x7f030040 net.micode.notes:attr/buttonIconDimen = 0x7f03003e net.micode.notes:drawable/abc_switch_thumb_material = 0x7f070043 @@ -2334,11 +1362,7 @@ net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0e0072 net.micode.notes:color/primary_text_default_material_light = 0x7f050044 net.micode.notes:menu/call_note_edit = 0x7f0b0000 net.micode.notes:attr/switchMinWidth = 0x7f0300d8 -<<<<<<< HEAD -net.micode.notes:id/listMode = 0x7f080061 -======= net.micode.notes:id/listMode = 0x7f080064 ->>>>>>> xiaojinchi_branch net.micode.notes:attr/actionModeStyle = 0x7f03001b net.micode.notes:id/ALT = 0x7f080000 net.micode.notes:attr/titleTextStyle = 0x7f0300fa @@ -2356,21 +1380,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 -<<<<<<< HEAD -net.micode.notes:layout/select_dialog_singlechoice_material = 0x7f0a002f -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 = 0x7f080097 -======= net.micode.notes:layout/select_dialog_singlechoice_material = 0x7f0a0030 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 = 0x7f0a001f -net.micode.notes:id/scrollView = 0x7f08009c ->>>>>>> xiaojinchi_branch +net.micode.notes:id/scrollView = 0x7f08009d net.micode.notes:attr/activityChooserViewStyle = 0x7f030021 net.micode.notes:attr/actionDropDownStyle = 0x7f03000c net.micode.notes:attr/textAllCaps = 0x7f0300dc @@ -2380,19 +1395,11 @@ 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 -<<<<<<< HEAD -net.micode.notes:id/iv_bg_yellow = 0x7f080058 -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/iv_bg_yellow = 0x7f08005a net.micode.notes:style/Base.Theme.AppCompat.DialogWhenLarge = 0x7f0f0042 net.micode.notes:attr/tickMark = 0x7f0300ec net.micode.notes:id/move = 0x7f08007e net.micode.notes:id/iv_bg_red = 0x7f080056 ->>>>>>> xiaojinchi_branch 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 @@ -2435,21 +1442,13 @@ net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.ActionBar.Title.Inve net.micode.notes:dimen/abc_alert_dialog_button_dimen = 0x7f060011 net.micode.notes:attr/windowFixedHeightMajor = 0x7f030109 net.micode.notes:attr/ratingBarStyleSmall = 0x7f0300be -<<<<<<< HEAD -net.micode.notes:id/delete = 0x7f080038 -======= net.micode.notes:id/delete = 0x7f08003a ->>>>>>> xiaojinchi_branch net.micode.notes:string/preferences_menu_change_account = 0x7f0e0078 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 -<<<<<<< HEAD -net.micode.notes:drawable/list_white_middle = 0x7f07007b -======= ->>>>>>> xiaojinchi_branch net.micode.notes:attr/windowActionModeOverlay = 0x7f030108 net.micode.notes:color/material_deep_teal_500 = 0x7f050034 net.micode.notes:attr/arrowHeadLength = 0x7f030029 @@ -2457,11 +1456,7 @@ net.micode.notes:style/Base.Widget.AppCompat.PopupWindow = 0x7f0f0091 net.micode.notes:attr/windowActionBarOverlay = 0x7f030107 net.micode.notes:menu/note_list = 0x7f0b0003 net.micode.notes:attr/alertDialogTheme = 0x7f030025 -<<<<<<< HEAD -net.micode.notes:id/btn_set_bg_color = 0x7f080026 -======= net.micode.notes:id/btn_set_bg_color = 0x7f080027 ->>>>>>> xiaojinchi_branch net.micode.notes:attr/panelMenuListTheme = 0x7f0300b1 net.micode.notes:attr/autoSizeTextType = 0x7f030030 net.micode.notes:attr/actionButtonStyle = 0x7f03000b @@ -2469,26 +1464,15 @@ net.micode.notes:drawable/widget_2x_red = 0x7f07009e net.micode.notes:string/abc_shareactionprovider_share_with = 0x7f0e0024 net.micode.notes:attr/actionBarSplitStyle = 0x7f030004 net.micode.notes:style/Widget.AppCompat.ActionBar.TabView = 0x7f0f011e -<<<<<<< HEAD -net.micode.notes:id/select_dialog_listview = 0x7f0800a2 -======= -net.micode.notes:id/select_dialog_listview = 0x7f0800a7 ->>>>>>> xiaojinchi_branch +net.micode.notes:id/select_dialog_listview = 0x7f0800a8 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 -<<<<<<< HEAD -net.micode.notes:id/screen = 0x7f080094 -net.micode.notes:drawable/edit_title_red = 0x7f070060 -net.micode.notes:drawable/abc_list_selector_background_transition_holo_dark = 0x7f07002e -net.micode.notes:id/tv_title = 0x7f0800c5 -======= -net.micode.notes:id/screen = 0x7f080099 +net.micode.notes:id/screen = 0x7f08009a net.micode.notes:drawable/edit_title_red = 0x7f070060 net.micode.notes:drawable/abc_list_selector_background_transition_holo_dark = 0x7f07002e net.micode.notes:id/tv_title = 0x7f0800ca ->>>>>>> xiaojinchi_branch 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 diff --git a/src/Notes-master3/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt b/src/Notes-master3/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt index 8083bf1..bf9c586 100644 --- a/src/Notes-master3/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt +++ b/src/Notes-master3/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt @@ -697,15 +697,10 @@ id async id beginning id blocking id bottom -<<<<<<< HEAD -id btn_new_note -id btn_set_bg_color -======= id btn id btn_new_note id btn_set_bg_color id btn_stop ->>>>>>> xiaojinchi_branch id buttonPanel id cb_edit_item id center @@ -762,18 +757,12 @@ id iv_medium_select id iv_small_select id iv_super_select id left -<<<<<<< HEAD -======= id length ->>>>>>> xiaojinchi_branch id line1 id line3 id listMode id list_item -<<<<<<< HEAD -======= id listen ->>>>>>> xiaojinchi_branch id ll_font_large id ll_font_normal id ll_font_small @@ -813,6 +802,7 @@ id notification_background id notification_main_column id notification_main_column_container id open_album +id open_camera id parentPanel id prefenerece_sync_status_textview id preference_sync_button @@ -820,10 +810,7 @@ id progress_circular id progress_horizontal id radio id read -<<<<<<< HEAD -======= id regonize_word ->>>>>>> xiaojinchi_branch id right id right_icon id right_side @@ -853,10 +840,6 @@ id src_atop id src_in id src_over id start -<<<<<<< HEAD -======= -id stop ->>>>>>> xiaojinchi_branch id submenuarrow id submit_area id sv_note_edit @@ -864,10 +847,6 @@ id tabMode id tag_transition_group id tag_unhandled_key_event_manager id tag_unhandled_key_listeners -<<<<<<< HEAD -id take_photo -======= ->>>>>>> xiaojinchi_branch id text id text2 id textSpacerNoButtons @@ -885,11 +864,8 @@ id tv_name id tv_time id tv_title id tv_title_bar -<<<<<<< HEAD -======= id txtLog id txtResult ->>>>>>> xiaojinchi_branch id uniform id up id useLogo @@ -932,10 +908,7 @@ layout abc_select_dialog_material layout abc_tooltip layout account_dialog_title layout add_account_text -<<<<<<< HEAD -======= layout common_mini ->>>>>>> xiaojinchi_branch layout datetime_picker layout dialog_edit_text layout folder_list_item diff --git a/src/Notes-master3/app/build/outputs/apk/debug/app-debug.apk b/src/Notes-master3/app/build/outputs/apk/debug/app-debug.apk index e9d5032..f929877 100644 Binary files a/src/Notes-master3/app/build/outputs/apk/debug/app-debug.apk and b/src/Notes-master3/app/build/outputs/apk/debug/app-debug.apk differ diff --git a/src/Notes-master3/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/Notes-master3/app/build/outputs/logs/manifest-merger-debug-report.txt index 9d1fb9a..faa83c0 100644 --- a/src/Notes-master3/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/src/Notes-master3/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,44 +1,9 @@ -- Merging decision tree log --- manifest -<<<<<<< HEAD -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:18:1-153:12 -INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml:18:1-153:12 -INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml:18:1-153:12 -INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml:18:1-153:12 -MERGED from [com.android.support:appcompat-v7:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\4fdced20544efc90da6c74d19436ed4c\transformed\appcompat-v7-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:support-fragment:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\ae0c9d09cd8fb6e806cbed51464a3aa2\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\87334\.gradle\caches\transforms-3\5fd24207ffa8da7dcc62fb414a6954b8\transformed\animated-vector-drawable-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:support-core-ui:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\185c10811b3f71de9ee4eba139576c26\transformed\support-core-ui-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:support-core-utils:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\43067444d1353a2cf77ed3269bc7bdbe\transformed\support-core-utils-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:support-vector-drawable:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\1a16b966351a39b46b716c24e04f635b\transformed\support-vector-drawable-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:loader:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\ed7d22200040cc1de91a5b0c884313c5\transformed\loader-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:viewpager:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\124c36dda73fa842e2126ec541d03639\transformed\viewpager-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:coordinatorlayout:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\fa718d1bfa54ce85ab7d4c953f045f5d\transformed\coordinatorlayout-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:drawerlayout:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\20a2622913b2818e13bfade2105d37d3\transformed\drawerlayout-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:slidingpanelayout:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\291501d2a928ed0d0e2876e1c765da67\transformed\slidingpanelayout-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:customview:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\d775bdb8b6db5ef7c69889c201b6687d\transformed\customview-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:swiperefreshlayout:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\c4352f9cd6674020f2f4ae7b80e6087d\transformed\swiperefreshlayout-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:asynclayoutinflater:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\1c69559437dc5a9ebb51d77043b8493f\transformed\asynclayoutinflater-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:support-compat:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\e96a7038b1f110461df5bc852ca33ca3\transformed\support-compat-28.0.0\AndroidManifest.xml:17:1-24:12 -MERGED from [com.android.support:versionedparcelable:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\e238cc3e6166a04e90e9cfcf84d7984b\transformed\versionedparcelable-28.0.0\AndroidManifest.xml:17:1-25:12 -MERGED from [com.android.support:cursoradapter:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\8be7fd9086408560aee62fbdee6df8a7\transformed\cursoradapter-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [android.arch.lifecycle:runtime:1.1.1] C:\Users\87334\.gradle\caches\transforms-3\5027112f4aadb03b73265cc046173520\transformed\runtime-1.1.1\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:documentfile:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\304e3beae22783bad6fbcd2d702a9428\transformed\documentfile-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:localbroadcastmanager:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\529058f50f85c6525fcafa1ddf139e6f\transformed\localbroadcastmanager-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:print:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\3ede959c65db861f9f97f5f4e5336067\transformed\print-28.0.0\AndroidManifest.xml:17:1-22:12 -MERGED from [android.arch.lifecycle:viewmodel:1.1.1] C:\Users\87334\.gradle\caches\transforms-3\2593bd74a2dbb6e32c4af12a76f7aeb7\transformed\viewmodel-1.1.1\AndroidManifest.xml:17:1-22:12 -MERGED from [android.arch.lifecycle:livedata:1.1.1] C:\Users\87334\.gradle\caches\transforms-3\e54f616f2b157537131e96d903e180de\transformed\livedata-1.1.1\AndroidManifest.xml:17:1-22:12 -MERGED from [android.arch.lifecycle:livedata-core:1.1.1] C:\Users\87334\.gradle\caches\transforms-3\e903e96001bfef696b1d620a2119baa6\transformed\livedata-core-1.1.1\AndroidManifest.xml:17:1-22:12 -MERGED from [android.arch.core:runtime:1.1.1] C:\Users\87334\.gradle\caches\transforms-3\e3746d36f60f5a2eb26784566fe86c7b\transformed\runtime-1.1.1\AndroidManifest.xml:17:1-22:12 -MERGED from [com.android.support:interpolator:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\e5d34c0cfdae27b1f6f4e6498da145e1\transformed\interpolator-28.0.0\AndroidManifest.xml:17:1-22:12 -INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml:18:1-153:12 -INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml:18:1-153:12 -INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml:18:1-153:12 -======= -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 -INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 -INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 -INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 +ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:18:1-157:12 +INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml:18:1-157:12 +INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml:18:1-157:12 +INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml:18:1-157:12 MERGED from [:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:2:1-32:12 MERGED from [androidx.appcompat:appcompat:1.0.2] C:\Users\87334\.gradle\caches\transforms-3\4153cc3e152567bf9af1bb2e27f956d0\transformed\appcompat-1.0.2\AndroidManifest.xml:17:1-22:12 MERGED from [androidx.fragment:fragment:1.0.0] C:\Users\87334\.gradle\caches\transforms-3\17a47b2739746e199681d5e8bf35083a\transformed\fragment-1.0.0\AndroidManifest.xml:17:1-22:12 @@ -66,10 +31,9 @@ MERGED from [androidx.lifecycle:lifecycle-livedata:2.0.0] C:\Users\87334\.gradle MERGED from [androidx.lifecycle:lifecycle-livedata-core:2.0.0] C:\Users\87334\.gradle\caches\transforms-3\c8337dbbef26b7737b56228e57b29a3b\transformed\lifecycle-livedata-core-2.0.0\AndroidManifest.xml:17:1-22:12 MERGED from [androidx.arch.core:core-runtime:2.0.0] C:\Users\87334\.gradle\caches\transforms-3\55b2125151ae1d142b7da911c05d1262\transformed\core-runtime-2.0.0\AndroidManifest.xml:17:1-22:12 MERGED from [androidx.interpolator:interpolator:1.0.0] C:\Users\87334\.gradle\caches\transforms-3\854f0aaaf6c97aae64ef060b7aea002a\transformed\interpolator-1.0.0\AndroidManifest.xml:17:1-22:12 -INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 -INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 -INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 ->>>>>>> xiaojinchi_branch +INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml:18:1-157:12 +INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml:18:1-157:12 +INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml:18:1-157:12 package ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:19:5-31 INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml @@ -88,60 +52,6 @@ uses-sdk ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:23:5-44 INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml:23:5-44 INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml:23:5-44 -<<<<<<< HEAD -MERGED from [com.android.support:appcompat-v7:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\4fdced20544efc90da6c74d19436ed4c\transformed\appcompat-v7-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:appcompat-v7:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\4fdced20544efc90da6c74d19436ed4c\transformed\appcompat-v7-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:support-fragment:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\ae0c9d09cd8fb6e806cbed51464a3aa2\transformed\support-fragment-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:support-fragment:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\ae0c9d09cd8fb6e806cbed51464a3aa2\transformed\support-fragment-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:animated-vector-drawable:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\5fd24207ffa8da7dcc62fb414a6954b8\transformed\animated-vector-drawable-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:animated-vector-drawable:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\5fd24207ffa8da7dcc62fb414a6954b8\transformed\animated-vector-drawable-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:support-core-ui:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\185c10811b3f71de9ee4eba139576c26\transformed\support-core-ui-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:support-core-ui:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\185c10811b3f71de9ee4eba139576c26\transformed\support-core-ui-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:support-core-utils:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\43067444d1353a2cf77ed3269bc7bdbe\transformed\support-core-utils-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:support-core-utils:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\43067444d1353a2cf77ed3269bc7bdbe\transformed\support-core-utils-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:support-vector-drawable:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\1a16b966351a39b46b716c24e04f635b\transformed\support-vector-drawable-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:support-vector-drawable:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\1a16b966351a39b46b716c24e04f635b\transformed\support-vector-drawable-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:loader:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\ed7d22200040cc1de91a5b0c884313c5\transformed\loader-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:loader:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\ed7d22200040cc1de91a5b0c884313c5\transformed\loader-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:viewpager:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\124c36dda73fa842e2126ec541d03639\transformed\viewpager-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:viewpager:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\124c36dda73fa842e2126ec541d03639\transformed\viewpager-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:coordinatorlayout:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\fa718d1bfa54ce85ab7d4c953f045f5d\transformed\coordinatorlayout-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:coordinatorlayout:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\fa718d1bfa54ce85ab7d4c953f045f5d\transformed\coordinatorlayout-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:drawerlayout:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\20a2622913b2818e13bfade2105d37d3\transformed\drawerlayout-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:drawerlayout:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\20a2622913b2818e13bfade2105d37d3\transformed\drawerlayout-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:slidingpanelayout:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\291501d2a928ed0d0e2876e1c765da67\transformed\slidingpanelayout-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:slidingpanelayout:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\291501d2a928ed0d0e2876e1c765da67\transformed\slidingpanelayout-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:customview:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\d775bdb8b6db5ef7c69889c201b6687d\transformed\customview-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:customview:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\d775bdb8b6db5ef7c69889c201b6687d\transformed\customview-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:swiperefreshlayout:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\c4352f9cd6674020f2f4ae7b80e6087d\transformed\swiperefreshlayout-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:swiperefreshlayout:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\c4352f9cd6674020f2f4ae7b80e6087d\transformed\swiperefreshlayout-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:asynclayoutinflater:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\1c69559437dc5a9ebb51d77043b8493f\transformed\asynclayoutinflater-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:asynclayoutinflater:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\1c69559437dc5a9ebb51d77043b8493f\transformed\asynclayoutinflater-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:support-compat:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\e96a7038b1f110461df5bc852ca33ca3\transformed\support-compat-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:support-compat:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\e96a7038b1f110461df5bc852ca33ca3\transformed\support-compat-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:versionedparcelable:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\e238cc3e6166a04e90e9cfcf84d7984b\transformed\versionedparcelable-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:versionedparcelable:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\e238cc3e6166a04e90e9cfcf84d7984b\transformed\versionedparcelable-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:cursoradapter:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\8be7fd9086408560aee62fbdee6df8a7\transformed\cursoradapter-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:cursoradapter:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\8be7fd9086408560aee62fbdee6df8a7\transformed\cursoradapter-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [android.arch.lifecycle:runtime:1.1.1] C:\Users\87334\.gradle\caches\transforms-3\5027112f4aadb03b73265cc046173520\transformed\runtime-1.1.1\AndroidManifest.xml:20:5-44 -MERGED from [android.arch.lifecycle:runtime:1.1.1] C:\Users\87334\.gradle\caches\transforms-3\5027112f4aadb03b73265cc046173520\transformed\runtime-1.1.1\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:documentfile:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\304e3beae22783bad6fbcd2d702a9428\transformed\documentfile-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:documentfile:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\304e3beae22783bad6fbcd2d702a9428\transformed\documentfile-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:localbroadcastmanager:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\529058f50f85c6525fcafa1ddf139e6f\transformed\localbroadcastmanager-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:localbroadcastmanager:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\529058f50f85c6525fcafa1ddf139e6f\transformed\localbroadcastmanager-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:print:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\3ede959c65db861f9f97f5f4e5336067\transformed\print-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:print:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\3ede959c65db861f9f97f5f4e5336067\transformed\print-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [android.arch.lifecycle:viewmodel:1.1.1] C:\Users\87334\.gradle\caches\transforms-3\2593bd74a2dbb6e32c4af12a76f7aeb7\transformed\viewmodel-1.1.1\AndroidManifest.xml:20:5-44 -MERGED from [android.arch.lifecycle:viewmodel:1.1.1] C:\Users\87334\.gradle\caches\transforms-3\2593bd74a2dbb6e32c4af12a76f7aeb7\transformed\viewmodel-1.1.1\AndroidManifest.xml:20:5-44 -MERGED from [android.arch.lifecycle:livedata:1.1.1] C:\Users\87334\.gradle\caches\transforms-3\e54f616f2b157537131e96d903e180de\transformed\livedata-1.1.1\AndroidManifest.xml:20:5-44 -MERGED from [android.arch.lifecycle:livedata:1.1.1] C:\Users\87334\.gradle\caches\transforms-3\e54f616f2b157537131e96d903e180de\transformed\livedata-1.1.1\AndroidManifest.xml:20:5-44 -MERGED from [android.arch.lifecycle:livedata-core:1.1.1] C:\Users\87334\.gradle\caches\transforms-3\e903e96001bfef696b1d620a2119baa6\transformed\livedata-core-1.1.1\AndroidManifest.xml:20:5-44 -MERGED from [android.arch.lifecycle:livedata-core:1.1.1] C:\Users\87334\.gradle\caches\transforms-3\e903e96001bfef696b1d620a2119baa6\transformed\livedata-core-1.1.1\AndroidManifest.xml:20:5-44 -MERGED from [android.arch.core:runtime:1.1.1] C:\Users\87334\.gradle\caches\transforms-3\e3746d36f60f5a2eb26784566fe86c7b\transformed\runtime-1.1.1\AndroidManifest.xml:20:5-44 -MERGED from [android.arch.core:runtime:1.1.1] C:\Users\87334\.gradle\caches\transforms-3\e3746d36f60f5a2eb26784566fe86c7b\transformed\runtime-1.1.1\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:interpolator:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\e5d34c0cfdae27b1f6f4e6498da145e1\transformed\interpolator-28.0.0\AndroidManifest.xml:20:5-44 -MERGED from [com.android.support:interpolator:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\e5d34c0cfdae27b1f6f4e6498da145e1\transformed\interpolator-28.0.0\AndroidManifest.xml:20:5-44 -======= MERGED from [:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:5:5-7:41 MERGED from [:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:5:5-7:41 MERGED from [androidx.appcompat:appcompat:1.0.2] C:\Users\87334\.gradle\caches\transforms-3\4153cc3e152567bf9af1bb2e27f956d0\transformed\appcompat-1.0.2\AndroidManifest.xml:20:5-44 @@ -196,7 +106,6 @@ MERGED from [androidx.arch.core:core-runtime:2.0.0] C:\Users\87334\.gradle\cache MERGED from [androidx.arch.core:core-runtime:2.0.0] C:\Users\87334\.gradle\caches\transforms-3\55b2125151ae1d142b7da911c05d1262\transformed\core-runtime-2.0.0\AndroidManifest.xml:20:5-44 MERGED from [androidx.interpolator:interpolator:1.0.0] C:\Users\87334\.gradle\caches\transforms-3\854f0aaaf6c97aae64ef060b7aea002a\transformed\interpolator-1.0.0\AndroidManifest.xml:20:5-44 MERGED from [androidx.interpolator:interpolator:1.0.0] C:\Users\87334\.gradle\caches\transforms-3\854f0aaaf6c97aae64ef060b7aea002a\transformed\interpolator-1.0.0\AndroidManifest.xml:20:5-44 ->>>>>>> xiaojinchi_branch INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml:23:5-44 INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml:23:5-44 android:targetSdkVersion @@ -209,11 +118,8 @@ INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml:23:5-44 INJECTED from D:\Notes-master3\app\src\main\AndroidManifest.xml uses-permission#android.permission.WRITE_EXTERNAL_STORAGE ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:25:5-81 -<<<<<<< HEAD -======= MERGED from [:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:12:5-81 MERGED from [:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:12:5-81 ->>>>>>> xiaojinchi_branch android:name ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:25:22-78 uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT @@ -222,11 +128,8 @@ ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:26:5-88 ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:26:22-85 uses-permission#android.permission.INTERNET ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:27:5-67 -<<<<<<< HEAD -======= MERGED from [:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:11:5-67 MERGED from [:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:11:5-67 ->>>>>>> xiaojinchi_branch android:name ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:27:22-64 uses-permission#android.permission.READ_CONTACTS @@ -261,176 +164,6 @@ uses-permission#android.permission.READ_EXTERNAL_STORAGE ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:35:5-79 android:name ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:35:22-77 -<<<<<<< HEAD -application -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:38:5-152:19 -MERGED from [com.android.support:support-compat:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\e96a7038b1f110461df5bc852ca33ca3\transformed\support-compat-28.0.0\AndroidManifest.xml:22:5-94 -MERGED from [com.android.support:support-compat:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\e96a7038b1f110461df5bc852ca33ca3\transformed\support-compat-28.0.0\AndroidManifest.xml:22:5-94 -MERGED from [com.android.support:versionedparcelable:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\e238cc3e6166a04e90e9cfcf84d7984b\transformed\versionedparcelable-28.0.0\AndroidManifest.xml:22:5-23:19 -MERGED from [com.android.support:versionedparcelable:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\e238cc3e6166a04e90e9cfcf84d7984b\transformed\versionedparcelable-28.0.0\AndroidManifest.xml:22:5-23:19 - android:appComponentFactory - ADDED from [com.android.support:support-compat:28.0.0] C:\Users\87334\.gradle\caches\transforms-3\e96a7038b1f110461df5bc852ca33ca3\transformed\support-compat-28.0.0\AndroidManifest.xml:22:18-91 - android:label - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:40:9-41 - android:icon - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:39:9-42 -activity#net.micode.notes.ui.NotesListActivity -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:41:9-54:20 - android:label - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:44:13-45 - android:launchMode - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:45:13-43 - android:windowSoftInputMode - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:48:13-52 - android:uiOptions - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:47:13-57 - android:configChanges - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:43:13-74 - android:theme - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:46:13-71 - android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:42:13-49 -intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:50:13-53:29 -action#android.intent.action.MAIN -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:51:17-69 - android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:51:25-66 -category#android.intent.category.LAUNCHER -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:52:17-77 - android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:52:27-74 -activity#net.micode.notes.ui.NoteEditActivity -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:56:9-84:20 - android:launchMode - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:59:13-43 - android:configChanges - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:58:13-74 - android:theme - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:60:13-71 - android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:57:13-48 -intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:62:13-67:29 -action#android.intent.action.VIEW -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:63:17-69 - android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:63:25-66 -category#android.intent.category.DEFAULT -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:64:17-76 - android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:64:27-73 -data -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:65:17-78 - android:mimeType - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:65:23-75 -intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:69:13-74:29 -action#android.intent.action.INSERT_OR_EDIT -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:70:17-79 - android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:70:25-76 -intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:76:13-79:29 -action#android.intent.action.SEARCH -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:77:17-71 - android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:77:25-68 -meta-data#android.app.searchable -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:81:13-83:54 - android:resource - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:83:17-51 - android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:82:17-54 -provider#net.micode.notes.data.NotesProvider -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:86:9-89:43 - android:authorities - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:88:13-47 - android:multiprocess - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:89:13-40 - android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:87:13-63 -receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:91:9-103:20 - android:label - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:93:13-50 - android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:92:13-57 -intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:94:13-98:29 -action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:95:17-84 - android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:95:25-81 -action#android.appwidget.action.APPWIDGET_DELETED -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:96:17-85 - android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:96:25-82 -action#android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:97:17-85 - android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:97:25-82 -meta-data#android.appwidget.provider -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:100:13-102:58 - android:resource - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:102:17-55 - android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:101:17-58 -receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:104:9-117:20 - android:label - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:106:13-50 - android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:105:13-57 -receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:119:9-123:20 - android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:119:19-55 -intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:120:13-122:29 -action#android.intent.action.BOOT_COMPLETED -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:121:17-79 - android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:121:25-76 -receiver#net.micode.notes.ui.AlarmReceiver -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:125:9-128:20 - android:process - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:127:13-38 - android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:126:13-61 -activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:130:9-135:20 - android:label - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:132:13-45 - android:launchMode - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:133:13-48 - android:theme - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:134:13-75 - android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:131:13-50 -activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:137:9-142:20 - android:label - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:139:13-54 - android:launchMode - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:140:13-43 - android:theme - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:141:13-60 - android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:138:13-71 -service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:144:9-147:19 - android:exported - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:146:13-37 - android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:145:13-74 -meta-data#android.app.default_searchable -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:149:9-151:52 - android:value - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:151:13-49 - android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:150:13-58 -======= uses-permission#android.permission.RECORD_AUDIO ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:38:5-71 MERGED from [:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:9:5-71 @@ -438,13 +171,13 @@ MERGED from [:core] D:\Notes-master3\core\build\intermediates\merged_manifest\de android:name ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:38:22-68 uses-permission#android.permission.ACCESS_NETWORK_STATE -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:40:5-79 +ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:39:5-79 MERGED from [:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:10:5-79 MERGED from [:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:10:5-79 android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:40:22-76 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:39:22-76 application -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:44:5-158:19 +ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:42:5-156:19 MERGED from [:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:20:5-30:19 MERGED from [:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:20:5-30:19 MERGED from [androidx.core:core:1.0.1] C:\Users\87334\.gradle\caches\transforms-3\6953185b4efad95e57bf8cc13b145959\transformed\core-1.0.1\AndroidManifest.xml:22:5-89 @@ -454,165 +187,165 @@ MERGED from [androidx.versionedparcelable:versionedparcelable:1.0.0] C:\Users\87 android:appComponentFactory ADDED from [androidx.core:core:1.0.1] C:\Users\87334\.gradle\caches\transforms-3\6953185b4efad95e57bf8cc13b145959\transformed\core-1.0.1\AndroidManifest.xml:22:18-86 android:label - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:46:9-41 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:44:9-41 android:icon - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:45:9-42 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:43:9-42 activity#net.micode.notes.ui.NotesListActivity -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:47:9-60:20 +ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:45:9-58:20 android:label - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:50:13-45 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:48:13-45 android:launchMode - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:51:13-43 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:49:13-43 android:windowSoftInputMode - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:54:13-52 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:52:13-52 android:uiOptions - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:53:13-57 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:51:13-57 android:configChanges - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:49:13-74 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:47:13-74 android:theme - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:52:13-71 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:50:13-71 android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:48:13-49 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:46:13-49 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:56:13-59:29 +ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:54:13-57:29 action#android.intent.action.MAIN -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:57:17-69 +ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:55:17-69 android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:57:25-66 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:55:25-66 category#android.intent.category.LAUNCHER -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:58:17-77 +ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:56:17-77 android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:58:27-74 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:56:27-74 activity#net.micode.notes.ui.NoteEditActivity -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:62:9-90:20 +ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:60:9-88:20 android:launchMode - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:65:13-43 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:63:13-43 android:configChanges - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:64:13-74 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:62:13-74 android:theme - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:66:13-71 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:64:13-71 android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:63:13-48 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:61:13-48 intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:68:13-73:29 +ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:66:13-71:29 action#android.intent.action.VIEW -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:69:17-69 +ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:67:17-69 android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:69:25-66 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:67:25-66 category#android.intent.category.DEFAULT -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:70:17-76 +ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:68:17-76 android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:70:27-73 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:68:27-73 data -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:71:17-78 +ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:69:17-78 android:mimeType - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:71:23-75 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:69:23-75 intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:75:13-80:29 +ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:73:13-78:29 action#android.intent.action.INSERT_OR_EDIT -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:76:17-79 +ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:74:17-79 android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:76:25-76 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:74:25-76 intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:82:13-85:29 +ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:80:13-83:29 action#android.intent.action.SEARCH -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:83:17-71 +ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:81:17-71 android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:83:25-68 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:81:25-68 meta-data#android.app.searchable -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:87:13-89:54 +ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:85:13-87:54 android:resource - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:89:17-51 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:87:17-51 android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:88:17-54 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:86:17-54 provider#net.micode.notes.data.NotesProvider -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:92:9-95:43 +ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:90:9-93:43 android:authorities - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:94:13-47 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:92:13-47 android:multiprocess - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:95:13-40 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:93:13-40 android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:93:13-63 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:91:13-63 receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:97:9-109:20 +ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:95:9-107:20 android:label - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:99:13-50 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:97:13-50 android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:98:13-57 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:96:13-57 intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:100:13-104:29 +ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:98:13-102:29 action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:101:17-84 +ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:99:17-84 android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:101:25-81 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:99:25-81 action#android.appwidget.action.APPWIDGET_DELETED -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:102:17-85 +ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85 android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:102:25-82 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82 action#android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:103:17-85 +ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:101:17-85 android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:103:25-82 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:101:25-82 meta-data#android.appwidget.provider -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:106:13-108:58 +ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:104:13-106:58 android:resource - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:108:17-55 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:106:17-55 android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:107:17-58 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:105:17-58 receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:110:9-123:20 +ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:108:9-121:20 android:label - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:112:13-50 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:110:13-50 android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:111:13-57 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:109:13-57 receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:125:9-129:20 +ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:123:9-127:20 android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:125:19-55 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:123:19-55 intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:126:13-128:29 +ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:124:13-126:29 action#android.intent.action.BOOT_COMPLETED -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:127:17-79 +ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:125:17-79 android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:127:25-76 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:125:25-76 receiver#net.micode.notes.ui.AlarmReceiver -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:131:9-134:20 +ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:129:9-132:20 android:process - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:133:13-38 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:131:13-38 android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:132:13-61 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:130:13-61 activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:136:9-141:20 +ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:134:9-139:20 android:label - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:138:13-45 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:136:13-45 android:launchMode - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:139:13-48 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:137:13-48 android:theme - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:140:13-75 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:138:13-75 android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:137:13-50 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:135:13-50 activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:143:9-148:20 +ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:141:9-146:20 android:label - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:145:13-54 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:143:13-54 android:launchMode - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:146:13-43 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:144:13-43 android:theme - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:147:13-60 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:145:13-60 android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:144:13-71 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:142:13-71 service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:150:9-153:19 +ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:148:9-151:19 android:exported - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:152:13-37 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:150:13-37 android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:151:13-74 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:149:13-74 meta-data#android.app.default_searchable -ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:155:9-157:52 +ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:153:9-155:52 android:value - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:157:13-49 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:155:13-49 android:name - ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:156:13-58 + ADDED from D:\Notes-master3\app\src\main\AndroidManifest.xml:154:13-58 uses-permission#android.permission.BROADCAST_STICKY ADDED from [:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:15:5-75 android:name @@ -647,4 +380,3 @@ ADDED from [:core] D:\Notes-master3\core\build\intermediates\merged_manifest\deb ADDED from [:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:29:13-61 android:name ADDED from [:core] D:\Notes-master3\core\build\intermediates\merged_manifest\debug\AndroidManifest.xml:28:13-55 ->>>>>>> xiaojinchi_branch diff --git a/src/Notes-master3/app/build/tmp/compileDebugAndroidTestJavaWithJavac/previous-compilation-data.bin b/src/Notes-master3/app/build/tmp/compileDebugAndroidTestJavaWithJavac/previous-compilation-data.bin index 43384d5..f112b7d 100644 Binary files a/src/Notes-master3/app/build/tmp/compileDebugAndroidTestJavaWithJavac/previous-compilation-data.bin and b/src/Notes-master3/app/build/tmp/compileDebugAndroidTestJavaWithJavac/previous-compilation-data.bin differ diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin index 48d6ba5..e7e7e41 100644 Binary files a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ diff --git a/src/Notes-master3/app/src/main/AndroidManifest.xml b/src/Notes-master3/app/src/main/AndroidManifest.xml index 2cb2fc4..e453285 100644 --- a/src/Notes-master3/app/src/main/AndroidManifest.xml +++ b/src/Notes-master3/app/src/main/AndroidManifest.xml @@ -34,15 +34,10 @@ -<<<<<<< HEAD -======= - - ->>>>>>> xiaojinchi_branch >>>>>> xiaojinchi_branch public long getAlertDate() { return mAlertDate; } diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/AccessToken.java b/src/Notes-master3/app/src/main/java/net/micode/notes/tool/AccessToken.java similarity index 98% rename from src/Notes-master3/app/src/main/java/net/micode/notes/ui/AccessToken.java rename to src/Notes-master3/app/src/main/java/net/micode/notes/tool/AccessToken.java index 3f5a3ef..092514c 100644 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/AccessToken.java +++ b/src/Notes-master3/app/src/main/java/net/micode/notes/tool/AccessToken.java @@ -1,4 +1,4 @@ -package net.micode.notes.ui; +package net.micode.notes.tool; import android.util.Log; diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/Base64Util.java b/src/Notes-master3/app/src/main/java/net/micode/notes/tool/Base64Util.java similarity index 98% rename from src/Notes-master3/app/src/main/java/net/micode/notes/ui/Base64Util.java rename to src/Notes-master3/app/src/main/java/net/micode/notes/tool/Base64Util.java index 9a2604a..a80bebc 100644 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/Base64Util.java +++ b/src/Notes-master3/app/src/main/java/net/micode/notes/tool/Base64Util.java @@ -1,4 +1,4 @@ -package net.micode.notes.ui; +package net.micode.notes.tool; /** * Base64 工具类 diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/FileUtil.java b/src/Notes-master3/app/src/main/java/net/micode/notes/tool/FileUtil.java similarity index 98% rename from src/Notes-master3/app/src/main/java/net/micode/notes/ui/FileUtil.java rename to src/Notes-master3/app/src/main/java/net/micode/notes/tool/FileUtil.java index df7bc6d..e2db42a 100644 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/FileUtil.java +++ b/src/Notes-master3/app/src/main/java/net/micode/notes/tool/FileUtil.java @@ -1,4 +1,4 @@ -package net.micode.notes.ui; +package net.micode.notes.tool; import java.io.*; diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/HttpUtil.java b/src/Notes-master3/app/src/main/java/net/micode/notes/tool/HttpUtil.java similarity index 98% rename from src/Notes-master3/app/src/main/java/net/micode/notes/ui/HttpUtil.java rename to src/Notes-master3/app/src/main/java/net/micode/notes/tool/HttpUtil.java index f82fb7a..c21d041 100644 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/HttpUtil.java +++ b/src/Notes-master3/app/src/main/java/net/micode/notes/tool/HttpUtil.java @@ -1,4 +1,4 @@ -package net.micode.notes.ui; +package net.micode.notes.tool; import java.io.BufferedReader; import java.io.DataOutputStream; diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/tool/ImageFactory.java b/src/Notes-master3/app/src/main/java/net/micode/notes/tool/ImageFactory.java new file mode 100644 index 0000000..cf8e1fb --- /dev/null +++ b/src/Notes-master3/app/src/main/java/net/micode/notes/tool/ImageFactory.java @@ -0,0 +1,266 @@ +package net.micode.notes.tool; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; + +import android.graphics.Bitmap; +import android.graphics.Bitmap.Config; +import android.graphics.BitmapFactory; + +import net.micode.notes.ui.NoteEditActivity; + +/** + * Image compress factory class + * + * @author + * + */ +public class ImageFactory { + + /** + * Get bitmap from specified image path + * + * @param imgPath + * @return + */ + public Bitmap getBitmap(String imgPath) { + // Get bitmap through image path + BitmapFactory.Options newOpts = new BitmapFactory.Options(); + newOpts.inJustDecodeBounds = false; + newOpts.inPurgeable = true; + newOpts.inInputShareable = true; + // Do not compress + newOpts.inSampleSize = 1; + newOpts.inPreferredConfig = Config.RGB_565; + return BitmapFactory.decodeFile(imgPath, newOpts); + } + + /** + * Store bitmap into specified image path + * + * @param bitmap + * @param outPath + * @throws FileNotFoundException + */ + public void storeImage(Bitmap bitmap, String outPath) throws FileNotFoundException { + FileOutputStream os = new FileOutputStream(outPath); + bitmap.compress(Bitmap.CompressFormat.JPEG, 100, os); + } + + /** + * Compress image by pixel, this will modify image width/height. + * Used to get thumbnail + * + * @param imgPath image path + * @param pixelW target pixel of width + * @param pixelH target pixel of height + * @return + */ + public Bitmap ratio(String imgPath, float pixelW, float pixelH) { + BitmapFactory.Options newOpts = new BitmapFactory.Options(); + // 开始读入图片，此时把options.inJustDecodeBounds 设回true，即只读边不读内容 + newOpts.inJustDecodeBounds = true; + newOpts.inPreferredConfig = Config.RGB_565; + // Get bitmap info, but notice that bitmap is null now + Bitmap bitmap = BitmapFactory.decodeFile(imgPath,newOpts); + + newOpts.inJustDecodeBounds = false; + int w = newOpts.outWidth; + int h = newOpts.outHeight; + // 想要缩放的目标尺寸 + float hh = pixelH;// 设置高度为240f时，可以明显看到图片缩小了 + float ww = pixelW;// 设置宽度为120f，可以明显看到图片缩小了 + // 缩放比。由于是固定比例缩放，只用高或者宽其中一个数据进行计算即可 + int be = 1;//be=1表示不缩放 + if (w > h && w > ww) {//如果宽度大的话根据宽度固定大小缩放 + be = (int) (newOpts.outWidth / ww); + } else if (w < h && h > hh) {//如果高度高的话根据宽度固定大小缩放 + be = (int) (newOpts.outHeight / hh); + } + if (be <= 0) be = 1; + newOpts.inSampleSize = be;//设置缩放比例 + // 开始压缩图片，注意此时已经把options.inJustDecodeBounds 设回false了 + bitmap = BitmapFactory.decodeFile(imgPath, newOpts); + // 压缩好比例大小后再进行质量压缩 +// return compress(bitmap, maxSize); // 这里再进行质量压缩的意义不大，反而耗资源，删除 + return bitmap; + } + + /** + * Compress image by size, this will modify image width/height. + * Used to get thumbnail + * + * @param image + * @param pixelW target pixel of width + * @param pixelH target pixel of height + * @return + */ + public Bitmap ratio(Bitmap image, float pixelW, float pixelH) { + ByteArrayOutputStream os = new ByteArrayOutputStream(); + image.compress(Bitmap.CompressFormat.JPEG, 100, os); + if( os.toByteArray().length / 1024>1024) {//判断如果图片大于1M,进行压缩避免在生成图片（BitmapFactory.decodeStream）时溢出 + os.reset();//重置baos即清空baos + image.compress(Bitmap.CompressFormat.JPEG, 50, os);//这里压缩50%，把压缩后的数据存放到baos中 + } + ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray()); + BitmapFactory.Options newOpts = new BitmapFactory.Options(); + //开始读入图片，此时把options.inJustDecodeBounds 设回true了 + newOpts.inJustDecodeBounds = true; + newOpts.inPreferredConfig = Config.RGB_565; + Bitmap bitmap = BitmapFactory.decodeStream(is, null, newOpts); + newOpts.inJustDecodeBounds = false; + int w = newOpts.outWidth; + int h = newOpts.outHeight; + float hh = pixelH;// 设置高度为240f时，可以明显看到图片缩小了 + float ww = pixelW;// 设置宽度为120f，可以明显看到图片缩小了 + //缩放比。由于是固定比例缩放，只用高或者宽其中一个数据进行计算即可 + int be = 1;//be=1表示不缩放 + if (w > h && w > ww) {//如果宽度大的话根据宽度固定大小缩放 + be = (int) (newOpts.outWidth / ww); + } else if (w < h && h > hh) {//如果高度高的话根据宽度固定大小缩放 + be = (int) (newOpts.outHeight / hh); + } + if (be <= 0) be = 1; + newOpts.inSampleSize = be;//设置缩放比例 + //重新读入图片，注意此时已经把options.inJustDecodeBounds 设回false了 + is = new ByteArrayInputStream(os.toByteArray()); + bitmap = BitmapFactory.decodeStream(is, null, newOpts); + //压缩好比例大小后再进行质量压缩 +// return compress(bitmap, maxSize); // 这里再进行质量压缩的意义不大，反而耗资源，删除 + return bitmap; + } + + /** + * Compress by quality, and generate image to the path specified + * + * @param image + * @param outPath + * @param maxSize target will be compressed to be smaller than this size.(kb) + * @throws IOException + */ + public void compressAndGenImage(Bitmap image, String outPath, int maxSize) throws IOException { + ByteArrayOutputStream os = new ByteArrayOutputStream(); + // scale + int options = 100; + // Store the bitmap into output stream(no compress) + image.compress(Bitmap.CompressFormat.JPEG, options, os); + // Compress by loop + while ( os.toByteArray().length / 1024 > maxSize) { + // Clean up os + os.reset(); + // interval 10 + options -= 10; + image.compress(Bitmap.CompressFormat.JPEG, options, os); + } + + // Generate compressed image file + FileOutputStream fos = new FileOutputStream(outPath); + fos.write(os.toByteArray()); + fos.flush(); + fos.close(); + } + + /** + * Compress by quality, and generate image to the path specified + * + * @param imgPath + * @param outPath + * @param maxSize target will be compressed to be smaller than this size.(kb) + * @param needsDelete Whether delete original file after compress + * @throws IOException + */ + public void compressAndGenImage(String imgPath, String outPath, int maxSize, boolean needsDelete) throws IOException { + compressAndGenImage(getBitmap(imgPath), outPath, maxSize); + + // Delete original file + if (needsDelete) { + File file = new File (imgPath); + if (file.exists()) { + file.delete(); + } + } + } + + /** + * Ratio and generate thumb to the path specified + * + * @param image + * @param outPath + * @param pixelW target pixel of width + * @param pixelH target pixel of height + * @throws FileNotFoundException + */ + public void ratioAndGenThumb(Bitmap image, String outPath, float pixelW, float pixelH) throws FileNotFoundException { + Bitmap bitmap = ratio(image, pixelW, pixelH); + storeImage( bitmap, outPath); + } + + /** + * Ratio and generate thumb to the path specified + * + * @param image + * @param outPath + * @param pixelW target pixel of width + * @param pixelH target pixel of height + * @param needsDelete Whether delete original file after compress + * @throws FileNotFoundException + */ + public void ratioAndGenThumb(String imgPath, String outPath, float pixelW, float pixelH, boolean needsDelete) throws FileNotFoundException { + Bitmap bitmap = ratio(imgPath, pixelW, pixelH); + storeImage( bitmap, outPath); + + // Delete original file + if (needsDelete) { + File file = new File (imgPath); + if (file.exists()) { + file.delete(); + } + } + } + public static Bitmap compressImage(Bitmap image) { + + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + image.compress(Bitmap.CompressFormat.JPEG, 100, baos);// 质量压缩方法，这里100表示不压缩，把压缩后的数据存放到baos中 + int options = 90; + + while (baos.toByteArray().length / 1024 > 100) { // 循环判断如果压缩后图片是否大于100kb,大于继续压缩 + baos.reset(); // 重置baos即清空baos + image.compress(Bitmap.CompressFormat.JPEG, options, baos);// 这里压缩options%，把压缩后的数据存放到baos中 + options -= 10;// 每次都减少10 + } + ByteArrayInputStream isBm = new ByteArrayInputStream(baos.toByteArray());// 把压缩后的数据baos存放到ByteArrayInputStream中 + Bitmap bitmap = BitmapFactory.decodeStream(isBm, null, null);// 把ByteArrayInputStream数据生成图片 + return bitmap; + } + public static Bitmap getimage(String srcPath, int width) { + + BitmapFactory.Options newOpts = new BitmapFactory.Options(); + // 开始读入图片，此时把options.inJustDecodeBounds 设回true了 + newOpts.inJustDecodeBounds = true; + Bitmap bitmap = BitmapFactory.decodeFile(srcPath, newOpts);// 此时返回bm为空 + + newOpts.inJustDecodeBounds = false; + int w = newOpts.outWidth; + int h = newOpts.outHeight; + // 现在主流手机比较多是800*480分辨率，所以高和宽我们设置为 + float hh = 800f;// 这里设置高度为800f + float ww = width;// 这里设置宽度为480f + // 缩放比。由于是固定比例缩放，只用高或者宽其中一个数据进行计算即可 + int be = 1;// be=1表示不缩放 + if (w > h && w > ww) {// 如果宽度大的话根据宽度固定大小缩放 + be = (int) (newOpts.outWidth / ww); + } else if (w < h && h > hh) {// 如果高度高的话根据宽度固定大小缩放 + be = (int) (newOpts.outHeight / hh); + } + if (be <= 0) + be = 1; + newOpts.inSampleSize = be;// 设置缩放比例 + // 重新读入图片，注意此时已经把options.inJustDecodeBounds 设回false了 + bitmap = BitmapFactory.decodeFile(srcPath, newOpts); + return compressImage(bitmap);// 压缩好比例大小后再进行质量压缩 + } + +} \ No newline at end of file diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java index 21d4f61..14e8d78 100644 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java +++ b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java @@ -115,11 +115,7 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD if ((silentModeStreams & (1 << AudioManager.STREAM_ALARM)) != 0) { mPlayer.setAudioStreamType(silentModeStreams); //设置音乐类型这个好像是静音模式下 } else { -<<<<<<< HEAD - mPlayer.setAudioStreamType(AudioManager.STREAM_ALARM); //不静音模式下 -======= //mPlayer.setAudioStreamType(AudioManager.STREAM_ALARM); //不静音模式下 ->>>>>>> xiaojinchi_branch } try { mPlayer.setDataSource(this, url); //盲猜就是准备播放吧，类似于将歌放进歌单 diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/DimenUtils.java b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/DimenUtils.java deleted file mode 100644 index 69f3941..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/DimenUtils.java +++ /dev/null @@ -1,33 +0,0 @@ -package net.micode.notes.ui; - -import android.content.res.Resources; -import android.util.DisplayMetrics; -import android.util.TypedValue; - -/** - * 工具类转换 - */ -public class DimenUtils { - - private static final Resources sResource = Resources.getSystem(); - - public static float dp2px(float dp) { - DisplayMetrics dm = sResource.getDisplayMetrics(); - return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, dm); - } - - public static int dp2pxInt(float dp) { - return (int) dp2px( dp); - } - - public static float sp2px(float sp) { - DisplayMetrics dm = sResource.getDisplayMetrics(); - return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, sp, dm); - } - - public static int sp2pxInt(float sp) { - return (int) sp2px(sp); - } - - -} \ No newline at end of file diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/GsonUtils.java b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/GsonUtils.java deleted file mode 100644 index 45a9b25..0000000 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/GsonUtils.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2017 Baidu, Inc. All Rights Reserved. - */ -package net.micode.notes.ui; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonParseException; - -import java.lang.reflect.Type; - -/** - * Json工具类. - */ -public class GsonUtils { - private static Gson gson = new GsonBuilder().create(); - - public static String toJson(Object value) { - return gson.toJson(value); - } - - public static T fromJson(String json, Class classOfT) throws JsonParseException { - return gson.fromJson(json, classOfT); - } - - public static T fromJson(String json, Type typeOfT) throws JsonParseException { - return (T) gson.fromJson(json, typeOfT); - } -} diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java index 1281d1b..52e4cee 100644 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java +++ b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java @@ -16,48 +16,21 @@ package net.micode.notes.ui; -import android.Manifest; -<<<<<<< HEAD -======= -import android.content.ActivityNotFoundException; ->>>>>>> xiaojinchi_branch import android.content.ContentResolver; import android.content.ContentValues; -import android.content.pm.PackageManager; import android.database.Cursor; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.net.Uri; import android.os.Build; import android.os.Environment; -<<<<<<< HEAD -import android.provider.DocumentsContract; -import android.provider.MediaStore; -import android.speech.tts.TextToSpeech; -import android.support.annotation.NonNull; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AppCompatActivity; -======= import android.os.PowerManager; import android.os.StrictMode; -import android.os.SystemClock; import android.provider.DocumentsContract; import android.provider.MediaStore; import android.speech.RecognizerIntent; -import android.speech.SpeechRecognizer; import android.speech.tts.TextToSpeech; -//import android.support.annotation.NonNull; -import androidx.annotation.NonNull; -//import android.support.v4.app.ActivityCompat; -import androidx.core.app.ActivityCompat; -//import android.support.v4.content.ContextCompat; -import androidx.core.content.ContextCompat; -//import android.support.v4.content.FileProvider; -import androidx.core.content.FileProvider; -//import android.support.v7.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity; ->>>>>>> xiaojinchi_branch import android.app.AlarmManager; import android.app.AlertDialog; import android.app.PendingIntent; @@ -71,29 +44,16 @@ import android.content.SharedPreferences; import android.graphics.Paint; import android.os.Bundle; import android.preference.PreferenceManager; -<<<<<<< HEAD -import android.support.v7.app.AppCompatActivity; -import android.support.v7.view.menu.MenuBuilder; -======= //import android.support.v7.view.menu.MenuBuilder; -import androidx.core.view.*; ->>>>>>> xiaojinchi_branch import android.text.Editable; import android.text.Spannable; import android.text.SpannableString; import android.text.TextUtils; -<<<<<<< HEAD -======= import android.text.TextWatcher; ->>>>>>> xiaojinchi_branch import android.text.format.DateUtils; import android.text.method.PasswordTransformationMethod; import android.text.style.BackgroundColorSpan; import android.text.style.ImageSpan; -<<<<<<< HEAD -======= -import android.util.AndroidRuntimeException; ->>>>>>> xiaojinchi_branch import android.util.Log; import android.view.KeyEvent; import android.view.LayoutInflater; @@ -102,10 +62,7 @@ import android.view.MenuItem; import android.view.MotionEvent; import android.view.View; import android.view.View.OnClickListener; -<<<<<<< HEAD -======= import android.view.Window; ->>>>>>> xiaojinchi_branch import android.view.WindowManager; import android.widget.Button; import android.widget.CheckBox; @@ -117,24 +74,23 @@ import android.widget.LinearLayout; import android.widget.TextView; import android.widget.Toast; -<<<<<<< HEAD -======= //import com.baidu.aip.asrwakeup3.core.util.FileUtil; import com.baidu.speech.EventListener; import com.baidu.speech.EventManager; import com.baidu.speech.EventManagerFactory; import com.baidu.speech.asr.SpeechConstant; -import com.google.gson.Gson; //import com.baidu.ai.aip.utils.Base64Util; //import com.baidu.ai.aip.utils.FileUtil; //import com.baidu.ai.aip.utils.HttpUtil; import java.net.URLEncoder; -import net.micode.notes.ui.Base64Util; -import net.micode.notes.ui.FileUtil; -import net.micode.notes.ui.HttpUtil; ->>>>>>> xiaojinchi_branch +import net.micode.notes.tool.AccessToken; +import net.micode.notes.tool.Base64Util; +import net.micode.notes.tool.FileUtil; +import net.micode.notes.tool.ImageFactory; +import net.micode.notes.tool.HttpUtil; + import net.micode.notes.R; import net.micode.notes.data.Notes; import net.micode.notes.data.Notes.TextNote; @@ -149,46 +105,27 @@ import net.micode.notes.ui.NoteEditText.OnTextViewChangeListener; import net.micode.notes.widget.NoteWidgetProvider_2x; import net.micode.notes.widget.NoteWidgetProvider_4x; -<<<<<<< HEAD -import java.io.File; -import java.io.FileNotFoundException; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Locale; -import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - - -public class NoteEditActivity extends AppCompatActivity implements OnClickListener, - NoteSettingChangedListener, OnTextViewChangeListener { -======= import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; import java.io.File; import java.io.FileNotFoundException; -import java.io.IOException; -import java.lang.reflect.InvocationTargetException; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashMap; -import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.TreeMap; import java.util.regex.Matcher; import java.util.regex.Pattern; -import retrofit2.http.Url; - public class NoteEditActivity extends AppCompatActivity implements OnClickListener, NoteSettingChangedListener, OnTextViewChangeListener, EventListener { - ->>>>>>> xiaojinchi_branch + private class HeadViewHolder { public TextView tvModified; @@ -200,10 +137,7 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen } private static final Map sBgSelectorBtnsMap = new HashMap(); -<<<<<<< HEAD -======= ->>>>>>> xiaojinchi_branch static { sBgSelectorBtnsMap.put(R.id.iv_bg_yellow, ResourceParser.YELLOW); sBgSelectorBtnsMap.put(R.id.iv_bg_red, ResourceParser.RED); @@ -213,10 +147,7 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen } private static final Map sBgSelectorSelectionMap = new HashMap(); -<<<<<<< HEAD -======= ->>>>>>> xiaojinchi_branch static { sBgSelectorSelectionMap.put(ResourceParser.YELLOW, R.id.iv_bg_yellow_select); sBgSelectorSelectionMap.put(ResourceParser.RED, R.id.iv_bg_red_select); @@ -226,10 +157,7 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen } private static final Map sFontSizeBtnsMap = new HashMap(); -<<<<<<< HEAD -======= ->>>>>>> xiaojinchi_branch static { sFontSizeBtnsMap.put(R.id.ll_font_large, ResourceParser.TEXT_LARGE); sFontSizeBtnsMap.put(R.id.ll_font_small, ResourceParser.TEXT_SMALL); @@ -238,10 +166,7 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen } private static final Map sFontSelectorSelectionMap = new HashMap(); -<<<<<<< HEAD -======= ->>>>>>> xiaojinchi_branch static { sFontSelectorSelectionMap.put(ResourceParser.TEXT_LARGE, R.id.iv_large_select); sFontSelectorSelectionMap.put(ResourceParser.TEXT_SMALL, R.id.iv_small_select); @@ -276,18 +201,14 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen public ImageView image; public int locked = 0; TextToSpeech tts; -<<<<<<< HEAD - -======= public Uri imageUri; CharSequence tmp; - private int RESULT_SPEECH = 4; protected EditText txtResult;//识别结果 protected Button startBtn;//开始识别 一直不说话会自动停止，需要再次打开 private EventManager asr;//语音识别核心库 static AccessToken access; int WORD_REGONIZE = 7; ->>>>>>> xiaojinchi_branch + String mFilePath; public static final String TAG_CHECKED = String.valueOf('\u221A'); public static final String TAG_UNCHECKED = String.valueOf('\u25A1'); @@ -300,10 +221,6 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); -<<<<<<< HEAD - this.setContentView(R.layout.note_edit); - -======= Window win = getWindow(); win.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED); @@ -319,22 +236,16 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder().permitAll().build(); StrictMode.setThreadPolicy(policy); } - TextView length = findViewById(R.id.length); ->>>>>>> xiaojinchi_branch if (savedInstanceState == null && !initActivityState(getIntent())) { finish(); return; } image = findViewById(R.id.image); initResources(); -<<<<<<< HEAD - tts = new TextToSpeech(this, new TextToSpeech.OnInitListener() { - @Override - public void onInit(int status) { - if (status == TextToSpeech.SUCCESS) - { -======= initView(); + StrictMode.VmPolicy.Builder builder = new StrictMode.VmPolicy.Builder(); + StrictMode.setVmPolicy(builder.build()); + builder.detectFileUriExposure(); //initPermission(); txtResult = findViewById(R.id.note_edit_view); @@ -346,24 +257,16 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen @Override public void onInit(int status) { if (status == TextToSpeech.SUCCESS) { ->>>>>>> xiaojinchi_branch // 设置使用美式英语朗读 int result = tts.setLanguage(Locale.US); // 如果不支持所设置的语言 if (result != TextToSpeech.LANG_COUNTRY_AVAILABLE -<<<<<<< HEAD - && result != TextToSpeech.LANG_AVAILABLE) - { -======= && result != TextToSpeech.LANG_AVAILABLE) { ->>>>>>> xiaojinchi_branch return; } } } }); -<<<<<<< HEAD -======= startBtn.setOnTouchListener(new View.OnTouchListener() { @Override public boolean onTouch(View v, MotionEvent event) { @@ -398,7 +301,6 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen startActivityForResult(regonize_Image,7); } }); ->>>>>>> xiaojinchi_branch } /** @@ -454,11 +356,7 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen getWindow().setSoftInputMode( WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE); -<<<<<<< HEAD - } else if(TextUtils.equals(Intent.ACTION_INSERT_OR_EDIT, intent.getAction())) { -======= } else if (TextUtils.equals(Intent.ACTION_INSERT_OR_EDIT, intent.getAction())) { ->>>>>>> xiaojinchi_branch // New note long folderId = intent.getLongExtra(Notes.INTENT_EXTRA_FOLDER_ID, 0); int widgetId = intent.getIntExtra(Notes.INTENT_EXTRA_WIDGET_ID, @@ -508,25 +406,16 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen @Override protected void onResume() { -<<<<<<< HEAD - super.onResume(); - initNoteScreen(); -======= Log.i(TAG, "onResume: 1"); super.onResume(); initNoteScreen(); xianshi(); ->>>>>>> xiaojinchi_branch } private void initNoteScreen() { final String password = mWorkingNote.getPassword(); -<<<<<<< HEAD - if(!password.equals("")) { -======= if (!password.equals("")) { ->>>>>>> xiaojinchi_branch final EditText inputServer = new EditText(this); inputServer.setTransformationMethod(PasswordTransformationMethod.getInstance()); inputServer.setOnEditorActionListener(new EditText.OnEditorActionListener() { @@ -537,24 +426,15 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setTitle("请输入密码") .setView(inputServer) -<<<<<<< HEAD - .setNegativeButton("取消", new DialogInterface.OnClickListener(){ - public void onClick(DialogInterface dialog,int which) { -======= .setCancelable(false) .setNegativeButton("取消", new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { ->>>>>>> xiaojinchi_branch mNoteEditor.setTextAppearance(NoteEditActivity.this, TextAppearanceResources .getTexAppearanceResource(mFontSizeId)); mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery)); onBackPressed(); } -<<<<<<< HEAD - }); -======= }); ->>>>>>> xiaojinchi_branch builder.setPositiveButton("确定", new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { if (inputServer.getText().toString().equals("")) { @@ -600,16 +480,9 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen } } }); -<<<<<<< HEAD - AlertDialog password_get = builder.create(); - password_get.show(); - } - else { -======= builder.create().show(); } else{ ->>>>>>> xiaojinchi_branch mNoteEditor.setTextAppearance(this, TextAppearanceResources .getTexAppearanceResource(mFontSizeId)); if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) { @@ -652,12 +525,8 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen } else { mNoteHeaderHolder.tvAlertDate.setVisibility(View.GONE); mNoteHeaderHolder.ivAlertIcon.setVisibility(View.GONE); -<<<<<<< HEAD - }; -======= } ; ->>>>>>> xiaojinchi_branch } @Override @@ -698,11 +567,7 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen } private boolean inRangeOfView(View view, MotionEvent ev) { -<<<<<<< HEAD - int []location = new int[2]; -======= int[] location = new int[2]; ->>>>>>> xiaojinchi_branch view.getLocationOnScreen(location); int x = location[0]; int y = location[1]; @@ -710,51 +575,12 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen || ev.getX() > (x + view.getWidth()) || ev.getY() < y || ev.getY() > (y + view.getHeight())) { -<<<<<<< HEAD - return false; - } -======= return false; } ->>>>>>> xiaojinchi_branch return true; } private void initResources() { -<<<<<<< HEAD - mHeadViewPanel = findViewById(R.id.note_title); - mNoteHeaderHolder = new HeadViewHolder(); - mNoteHeaderHolder.tvModified = (TextView) findViewById(R.id.tv_modified_date); - mNoteHeaderHolder.ivAlertIcon = (ImageView) findViewById(R.id.iv_alert_icon); - mNoteHeaderHolder.tvAlertDate = (TextView) findViewById(R.id.tv_alert_date); - mNoteHeaderHolder.ibSetBgColor = (ImageView) findViewById(R.id.btn_set_bg_color); - mNoteHeaderHolder.ibSetBgColor.setOnClickListener(this); - mNoteEditor = (EditText) findViewById(R.id.note_edit_view); - mNoteEditorPanel = findViewById(R.id.sv_note_edit); - mNoteBgColorSelector = findViewById(R.id.note_bg_color_selector); - for (int id : sBgSelectorBtnsMap.keySet()) { - ImageView iv = (ImageView) findViewById(id); - iv.setOnClickListener(this); - } - - mFontSizeSelector = findViewById(R.id.font_size_selector); - for (int id : sFontSizeBtnsMap.keySet()) { - View view = findViewById(id); - view.setOnClickListener(this); - } - ; - mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(this); - mFontSizeId = mSharedPrefs.getInt(PREFERENCE_FONT_SIZE, ResourceParser.BG_DEFAULT_FONT_SIZE); - /** - * HACKME: Fix bug of store the resource id in shared preference. - * The id may larger than the length of resources, in this case, - * return the {@link ResourceParser#BG_DEFAULT_FONT_SIZE} - */ - if (mFontSizeId >= TextAppearanceResources.getResourcesSize()) { - mFontSizeId = ResourceParser.BG_DEFAULT_FONT_SIZE; - } - mEditTextList = (LinearLayout) findViewById(R.id.note_edit_list); -======= mHeadViewPanel = findViewById(R.id.note_title); mNoteHeaderHolder = new HeadViewHolder(); mNoteHeaderHolder.tvModified = (TextView) findViewById(R.id.tv_modified_date); @@ -788,7 +614,6 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen } mEditTextList = (LinearLayout) findViewById(R.id.note_edit_list); EditText e = findViewById(R.id.note_edit_view); - //CharSequence tmp; e.addTextChangedListener(new TextWatcher() { public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { tmp = charSequence; @@ -801,8 +626,6 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen @Override public void afterTextChanged(Editable editable) { - //NoteEditText noteEditText = (NoteEditText) findViewById(R.id.note_edit_view); //获取当前的edit - //Editable edit = noteEditText.getText();//1.获取text String s = editable.toString(); //2.将note内容转换为字符串 int len = editable.length(); //内容的长度 for (int i = 0; i < len; i++) { @@ -815,33 +638,17 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen len = len + i - j - 1; } } - /* (int k = 0; k < len; k++) { - for (int j = k; j < len; j++) { - String img_fragment = s.substring(k, j + 1); //img_fragment：关于图片路径的片段 - if (img_fragment.length() > 15 && img_fragment.endsWith("[/local]") && img_fragment.startsWith("[local]")) { - String b = s.substring(0,k); - String c = s.substring(j+1,len); - s = b + c; - len = len + k - j - 16; - } - } - }*/ } TextView length = findViewById(R.id.length); length.setText("字符数：" + operateText(s).length()); } }); ->>>>>>> xiaojinchi_branch } @Override protected void onPause() { super.onPause(); -<<<<<<< HEAD - if(saveNote()) { -======= if (saveNote()) { ->>>>>>> xiaojinchi_branch Log.d(TAG, "Note data was saved with length:" + mWorkingNote.getContent().length()); } clearSettingState(); @@ -858,13 +665,8 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen return; } -<<<<<<< HEAD - intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[] { - mWorkingNote.getWidgetId() -======= intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[]{ mWorkingNote.getWidgetId() ->>>>>>> xiaojinchi_branch }); sendBroadcast(intent); @@ -876,11 +678,7 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen if (id == R.id.btn_set_bg_color) { mNoteBgColorSelector.setVisibility(View.VISIBLE); findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility( -<<<<<<< HEAD - View.VISIBLE); -======= View.VISIBLE); ->>>>>>> xiaojinchi_branch } else if (sBgSelectorBtnsMap.containsKey(id)) { findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility( View.GONE); @@ -904,11 +702,7 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen @Override public void onBackPressed() { -<<<<<<< HEAD - if(clearSettingState()) { -======= if (clearSettingState()) { ->>>>>>> xiaojinchi_branch return; } @@ -956,19 +750,11 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen } else { menu.findItem(R.id.menu_delete_remind).setVisible(false); } -<<<<<<< HEAD - if(mWorkingNote.getPassword().equals("")){ - menu.findItem(R.id.menu_lock_note).setVisible(true); - menu.findItem(R.id.menu_Unencrpt).setVisible(false); - } - if(!mWorkingNote.getPassword().equals("")){ -======= if (mWorkingNote.getPassword().equals("")) { menu.findItem(R.id.menu_lock_note).setVisible(true); menu.findItem(R.id.menu_Unencrpt).setVisible(false); } if (!mWorkingNote.getPassword().equals("")) { ->>>>>>> xiaojinchi_branch menu.findItem(R.id.menu_lock_note).setVisible(false); menu.findItem(R.id.menu_Unencrpt).setVisible(true); } @@ -1026,7 +812,6 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen Toast.makeText(NoteEditActivity.this, "私密锁删除", Toast.LENGTH_SHORT).show(); break; case R.id.menu_add_image: - //onContextItemSelected(item); break; case R.id.open_album: Log.d(TAG, "onClick: click add image button"); @@ -1038,25 +823,24 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen loadImage.setType("image/*"); startActivityForResult(loadImage, 2); break; -<<<<<<< HEAD - case R.id.take_photo: - Intent photo_image = new Intent(Intent.ACTION_GET_CONTENT); - //Category属性用于指定当前动作（Action）被执行的环境. - //CATEGORY_OPENABLE; 用来指示一个ACTION_GET_CONTENT的intent - photo_image.addCategory(Intent.CATEGORY_OPENABLE); - photo_image.setType("image/*"); - startActivityForResult(photo_image, 2); - Toast.makeText(NoteEditActivity.this, "拍张照片吧", Toast.LENGTH_SHORT).show(); + case R.id.open_camera: + mFilePath = Environment.getExternalStorageDirectory().getAbsolutePath() + "/systemCemer"; + //存储文件夹操作 + File outFilePath = new File(mFilePath); + if (!outFilePath.exists()) { + outFilePath.mkdirs(); + } + //设置自定义照片的名字 + String fileName = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()); + mFilePath = mFilePath + "/IMG_" + fileName + ".jpg"; + + File outFile = new File(mFilePath); + Uri uri = Uri.fromFile(outFile); + //拍照 + Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); + intent.putExtra(MediaStore.EXTRA_OUTPUT, uri); + startActivityForResult(intent, 8); break; -======= -// case R.id.regonize_word: -// Intent regonize_Image = new Intent(Intent.ACTION_GET_CONTENT); -// //Category属性用于指定当前动作（Action）被执行的环境. -// //CATEGORY_OPENABLE; 用来指示一个ACTION_GET_CONTENT的intent -// regonize_Image.addCategory(Intent.CATEGORY_OPENABLE); -// regonize_Image.setType("image/*"); -// startActivityForResult(regonize_Image,7); ->>>>>>> xiaojinchi_branch default: break; } @@ -1067,11 +851,7 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen DateTimePickerDialog d = new DateTimePickerDialog(this, System.currentTimeMillis()); d.setOnDateTimeSetListener(new OnDateTimeSetListener() { public void OnDateTimeSet(AlertDialog dialog, long date) { -<<<<<<< HEAD - mWorkingNote.setAlertDate(date , true); -======= mWorkingNote.setAlertDate(date, true); ->>>>>>> xiaojinchi_branch } }); d.show(); @@ -1141,11 +921,7 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, intent, 0); AlarmManager alarmManager = ((AlarmManager) getSystemService(ALARM_SERVICE)); showAlertHeader(); -<<<<<<< HEAD - if(!set) { -======= if (!set) { ->>>>>>> xiaojinchi_branch alarmManager.cancel(pendingIntent); } else { alarmManager.set(AlarmManager.RTC_WAKEUP, date, pendingIntent); @@ -1178,11 +954,7 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen mEditTextList.removeViewAt(index); NoteEditText edit = null; -<<<<<<< HEAD - if(index == 0) { -======= if (index == 0) { ->>>>>>> xiaojinchi_branch edit = (NoteEditText) mEditTextList.getChildAt(0).findViewById( R.id.et_edit_text); } else { @@ -1199,11 +971,7 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen /** * Should not happen, check for debug */ -<<<<<<< HEAD - if(index > mEditTextList.getChildCount()) { -======= if (index > mEditTextList.getChildCount()) { ->>>>>>> xiaojinchi_branch Log.e(TAG, "Index out of mEditTextList boundrary, should not happen"); } @@ -1223,11 +991,7 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen String[] items = text.split("\n"); int index = 0; for (String item : items) { -<<<<<<< HEAD - if(!TextUtils.isEmpty(item)) { -======= if (!TextUtils.isEmpty(item)) { ->>>>>>> xiaojinchi_branch mEditTextList.addView(getListItem(item, index)); index++; } @@ -1292,11 +1056,7 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen Log.e(TAG, "Wrong index, should not happen"); return; } -<<<<<<< HEAD - if(hasText) { -======= if (hasText) { ->>>>>>> xiaojinchi_branch mEditTextList.getChildAt(index).findViewById(R.id.cb_edit_item).setVisibility(View.VISIBLE); } else { mEditTextList.getChildAt(index).findViewById(R.id.cb_edit_item).setVisibility(View.GONE); @@ -1397,37 +1157,17 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen return content.length() > SHORTCUT_ICON_TITLE_MAX_LEN ? content.substring(0, SHORTCUT_ICON_TITLE_MAX_LEN) : content; } -<<<<<<< HEAD - private void setPassword(){ - final EditText inputServer = new EditText(this); - inputServer.setOnEditorActionListener(new EditText.OnEditorActionListener() { - public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { - return (event.getKeyCode()==KeyEvent.KEYCODE_ENTER); -======= private void setPassword() { final EditText inputServer = new EditText(this); inputServer.setOnEditorActionListener(new EditText.OnEditorActionListener() { public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { return (event.getKeyCode() == KeyEvent.KEYCODE_ENTER); ->>>>>>> xiaojinchi_branch } }); AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setTitle("请输入密码") .setView(inputServer) -<<<<<<< HEAD - .setNegativeButton("取消",null); - builder.setPositiveButton("确定", new DialogInterface.OnClickListener(){ - public void onClick(DialogInterface dialog, int which){ - if(inputServer.getText().toString().equals("")) { - Toast.makeText(NoteEditActivity.this, "请输入密码", Toast.LENGTH_SHORT).show(); - } - else if(inputServer.getText().toString().length() > 16){ - Toast.makeText(NoteEditActivity.this, "密码请小于16位", Toast.LENGTH_SHORT).show(); - } - else{ -======= .setNegativeButton("取消", null); builder.setPositiveButton("确定", new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { @@ -1436,16 +1176,11 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen } else if (inputServer.getText().toString().length() > 16) { Toast.makeText(NoteEditActivity.this, "密码请小于16位", Toast.LENGTH_SHORT).show(); } else { ->>>>>>> xiaojinchi_branch password = inputServer.getText().toString(); mWorkingNote.setPassword(password); locked = 1; -<<<<<<< HEAD - Toast.makeText(NoteEditActivity.this,"设置密码成功",Toast.LENGTH_SHORT).show(); -======= Toast.makeText(NoteEditActivity.this, "设置密码成功", Toast.LENGTH_SHORT).show(); ->>>>>>> xiaojinchi_branch } } }); @@ -1460,16 +1195,10 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen private void showToast(int resId, int duration) { Toast.makeText(this, resId, duration).show(); } -<<<<<<< HEAD - public void read(View v){ - tts.speak(mWorkingNote.getContent().toString(),TextToSpeech.QUEUE_ADD, null); - Log.i(TAG,"play"); -======= public void read(View v) { tts.speak(mWorkingNote.getContent().toString(), TextToSpeech.QUEUE_ADD, null); Log.i(TAG, "play"); ->>>>>>> xiaojinchi_branch } @Override //重写onActivityResult()来处理返回的数据 @@ -1487,15 +1216,6 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen e.printStackTrace(); } -<<<<<<< HEAD - if(bitmap != null){ - //3.根据Bitmap对象创建ImageSpan对象 - Log.d(TAG, "onActivityResult: bitmap is not null"); - ImageSpan imageSpan = new ImageSpan(NoteEditActivity.this, bitmap); - String path = getPath(this,originalUri); - //4.使用[local][/local]将path括起来，用于之后方便识别图片路径在note中的位置 - String img_fragment= "[local]" + path + "[/local]"; -======= if (bitmap != null) { //3.根据Bitmap对象创建ImageSpan对象 Log.d(TAG, "onActivityResult: bitmap is not null"); @@ -1503,7 +1223,6 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen String path = getPath(this, originalUri); //4.使用[local][/local]将path括起来，用于之后方便识别图片路径在note中的位置 String img_fragment = "[local]" + path + "[/local]"; ->>>>>>> xiaojinchi_branch //创建一个SpannableString对象，以便插入用ImageSpan对象封装的图像 SpannableString spannableString = new SpannableString(img_fragment); spannableString.setSpan(imageSpan, 0, img_fragment.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); @@ -1513,25 +1232,11 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen Log.d(TAG, "Index是: " + index); Editable edit_text = e.getEditableText(); edit_text.insert(index, spannableString); //将图片插入到光标所在位置 - - //mWorkingNote.mContent = e.getText().toString(); mWorkingNote.setmContent(e.getText().toString()); //6.把改动提交到数据库中,两个数据库表都要改的 ContentResolver contentResolver = getContentResolver(); ContentValues contentValues = new ContentValues(); final long id = mWorkingNote.getNoteId(); -<<<<<<< HEAD - contentValues.put("snippet",mWorkingNote.getContent()); - contentResolver.update(Uri.parse("content://micode_notes/note"), contentValues,"_id=?",new String[]{""+id}); - ContentValues contentValues1 = new ContentValues(); - contentValues1.put("content",mWorkingNote.getContent()); - contentResolver.update(Uri.parse("content://micode_notes/data"), contentValues1,"mime_type=? and note_id=?", new String[]{"vnd.android.cursor.item/text_note",""+id}); - - }else{ - Toast.makeText(NoteEditActivity.this, "获取图片失败", Toast.LENGTH_SHORT).show(); - } - break; -======= contentValues.put("snippet", mWorkingNote.getContent()); contentResolver.update(Uri.parse("content://micode_notes/note"), contentValues, "_id=?", new String[]{"" + id}); ContentValues contentValues1 = new ContentValues(); @@ -1597,7 +1302,11 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen case 7: accurateBasic(intent); break; ->>>>>>> xiaojinchi_branch + case 8: + String FilePath = "[local]" + mFilePath + "[/local]"; + mWorkingNote.addContent(FilePath); + convertToImage(); + break; default: break; } @@ -1655,10 +1364,7 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen } return null; } -<<<<<<< HEAD -======= ->>>>>>> xiaojinchi_branch public String getDataColumn(Context context, Uri uri, String selection, String[] selectionArgs) { Cursor cursor = null; @@ -1677,36 +1383,17 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen } return null; } -<<<<<<< HEAD - public boolean isMediaDocument(Uri uri) { - return "com.android.providers.media.documents".equals(uri.getAuthority()); - } -======= public boolean isMediaDocument(Uri uri) { return "com.android.providers.media.documents".equals(uri.getAuthority()); } ->>>>>>> xiaojinchi_branch private void convertToImage() { NoteEditText noteEditText = (NoteEditText) findViewById(R.id.note_edit_view); //获取当前的edit Editable editable = noteEditText.getText();//1.获取text String noteText = editable.toString(); //2.将note内容转换为字符串 int length = editable.length(); //内容的长度 //3.截取img片段 [local]+uri+[local]，提取uri -<<<<<<< HEAD - for(int i = 0; i < length; i++) { - for(int j = i; j < length; j++) { - String img_fragment = noteText.substring(i, j+1); //img_fragment：关于图片路径的片段 - if(img_fragment.length() > 15 && img_fragment.endsWith("[/local]") && img_fragment.startsWith("[local]")){ - int limit = 7; //[local]为7个字符 - //[local][/local]共15个字符，剩下的为真正的path长度 - int len = img_fragment.length()-15; - //从[local]之后的len个字符就是path - String path = img_fragment.substring(limit,limit+len);//获取到了图片路径 - Bitmap bitmap = null; - Log.d(TAG, "图片的路径是："+path); -======= for (int i = 0; i < length; i++) { for (int j = i; j < length; j++) { String img_fragment = noteText.substring(i, j + 1); //img_fragment：关于图片路径的片段 @@ -1718,17 +1405,13 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen String path = img_fragment.substring(limit, limit + len);//获取到了图片路径 Bitmap bitmap = null; Log.d(TAG, "图片的路径是：" + path); ->>>>>>> xiaojinchi_branch try { - bitmap = BitmapFactory.decodeFile(path);//将图片路径解码为图片格式 + int width = ScreenUtils.getScreenWidth(NoteEditActivity.this); + bitmap = ImageFactory.getimage(path,width);//将图片路径解码为图片格式 } catch (Exception e) { e.printStackTrace(); } -<<<<<<< HEAD - if(bitmap!=null){ //若图片存在 -======= if (bitmap != null) { //若图片存在 ->>>>>>> xiaojinchi_branch Log.d(TAG, "图片不为null"); ImageSpan imageSpan = new ImageSpan(NoteEditActivity.this, bitmap); //4.创建一个SpannableString对象，以便插入用ImageSpan对象封装的图像 @@ -1738,27 +1421,13 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen spannableString.setSpan(imageSpan, 0, ss.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); Log.d(TAG, "Create spannable string success!"); Editable edit_text = noteEditText.getEditableText(); -<<<<<<< HEAD - edit_text.delete(i,i+len+15); //6.删掉图片路径的文字 -======= edit_text.delete(i, i + len + 15); //6.删掉图片路径的文字 ->>>>>>> xiaojinchi_branch edit_text.insert(i, spannableString); //7.在路径的起始位置插入图片 } } } } } -<<<<<<< HEAD -} -======= - - public int get_length() { - if (mWorkingNote.getContent() != null) - return mWorkingNote.getContent().length(); - else return 0; - } - public void xianshi() { NoteEditText noteEditText = (NoteEditText) findViewById(R.id.note_edit_view); //获取当前的edit Editable editable = noteEditText.getText();//1.获取text @@ -1771,7 +1440,6 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen String b = s.substring(0, i); String c = s.substring(j + 1, len); s = b + c; - //Log.i(TAG, s); len = len + i - j - 1; } } @@ -1798,7 +1466,6 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen asr.send(event, json, null, 0, 0);// 初始化EventManager对象,这个实例只能创建一次，就是我们上方创建的asr，此处开始传入 } private void stop(){ - //txtResult.append("停止识别：ASR_STOP"); asr.send(SpeechConstant.ASR_STOP, null, null, 0, 0);//此处停止 } @Override @@ -1842,73 +1509,32 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen txtResult = findViewById(R.id.note_edit_view); startBtn = findViewById(R.id.listen); } - private void initPermission() { - String permissions[] = {Manifest.permission.RECORD_AUDIO, - Manifest.permission.ACCESS_NETWORK_STATE, - Manifest.permission.INTERNET, - Manifest.permission.READ_PHONE_STATE, - Manifest.permission.WRITE_EXTERNAL_STORAGE - }; - - ArrayList toApplyList = new ArrayList(); - - for (String perm :permissions){ - if (PackageManager.PERMISSION_GRANTED != ContextCompat.checkSelfPermission(this, perm)) { - Log.i(TAG, "initPermission: 1"); - toApplyList.add(perm); - //进入到这里代表没有权限. - } - } - String tmpList[] = new String[toApplyList.size()]; - if (!toApplyList.isEmpty()){ - ActivityCompat.requestPermissions(this, toApplyList.toArray(tmpList), 123); - } - Log.i(TAG, "initPermission: 2"); - } public boolean isScreenOn(){ PowerManager pm = (PowerManager) NoteEditActivity.this.getSystemService(Context.POWER_SERVICE); boolean isScreenOn = pm.isScreenOn(); return isScreenOn; } - public static void wakeUp(Context context) { - PowerManager powerManager= (PowerManager)context.getSystemService(Context.POWER_SERVICE); - try { - powerManager.getClass().getMethod("wakeUp", new Class[]{long.class}).invoke(powerManager, SystemClock.uptimeMillis()); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } catch (InvocationTargetException e) { - e.printStackTrace(); - } catch (NoSuchMethodException e) { - e.printStackTrace(); - } - } public String accurateBasic(Intent intent) { // 请求url String url = "https://aip.baidubce.com/rest/2.0/ocr/v1/accurate_basic"; Uri uri = intent.getData(); try { // 本地文件路径 - //Log.i(TAG, "accurateBasic: 9"); String filePath = getPath(NoteEditActivity.this,uri); - Log.i("filePath", filePath); byte[] imgData = FileUtil.readFileByBytes(filePath); String imgStr = Base64Util.encode(imgData); String imgParam = URLEncoder.encode(imgStr, "UTF-8"); - String param = "image=" + imgParam; - - // 注意这里仅为了简化编码每一次请求都去获取access_token，线上环境access_token有过期时间， 客户端可自行缓存，过期后重新获取。 String accessToken = access.getAuth(); String result = HttpUtil.post(url, accessToken, param); - System.out.println(result); JSONObject Json = new JSONObject(result); JSONArray Array = Json.getJSONArray("words_result"); - String content = mWorkingNote.getContent(); for(int i = 0; i >>>>>> xiaojinchi_branch diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteItemData.java b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteItemData.java index 67dc8f7..e0fdd58 100644 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteItemData.java +++ b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NoteItemData.java @@ -72,10 +72,7 @@ public class NoteItemData { private String mName; private String mPhoneNumber; private int mLocked; -<<<<<<< HEAD -======= private String mPassword = ""; ->>>>>>> xiaojinchi_branch private boolean mIsLastItem; private boolean mIsFirstItem; @@ -222,11 +219,8 @@ public class NoteItemData { return (mAlertDate > 0); } -<<<<<<< HEAD -======= public String getPassword(){ return mPassword;} ->>>>>>> xiaojinchi_branch public void locked(){ mLocked = 1;} public boolean isCallRecord() { diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListActivity.java index 5b17e03..89097fc 100644 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListActivity.java +++ b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -16,7 +16,6 @@ package net.micode.notes.ui; -import android.support.v7.app.AppCompatActivity; import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; @@ -28,14 +27,21 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; +import android.content.res.Resources; import android.database.Cursor; +import android.graphics.Bitmap; +import android.graphics.drawable.BitmapDrawable; +import android.graphics.drawable.Drawable; +import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; +import android.os.Environment; import android.preference.PreferenceManager; -import android.support.v7.app.AppCompatActivity; +import android.provider.MediaStore; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; +import android.util.DisplayMetrics; import android.util.Log; import android.view.ActionMode; import android.view.ContextMenu; @@ -58,6 +64,7 @@ import android.widget.AdapterView.OnItemClickListener; import android.widget.AdapterView.OnItemLongClickListener; import android.widget.Button; import android.widget.EditText; +import android.widget.FrameLayout; import android.widget.ListView; import android.widget.PopupMenu; import android.widget.TextView; @@ -70,15 +77,20 @@ import net.micode.notes.gtask.remote.GTaskSyncService; import net.micode.notes.model.WorkingNote; import net.micode.notes.tool.BackupUtils; import net.micode.notes.tool.DataUtils; +import net.micode.notes.tool.ImageFactory; import net.micode.notes.tool.ResourceParser; +import net.micode.notes.tool.ScreenUtils; import net.micode.notes.ui.NotesListAdapter.AppWidgetAttribute; import net.micode.notes.widget.NoteWidgetProvider_2x; import net.micode.notes.widget.NoteWidgetProvider_4x; import java.io.BufferedReader; +import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.HashSet; public class NotesListActivity extends AppCompatActivity implements OnClickListener, OnItemLongClickListener { @@ -128,6 +140,8 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe private NoteItemData mFocusNoteDataItem; + String mFilePath; + private static final String NORMAL_SELECTION = NoteColumns.PARENT_ID + "=?"; private static final String ROOT_FOLDER_SELECTION = "(" + NoteColumns.TYPE + "<>" @@ -167,7 +181,6 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe InputStream in = null; try { in = getResources().openRawResource(R.raw.introduction); - if (in != null) { InputStreamReader isr = new InputStreamReader(in); BufferedReader br = new BufferedReader(isr); char [] buf = new char[1024]; @@ -175,10 +188,7 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe while ((len = br.read(buf)) > 0) { sb.append(buf, 0, len); } - } else { - Log.e(TAG, "Read introduction file error"); - return; - } + br.close(); } catch (IOException e) { e.printStackTrace(); return; @@ -186,7 +196,8 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe if(in != null) { try { in.close(); - } catch (IOException e) { + } + catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); } @@ -540,7 +551,6 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe } private void openNode(NoteItemData data) { - Log.i("open","Node"); Intent intent = new Intent(this, NoteEditActivity.class); intent.setAction(Intent.ACTION_VIEW); intent.putExtra(Intent.EXTRA_UID, data.getId()); @@ -824,6 +834,26 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe case R.id.menu_search: onSearchRequested(); break; + case R.id.album: + break; + case R.id.camera: + mFilePath = Environment.getExternalStorageDirectory().getAbsolutePath() + "/systemCemer"; + //存储文件夹操作 + File outFilePath = new File(mFilePath); + if (!outFilePath.exists()) { + outFilePath.mkdirs(); + } + //设置自定义照片的名字 + String fileName = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()); + mFilePath = mFilePath + "/IMG_" + fileName + ".jpg"; + + File outFile = new File(mFilePath); + Uri uri = Uri.fromFile(outFile); + //拍照 + Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); + intent.putExtra(MediaStore.EXTRA_OUTPUT, uri); + startActivityForResult(intent, 8); + break; default: break; } diff --git a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListItem.java b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListItem.java index 1221e80..c2fd85d 100644 --- a/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListItem.java +++ b/src/Notes-master3/app/src/main/java/net/micode/notes/ui/NotesListItem.java @@ -18,6 +18,7 @@ package net.micode.notes.ui; import android.content.Context; import android.text.format.DateUtils; +import android.util.Log; import android.view.View; import android.widget.CheckBox; import android.widget.ImageView; @@ -67,7 +68,7 @@ public class NotesListItem extends LinearLayout { } else if (data.getParentId() == Notes.ID_CALL_RECORD_FOLDER) { mCallName.setVisibility(View.VISIBLE); mCallName.setText(data.getCallName()); - mTitle.setTextAppearance(context,R.style.TextAppearanceSecondaryItem); + mTitle.setTextAppearance(context, R.style.TextAppearanceSecondaryItem); mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet())); if (data.hasAlert()) { mAlert.setImageResource(R.drawable.clock); @@ -82,21 +83,31 @@ public class NotesListItem extends LinearLayout { if (data.getType() == Notes.TYPE_FOLDER) { mTitle.setText(data.getSnippet() + context.getString(R.string.format_folder_files_count, - data.getNotesCount())); + data.getNotesCount())); mAlert.setVisibility(View.GONE); } else { - mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet())); - if (data.hasAlert()) { - mAlert.setImageResource(R.drawable.clock); - mAlert.setVisibility(View.VISIBLE); + if (!data.getPassword().equals("")) { + mTitle.setText(DataUtils.getFormattedSnippet("输入密码后查看")); + if (data.hasAlert()) { + mAlert.setImageResource(R.drawable.clock); + mAlert.setVisibility(View.VISIBLE); + } else { + mAlert.setVisibility(View.GONE); + } } else { - mAlert.setVisibility(View.GONE); + mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet())); + if (data.hasAlert()) { + mAlert.setImageResource(R.drawable.clock); + mAlert.setVisibility(View.VISIBLE); + } else { + mAlert.setVisibility(View.GONE); + } } } - } - mTime.setText(DateUtils.getRelativeTimeSpanString(data.getModifiedDate())); + mTime.setText(DateUtils.getRelativeTimeSpanString(data.getModifiedDate())); - setBackground(data); + setBackground(data); + } } private void setBackground(NoteItemData data) { diff --git a/src/Notes-master3/app/src/main/res/layout/note_edit.xml b/src/Notes-master3/app/src/main/res/layout/note_edit.xml index 024f190..f64c5be 100644 --- a/src/Notes-master3/app/src/main/res/layout/note_edit.xml +++ b/src/Notes-master3/app/src/main/res/layout/note_edit.xml @@ -129,8 +129,6 @@ android:onClick="read" android:src="@drawable/read" android:text="Read For Me" /> -<<<<<<< HEAD -=======