diff --git a/src/Notes-master1/.gradle/7.0.2/executionHistory/executionHistory.bin b/src/Notes-master1/.gradle/7.0.2/executionHistory/executionHistory.bin index f1934f8d..5c554fdd 100644 Binary files a/src/Notes-master1/.gradle/7.0.2/executionHistory/executionHistory.bin and b/src/Notes-master1/.gradle/7.0.2/executionHistory/executionHistory.bin differ diff --git a/src/Notes-master1/.gradle/7.0.2/executionHistory/executionHistory.lock b/src/Notes-master1/.gradle/7.0.2/executionHistory/executionHistory.lock index a790e564..55867a4f 100644 Binary files a/src/Notes-master1/.gradle/7.0.2/executionHistory/executionHistory.lock and b/src/Notes-master1/.gradle/7.0.2/executionHistory/executionHistory.lock differ diff --git a/src/Notes-master1/.gradle/7.0.2/fileHashes/fileHashes.bin b/src/Notes-master1/.gradle/7.0.2/fileHashes/fileHashes.bin index 6528e6d7..c7d8c654 100644 Binary files a/src/Notes-master1/.gradle/7.0.2/fileHashes/fileHashes.bin and b/src/Notes-master1/.gradle/7.0.2/fileHashes/fileHashes.bin differ diff --git a/src/Notes-master1/.gradle/7.0.2/fileHashes/fileHashes.lock b/src/Notes-master1/.gradle/7.0.2/fileHashes/fileHashes.lock index ecee7a88..50480468 100644 Binary files a/src/Notes-master1/.gradle/7.0.2/fileHashes/fileHashes.lock and b/src/Notes-master1/.gradle/7.0.2/fileHashes/fileHashes.lock differ diff --git a/src/Notes-master1/.gradle/7.0.2/fileHashes/resourceHashesCache.bin b/src/Notes-master1/.gradle/7.0.2/fileHashes/resourceHashesCache.bin index 9493c982..e25e07e7 100644 Binary files a/src/Notes-master1/.gradle/7.0.2/fileHashes/resourceHashesCache.bin and b/src/Notes-master1/.gradle/7.0.2/fileHashes/resourceHashesCache.bin differ diff --git a/src/Notes-master1/.gradle/7.0.2/javaCompile/classAnalysis.bin b/src/Notes-master1/.gradle/7.0.2/javaCompile/classAnalysis.bin index 5494ab9e..a96ccc77 100644 Binary files a/src/Notes-master1/.gradle/7.0.2/javaCompile/classAnalysis.bin and b/src/Notes-master1/.gradle/7.0.2/javaCompile/classAnalysis.bin differ diff --git a/src/Notes-master1/.gradle/7.0.2/javaCompile/jarAnalysis.bin b/src/Notes-master1/.gradle/7.0.2/javaCompile/jarAnalysis.bin index 4f570659..e803d1a2 100644 Binary files a/src/Notes-master1/.gradle/7.0.2/javaCompile/jarAnalysis.bin and b/src/Notes-master1/.gradle/7.0.2/javaCompile/jarAnalysis.bin differ diff --git a/src/Notes-master1/.gradle/7.0.2/javaCompile/javaCompile.lock b/src/Notes-master1/.gradle/7.0.2/javaCompile/javaCompile.lock index 4df584bb..77f72398 100644 Binary files a/src/Notes-master1/.gradle/7.0.2/javaCompile/javaCompile.lock and b/src/Notes-master1/.gradle/7.0.2/javaCompile/javaCompile.lock differ diff --git a/src/Notes-master1/.gradle/7.0.2/javaCompile/taskHistory.bin b/src/Notes-master1/.gradle/7.0.2/javaCompile/taskHistory.bin index e772bc8a..32f14fac 100644 Binary files a/src/Notes-master1/.gradle/7.0.2/javaCompile/taskHistory.bin and b/src/Notes-master1/.gradle/7.0.2/javaCompile/taskHistory.bin differ diff --git a/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 2a4b1c8b..fbc79c9d 100644 Binary files a/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/Notes-master1/.idea/dbnavigator.xml b/src/Notes-master1/.idea/dbnavigator.xml index 50b47697..382398ee 100644 --- a/src/Notes-master1/.idea/dbnavigator.xml +++ b/src/Notes-master1/.idea/dbnavigator.xml @@ -2,7 +2,7 @@ - + @@ -24,11 +24,38 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -54,7 +81,182 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Notes-master1/.idea/misc.xml b/src/Notes-master1/.idea/misc.xml index 852c9742..346f7324 100644 --- a/src/Notes-master1/.idea/misc.xml +++ b/src/Notes-master1/.idea/misc.xml @@ -11,7 +11,21 @@ + + + + + + + + + + + + + + diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/1/e/1eb2363b523dbcae43d3c6e4790c64436af61b13 b/src/Notes-master1/.idea/sonarlint/issuestore/1/e/1eb2363b523dbcae43d3c6e4790c64436af61b13 index 841ef402..da182573 100644 --- a/src/Notes-master1/.idea/sonarlint/issuestore/1/e/1eb2363b523dbcae43d3c6e4790c64436af61b13 +++ b/src/Notes-master1/.idea/sonarlint/issuestore/1/e/1eb2363b523dbcae43d3c6e4790c64436af61b13 @@ -4,22 +4,28 @@ java:S1214#"CMove constants defined in this interfaces to another class or enum v java:S11927"[Define a constant instead of duplicating this literal " TEXT NOT NULL DEFAULT ''," 5 times.(޿ c -java:S1192["HDefine a constant instead of duplicating this literal " BEGIN " 4 times.( +java:S1192\"HDefine a constant instead of duplicating this literal " BEGIN " 4 times.( a -java:S1192j"FDefine a constant instead of duplicating this literal "=old." 6 times.( +java:S1192k"FDefine a constant instead of duplicating this literal "=old." 6 times.( c -java:S1192"GDefine a constant instead of duplicating this literal " BEGIN" 6 times.( +java:S1192"GDefine a constant instead of duplicating this literal " BEGIN" 6 times.( t -java:S11920"^Define a constant instead of duplicating this literal " INTEGER NOT NULL DEFAULT 0," 11 times.( +java:S11920"^Define a constant instead of duplicating this literal " INTEGER NOT NULL DEFAULT 0," 12 times.( _ -java:S1192^"IDefine a constant instead of duplicating this literal " WHERE " 8 times.(랰 +java:S1192_"IDefine a constant instead of duplicating this literal " WHERE " 8 times.(랰 +w +java:S1192@"\Define a constant instead of duplicating this literal " INTEGER NOT NULL DEFAULT 0" 3 times.(ԧ \ -java:S1192^"FDefine a constant instead of duplicating this literal "=new." 6 times.(랰 -g -java:S1192"RDefine a constant instead of duplicating this literal " AFTER DELETE ON " 3 times.(B +java:S1192_"FDefine a constant instead of duplicating this literal "=new." 6 times.(랰 +i +java:S1192"MDefine a constant instead of duplicating this literal " ADD COLUMN " 3 times.( +h +java:S1192"RDefine a constant instead of duplicating this literal " AFTER DELETE ON " 3 times.(B +i +java:S1192"MDefine a constant instead of duplicating this literal "ALTER TABLE " 3 times.( c -java:S1192]"HDefine a constant instead of duplicating this literal " SET " 8 times.(˓ +java:S1192^"HDefine a constant instead of duplicating this literal " SET " 8 times.(˓ ` -java:S1192\"JDefine a constant instead of duplicating this literal " UPDATE " 8 times.( +java:S1192]"JDefine a constant instead of duplicating this literal " UPDATE " 8 times.(  java:S11923"yDefine a constant instead of duplicating this literal " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," 4 times.( \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/2/8/283f16cc23da56ca65616082bc810304d3511d0a b/src/Notes-master1/.idea/sonarlint/issuestore/2/8/283f16cc23da56ca65616082bc810304d3511d0a new file mode 100644 index 00000000..a4843ed2 --- /dev/null +++ b/src/Notes-master1/.idea/sonarlint/issuestore/2/8/283f16cc23da56ca65616082bc810304d3511d0a @@ -0,0 +1,39 @@ + +7 +java:S1116,"Remove this empty statement.( +K +java:S1874/"5Remove this use of "CursorAdapter"; it is deprecated.( +J +java:S2864^"4Iterate over the "entrySet" instead of the "keySet".(਷ +B +java:S1125_"'Remove the unnecessary boolean literal.(ɯ +J +java:S2864n"4Iterate over the "entrySet" instead of the "keySet".(਷ +B +java:S1125o"'Remove the unnecessary boolean literal.(ɯ +A +java:S1168|"+Return an empty collection instead of null.( +C +java:S1125"'Remove the unnecessary boolean literal.( +t +java:S22930"YReplace the type specification in this constructor call with the diamond operator ("<>").(ə +o +java:S2293]"YReplace the type specification in this constructor call with the diamond operator ("<>").( +o +java:S2293m"YReplace the type specification in this constructor call with the diamond operator ("<>").(Ȫ +J +java:S1066U"/Merge this if statement with the enclosing one.(ڧ + +java:S1319\"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".( + +java:S1319l"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".( +j +java:S1104*"TMake widgetId a static final constant or non-public and provide accessors if needed.(ǎ +q +java:S1104+"VMake widgetType a static final constant or non-public and provide accessors if needed.(漬 +E +java:S5411_"*Use the primitive boolean expression here.(ɯ +E +java:S5411o"*Use the primitive boolean expression here.(ɯ +F +java:S5411"*Use the primitive boolean expression here.( \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/3/2/32360bf24febc78f20db52498c7576b3d8650d56 b/src/Notes-master1/.idea/sonarlint/issuestore/3/2/32360bf24febc78f20db52498c7576b3d8650d56 index 9c10fb07..e00702e0 100644 --- a/src/Notes-master1/.idea/sonarlint/issuestore/3/2/32360bf24febc78f20db52498c7576b3d8650d56 +++ b/src/Notes-master1/.idea/sonarlint/issuestore/3/2/32360bf24febc78f20db52498c7576b3d8650d56 @@ -4,36 +4,36 @@ java:S1118&":Add a private constructor to hide the implicit public one.( Z java:S2147E"DCombine this catch with the one at line 67, which has the same body.(暩 [ -java:S2147l"ECombine this catch with the one at line 106, which has the same body.(暩 +java:S2147m"ECombine this catch with the one at line 107, which has the same body.(暩 k -java:S3252"OUse static access with "net.micode.notes.data.Notes$DataColumns" for "NOTE_ID".( +java:S3252"OUse static access with "net.micode.notes.data.Notes$DataColumns" for "NOTE_ID".( m -java:S3252"QUse static access with "net.micode.notes.data.Notes$DataColumns" for "MIME_TYPE".( +java:S3252"QUse static access with "net.micode.notes.data.Notes$DataColumns" for "MIME_TYPE".( f -java:S3252"OUse static access with "net.micode.notes.data.Notes$DataColumns" for "NOTE_ID".(ʹ +java:S3252"OUse static access with "net.micode.notes.data.Notes$DataColumns" for "NOTE_ID".(ʹ m -java:S3252"QUse static access with "net.micode.notes.data.Notes$DataColumns" for "MIME_TYPE".( +java:S3252"QUse static access with "net.micode.notes.data.Notes$DataColumns" for "MIME_TYPE".( t java:S22932"YReplace the type specification in this constructor call with the diamond operator ("<>").(л t java:S2293Z"YReplace the type specification in this constructor call with the diamond operator ("<>").(л u -java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(ª +java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(ª b java:S1192D"GDefine a constant instead of duplicating this literal "%s: %s" 4 times.( j -java:S1192x"HDefine a constant instead of duplicating this literal "=? AND " 4 times.(8̑/ +java:S1192y"HDefine a constant instead of duplicating this literal "=? AND " 4 times.(8̑/ J -java:S1066~"/Merge this if statement with the enclosing one.(䲜 +java:S1066"/Merge this if statement with the enclosing one.(䲜 v java:S1319("`The type of "ids" should be an interface such as "Set" rather than the implementation "HashSet".( { java:S1319S"`The type of "ids" should be an interface such as "Set" rather than the implementation "HashSet".(󆱋  -java:S1319"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".( +java:S1319"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".( T java:S1155-">Use isEmpty() to check whether the collection is empty or not.( S java:S2589>"8Remove this expression which always evaluates to "false"(Ύ S -java:S2589e"8Remove this expression which always evaluates to "false"(Ύ \ No newline at end of file +java:S2589f"8Remove this expression which always evaluates to "false"(Ύ \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c b/src/Notes-master1/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c index 3964d247..aa5bdcfd 100644 --- a/src/Notes-master1/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c +++ b/src/Notes-master1/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c @@ -61,69 +61,5 @@ r java:S1104S"WMake tvAlertDate a static final constant or non-public and provide accessors if needed.( s java:S1104U"XMake ibSetBgColor a static final constant or non-public and provide accessors if needed.( -n -java:S1450"WRemove the "mPattern" field and declare it as a local variable in the relevant methods.( -n -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 26 to the 15 allowed.(ݨ -W -java:S1874"@Remove this use of "SOFT_INPUT_ADJUST_RESIZE"; it is deprecated.(ѯ -\ -java:S1874"@Remove this use of "SOFT_INPUT_ADJUST_RESIZE"; it is deprecated.(ң -O -java:S1874"9Remove this use of "setTextAppearance"; it is deprecated.(( -K -java:S2864"4Iterate over the "entrySet" instead of the "keySet".(ԇ -N -java:S1135"2Complete the task associated to this TODO comment.( -8 -java:S1116"Remove this empty statement.( -X -java:S1126"AReplace this if-then-else statement by a single return statement.( -8 -java:S1116"Remove this empty statement.( -P -java:S1874"9Remove this use of "PreferenceManager"; it is deprecated.( -Z -java:S1874"CRemove this use of "getDefaultSharedPreferences"; it is deprecated.( -U -java:S1874"9Remove this use of "setTextAppearance"; it is deprecated.( -G -java:S1874"0Remove this use of "getColor"; it is deprecated.( -d -java:S3252"MUse static access with "android.text.Spanned" for "SPAN_INCLUSIVE_EXCLUSIVE".( -U -java:S1874"9Remove this use of "setTextAppearance"; it is deprecated.( -T -java:S1874"=Remove this use of "EXTRA_SHORTCUT_INTENT"; it is deprecated.(ð -R -java:S1874";Remove this use of "EXTRA_SHORTCUT_NAME"; it is deprecated.( -[ -java:S1874"DRemove this use of "EXTRA_SHORTCUT_ICON_RESOURCE"; it is deprecated.(Ǿ -t -java:S2293X"YReplace the type specification in this constructor call with the diamond operator ("<>").(ӏ -t -java:S2293a"YReplace the type specification in this constructor call with the diamond operator ("<>").( -t -java:S2293j"YReplace the type specification in this constructor call with the diamond operator ("<>").( -o -java:S2293r"YReplace the type specification in this constructor call with the diamond operator ("<>").( -p -java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥 -? -java:S1604"(Make this anonymous inner class a lambda(ά -? -java:S1604"(Make this anonymous inner class a lambda( -? -java:S1604"(Make this anonymous inner class a lambda(ߒ -q -java:S1104O"VMake tvModified a static final constant or non-public and provide accessors if needed.(ԣ -r -java:S1104Q"WMake ivAlertIcon a static final constant or non-public and provide accessors if needed.(න -r -java:S1104S"WMake tvAlertDate a static final constant or non-public and provide accessors if needed.( -s -java:S1104U"XMake ibSetBgColor a static final constant or non-public and provide accessors if needed.( -O -java:S3516"9Refactor this method to not always return the same value.(l O java:S3516"9Refactor this method to not always return the same value.(l \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/a/7/a7641cfac724321d508c2a284223a711011a93f5 b/src/Notes-master1/.idea/sonarlint/issuestore/a/7/a7641cfac724321d508c2a284223a711011a93f5 index eed746e1..d1433502 100644 --- a/src/Notes-master1/.idea/sonarlint/issuestore/a/7/a7641cfac724321d508c2a284223a711011a93f5 +++ b/src/Notes-master1/.idea/sonarlint/issuestore/a/7/a7641cfac724321d508c2a284223a711011a93f5 @@ -4,10 +4,10 @@ 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.( +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.( +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.(߀ +java:S1118":Add a private constructor to hide the implicit public one.(߀ f java:S11929"KDefine a constant instead of duplicating this literal "content://" 4 times.( \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32 b/src/Notes-master1/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32 index 4d8e1065..77f37cff 100644 --- a/src/Notes-master1/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32 +++ b/src/Notes-master1/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32 @@ -1,90 +1,101 @@ +i +java:S3008^"SRename this field "VIEW_WAY" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( 7 -java:S1116a"Remove this empty statement.( +java:S1116d"Remove this empty statement.( a -java:S1124"EReorder the modifiers to comply with the Java Language Specification.( +java:S1124"EReorder the modifiers to comply with the Java Language Specification.( [ -java:S1124"EReorder the modifiers to comply with the Java Language Specification.(Ѿk +java:S1124"EReorder the modifiers to comply with the Java Language Specification.(Ѿk n -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.( +java:S3776"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.( 2 -java:S3626"Remove this redundant jump.(݅ +java:S3626"Remove this redundant jump.(݅ 2 -java:S3626"Remove this redundant jump.(݅ +java:S3626"Remove this redundant jump.(݅ 2 -java:S3626"Remove this redundant jump.(݅ +java:S3626"Remove this redundant jump.(݅ P -java:S1874"9Remove this use of "PreferenceManager"; it is deprecated.(­ +java:S1874"9Remove this use of "PreferenceManager"; it is deprecated.(­ Z -java:S1874"CRemove this use of "getDefaultSharedPreferences"; it is deprecated.(­ +java:S1874"CRemove this use of "getDefaultSharedPreferences"; it is deprecated.(­ N -java:S1135"2Complete the task associated to this TODO comment.(̐ +java:S1135"2Complete the task associated to this TODO comment.(̐ F -java:S2093"*Change this "try" to a try-with-resources.( +java:S2093"*Change this "try" to a try-with-resources.( o -java:S1450"XRemove the "mMoveMenu" field and declare it as a local variable in the relevant methods.( +java:S1450"XRemove the "mMoveMenu" field and declare it as a local variable in the relevant methods.( n -java:S3252"RUse static access with "android.widget.AbsListView" for "MultiChoiceModeListener".( +java:S3252"RUse static access with "android.widget.AbsListView" for "MultiChoiceModeListener".( N -java:S1135"2Complete the task associated to this TODO comment.( +java:S1135"2Complete the task associated to this TODO comment.( N -java:S1135"2Complete the task associated to this TODO comment.( +java:S1135"2Complete the task associated to this TODO comment.( U -java:S1874"9Remove this use of "getDefaultDisplay"; it is deprecated.(ĸ +java:S1874"9Remove this use of "getDefaultDisplay"; it is deprecated.(ĸ M -java:S1874"1Remove this use of "getHeight"; it is deprecated.( +java:S1874"1Remove this use of "getHeight"; it is deprecated.( 8 -java:S1116"Remove this empty statement.( +java:S1116"Remove this empty statement.( i -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 29 to the 15 allowed.( +java:S3776"RRefactor this method to reduce its Cognitive Complexity from 29 to the 15 allowed.( F -java:S1874"1Remove this use of "AsyncTask"; it is deprecated.(? -? java:S108")Either remove or fill this block of code.(ʥ +java:S1874"1Remove this use of "AsyncTask"; it is deprecated.(? +? java:S108")Either remove or fill this block of code.(ʥ a -java:S1874"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(Ϳ +java:S1874"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(Ϳ K -java:S1874"/Remove this use of "execute"; it is deprecated.(嫏 +java:S1874"/Remove this use of "execute"; it is deprecated.(嫏 h -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.(# +java:S3776"RRefactor this method to reduce its Cognitive Complexity from 20 to the 15 allowed.(# N -java:S1135"2Complete the task associated to this TODO comment.( +java:S1135"2Complete the task associated to this TODO comment.( ^ -java:S1126"BReplace this if-then-else statement by a single method invocation.(玒 +java:S1126"BReplace this if-then-else statement by a single method invocation.(玒 N -java:S1135"2Complete the task associated to this TODO comment.( +java:S1135"2Complete the task associated to this TODO comment.( +M +java:S2696"6Make the enclosing method "static" or remove this set.( M -java:S1874"1Remove this use of "AsyncTask"; it is deprecated.(Ч +java:S1874"1Remove this use of "AsyncTask"; it is deprecated.(Ч f -java:S1874"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(ች +java:S1874"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(ች K -java:S1874"/Remove this use of "execute"; it is deprecated.(嫏 +java:S1874"/Remove this use of "execute"; it is deprecated.(嫏 h -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(b -K -java:S3398"/Move this method into "BackgroundQueryHandler".( -A -java:S3398"%Move this method into "ModeCallback".( -< -java:S3398"%Move this method into "ModeCallback".( +java:S3776"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(b G -java:S3398"0Move this method into "OnListItemClickListener".( +java:S3398"0Move this method into "OnListItemClickListener".( +< +java:S3398"%Move this method into "ModeCallback".( +A +java:S3398"%Move this method into "ModeCallback".( +K +java:S3398"/Move this method into "BackgroundQueryHandler".( p -java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥 +java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥 +b +java:S1192"FDefine a constant instead of duplicating this literal " AND " 4 times.( +] +java:S1192"FDefine a constant instead of duplicating this literal " DESC" 3 times.( +g java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( > -java:S1604"(Make this anonymous inner class a lambda(̺V +java:S1604"(Make this anonymous inner class a lambda(̺V ? -java:S1604"(Make this anonymous inner class a lambda(ά +java:S1604"(Make this anonymous inner class a lambda(ά ? -java:S1604"(Make this anonymous inner class a lambda(ܴ +java:S1604"(Make this anonymous inner class a lambda(ܴ D -java:S1604"(Make this anonymous inner class a lambda( +java:S1604"(Make this anonymous inner class a lambda( ? -java:S1604"(Make this anonymous inner class a lambda( +java:S1604"(Make this anonymous inner class a lambda( ? -java:S1604"(Make this anonymous inner class a lambda(۱ +java:S1604"(Make this anonymous inner class a lambda(۱ ? -java:S1604"(Make this anonymous inner class a lambda(ά +java:S1604"(Make this anonymous inner class a lambda(ά g -java:S1301"KReplace this "switch" statement by "if" statements to increase readability.(ד +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"(Ѷ Z -java:S2583"CChange this condition so that it does not always evaluate to "true"( \ No newline at end of file +java:S2583"CChange this condition so that it does not always evaluate to "true"( \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/d/d/dd970bd8ce083850fca1d4d159647ccd110e57cb b/src/Notes-master1/.idea/sonarlint/issuestore/d/d/dd970bd8ce083850fca1d4d159647ccd110e57cb index afb52e5e..e2674039 100644 --- a/src/Notes-master1/.idea/sonarlint/issuestore/d/d/dd970bd8ce083850fca1d4d159647ccd110e57cb +++ b/src/Notes-master1/.idea/sonarlint/issuestore/d/d/dd970bd8ce083850fca1d4d159647ccd110e57cb @@ -1,15 +1,15 @@ \ -java:S1126}"AReplace this if-then-else statement by a single return statement.(Ʒ +java:S1126~"AReplace this if-then-else statement by a single return statement.(Ʒ i -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 23 to the 15 allowed.( +java:S3776"RRefactor this method to reduce its Cognitive Complexity from 23 to the 15 allowed.( \ -java:S2147"ECombine this catch with the one at line 242, which has the same body.(暩 +java:S2147"ECombine this catch with the one at line 243, which has the same body.(暩 u -java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(л +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.( +java:S1192@"ODefine a constant instead of duplicating this literal "Wrong note id:" 3 times.( U -java:S1155">Use isEmpty() to check whether the collection is empty or not.( +java:S1155">Use isEmpty() to check whether the collection is empty or not.( O -java:S2589"8Remove this expression which always evaluates to "false"( \ No newline at end of file +java:S2589"8Remove this expression which always evaluates to "false"( \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/f/9/f9f49497f95afd327db7a7a512612aa1089003d4 b/src/Notes-master1/.idea/sonarlint/issuestore/f/9/f9f49497f95afd327db7a7a512612aa1089003d4 new file mode 100644 index 00000000..aff35b7e --- /dev/null +++ b/src/Notes-master1/.idea/sonarlint/issuestore/f/9/f9f49497f95afd327db7a7a512612aa1089003d4 @@ -0,0 +1,7 @@ + +3 +java:S2386!"Make this member "protected".(Ꙗ +K +java:S1874*"5Remove this use of "CursorAdapter"; it is deprecated.(ж +M +java:S1135+"2Complete the task associated to this TODO comment.( \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/index.pb b/src/Notes-master1/.idea/sonarlint/issuestore/index.pb index 6061b8ee..e321d6f1 100644 --- a/src/Notes-master1/.idea/sonarlint/issuestore/index.pb +++ b/src/Notes-master1/.idea/sonarlint/issuestore/index.pb @@ -3,10 +3,6 @@ settings.gradle,0\5\05efc8b1657769a27696d478ded1e95f38737233 A gradle.properties,2\a\2afbb999f001938c88fa43fc2ef52abf0f8213e4 -j -:app/src/main/java/net/micode/notes/data/NotesProvider.java,6\a\6a65e747031f27aef20597b4181148a9fbf963d5 -p -@app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java,1\e\1eb2363b523dbcae43d3c6e4790c64436af61b13 g 7app/src/main/java/net/micode/notes/gtask/data/Node.java,3\a\3aac5305cb73bfbdeb8078cd264d04323fa80e92 k @@ -49,24 +45,16 @@ h 8app/src/main/java/net/micode/notes/tool/BackupUtils.java,a\4\a446c87b1013132f8adaf83656b582028e8809af m =app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java,c\4\c42ad3cd6e664963fa1849c760a57d417d500ee7 -f -6app/src/main/java/net/micode/notes/tool/DataUtils.java,3\2\32360bf24febc78f20db52498c7576b3d8650d56 m =app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java,3\e\3e688be40dc69cfd1062f41d0fc27fe261a26710 i 9app/src/main/java/net/micode/notes/ui/DateTimePicker.java,6\c\6cbf8bd9aa98eff862b1dc067330ba66ba4493aa k ;app/src/main/java/net/micode/notes/tool/ResourceParser.java,c\6\c65f5dc8218ef1da6f6bfb5d1b14aea855a54d7f -b -2app/src/main/java/net/micode/notes/data/Notes.java,a\7\a7641cfac724321d508c2a284223a711011a93f5 h 8app/src/main/java/net/micode/notes/ui/NotesListItem.java,5\d\5dfe6902d8ec740690f88d644e74362c3be08fad r Bapp/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java,d\a\da57ce446af85bbd9aefee65e969869f0cff78b0 -i -9app/src/main/java/net/micode/notes/model/WorkingNote.java,8\7\876016634c6642b35109680ccac740dc8271b236 -b -2app/src/main/java/net/micode/notes/model/Note.java,d\d\dd970bd8ce083850fca1d4d159647ccd110e57cb g 7app/src/main/java/net/micode/notes/ui/DropdownMenu.java,d\1\d1cc822fa9d783a8d4563bf6e139b7ae10de2fb1 o @@ -76,12 +64,28 @@ h l - - - - @@ -26,12 +23,16 @@ - + - + + + - + + + @@ -42,28 +43,137 @@ - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -72,7 +182,12 @@ + + + + + @@ -81,211 +196,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -395,23 +308,30 @@ - - - - - - - + + + + + + + + + + + + + + @@ -420,7 +340,12 @@ + + + + + @@ -435,6 +360,11 @@ + + + + + @@ -517,8 +447,8 @@ - - + + @@ -607,55 +537,56 @@ + file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 139 + 147 file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 272 + 280 file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 922 + 963 file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 788 + 825 file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 278 + 286 file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 354 + 362 file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 548 + 567 file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 551 + 570 file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 614 + 633 diff --git a/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar index 93908cc3..8e27a60c 100644 Binary files a/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin index aec2131d..141b70b6 100644 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin index c65ca834..b68870f4 100644 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin index 6d682154..a2ad0b1e 100644 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin index 62e6d467..dfa3e79a 100644 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index 04267543..88ad0006 100644 Binary files a/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index 6f7d2453..a759b8d8 100644 Binary files a/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties index 20125daa..6849a631 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties +++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties @@ -1,4 +1,4 @@ -#Wed Oct 27 09:15:29 CST 2021 +#Fri Oct 29 22:19:24 CST 2021 E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_edit_text.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml index 30e6ca1b..76330680 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml +++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml @@ -300,6 +300,7 @@ Input name Note added to home Remind me + Change view New Folder Delete Deselect all diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merger.xml index 8207f861..ac7b235b 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merger.xml +++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merger.xml @@ -2608,7 +2608,7 @@ Messaging Email - #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchRestoreDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel + #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchRestoreChange viewDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel %1$s result for \"%2$s\" %1$s results for \"%2$s\" diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 36b3eca5..409c9956 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Wed Oct 27 09:15:44 CST 2021 +#Sat Oct 30 08:20:16 CST 2021 base.0=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex renamed.0=classes.dex path.0=classes.dex diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index f08f75c4..cb1d7507 100644 Binary files a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class index 534af6e1..89d31944 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class index 37c051dc..db96b8b1 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class index a78b61a1..7640e9fe 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class index 1f3ea0b6..eeaf53c1 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class index 76abe696..395624ba 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class index cab818b9..124cf34b 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class index 30318fc9..54b4705d 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class index bbbea2e5..e93ace14 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class index fc1d9a26..6f163023 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class index e5fa6924..ff0356c2 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class index 7be6c5e4..ac7300fc 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class index 8634bea8..5ea873f8 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class index 0c6ef372..58d68753 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class index dd273572..63d768ae 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class index 16d59fc4..e0283832 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class index 4f7e6075..d202bf63 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class index 5003b1e5..59c539e3 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class index 43f63ae2..14caec84 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class index 027e50c9..624498e2 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class index e162f792..033bda0a 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class index fc4cfc89..f4ee9b53 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class index 7b692506..b909b8e3 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class index 3a30ff81..09f5817d 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class index 127c3ee9..e8c1fe3c 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class index ad360396..db11d2b1 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class index 6cd91945..b40ced99 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class index 4af37e90..aa9e373f 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class index 2cce5c16..12863784 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class index 74948dfb..161cbc68 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class index 52efe7b0..6a0ede77 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class index a3e41893..9e3a285b 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class index e3ebf8bd..a4b92c96 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class index 88edaa82..8f5e15fb 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class index d24f53e4..75c37020 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class index f54af9c5..b2372c1a 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class index 172102b3..f290ea93 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class index e40c4cb6..b44f24a3 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat index 87e9c3b9..0b000f5e 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat index cb04627d..523dae69 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json index 78341e31..44bc5c25 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -1979,12 +1979,12 @@ "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,363,1704,1705,1709,1710,1714,1879,1880,2545,2695,2738,2770,2807", + "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,364,1705,1706,1710,1711,1715,1880,1881,2546,2696,2739,2771,2808", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "3720,3789,10432,10502,10570,10642,10712,10773,10847,11704,11765,11826,11888,11952,12014,12075,12143,12243,12303,12369,12442,12511,12568,12620,13397,13469,13784,13819,13996,14046,14107,14164,14198,14233,14543,24065,113317,113434,113635,113745,113946,126247,126319,162198,170740,173646,175711,177471", - "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,363,1704,1708,1709,1713,1714,1879,1880,2551,2737,2769,2806,2813", + "startOffsets": "3720,3789,10432,10502,10570,10642,10712,10773,10847,11704,11765,11826,11888,11952,12014,12075,12143,12243,12303,12369,12442,12511,12568,12620,13397,13469,13784,13819,13996,14046,14107,14164,14198,14233,14543,24122,113374,113491,113692,113802,114003,126304,126376,162255,170797,173703,175768,177528", + "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,364,1705,1709,1710,1714,1715,1880,1881,2552,2738,2770,2807,2814", "endColumns": "68,62,69,67,71,69,60,73,72,60,60,61,63,61,60,67,99,59,65,72,68,56,51,61,71,75,34,34,49,60,56,33,34,34,69,70,116,12,109,12,128,71,66,24,24,24,24,24", - "endOffsets": "3784,3847,10497,10565,10637,10707,10768,10842,10915,11760,11821,11883,11947,12009,12070,12138,12238,12298,12364,12437,12506,12563,12615,12677,13464,13540,13814,13849,14041,14102,14159,14193,14228,14263,14608,24131,113429,113630,113740,113941,114070,126314,126381,162491,173641,175706,177466,177843" + "endOffsets": "3784,3847,10497,10565,10637,10707,10768,10842,10915,11760,11821,11883,11947,12009,12070,12138,12238,12298,12364,12437,12506,12563,12615,12677,13464,13540,13814,13849,14041,14102,14159,14193,14228,14263,14608,24188,113486,113687,113797,113998,114127,126371,126438,162548,173698,175763,177523,177900" } }, { @@ -1998,12 +1998,12 @@ "endOffsets": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104" }, "to": { - "startLines": "1440,1444,1448,1452,1721,1725,1729,1733,1737,1741,1745", + "startLines": "1441,1445,1449,1453,1722,1726,1730,1734,1738,1742,1746", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "93338,93542,93753,93960,114503,114686,114871,115056,115259,115465,115648", - "endLines": "1443,1447,1451,1454,1724,1728,1732,1736,1740,1744,1748", + "startOffsets": "93395,93599,93810,94017,114560,114743,114928,115113,115316,115522,115705", + "endLines": "1444,1448,1452,1455,1725,1729,1733,1737,1741,1745,1749", "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "93537,93748,93955,94115,114681,114866,115051,115254,115460,115643,115844" + "endOffsets": "93594,93805,94012,94172,114738,114923,115108,115311,115517,115700,115901" } }, { @@ -2045,20 +2045,20 @@ { "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml", "from": { - "startLines": "129,73,76,75,74,19,20,21,119,120,128,127,26,82,83,81,80,79,95,94,93,85,39,38,65,29,30,86,41,77,121,72,68,42,49,54,43,64,63,62,58,57,55,56,59,60,50,71,61,69,48,47,53,52,51,67,46,66,44,45,70,28,34,36,33,35,32,31,25,24,102,101,105,117,110,109,111,112,114,113,103,104,108,106,107,100,115,116,126,124,123,125,27,84,92,97,96,98,91,90,89,88,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,4", - "startOffsets": "8186,4020,4284,4187,4117,846,890,943,7674,7724,8127,8075,1308,4744,4839,4672,4587,4503,5718,5634,5531,5017,2043,1991,3511,1515,1569,5079,2138,4368,7788,3948,3699,2198,2569,2875,2257,3439,3377,3319,3093,3040,2935,2989,3144,3195,2617,3881,3256,3749,2519,2471,2819,2730,2671,3636,2420,3590,2315,2359,3813,1459,1784,1894,1736,1840,1679,1630,1252,1198,6181,6113,6425,7575,6794,6712,6869,6959,7203,7123,6266,6342,6652,6490,6571,6057,7348,7471,8033,7904,7846,7958,1393,4948,5444,5855,5785,5936,5384,5328,5265,5204,996,1107", - "endLines": "133,73,76,75,74,19,20,21,119,120,128,127,26,82,83,81,80,79,95,94,93,85,39,38,65,29,30,86,41,77,121,72,68,42,49,54,43,64,63,62,58,57,55,56,59,60,50,71,61,69,48,47,53,52,51,67,46,66,44,45,70,28,34,36,33,35,32,31,25,24,102,101,105,117,110,109,111,112,114,113,103,104,108,106,107,100,115,116,126,124,123,125,27,84,92,97,96,98,91,90,89,88,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,48,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": "8594,4111,4362,4278,4181,884,937,990,7718,7782,8180,8121,1387,4833,4942,4738,4666,4581,5779,5712,5628,5073,2100,2037,3584,1563,1624,5179,2192,4465,7838,4014,3743,2251,2611,2929,2309,3505,3433,3371,3138,3087,2983,3034,3189,3250,2665,3942,3313,3807,2563,2513,2869,2813,2724,3693,2465,3630,2353,2414,3875,1509,1834,1942,1778,1888,1730,1673,1302,1246,6260,6175,6484,7666,6863,6788,6953,7117,7342,7197,6336,6419,6706,6565,6646,6107,7465,7569,8069,7952,7898,8027,1453,5011,5525,5930,5849,6025,5438,5378,5322,5259,1101,1192" + "startLines": "130,74,77,76,75,19,20,21,120,121,129,128,26,83,84,82,81,80,96,95,94,86,39,38,66,29,30,87,41,78,122,73,69,49,42,50,55,43,65,64,63,59,58,56,57,60,61,51,72,62,70,48,47,54,53,52,68,46,67,44,45,71,28,34,36,33,35,32,31,25,24,103,102,106,118,111,110,112,113,115,114,104,105,109,107,108,101,116,117,127,125,124,126,27,85,93,98,97,99,92,91,90,89,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,4,4", + "startOffsets": "8244,4078,4342,4245,4175,846,890,943,7732,7782,8185,8133,1308,4802,4897,4730,4645,4561,5776,5692,5589,5075,2043,1991,3569,1515,1569,5137,2138,4426,7846,4006,3757,2569,2198,2627,2933,2257,3497,3435,3377,3151,3098,2993,3047,3202,3253,2675,3939,3314,3807,2519,2471,2877,2788,2729,3694,2420,3648,2315,2359,3871,1459,1784,1894,1736,1840,1679,1630,1252,1198,6239,6171,6483,7633,6852,6770,6927,7017,7261,7181,6324,6400,6710,6548,6629,6115,7406,7529,8091,7962,7904,8016,1393,5006,5502,5913,5843,5994,5442,5386,5323,5262,996,1107", + "endLines": "134,74,77,76,75,19,20,21,120,121,129,128,26,83,84,82,81,80,96,95,94,86,39,38,66,29,30,87,41,78,122,73,69,49,42,50,55,43,65,64,63,59,58,56,57,60,61,51,72,62,70,48,47,54,53,52,68,46,67,44,45,71,28,34,36,33,35,32,31,25,24,103,102,106,118,111,110,112,113,115,114,104,105,109,107,108,101,116,117,127,125,124,126,27,85,93,98,97,99,92,91,90,89,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,56,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,48,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": "8652,4169,4420,4336,4239,884,937,990,7776,7840,8238,8179,1387,4891,5000,4796,4724,4639,5837,5770,5686,5131,2100,2037,3642,1563,1624,5237,2192,4523,7896,4072,3801,2621,2251,2669,2987,2309,3563,3491,3429,3196,3145,3041,3092,3247,3308,2723,4000,3371,3865,2563,2513,2927,2871,2782,3751,2465,3688,2353,2414,3933,1509,1834,1942,1778,1888,1730,1673,1302,1246,6318,6233,6542,7724,6921,6846,7011,7175,7400,7255,6394,6477,6764,6623,6704,6165,7523,7627,8127,8010,7956,8085,1453,5069,5583,5988,5907,6083,5496,5436,5380,5317,1101,1192" }, "to": { - "startLines": "226,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,361,362,364,365,366,367,368,369,370,371,372,373,374", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "14613,17764,17860,17943,18039,18108,18151,18203,18255,18304,18367,18425,18476,18560,18654,18762,18833,18917,19000,19066,19149,19251,19312,19374,19425,19503,19556,19616,19721,19780,19882,19937,20008,20057,20115,20162,20221,20278,20349,20410,20467,20517,20569,20622,20672,20722,20782,20835,20901,20963,21026,21075,21122,21177,21265,21323,21385,21435,21480,21523,21583,21650,21705,21760,21813,21860,21913,21969,22017,22072,22125,22209,22276,22340,22436,22510,22591,22680,22843,22987,23066,23141,23223,23282,23362,23442,23497,23619,23722,23763,23816,23926,24000,24136,24204,24290,24370,24439,24533,24592,24647,24709,24769,24879", - "endLines": "230,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,361,362,364,365,366,367,368,369,370,371,372,373,374", - "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,48,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": "15001,17855,17938,18034,18103,18146,18198,18250,18299,18362,18420,18471,18555,18649,18757,18828,18912,18995,19061,19144,19246,19307,19369,19420,19498,19551,19611,19716,19775,19877,19932,20003,20052,20110,20157,20216,20273,20344,20405,20462,20512,20564,20617,20667,20717,20777,20830,20896,20958,21021,21070,21117,21172,21260,21318,21380,21430,21475,21518,21578,21645,21700,21755,21808,21855,21908,21964,22012,22067,22120,22204,22271,22335,22431,22505,22586,22675,22838,22982,23061,23136,23218,23277,23357,23437,23492,23614,23717,23758,23811,23868,23995,24060,24199,24285,24365,24434,24528,24587,24642,24704,24764,24874,24964" + "startLines": "226,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,362,363,365,366,367,368,369,370,371,372,373,374,375", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "14613,17764,17860,17943,18039,18108,18151,18203,18255,18304,18367,18425,18476,18560,18654,18762,18833,18917,19000,19066,19149,19251,19312,19374,19425,19503,19556,19616,19721,19780,19882,19937,20008,20057,20114,20172,20219,20278,20335,20406,20467,20524,20574,20626,20679,20729,20779,20839,20892,20958,21020,21083,21132,21179,21234,21322,21380,21442,21492,21537,21580,21640,21707,21762,21817,21870,21917,21970,22026,22074,22129,22182,22266,22333,22397,22493,22567,22648,22737,22900,23044,23123,23198,23280,23339,23419,23499,23554,23676,23779,23820,23873,23983,24057,24193,24261,24347,24427,24496,24590,24649,24704,24766,24826,24936", + "endLines": "230,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,362,363,365,366,367,368,369,370,371,372,373,374,375", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,56,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,48,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": "15001,17855,17938,18034,18103,18146,18198,18250,18299,18362,18420,18471,18555,18649,18757,18828,18912,18995,19061,19144,19246,19307,19369,19420,19498,19551,19611,19716,19775,19877,19932,20003,20052,20109,20167,20214,20273,20330,20401,20462,20519,20569,20621,20674,20724,20774,20834,20887,20953,21015,21078,21127,21174,21229,21317,21375,21437,21487,21532,21575,21635,21702,21757,21812,21865,21912,21965,22021,22069,22124,22177,22261,22328,22392,22488,22562,22643,22732,22895,23039,23118,23193,23275,23334,23414,23494,23549,23671,23774,23815,23868,23925,24052,24117,24256,24342,24422,24491,24585,24644,24699,24761,24821,24931,25021" } }, { @@ -2072,12 +2072,12 @@ "endOffsets": "111,6075,719,5930" }, "to": { - "startLines": "12,1881,2578,2588", + "startLines": "12,1882,2579,2589", "startColumns": "4,4,4,4", - "startOffsets": "532,126386,163888,164496", - "endLines": "12,1883,2587,2676", + "startOffsets": "532,126443,163945,164553", + "endLines": "12,1884,2588,2677", "endColumns": "60,12,24,24", - "endOffsets": "588,126526,164491,169702" + "endOffsets": "588,126583,164548,169759" } }, { @@ -2091,12 +2091,12 @@ "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,360,375,376,377,378,379,380,388,389,393,397,401,406,412,419,423,427,432,436,440,444,448,452,456,462,466,472,476,482,486,491,495,498,502,508,512,518,522,528,531,535,539,543,547,551,552,553,554,557,560,563,566,570,571,572,573,574,577,579,581,583,588,589,593,599,603,604,606,617,618,622,628,632,633,634,638,665,669,670,674,702,870,896,1065,1091,1122,1130,1136,1150,1172,1177,1182,1192,1201,1210,1214,1221,1229,1236,1237,1246,1249,1252,1256,1260,1264,1267,1268,1272,1276,1286,1291,1298,1304,1305,1308,1312,1317,1319,1321,1324,1327,1329,1333,1336,1343,1346,1349,1353,1355,1359,1361,1363,1365,1369,1377,1385,1397,1403,1412,1415,1426,1429,1434,1435,1455,1513,1572,1573,1583,1592,1593,1595,1599,1602,1605,1608,1611,1614,1617,1620,1624,1627,1630,1633,1637,1640,1644,1648,1649,1650,1651,1652,1653,1654,1655,1656,1657,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1670,1672,1673,1674,1675,1676,1677,1678,1679,1681,1682,1684,1685,1687,1689,1690,1692,1693,1694,1695,1696,1697,1699,1700,1701,1702,1703,1715,1717,1719,1749,1750,1751,1752,1753,1754,1755,1756,1757,1758,1759,1760,1761,1763,1764,1765,1766,1767,1768,1770,1774,1778,1779,1780,1781,1782,1783,1784,1785,1787,1789,1791,1793,1795,1796,1797,1798,1800,1802,1804,1805,1806,1807,1808,1809,1810,1811,1812,1813,1814,1815,1818,1819,1820,1821,1823,1825,1826,1828,1829,1831,1833,1835,1836,1837,1838,1839,1840,1841,1842,1843,1844,1845,1846,1848,1849,1850,1851,1853,1854,1855,1856,1857,1859,1861,1863,1865,1866,1867,1868,1869,1870,1871,1872,1873,1874,1875,1876,1877,1878,1884,1967,1970,1973,1976,1990,2001,2011,2038,2045,2056,2086,2113,2122,2159,2540,2552,2677,2814,2850,2856,2862,2885,3026,3046,3052,3056,3062,3099,3111,3138,3143,3209,3224,3289,3308,3334", + "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,361,376,377,378,379,380,381,389,390,394,398,402,407,413,420,424,428,433,437,441,445,449,453,457,463,467,473,477,483,487,492,496,499,503,509,513,519,523,529,532,536,540,544,548,552,553,554,555,558,561,564,567,571,572,573,574,575,578,580,582,584,589,590,594,600,604,605,607,618,619,623,629,633,634,635,639,666,670,671,675,703,871,897,1066,1092,1123,1131,1137,1151,1173,1178,1183,1193,1202,1211,1215,1222,1230,1237,1238,1247,1250,1253,1257,1261,1265,1268,1269,1273,1277,1287,1292,1299,1305,1306,1309,1313,1318,1320,1322,1325,1328,1330,1334,1337,1344,1347,1350,1354,1356,1360,1362,1364,1366,1370,1378,1386,1398,1404,1413,1416,1427,1430,1435,1436,1456,1514,1573,1574,1584,1593,1594,1596,1600,1603,1606,1609,1612,1615,1618,1621,1625,1628,1631,1634,1638,1641,1645,1649,1650,1651,1652,1653,1654,1655,1656,1657,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1671,1673,1674,1675,1676,1677,1678,1679,1680,1682,1683,1685,1686,1688,1690,1691,1693,1694,1695,1696,1697,1698,1700,1701,1702,1703,1704,1716,1718,1720,1750,1751,1752,1753,1754,1755,1756,1757,1758,1759,1760,1761,1762,1764,1765,1766,1767,1768,1769,1771,1775,1779,1780,1781,1782,1783,1784,1785,1786,1788,1790,1792,1794,1796,1797,1798,1799,1801,1803,1805,1806,1807,1808,1809,1810,1811,1812,1813,1814,1815,1816,1819,1820,1821,1822,1824,1826,1827,1829,1830,1832,1834,1836,1837,1838,1839,1840,1841,1842,1843,1844,1845,1846,1847,1849,1850,1851,1852,1854,1855,1856,1857,1858,1860,1862,1864,1866,1867,1868,1869,1870,1871,1872,1873,1874,1875,1876,1877,1878,1879,1885,1968,1971,1974,1977,1991,2002,2012,2039,2046,2057,2087,2114,2123,2160,2541,2553,2678,2815,2851,2857,2863,2886,3027,3047,3053,3057,3063,3100,3112,3139,3144,3210,3225,3290,3309,3335", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "593,648,693,742,783,838,897,959,1040,1101,1176,1252,1329,1407,1492,1574,1650,1726,1803,1881,1987,2093,2172,2252,2309,2367,2441,2516,2581,2647,2707,2768,2840,2913,2980,3048,3107,3166,3225,3284,3343,3397,3451,3504,3558,3612,3666,3852,3926,4005,4078,4152,4223,4295,4367,4440,4497,4555,4628,4702,4776,4851,4923,4996,5066,5137,5197,5315,5384,5453,5523,5597,5673,5737,5814,5890,5967,6032,6101,6178,6253,6322,6390,6467,6533,6594,6691,6756,6825,6924,6995,7054,7112,7169,7228,7292,7363,7435,7507,7579,7651,7718,7786,7854,7913,7976,8040,8130,8221,8281,8347,8414,8480,8550,8614,8667,8780,8838,8901,8966,9031,9106,9179,9251,9300,9361,9422,9483,9545,9609,9673,9737,9802,9865,9925,9986,10052,10111,10171,10233,10304,10364,10920,11006,11093,11183,11270,11358,11440,11523,11613,12944,12996,13054,13099,13165,13229,13286,13343,13545,13602,13650,13699,13750,13854,13901,13950,14268,14300,14364,14426,14486,15006,15080,15150,15228,15282,15352,15437,15485,15531,15602,15680,15758,15830,15904,15978,16052,16132,16205,16274,16346,16423,16484,16547,16613,16677,16748,16811,16876,16940,17001,17062,17114,17187,17261,17330,17405,17479,17553,17694,23873,24969,25047,25137,25225,25321,25411,25993,26082,26329,26610,26862,27147,27540,28017,28239,28461,28737,28964,29194,29424,29654,29884,30111,30530,30756,31181,31411,31839,32058,32341,32549,32680,32907,33333,33558,33985,34206,34631,34751,35027,35328,35652,35943,36257,36394,36525,36630,36872,37039,37243,37451,37722,37834,37946,38051,38168,38382,38528,38668,38754,39102,39190,39436,39854,40103,40185,40283,40900,41000,41252,41676,41931,42025,42114,42351,44403,44645,44747,45000,47184,57905,59421,70241,71769,73526,74152,74572,75633,76898,77154,77390,77937,78431,79036,79234,79814,80378,80753,80871,81409,81566,81762,82035,82291,82461,82602,82666,82948,83234,83910,84174,84512,84865,84959,85145,85451,85713,85838,85965,86204,86415,86534,86727,86904,87359,87540,87662,87921,88034,88221,88323,88430,88559,88834,89342,89838,90715,91009,91579,91728,92460,92632,92968,93060,94120,98464,102951,103013,103643,104257,104348,104461,104690,104850,105002,105173,105339,105508,105675,105838,106081,106251,106424,106595,106869,107068,107273,107603,107687,107783,107879,107977,108077,108179,108281,108383,108485,108587,108687,108783,108895,109024,109147,109278,109409,109507,109621,109715,109855,109989,110085,110197,110297,110413,110509,110621,110721,110861,110997,111161,111291,111449,111599,111740,111884,112019,112131,112281,112409,112537,112673,112805,112935,113065,113177,114075,114221,114365,115849,115915,116005,116081,116185,116275,116377,116485,116593,116693,116773,116865,116963,117073,117151,117257,117349,117453,117563,117685,117848,118005,118085,118185,118275,118385,118479,118585,118677,118777,118889,119003,119119,119235,119329,119443,119555,119657,119777,119899,119981,120085,120205,120331,120429,120523,120611,120723,120839,120961,121073,121248,121364,121450,121542,121654,121778,121845,121971,122039,122167,122311,122439,122508,122603,122718,122831,122930,123039,123150,123261,123362,123467,123567,123697,123788,123911,124005,124117,124203,124307,124403,124491,124609,124713,124817,124943,125031,125139,125239,125329,125439,125523,125625,125709,125763,125827,125933,126043,126127,126531,131675,131793,131908,132040,132755,133447,133964,135611,135996,136593,138192,139725,140113,142420,161938,162496,169707,177848,179861,180123,180479,181309,188091,189225,189519,189742,190069,192119,192767,194400,194670,198521,199122,202931,204146,205555", - "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,360,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,869,895,1064,1090,1121,1129,1135,1149,1171,1176,1181,1191,1200,1209,1213,1220,1228,1235,1236,1245,1248,1251,1255,1259,1263,1266,1267,1271,1275,1285,1290,1297,1303,1304,1307,1311,1316,1318,1320,1323,1326,1328,1332,1335,1342,1345,1348,1352,1354,1358,1360,1362,1364,1368,1376,1384,1396,1402,1411,1414,1425,1428,1433,1434,1439,1512,1571,1572,1582,1591,1592,1594,1598,1601,1604,1607,1610,1613,1616,1619,1623,1626,1629,1632,1636,1639,1643,1647,1648,1649,1650,1651,1652,1653,1654,1655,1656,1657,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1669,1671,1672,1673,1674,1675,1676,1677,1678,1680,1681,1683,1684,1686,1688,1689,1691,1692,1693,1694,1695,1696,1698,1699,1700,1701,1702,1703,1716,1718,1720,1749,1750,1751,1752,1753,1754,1755,1756,1757,1758,1759,1760,1762,1763,1764,1765,1766,1767,1769,1773,1777,1778,1779,1780,1781,1782,1783,1784,1786,1788,1790,1792,1794,1795,1796,1797,1799,1801,1803,1804,1805,1806,1807,1808,1809,1810,1811,1812,1813,1814,1817,1818,1819,1820,1822,1824,1825,1827,1828,1830,1832,1834,1835,1836,1837,1838,1839,1840,1841,1842,1843,1844,1845,1847,1848,1849,1850,1852,1853,1854,1855,1856,1858,1860,1862,1864,1865,1866,1867,1868,1869,1870,1871,1872,1873,1874,1875,1876,1877,1878,1966,1969,1972,1975,1989,2000,2010,2037,2044,2055,2085,2112,2121,2158,2539,2544,2577,2694,2849,2855,2861,2884,3025,3045,3051,3055,3061,3098,3110,3137,3142,3208,3223,3288,3307,3333,3342", + "startOffsets": "593,648,693,742,783,838,897,959,1040,1101,1176,1252,1329,1407,1492,1574,1650,1726,1803,1881,1987,2093,2172,2252,2309,2367,2441,2516,2581,2647,2707,2768,2840,2913,2980,3048,3107,3166,3225,3284,3343,3397,3451,3504,3558,3612,3666,3852,3926,4005,4078,4152,4223,4295,4367,4440,4497,4555,4628,4702,4776,4851,4923,4996,5066,5137,5197,5315,5384,5453,5523,5597,5673,5737,5814,5890,5967,6032,6101,6178,6253,6322,6390,6467,6533,6594,6691,6756,6825,6924,6995,7054,7112,7169,7228,7292,7363,7435,7507,7579,7651,7718,7786,7854,7913,7976,8040,8130,8221,8281,8347,8414,8480,8550,8614,8667,8780,8838,8901,8966,9031,9106,9179,9251,9300,9361,9422,9483,9545,9609,9673,9737,9802,9865,9925,9986,10052,10111,10171,10233,10304,10364,10920,11006,11093,11183,11270,11358,11440,11523,11613,12944,12996,13054,13099,13165,13229,13286,13343,13545,13602,13650,13699,13750,13854,13901,13950,14268,14300,14364,14426,14486,15006,15080,15150,15228,15282,15352,15437,15485,15531,15602,15680,15758,15830,15904,15978,16052,16132,16205,16274,16346,16423,16484,16547,16613,16677,16748,16811,16876,16940,17001,17062,17114,17187,17261,17330,17405,17479,17553,17694,23930,25026,25104,25194,25282,25378,25468,26050,26139,26386,26667,26919,27204,27597,28074,28296,28518,28794,29021,29251,29481,29711,29941,30168,30587,30813,31238,31468,31896,32115,32398,32606,32737,32964,33390,33615,34042,34263,34688,34808,35084,35385,35709,36000,36314,36451,36582,36687,36929,37096,37300,37508,37779,37891,38003,38108,38225,38439,38585,38725,38811,39159,39247,39493,39911,40160,40242,40340,40957,41057,41309,41733,41988,42082,42171,42408,44460,44702,44804,45057,47241,57962,59478,70298,71826,73583,74209,74629,75690,76955,77211,77447,77994,78488,79093,79291,79871,80435,80810,80928,81466,81623,81819,82092,82348,82518,82659,82723,83005,83291,83967,84231,84569,84922,85016,85202,85508,85770,85895,86022,86261,86472,86591,86784,86961,87416,87597,87719,87978,88091,88278,88380,88487,88616,88891,89399,89895,90772,91066,91636,91785,92517,92689,93025,93117,94177,98521,103008,103070,103700,104314,104405,104518,104747,104907,105059,105230,105396,105565,105732,105895,106138,106308,106481,106652,106926,107125,107330,107660,107744,107840,107936,108034,108134,108236,108338,108440,108542,108644,108744,108840,108952,109081,109204,109335,109466,109564,109678,109772,109912,110046,110142,110254,110354,110470,110566,110678,110778,110918,111054,111218,111348,111506,111656,111797,111941,112076,112188,112338,112466,112594,112730,112862,112992,113122,113234,114132,114278,114422,115906,115972,116062,116138,116242,116332,116434,116542,116650,116750,116830,116922,117020,117130,117208,117314,117406,117510,117620,117742,117905,118062,118142,118242,118332,118442,118536,118642,118734,118834,118946,119060,119176,119292,119386,119500,119612,119714,119834,119956,120038,120142,120262,120388,120486,120580,120668,120780,120896,121018,121130,121305,121421,121507,121599,121711,121835,121902,122028,122096,122224,122368,122496,122565,122660,122775,122888,122987,123096,123207,123318,123419,123524,123624,123754,123845,123968,124062,124174,124260,124364,124460,124548,124666,124770,124874,125000,125088,125196,125296,125386,125496,125580,125682,125766,125820,125884,125990,126100,126184,126588,131732,131850,131965,132097,132812,133504,134021,135668,136053,136650,138249,139782,140170,142477,161995,162553,169764,177905,179918,180180,180536,181366,188148,189282,189576,189799,190126,192176,192824,194457,194727,198578,199179,202988,204203,205612", + "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,361,376,377,378,379,380,388,389,393,397,401,406,412,419,423,427,432,436,440,444,448,452,456,462,466,472,476,482,486,491,495,498,502,508,512,518,522,528,531,535,539,543,547,551,552,553,554,557,560,563,566,570,571,572,573,574,577,579,581,583,588,589,593,599,603,604,606,617,618,622,628,632,633,634,638,665,669,670,674,702,870,896,1065,1091,1122,1130,1136,1150,1172,1177,1182,1192,1201,1210,1214,1221,1229,1236,1237,1246,1249,1252,1256,1260,1264,1267,1268,1272,1276,1286,1291,1298,1304,1305,1308,1312,1317,1319,1321,1324,1327,1329,1333,1336,1343,1346,1349,1353,1355,1359,1361,1363,1365,1369,1377,1385,1397,1403,1412,1415,1426,1429,1434,1435,1440,1513,1572,1573,1583,1592,1593,1595,1599,1602,1605,1608,1611,1614,1617,1620,1624,1627,1630,1633,1637,1640,1644,1648,1649,1650,1651,1652,1653,1654,1655,1656,1657,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1670,1672,1673,1674,1675,1676,1677,1678,1679,1681,1682,1684,1685,1687,1689,1690,1692,1693,1694,1695,1696,1697,1699,1700,1701,1702,1703,1704,1717,1719,1721,1750,1751,1752,1753,1754,1755,1756,1757,1758,1759,1760,1761,1763,1764,1765,1766,1767,1768,1770,1774,1778,1779,1780,1781,1782,1783,1784,1785,1787,1789,1791,1793,1795,1796,1797,1798,1800,1802,1804,1805,1806,1807,1808,1809,1810,1811,1812,1813,1814,1815,1818,1819,1820,1821,1823,1825,1826,1828,1829,1831,1833,1835,1836,1837,1838,1839,1840,1841,1842,1843,1844,1845,1846,1848,1849,1850,1851,1853,1854,1855,1856,1857,1859,1861,1863,1865,1866,1867,1868,1869,1870,1871,1872,1873,1874,1875,1876,1877,1878,1879,1967,1970,1973,1976,1990,2001,2011,2038,2045,2056,2086,2113,2122,2159,2540,2545,2578,2695,2850,2856,2862,2885,3026,3046,3052,3056,3062,3099,3111,3138,3143,3209,3224,3289,3308,3334,3343", "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,63,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,91,12,12,12,61,12,12,90,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24", - "endOffsets": "643,688,737,778,833,892,954,1035,1096,1171,1247,1324,1402,1487,1569,1645,1721,1798,1876,1982,2088,2167,2247,2304,2362,2436,2511,2576,2642,2702,2763,2835,2908,2975,3043,3102,3161,3220,3279,3338,3392,3446,3499,3553,3607,3661,3715,3921,4000,4073,4147,4218,4290,4362,4435,4492,4550,4623,4697,4771,4846,4918,4991,5061,5132,5192,5253,5379,5448,5518,5592,5668,5732,5809,5885,5962,6027,6096,6173,6248,6317,6385,6462,6528,6589,6686,6751,6820,6919,6990,7049,7107,7164,7223,7287,7358,7430,7502,7574,7646,7713,7781,7849,7908,7971,8035,8125,8216,8276,8342,8409,8475,8545,8609,8662,8775,8833,8896,8961,9026,9101,9174,9246,9295,9356,9417,9478,9540,9604,9668,9732,9797,9860,9920,9981,10047,10106,10166,10228,10299,10359,10427,11001,11088,11178,11265,11353,11435,11518,11608,11699,12991,13049,13094,13160,13224,13281,13338,13392,13597,13645,13694,13745,13779,13896,13945,13991,14295,14359,14421,14481,14538,15075,15145,15223,15277,15347,15432,15480,15526,15597,15675,15753,15825,15899,15973,16047,16127,16200,16269,16341,16418,16479,16542,16608,16672,16743,16806,16871,16935,16996,17057,17109,17182,17256,17325,17400,17474,17548,17689,17759,23921,25042,25132,25220,25316,25406,25988,26077,26324,26605,26857,27142,27535,28012,28234,28456,28732,28959,29189,29419,29649,29879,30106,30525,30751,31176,31406,31834,32053,32336,32544,32675,32902,33328,33553,33980,34201,34626,34746,35022,35323,35647,35938,36252,36389,36520,36625,36867,37034,37238,37446,37717,37829,37941,38046,38163,38377,38523,38663,38749,39097,39185,39431,39849,40098,40180,40278,40895,40995,41247,41671,41926,42020,42109,42346,44398,44640,44742,44995,47179,57900,59416,70236,71764,73521,74147,74567,75628,76893,77149,77385,77932,78426,79031,79229,79809,80373,80748,80866,81404,81561,81757,82030,82286,82456,82597,82661,82943,83229,83905,84169,84507,84860,84954,85140,85446,85708,85833,85960,86199,86410,86529,86722,86899,87354,87535,87657,87916,88029,88216,88318,88425,88554,88829,89337,89833,90710,91004,91574,91723,92455,92627,92963,93055,93333,98459,102946,103008,103638,104252,104343,104456,104685,104845,104997,105168,105334,105503,105670,105833,106076,106246,106419,106590,106864,107063,107268,107598,107682,107778,107874,107972,108072,108174,108276,108378,108480,108582,108682,108778,108890,109019,109142,109273,109404,109502,109616,109710,109850,109984,110080,110192,110292,110408,110504,110616,110716,110856,110992,111156,111286,111444,111594,111735,111879,112014,112126,112276,112404,112532,112668,112800,112930,113060,113172,113312,114216,114360,114498,115910,116000,116076,116180,116270,116372,116480,116588,116688,116768,116860,116958,117068,117146,117252,117344,117448,117558,117680,117843,118000,118080,118180,118270,118380,118474,118580,118672,118772,118884,118998,119114,119230,119324,119438,119550,119652,119772,119894,119976,120080,120200,120326,120424,120518,120606,120718,120834,120956,121068,121243,121359,121445,121537,121649,121773,121840,121966,122034,122162,122306,122434,122503,122598,122713,122826,122925,123034,123145,123256,123357,123462,123562,123692,123783,123906,124000,124112,124198,124302,124398,124486,124604,124708,124812,124938,125026,125134,125234,125324,125434,125518,125620,125704,125758,125822,125928,126038,126122,126242,131670,131788,131903,132035,132750,133442,133959,135606,135991,136588,138187,139720,140108,142415,161933,162193,163883,170735,179856,180118,180474,181304,188086,189220,189514,189737,190064,192114,192762,194395,194665,198516,199117,202926,204141,205550,206024" + "endOffsets": "643,688,737,778,833,892,954,1035,1096,1171,1247,1324,1402,1487,1569,1645,1721,1798,1876,1982,2088,2167,2247,2304,2362,2436,2511,2576,2642,2702,2763,2835,2908,2975,3043,3102,3161,3220,3279,3338,3392,3446,3499,3553,3607,3661,3715,3921,4000,4073,4147,4218,4290,4362,4435,4492,4550,4623,4697,4771,4846,4918,4991,5061,5132,5192,5253,5379,5448,5518,5592,5668,5732,5809,5885,5962,6027,6096,6173,6248,6317,6385,6462,6528,6589,6686,6751,6820,6919,6990,7049,7107,7164,7223,7287,7358,7430,7502,7574,7646,7713,7781,7849,7908,7971,8035,8125,8216,8276,8342,8409,8475,8545,8609,8662,8775,8833,8896,8961,9026,9101,9174,9246,9295,9356,9417,9478,9540,9604,9668,9732,9797,9860,9920,9981,10047,10106,10166,10228,10299,10359,10427,11001,11088,11178,11265,11353,11435,11518,11608,11699,12991,13049,13094,13160,13224,13281,13338,13392,13597,13645,13694,13745,13779,13896,13945,13991,14295,14359,14421,14481,14538,15075,15145,15223,15277,15347,15432,15480,15526,15597,15675,15753,15825,15899,15973,16047,16127,16200,16269,16341,16418,16479,16542,16608,16672,16743,16806,16871,16935,16996,17057,17109,17182,17256,17325,17400,17474,17548,17689,17759,23978,25099,25189,25277,25373,25463,26045,26134,26381,26662,26914,27199,27592,28069,28291,28513,28789,29016,29246,29476,29706,29936,30163,30582,30808,31233,31463,31891,32110,32393,32601,32732,32959,33385,33610,34037,34258,34683,34803,35079,35380,35704,35995,36309,36446,36577,36682,36924,37091,37295,37503,37774,37886,37998,38103,38220,38434,38580,38720,38806,39154,39242,39488,39906,40155,40237,40335,40952,41052,41304,41728,41983,42077,42166,42403,44455,44697,44799,45052,47236,57957,59473,70293,71821,73578,74204,74624,75685,76950,77206,77442,77989,78483,79088,79286,79866,80430,80805,80923,81461,81618,81814,82087,82343,82513,82654,82718,83000,83286,83962,84226,84564,84917,85011,85197,85503,85765,85890,86017,86256,86467,86586,86779,86956,87411,87592,87714,87973,88086,88273,88375,88482,88611,88886,89394,89890,90767,91061,91631,91780,92512,92684,93020,93112,93390,98516,103003,103065,103695,104309,104400,104513,104742,104902,105054,105225,105391,105560,105727,105890,106133,106303,106476,106647,106921,107120,107325,107655,107739,107835,107931,108029,108129,108231,108333,108435,108537,108639,108739,108835,108947,109076,109199,109330,109461,109559,109673,109767,109907,110041,110137,110249,110349,110465,110561,110673,110773,110913,111049,111213,111343,111501,111651,111792,111936,112071,112183,112333,112461,112589,112725,112857,112987,113117,113229,113369,114273,114417,114555,115967,116057,116133,116237,116327,116429,116537,116645,116745,116825,116917,117015,117125,117203,117309,117401,117505,117615,117737,117900,118057,118137,118237,118327,118437,118531,118637,118729,118829,118941,119055,119171,119287,119381,119495,119607,119709,119829,119951,120033,120137,120257,120383,120481,120575,120663,120775,120891,121013,121125,121300,121416,121502,121594,121706,121830,121897,122023,122091,122219,122363,122491,122560,122655,122770,122883,122982,123091,123202,123313,123414,123519,123619,123749,123840,123963,124057,124169,124255,124359,124455,124543,124661,124765,124869,124995,125083,125191,125291,125381,125491,125575,125677,125761,125815,125879,125985,126095,126179,126299,131727,131845,131960,132092,132807,133499,134016,135663,136048,136645,138244,139777,140165,142472,161990,162250,163940,170792,179913,180175,180531,181361,188143,189277,189571,189794,190121,192171,192819,194452,194722,198573,199174,202983,204198,205607,206081" } }, { diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json index f053859f..a4836eea 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -14,12 +14,12 @@ "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,363,1704,1705,1709,1710,1714,1879,1880,2545,2695,2738,2770,2807", + "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,364,1705,1706,1710,1711,1715,1880,1881,2546,2696,2739,2771,2808", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "3720,3789,10432,10502,10570,10642,10712,10773,10847,11704,11765,11826,11888,11952,12014,12075,12143,12243,12303,12369,12442,12511,12568,12620,13397,13469,13784,13819,13996,14046,14107,14164,14198,14233,14543,24065,113317,113434,113635,113745,113946,126247,126319,162198,170740,173646,175711,177471", - "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,363,1704,1708,1709,1713,1714,1879,1880,2551,2737,2769,2806,2813", + "startOffsets": "3720,3789,10432,10502,10570,10642,10712,10773,10847,11704,11765,11826,11888,11952,12014,12075,12143,12243,12303,12369,12442,12511,12568,12620,13397,13469,13784,13819,13996,14046,14107,14164,14198,14233,14543,24122,113374,113491,113692,113802,114003,126304,126376,162255,170797,173703,175768,177528", + "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,364,1705,1709,1710,1714,1715,1880,1881,2552,2738,2770,2807,2814", "endColumns": "68,62,69,67,71,69,60,73,72,60,60,61,63,61,60,67,99,59,65,72,68,56,51,61,71,75,34,34,49,60,56,33,34,34,69,70,116,12,109,12,128,71,66,24,24,24,24,24", - "endOffsets": "3784,3847,10497,10565,10637,10707,10768,10842,10915,11760,11821,11883,11947,12009,12070,12138,12238,12298,12364,12437,12506,12563,12615,12677,13464,13540,13814,13849,14041,14102,14159,14193,14228,14263,14608,24131,113429,113630,113740,113941,114070,126314,126381,162491,173641,175706,177466,177843" + "endOffsets": "3784,3847,10497,10565,10637,10707,10768,10842,10915,11760,11821,11883,11947,12009,12070,12138,12238,12298,12364,12437,12506,12563,12615,12677,13464,13540,13814,13849,14041,14102,14159,14193,14228,14263,14608,24188,113486,113687,113797,113998,114127,126371,126438,162548,173698,175763,177523,177900" } }, { @@ -33,12 +33,12 @@ "endOffsets": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104" }, "to": { - "startLines": "1440,1444,1448,1452,1721,1725,1729,1733,1737,1741,1745", + "startLines": "1441,1445,1449,1453,1722,1726,1730,1734,1738,1742,1746", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "93338,93542,93753,93960,114503,114686,114871,115056,115259,115465,115648", - "endLines": "1443,1447,1451,1454,1724,1728,1732,1736,1740,1744,1748", + "startOffsets": "93395,93599,93810,94017,114560,114743,114928,115113,115316,115522,115705", + "endLines": "1444,1448,1452,1455,1725,1729,1733,1737,1741,1745,1749", "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "93537,93748,93955,94115,114681,114866,115051,115254,115460,115643,115844" + "endOffsets": "93594,93805,94012,94172,114738,114923,115108,115311,115517,115700,115901" } }, { @@ -80,20 +80,20 @@ { "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml", "from": { - "startLines": "129,73,76,75,74,19,20,21,119,120,128,127,26,82,83,81,80,79,95,94,93,85,39,38,65,29,30,86,41,77,121,72,68,42,49,54,43,64,63,62,58,57,55,56,59,60,50,71,61,69,48,47,53,52,51,67,46,66,44,45,70,28,34,36,33,35,32,31,25,24,102,101,105,117,110,109,111,112,114,113,103,104,108,106,107,100,115,116,126,124,123,125,27,84,92,97,96,98,91,90,89,88,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,4", - "startOffsets": "8186,4020,4284,4187,4117,846,890,943,7674,7724,8127,8075,1308,4744,4839,4672,4587,4503,5718,5634,5531,5017,2043,1991,3511,1515,1569,5079,2138,4368,7788,3948,3699,2198,2569,2875,2257,3439,3377,3319,3093,3040,2935,2989,3144,3195,2617,3881,3256,3749,2519,2471,2819,2730,2671,3636,2420,3590,2315,2359,3813,1459,1784,1894,1736,1840,1679,1630,1252,1198,6181,6113,6425,7575,6794,6712,6869,6959,7203,7123,6266,6342,6652,6490,6571,6057,7348,7471,8033,7904,7846,7958,1393,4948,5444,5855,5785,5936,5384,5328,5265,5204,996,1107", - "endLines": "133,73,76,75,74,19,20,21,119,120,128,127,26,82,83,81,80,79,95,94,93,85,39,38,65,29,30,86,41,77,121,72,68,42,49,54,43,64,63,62,58,57,55,56,59,60,50,71,61,69,48,47,53,52,51,67,46,66,44,45,70,28,34,36,33,35,32,31,25,24,102,101,105,117,110,109,111,112,114,113,103,104,108,106,107,100,115,116,126,124,123,125,27,84,92,97,96,98,91,90,89,88,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,48,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": "8594,4111,4362,4278,4181,884,937,990,7718,7782,8180,8121,1387,4833,4942,4738,4666,4581,5779,5712,5628,5073,2100,2037,3584,1563,1624,5179,2192,4465,7838,4014,3743,2251,2611,2929,2309,3505,3433,3371,3138,3087,2983,3034,3189,3250,2665,3942,3313,3807,2563,2513,2869,2813,2724,3693,2465,3630,2353,2414,3875,1509,1834,1942,1778,1888,1730,1673,1302,1246,6260,6175,6484,7666,6863,6788,6953,7117,7342,7197,6336,6419,6706,6565,6646,6107,7465,7569,8069,7952,7898,8027,1453,5011,5525,5930,5849,6025,5438,5378,5322,5259,1101,1192" + "startLines": "130,74,77,76,75,19,20,21,120,121,129,128,26,83,84,82,81,80,96,95,94,86,39,38,66,29,30,87,41,78,122,73,69,49,42,50,55,43,65,64,63,59,58,56,57,60,61,51,72,62,70,48,47,54,53,52,68,46,67,44,45,71,28,34,36,33,35,32,31,25,24,103,102,106,118,111,110,112,113,115,114,104,105,109,107,108,101,116,117,127,125,124,126,27,85,93,98,97,99,92,91,90,89,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,4,4", + "startOffsets": "8244,4078,4342,4245,4175,846,890,943,7732,7782,8185,8133,1308,4802,4897,4730,4645,4561,5776,5692,5589,5075,2043,1991,3569,1515,1569,5137,2138,4426,7846,4006,3757,2569,2198,2627,2933,2257,3497,3435,3377,3151,3098,2993,3047,3202,3253,2675,3939,3314,3807,2519,2471,2877,2788,2729,3694,2420,3648,2315,2359,3871,1459,1784,1894,1736,1840,1679,1630,1252,1198,6239,6171,6483,7633,6852,6770,6927,7017,7261,7181,6324,6400,6710,6548,6629,6115,7406,7529,8091,7962,7904,8016,1393,5006,5502,5913,5843,5994,5442,5386,5323,5262,996,1107", + "endLines": "134,74,77,76,75,19,20,21,120,121,129,128,26,83,84,82,81,80,96,95,94,86,39,38,66,29,30,87,41,78,122,73,69,49,42,50,55,43,65,64,63,59,58,56,57,60,61,51,72,62,70,48,47,54,53,52,68,46,67,44,45,71,28,34,36,33,35,32,31,25,24,103,102,106,118,111,110,112,113,115,114,104,105,109,107,108,101,116,117,127,125,124,126,27,85,93,98,97,99,92,91,90,89,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,56,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,48,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": "8652,4169,4420,4336,4239,884,937,990,7776,7840,8238,8179,1387,4891,5000,4796,4724,4639,5837,5770,5686,5131,2100,2037,3642,1563,1624,5237,2192,4523,7896,4072,3801,2621,2251,2669,2987,2309,3563,3491,3429,3196,3145,3041,3092,3247,3308,2723,4000,3371,3865,2563,2513,2927,2871,2782,3751,2465,3688,2353,2414,3933,1509,1834,1942,1778,1888,1730,1673,1302,1246,6318,6233,6542,7724,6921,6846,7011,7175,7400,7255,6394,6477,6764,6623,6704,6165,7523,7627,8127,8010,7956,8085,1453,5069,5583,5988,5907,6083,5496,5436,5380,5317,1101,1192" }, "to": { - "startLines": "226,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,361,362,364,365,366,367,368,369,370,371,372,373,374", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "14613,17764,17860,17943,18039,18108,18151,18203,18255,18304,18367,18425,18476,18560,18654,18762,18833,18917,19000,19066,19149,19251,19312,19374,19425,19503,19556,19616,19721,19780,19882,19937,20008,20057,20115,20162,20221,20278,20349,20410,20467,20517,20569,20622,20672,20722,20782,20835,20901,20963,21026,21075,21122,21177,21265,21323,21385,21435,21480,21523,21583,21650,21705,21760,21813,21860,21913,21969,22017,22072,22125,22209,22276,22340,22436,22510,22591,22680,22843,22987,23066,23141,23223,23282,23362,23442,23497,23619,23722,23763,23816,23926,24000,24136,24204,24290,24370,24439,24533,24592,24647,24709,24769,24879", - "endLines": "230,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,361,362,364,365,366,367,368,369,370,371,372,373,374", - "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,48,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": "15001,17855,17938,18034,18103,18146,18198,18250,18299,18362,18420,18471,18555,18649,18757,18828,18912,18995,19061,19144,19246,19307,19369,19420,19498,19551,19611,19716,19775,19877,19932,20003,20052,20110,20157,20216,20273,20344,20405,20462,20512,20564,20617,20667,20717,20777,20830,20896,20958,21021,21070,21117,21172,21260,21318,21380,21430,21475,21518,21578,21645,21700,21755,21808,21855,21908,21964,22012,22067,22120,22204,22271,22335,22431,22505,22586,22675,22838,22982,23061,23136,23218,23277,23357,23437,23492,23614,23717,23758,23811,23868,23995,24060,24199,24285,24365,24434,24528,24587,24642,24704,24764,24874,24964" + "startLines": "226,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,362,363,365,366,367,368,369,370,371,372,373,374,375", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "14613,17764,17860,17943,18039,18108,18151,18203,18255,18304,18367,18425,18476,18560,18654,18762,18833,18917,19000,19066,19149,19251,19312,19374,19425,19503,19556,19616,19721,19780,19882,19937,20008,20057,20114,20172,20219,20278,20335,20406,20467,20524,20574,20626,20679,20729,20779,20839,20892,20958,21020,21083,21132,21179,21234,21322,21380,21442,21492,21537,21580,21640,21707,21762,21817,21870,21917,21970,22026,22074,22129,22182,22266,22333,22397,22493,22567,22648,22737,22900,23044,23123,23198,23280,23339,23419,23499,23554,23676,23779,23820,23873,23983,24057,24193,24261,24347,24427,24496,24590,24649,24704,24766,24826,24936", + "endLines": "230,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,362,363,365,366,367,368,369,370,371,372,373,374,375", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,56,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,48,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": "15001,17855,17938,18034,18103,18146,18198,18250,18299,18362,18420,18471,18555,18649,18757,18828,18912,18995,19061,19144,19246,19307,19369,19420,19498,19551,19611,19716,19775,19877,19932,20003,20052,20109,20167,20214,20273,20330,20401,20462,20519,20569,20621,20674,20724,20774,20834,20887,20953,21015,21078,21127,21174,21229,21317,21375,21437,21487,21532,21575,21635,21702,21757,21812,21865,21912,21965,22021,22069,22124,22177,22261,22328,22392,22488,22562,22643,22732,22895,23039,23118,23193,23275,23334,23414,23494,23549,23671,23774,23815,23868,23925,24052,24117,24256,24342,24422,24491,24585,24644,24699,24761,24821,24931,25021" } }, { @@ -107,12 +107,12 @@ "endOffsets": "111,6075,719,5930" }, "to": { - "startLines": "12,1881,2578,2588", + "startLines": "12,1882,2579,2589", "startColumns": "4,4,4,4", - "startOffsets": "532,126386,163888,164496", - "endLines": "12,1883,2587,2676", + "startOffsets": "532,126443,163945,164553", + "endLines": "12,1884,2588,2677", "endColumns": "60,12,24,24", - "endOffsets": "588,126526,164491,169702" + "endOffsets": "588,126583,164548,169759" } }, { @@ -126,12 +126,12 @@ "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,360,375,376,377,378,379,380,388,389,393,397,401,406,412,419,423,427,432,436,440,444,448,452,456,462,466,472,476,482,486,491,495,498,502,508,512,518,522,528,531,535,539,543,547,551,552,553,554,557,560,563,566,570,571,572,573,574,577,579,581,583,588,589,593,599,603,604,606,617,618,622,628,632,633,634,638,665,669,670,674,702,870,896,1065,1091,1122,1130,1136,1150,1172,1177,1182,1192,1201,1210,1214,1221,1229,1236,1237,1246,1249,1252,1256,1260,1264,1267,1268,1272,1276,1286,1291,1298,1304,1305,1308,1312,1317,1319,1321,1324,1327,1329,1333,1336,1343,1346,1349,1353,1355,1359,1361,1363,1365,1369,1377,1385,1397,1403,1412,1415,1426,1429,1434,1435,1455,1513,1572,1573,1583,1592,1593,1595,1599,1602,1605,1608,1611,1614,1617,1620,1624,1627,1630,1633,1637,1640,1644,1648,1649,1650,1651,1652,1653,1654,1655,1656,1657,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1670,1672,1673,1674,1675,1676,1677,1678,1679,1681,1682,1684,1685,1687,1689,1690,1692,1693,1694,1695,1696,1697,1699,1700,1701,1702,1703,1715,1717,1719,1749,1750,1751,1752,1753,1754,1755,1756,1757,1758,1759,1760,1761,1763,1764,1765,1766,1767,1768,1770,1774,1778,1779,1780,1781,1782,1783,1784,1785,1787,1789,1791,1793,1795,1796,1797,1798,1800,1802,1804,1805,1806,1807,1808,1809,1810,1811,1812,1813,1814,1815,1818,1819,1820,1821,1823,1825,1826,1828,1829,1831,1833,1835,1836,1837,1838,1839,1840,1841,1842,1843,1844,1845,1846,1848,1849,1850,1851,1853,1854,1855,1856,1857,1859,1861,1863,1865,1866,1867,1868,1869,1870,1871,1872,1873,1874,1875,1876,1877,1878,1884,1967,1970,1973,1976,1990,2001,2011,2038,2045,2056,2086,2113,2122,2159,2540,2552,2677,2814,2850,2856,2862,2885,3026,3046,3052,3056,3062,3099,3111,3138,3143,3209,3224,3289,3308,3334", + "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,361,376,377,378,379,380,381,389,390,394,398,402,407,413,420,424,428,433,437,441,445,449,453,457,463,467,473,477,483,487,492,496,499,503,509,513,519,523,529,532,536,540,544,548,552,553,554,555,558,561,564,567,571,572,573,574,575,578,580,582,584,589,590,594,600,604,605,607,618,619,623,629,633,634,635,639,666,670,671,675,703,871,897,1066,1092,1123,1131,1137,1151,1173,1178,1183,1193,1202,1211,1215,1222,1230,1237,1238,1247,1250,1253,1257,1261,1265,1268,1269,1273,1277,1287,1292,1299,1305,1306,1309,1313,1318,1320,1322,1325,1328,1330,1334,1337,1344,1347,1350,1354,1356,1360,1362,1364,1366,1370,1378,1386,1398,1404,1413,1416,1427,1430,1435,1436,1456,1514,1573,1574,1584,1593,1594,1596,1600,1603,1606,1609,1612,1615,1618,1621,1625,1628,1631,1634,1638,1641,1645,1649,1650,1651,1652,1653,1654,1655,1656,1657,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1671,1673,1674,1675,1676,1677,1678,1679,1680,1682,1683,1685,1686,1688,1690,1691,1693,1694,1695,1696,1697,1698,1700,1701,1702,1703,1704,1716,1718,1720,1750,1751,1752,1753,1754,1755,1756,1757,1758,1759,1760,1761,1762,1764,1765,1766,1767,1768,1769,1771,1775,1779,1780,1781,1782,1783,1784,1785,1786,1788,1790,1792,1794,1796,1797,1798,1799,1801,1803,1805,1806,1807,1808,1809,1810,1811,1812,1813,1814,1815,1816,1819,1820,1821,1822,1824,1826,1827,1829,1830,1832,1834,1836,1837,1838,1839,1840,1841,1842,1843,1844,1845,1846,1847,1849,1850,1851,1852,1854,1855,1856,1857,1858,1860,1862,1864,1866,1867,1868,1869,1870,1871,1872,1873,1874,1875,1876,1877,1878,1879,1885,1968,1971,1974,1977,1991,2002,2012,2039,2046,2057,2087,2114,2123,2160,2541,2553,2678,2815,2851,2857,2863,2886,3027,3047,3053,3057,3063,3100,3112,3139,3144,3210,3225,3290,3309,3335", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "593,648,693,742,783,838,897,959,1040,1101,1176,1252,1329,1407,1492,1574,1650,1726,1803,1881,1987,2093,2172,2252,2309,2367,2441,2516,2581,2647,2707,2768,2840,2913,2980,3048,3107,3166,3225,3284,3343,3397,3451,3504,3558,3612,3666,3852,3926,4005,4078,4152,4223,4295,4367,4440,4497,4555,4628,4702,4776,4851,4923,4996,5066,5137,5197,5315,5384,5453,5523,5597,5673,5737,5814,5890,5967,6032,6101,6178,6253,6322,6390,6467,6533,6594,6691,6756,6825,6924,6995,7054,7112,7169,7228,7292,7363,7435,7507,7579,7651,7718,7786,7854,7913,7976,8040,8130,8221,8281,8347,8414,8480,8550,8614,8667,8780,8838,8901,8966,9031,9106,9179,9251,9300,9361,9422,9483,9545,9609,9673,9737,9802,9865,9925,9986,10052,10111,10171,10233,10304,10364,10920,11006,11093,11183,11270,11358,11440,11523,11613,12944,12996,13054,13099,13165,13229,13286,13343,13545,13602,13650,13699,13750,13854,13901,13950,14268,14300,14364,14426,14486,15006,15080,15150,15228,15282,15352,15437,15485,15531,15602,15680,15758,15830,15904,15978,16052,16132,16205,16274,16346,16423,16484,16547,16613,16677,16748,16811,16876,16940,17001,17062,17114,17187,17261,17330,17405,17479,17553,17694,23873,24969,25047,25137,25225,25321,25411,25993,26082,26329,26610,26862,27147,27540,28017,28239,28461,28737,28964,29194,29424,29654,29884,30111,30530,30756,31181,31411,31839,32058,32341,32549,32680,32907,33333,33558,33985,34206,34631,34751,35027,35328,35652,35943,36257,36394,36525,36630,36872,37039,37243,37451,37722,37834,37946,38051,38168,38382,38528,38668,38754,39102,39190,39436,39854,40103,40185,40283,40900,41000,41252,41676,41931,42025,42114,42351,44403,44645,44747,45000,47184,57905,59421,70241,71769,73526,74152,74572,75633,76898,77154,77390,77937,78431,79036,79234,79814,80378,80753,80871,81409,81566,81762,82035,82291,82461,82602,82666,82948,83234,83910,84174,84512,84865,84959,85145,85451,85713,85838,85965,86204,86415,86534,86727,86904,87359,87540,87662,87921,88034,88221,88323,88430,88559,88834,89342,89838,90715,91009,91579,91728,92460,92632,92968,93060,94120,98464,102951,103013,103643,104257,104348,104461,104690,104850,105002,105173,105339,105508,105675,105838,106081,106251,106424,106595,106869,107068,107273,107603,107687,107783,107879,107977,108077,108179,108281,108383,108485,108587,108687,108783,108895,109024,109147,109278,109409,109507,109621,109715,109855,109989,110085,110197,110297,110413,110509,110621,110721,110861,110997,111161,111291,111449,111599,111740,111884,112019,112131,112281,112409,112537,112673,112805,112935,113065,113177,114075,114221,114365,115849,115915,116005,116081,116185,116275,116377,116485,116593,116693,116773,116865,116963,117073,117151,117257,117349,117453,117563,117685,117848,118005,118085,118185,118275,118385,118479,118585,118677,118777,118889,119003,119119,119235,119329,119443,119555,119657,119777,119899,119981,120085,120205,120331,120429,120523,120611,120723,120839,120961,121073,121248,121364,121450,121542,121654,121778,121845,121971,122039,122167,122311,122439,122508,122603,122718,122831,122930,123039,123150,123261,123362,123467,123567,123697,123788,123911,124005,124117,124203,124307,124403,124491,124609,124713,124817,124943,125031,125139,125239,125329,125439,125523,125625,125709,125763,125827,125933,126043,126127,126531,131675,131793,131908,132040,132755,133447,133964,135611,135996,136593,138192,139725,140113,142420,161938,162496,169707,177848,179861,180123,180479,181309,188091,189225,189519,189742,190069,192119,192767,194400,194670,198521,199122,202931,204146,205555", - "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,360,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,869,895,1064,1090,1121,1129,1135,1149,1171,1176,1181,1191,1200,1209,1213,1220,1228,1235,1236,1245,1248,1251,1255,1259,1263,1266,1267,1271,1275,1285,1290,1297,1303,1304,1307,1311,1316,1318,1320,1323,1326,1328,1332,1335,1342,1345,1348,1352,1354,1358,1360,1362,1364,1368,1376,1384,1396,1402,1411,1414,1425,1428,1433,1434,1439,1512,1571,1572,1582,1591,1592,1594,1598,1601,1604,1607,1610,1613,1616,1619,1623,1626,1629,1632,1636,1639,1643,1647,1648,1649,1650,1651,1652,1653,1654,1655,1656,1657,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1669,1671,1672,1673,1674,1675,1676,1677,1678,1680,1681,1683,1684,1686,1688,1689,1691,1692,1693,1694,1695,1696,1698,1699,1700,1701,1702,1703,1716,1718,1720,1749,1750,1751,1752,1753,1754,1755,1756,1757,1758,1759,1760,1762,1763,1764,1765,1766,1767,1769,1773,1777,1778,1779,1780,1781,1782,1783,1784,1786,1788,1790,1792,1794,1795,1796,1797,1799,1801,1803,1804,1805,1806,1807,1808,1809,1810,1811,1812,1813,1814,1817,1818,1819,1820,1822,1824,1825,1827,1828,1830,1832,1834,1835,1836,1837,1838,1839,1840,1841,1842,1843,1844,1845,1847,1848,1849,1850,1852,1853,1854,1855,1856,1858,1860,1862,1864,1865,1866,1867,1868,1869,1870,1871,1872,1873,1874,1875,1876,1877,1878,1966,1969,1972,1975,1989,2000,2010,2037,2044,2055,2085,2112,2121,2158,2539,2544,2577,2694,2849,2855,2861,2884,3025,3045,3051,3055,3061,3098,3110,3137,3142,3208,3223,3288,3307,3333,3342", + "startOffsets": "593,648,693,742,783,838,897,959,1040,1101,1176,1252,1329,1407,1492,1574,1650,1726,1803,1881,1987,2093,2172,2252,2309,2367,2441,2516,2581,2647,2707,2768,2840,2913,2980,3048,3107,3166,3225,3284,3343,3397,3451,3504,3558,3612,3666,3852,3926,4005,4078,4152,4223,4295,4367,4440,4497,4555,4628,4702,4776,4851,4923,4996,5066,5137,5197,5315,5384,5453,5523,5597,5673,5737,5814,5890,5967,6032,6101,6178,6253,6322,6390,6467,6533,6594,6691,6756,6825,6924,6995,7054,7112,7169,7228,7292,7363,7435,7507,7579,7651,7718,7786,7854,7913,7976,8040,8130,8221,8281,8347,8414,8480,8550,8614,8667,8780,8838,8901,8966,9031,9106,9179,9251,9300,9361,9422,9483,9545,9609,9673,9737,9802,9865,9925,9986,10052,10111,10171,10233,10304,10364,10920,11006,11093,11183,11270,11358,11440,11523,11613,12944,12996,13054,13099,13165,13229,13286,13343,13545,13602,13650,13699,13750,13854,13901,13950,14268,14300,14364,14426,14486,15006,15080,15150,15228,15282,15352,15437,15485,15531,15602,15680,15758,15830,15904,15978,16052,16132,16205,16274,16346,16423,16484,16547,16613,16677,16748,16811,16876,16940,17001,17062,17114,17187,17261,17330,17405,17479,17553,17694,23930,25026,25104,25194,25282,25378,25468,26050,26139,26386,26667,26919,27204,27597,28074,28296,28518,28794,29021,29251,29481,29711,29941,30168,30587,30813,31238,31468,31896,32115,32398,32606,32737,32964,33390,33615,34042,34263,34688,34808,35084,35385,35709,36000,36314,36451,36582,36687,36929,37096,37300,37508,37779,37891,38003,38108,38225,38439,38585,38725,38811,39159,39247,39493,39911,40160,40242,40340,40957,41057,41309,41733,41988,42082,42171,42408,44460,44702,44804,45057,47241,57962,59478,70298,71826,73583,74209,74629,75690,76955,77211,77447,77994,78488,79093,79291,79871,80435,80810,80928,81466,81623,81819,82092,82348,82518,82659,82723,83005,83291,83967,84231,84569,84922,85016,85202,85508,85770,85895,86022,86261,86472,86591,86784,86961,87416,87597,87719,87978,88091,88278,88380,88487,88616,88891,89399,89895,90772,91066,91636,91785,92517,92689,93025,93117,94177,98521,103008,103070,103700,104314,104405,104518,104747,104907,105059,105230,105396,105565,105732,105895,106138,106308,106481,106652,106926,107125,107330,107660,107744,107840,107936,108034,108134,108236,108338,108440,108542,108644,108744,108840,108952,109081,109204,109335,109466,109564,109678,109772,109912,110046,110142,110254,110354,110470,110566,110678,110778,110918,111054,111218,111348,111506,111656,111797,111941,112076,112188,112338,112466,112594,112730,112862,112992,113122,113234,114132,114278,114422,115906,115972,116062,116138,116242,116332,116434,116542,116650,116750,116830,116922,117020,117130,117208,117314,117406,117510,117620,117742,117905,118062,118142,118242,118332,118442,118536,118642,118734,118834,118946,119060,119176,119292,119386,119500,119612,119714,119834,119956,120038,120142,120262,120388,120486,120580,120668,120780,120896,121018,121130,121305,121421,121507,121599,121711,121835,121902,122028,122096,122224,122368,122496,122565,122660,122775,122888,122987,123096,123207,123318,123419,123524,123624,123754,123845,123968,124062,124174,124260,124364,124460,124548,124666,124770,124874,125000,125088,125196,125296,125386,125496,125580,125682,125766,125820,125884,125990,126100,126184,126588,131732,131850,131965,132097,132812,133504,134021,135668,136053,136650,138249,139782,140170,142477,161995,162553,169764,177905,179918,180180,180536,181366,188148,189282,189576,189799,190126,192176,192824,194457,194727,198578,199179,202988,204203,205612", + "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,361,376,377,378,379,380,388,389,393,397,401,406,412,419,423,427,432,436,440,444,448,452,456,462,466,472,476,482,486,491,495,498,502,508,512,518,522,528,531,535,539,543,547,551,552,553,554,557,560,563,566,570,571,572,573,574,577,579,581,583,588,589,593,599,603,604,606,617,618,622,628,632,633,634,638,665,669,670,674,702,870,896,1065,1091,1122,1130,1136,1150,1172,1177,1182,1192,1201,1210,1214,1221,1229,1236,1237,1246,1249,1252,1256,1260,1264,1267,1268,1272,1276,1286,1291,1298,1304,1305,1308,1312,1317,1319,1321,1324,1327,1329,1333,1336,1343,1346,1349,1353,1355,1359,1361,1363,1365,1369,1377,1385,1397,1403,1412,1415,1426,1429,1434,1435,1440,1513,1572,1573,1583,1592,1593,1595,1599,1602,1605,1608,1611,1614,1617,1620,1624,1627,1630,1633,1637,1640,1644,1648,1649,1650,1651,1652,1653,1654,1655,1656,1657,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1670,1672,1673,1674,1675,1676,1677,1678,1679,1681,1682,1684,1685,1687,1689,1690,1692,1693,1694,1695,1696,1697,1699,1700,1701,1702,1703,1704,1717,1719,1721,1750,1751,1752,1753,1754,1755,1756,1757,1758,1759,1760,1761,1763,1764,1765,1766,1767,1768,1770,1774,1778,1779,1780,1781,1782,1783,1784,1785,1787,1789,1791,1793,1795,1796,1797,1798,1800,1802,1804,1805,1806,1807,1808,1809,1810,1811,1812,1813,1814,1815,1818,1819,1820,1821,1823,1825,1826,1828,1829,1831,1833,1835,1836,1837,1838,1839,1840,1841,1842,1843,1844,1845,1846,1848,1849,1850,1851,1853,1854,1855,1856,1857,1859,1861,1863,1865,1866,1867,1868,1869,1870,1871,1872,1873,1874,1875,1876,1877,1878,1879,1967,1970,1973,1976,1990,2001,2011,2038,2045,2056,2086,2113,2122,2159,2540,2545,2578,2695,2850,2856,2862,2885,3026,3046,3052,3056,3062,3099,3111,3138,3143,3209,3224,3289,3308,3334,3343", "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,63,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,91,12,12,12,61,12,12,90,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24", - "endOffsets": "643,688,737,778,833,892,954,1035,1096,1171,1247,1324,1402,1487,1569,1645,1721,1798,1876,1982,2088,2167,2247,2304,2362,2436,2511,2576,2642,2702,2763,2835,2908,2975,3043,3102,3161,3220,3279,3338,3392,3446,3499,3553,3607,3661,3715,3921,4000,4073,4147,4218,4290,4362,4435,4492,4550,4623,4697,4771,4846,4918,4991,5061,5132,5192,5253,5379,5448,5518,5592,5668,5732,5809,5885,5962,6027,6096,6173,6248,6317,6385,6462,6528,6589,6686,6751,6820,6919,6990,7049,7107,7164,7223,7287,7358,7430,7502,7574,7646,7713,7781,7849,7908,7971,8035,8125,8216,8276,8342,8409,8475,8545,8609,8662,8775,8833,8896,8961,9026,9101,9174,9246,9295,9356,9417,9478,9540,9604,9668,9732,9797,9860,9920,9981,10047,10106,10166,10228,10299,10359,10427,11001,11088,11178,11265,11353,11435,11518,11608,11699,12991,13049,13094,13160,13224,13281,13338,13392,13597,13645,13694,13745,13779,13896,13945,13991,14295,14359,14421,14481,14538,15075,15145,15223,15277,15347,15432,15480,15526,15597,15675,15753,15825,15899,15973,16047,16127,16200,16269,16341,16418,16479,16542,16608,16672,16743,16806,16871,16935,16996,17057,17109,17182,17256,17325,17400,17474,17548,17689,17759,23921,25042,25132,25220,25316,25406,25988,26077,26324,26605,26857,27142,27535,28012,28234,28456,28732,28959,29189,29419,29649,29879,30106,30525,30751,31176,31406,31834,32053,32336,32544,32675,32902,33328,33553,33980,34201,34626,34746,35022,35323,35647,35938,36252,36389,36520,36625,36867,37034,37238,37446,37717,37829,37941,38046,38163,38377,38523,38663,38749,39097,39185,39431,39849,40098,40180,40278,40895,40995,41247,41671,41926,42020,42109,42346,44398,44640,44742,44995,47179,57900,59416,70236,71764,73521,74147,74567,75628,76893,77149,77385,77932,78426,79031,79229,79809,80373,80748,80866,81404,81561,81757,82030,82286,82456,82597,82661,82943,83229,83905,84169,84507,84860,84954,85140,85446,85708,85833,85960,86199,86410,86529,86722,86899,87354,87535,87657,87916,88029,88216,88318,88425,88554,88829,89337,89833,90710,91004,91574,91723,92455,92627,92963,93055,93333,98459,102946,103008,103638,104252,104343,104456,104685,104845,104997,105168,105334,105503,105670,105833,106076,106246,106419,106590,106864,107063,107268,107598,107682,107778,107874,107972,108072,108174,108276,108378,108480,108582,108682,108778,108890,109019,109142,109273,109404,109502,109616,109710,109850,109984,110080,110192,110292,110408,110504,110616,110716,110856,110992,111156,111286,111444,111594,111735,111879,112014,112126,112276,112404,112532,112668,112800,112930,113060,113172,113312,114216,114360,114498,115910,116000,116076,116180,116270,116372,116480,116588,116688,116768,116860,116958,117068,117146,117252,117344,117448,117558,117680,117843,118000,118080,118180,118270,118380,118474,118580,118672,118772,118884,118998,119114,119230,119324,119438,119550,119652,119772,119894,119976,120080,120200,120326,120424,120518,120606,120718,120834,120956,121068,121243,121359,121445,121537,121649,121773,121840,121966,122034,122162,122306,122434,122503,122598,122713,122826,122925,123034,123145,123256,123357,123462,123562,123692,123783,123906,124000,124112,124198,124302,124398,124486,124604,124708,124812,124938,125026,125134,125234,125324,125434,125518,125620,125704,125758,125822,125928,126038,126122,126242,131670,131788,131903,132035,132750,133442,133959,135606,135991,136588,138187,139720,140108,142415,161933,162193,163883,170735,179856,180118,180474,181304,188086,189220,189514,189737,190064,192114,192762,194395,194665,198516,199117,202926,204141,205550,206024" + "endOffsets": "643,688,737,778,833,892,954,1035,1096,1171,1247,1324,1402,1487,1569,1645,1721,1798,1876,1982,2088,2167,2247,2304,2362,2436,2511,2576,2642,2702,2763,2835,2908,2975,3043,3102,3161,3220,3279,3338,3392,3446,3499,3553,3607,3661,3715,3921,4000,4073,4147,4218,4290,4362,4435,4492,4550,4623,4697,4771,4846,4918,4991,5061,5132,5192,5253,5379,5448,5518,5592,5668,5732,5809,5885,5962,6027,6096,6173,6248,6317,6385,6462,6528,6589,6686,6751,6820,6919,6990,7049,7107,7164,7223,7287,7358,7430,7502,7574,7646,7713,7781,7849,7908,7971,8035,8125,8216,8276,8342,8409,8475,8545,8609,8662,8775,8833,8896,8961,9026,9101,9174,9246,9295,9356,9417,9478,9540,9604,9668,9732,9797,9860,9920,9981,10047,10106,10166,10228,10299,10359,10427,11001,11088,11178,11265,11353,11435,11518,11608,11699,12991,13049,13094,13160,13224,13281,13338,13392,13597,13645,13694,13745,13779,13896,13945,13991,14295,14359,14421,14481,14538,15075,15145,15223,15277,15347,15432,15480,15526,15597,15675,15753,15825,15899,15973,16047,16127,16200,16269,16341,16418,16479,16542,16608,16672,16743,16806,16871,16935,16996,17057,17109,17182,17256,17325,17400,17474,17548,17689,17759,23978,25099,25189,25277,25373,25463,26045,26134,26381,26662,26914,27199,27592,28069,28291,28513,28789,29016,29246,29476,29706,29936,30163,30582,30808,31233,31463,31891,32110,32393,32601,32732,32959,33385,33610,34037,34258,34683,34803,35079,35380,35704,35995,36309,36446,36577,36682,36924,37091,37295,37503,37774,37886,37998,38103,38220,38434,38580,38720,38806,39154,39242,39488,39906,40155,40237,40335,40952,41052,41304,41728,41983,42077,42166,42403,44455,44697,44799,45052,47236,57957,59473,70293,71821,73578,74204,74624,75685,76950,77206,77442,77989,78483,79088,79286,79866,80430,80805,80923,81461,81618,81814,82087,82343,82513,82654,82718,83000,83286,83962,84226,84564,84917,85011,85197,85503,85765,85890,86017,86256,86467,86586,86779,86956,87411,87592,87714,87973,88086,88273,88375,88482,88611,88886,89394,89890,90767,91061,91631,91780,92512,92684,93020,93112,93390,98516,103003,103065,103695,104309,104400,104513,104742,104902,105054,105225,105391,105560,105727,105890,106133,106303,106476,106647,106921,107120,107325,107655,107739,107835,107931,108029,108129,108231,108333,108435,108537,108639,108739,108835,108947,109076,109199,109330,109461,109559,109673,109767,109907,110041,110137,110249,110349,110465,110561,110673,110773,110913,111049,111213,111343,111501,111651,111792,111936,112071,112183,112333,112461,112589,112725,112857,112987,113117,113229,113369,114273,114417,114555,115967,116057,116133,116237,116327,116429,116537,116645,116745,116825,116917,117015,117125,117203,117309,117401,117505,117615,117737,117900,118057,118137,118237,118327,118437,118531,118637,118729,118829,118941,119055,119171,119287,119381,119495,119607,119709,119829,119951,120033,120137,120257,120383,120481,120575,120663,120775,120891,121013,121125,121300,121416,121502,121594,121706,121830,121897,122023,122091,122219,122363,122491,122560,122655,122770,122883,122982,123091,123202,123313,123414,123519,123619,123749,123840,123963,124057,124169,124255,124359,124455,124543,124661,124765,124869,124995,125083,125191,125291,125381,125491,125575,125677,125761,125815,125879,125985,126095,126179,126299,131727,131845,131960,132092,132807,133499,134016,135663,136048,136645,138244,139777,140165,142472,161990,162250,163940,170792,179913,180175,180531,181361,188143,189277,189571,189794,190121,192171,192819,194452,194722,198573,199174,202983,204198,205607,206081" } }, { diff --git a/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ index 67231873..b0f156f8 100644 Binary files a/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/7d816bfc7a00bd83455128f056d9f3a7cc8d0aeee11e444329e85c09b348d6b1_0.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/7d816bfc7a00bd83455128f056d9f3a7cc8d0aeee11e444329e85c09b348d6b1_0.jar deleted file mode 100644 index 78f89f4c..00000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/7d816bfc7a00bd83455128f056d9f3a7cc8d0aeee11e444329e85c09b348d6b1_0.jar and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/7d816bfc7a00bd83455128f056d9f3a7cc8d0aeee11e444329e85c09b348d6b1_1.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/7d816bfc7a00bd83455128f056d9f3a7cc8d0aeee11e444329e85c09b348d6b1_1.jar deleted file mode 100644 index 361cf97d..00000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/7d816bfc7a00bd83455128f056d9f3a7cc8d0aeee11e444329e85c09b348d6b1_1.jar and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/7d816bfc7a00bd83455128f056d9f3a7cc8d0aeee11e444329e85c09b348d6b1_2.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/7d816bfc7a00bd83455128f056d9f3a7cc8d0aeee11e444329e85c09b348d6b1_2.jar deleted file mode 100644 index bd8a14f5..00000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/7d816bfc7a00bd83455128f056d9f3a7cc8d0aeee11e444329e85c09b348d6b1_2.jar and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/7d816bfc7a00bd83455128f056d9f3a7cc8d0aeee11e444329e85c09b348d6b1_3.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/7d816bfc7a00bd83455128f056d9f3a7cc8d0aeee11e444329e85c09b348d6b1_3.jar deleted file mode 100644 index a0d01778..00000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/7d816bfc7a00bd83455128f056d9f3a7cc8d0aeee11e444329e85c09b348d6b1_3.jar and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/7d816bfc7a00bd83455128f056d9f3a7cc8d0aeee11e444329e85c09b348d6b1_4.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/7d816bfc7a00bd83455128f056d9f3a7cc8d0aeee11e444329e85c09b348d6b1_4.jar deleted file mode 100644 index 53284c5a..00000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/7d816bfc7a00bd83455128f056d9f3a7cc8d0aeee11e444329e85c09b348d6b1_4.jar and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/7d816bfc7a00bd83455128f056d9f3a7cc8d0aeee11e444329e85c09b348d6b1_5.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/7d816bfc7a00bd83455128f056d9f3a7cc8d0aeee11e444329e85c09b348d6b1_5.jar deleted file mode 100644 index 42eefee5..00000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/7d816bfc7a00bd83455128f056d9f3a7cc8d0aeee11e444329e85c09b348d6b1_5.jar and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/e1d8198b37b4a98d4424a613c69e8f1575e9e3e318d84ab14a02c1c6ee61c391_0.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/e1d8198b37b4a98d4424a613c69e8f1575e9e3e318d84ab14a02c1c6ee61c391_0.jar new file mode 100644 index 00000000..03f6c85a Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/e1d8198b37b4a98d4424a613c69e8f1575e9e3e318d84ab14a02c1c6ee61c391_0.jar differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/e1d8198b37b4a98d4424a613c69e8f1575e9e3e318d84ab14a02c1c6ee61c391_1.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/e1d8198b37b4a98d4424a613c69e8f1575e9e3e318d84ab14a02c1c6ee61c391_1.jar new file mode 100644 index 00000000..e8bc2588 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/e1d8198b37b4a98d4424a613c69e8f1575e9e3e318d84ab14a02c1c6ee61c391_1.jar differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/e1d8198b37b4a98d4424a613c69e8f1575e9e3e318d84ab14a02c1c6ee61c391_2.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/e1d8198b37b4a98d4424a613c69e8f1575e9e3e318d84ab14a02c1c6ee61c391_2.jar new file mode 100644 index 00000000..b839873c Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/e1d8198b37b4a98d4424a613c69e8f1575e9e3e318d84ab14a02c1c6ee61c391_2.jar differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/e1d8198b37b4a98d4424a613c69e8f1575e9e3e318d84ab14a02c1c6ee61c391_3.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/e1d8198b37b4a98d4424a613c69e8f1575e9e3e318d84ab14a02c1c6ee61c391_3.jar new file mode 100644 index 00000000..1213c927 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/e1d8198b37b4a98d4424a613c69e8f1575e9e3e318d84ab14a02c1c6ee61c391_3.jar differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/e1d8198b37b4a98d4424a613c69e8f1575e9e3e318d84ab14a02c1c6ee61c391_4.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/e1d8198b37b4a98d4424a613c69e8f1575e9e3e318d84ab14a02c1c6ee61c391_4.jar new file mode 100644 index 00000000..7286ffc5 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/e1d8198b37b4a98d4424a613c69e8f1575e9e3e318d84ab14a02c1c6ee61c391_4.jar differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/e1d8198b37b4a98d4424a613c69e8f1575e9e3e318d84ab14a02c1c6ee61c391_5.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/e1d8198b37b4a98d4424a613c69e8f1575e9e3e318d84ab14a02c1c6ee61c391_5.jar new file mode 100644 index 00000000..c0a4373b Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/e1d8198b37b4a98d4424a613c69e8f1575e9e3e318d84ab14a02c1c6ee61c391_5.jar differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex index d8ec2c4e..7200f8ef 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex index e32f11d3..650a8321 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex index 2f5ecfbd..fdbfacea 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex index ea6f71e5..0750f7ed 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex index 97357c85..c16801b9 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex index 846ec476..9b866691 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex index 3d1900e8..9b620804 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex index eb6b38fe..9b16d2c7 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex index 341cb7a9..4f3799b1 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex index 1e6dcd83..11c2c823 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex index 18abf329..52a90688 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex index c5945c7c..40e25c83 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex index 3be640ce..0159016f 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex index 50eec066..3eafb687 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex index 7e72b37d..8280ce37 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex index 5fe6e681..37318484 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex index 176de40b..a26f61d9 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex index 6bdecccb..f3bb0642 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex index bae27c73..6362dc13 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex index d2e092fe..bd61caf7 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex index da8000bc..be53fc55 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex index 97215a17..13defdb3 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex index 41c6d9cc..fcc69422 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex index dc686065..f97e90f7 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex index 236492b9..2f50f770 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex index 0c5462d4..f55c2a85 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex index 6eabdd4c..f3588bb5 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex index 6d3f5deb..204e8d72 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex index 2046ec84..8d7a5a7f 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex index c00fc9ee..301b2089 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex index d96b59b1..fa72ff7d 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex index a1da4095..95d25df3 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex index adb7fdff..6ccfcad4 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex index f0fbc7fd..431d7d3b 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex index e00ba914..f26ce1bc 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex index 9f37fc68..4d896693 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex index 7dead913..56c3a1d7 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex differ diff --git a/src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt b/src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt index 3892c947..ee1c1167 100644 --- a/src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt +++ b/src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt @@ -761,103 +761,104 @@ int id ll_font_normal 0x7f080064 int id ll_font_small 0x7f080065 int id ll_font_super 0x7f080066 int id menu_alert 0x7f080067 -int id menu_delete 0x7f080068 -int id menu_delete_remind 0x7f080069 -int id menu_export_text 0x7f08006a -int id menu_font_size 0x7f08006b -int id menu_list_mode 0x7f08006c -int id menu_new_folder 0x7f08006d -int id menu_new_note 0x7f08006e -int id menu_restore 0x7f08006f -int id menu_search 0x7f080070 -int id menu_send_to_desktop 0x7f080071 -int id menu_setting 0x7f080072 -int id menu_share 0x7f080073 -int id menu_sync 0x7f080074 -int id message 0x7f080075 -int id middle 0x7f080076 -int id minute 0x7f080077 -int id move 0x7f080078 -int id multiply 0x7f080079 -int id navigation_bar 0x7f08007a -int id never 0x7f08007b -int id none 0x7f08007c -int id normal 0x7f08007d -int id note_bg_color_selector 0x7f08007e -int id note_edit_list 0x7f08007f -int id note_edit_view 0x7f080080 -int id note_item 0x7f080081 -int id note_title 0x7f080082 -int id notes_list 0x7f080083 -int id notification_background 0x7f080084 -int id notification_main_column 0x7f080085 -int id notification_main_column_container 0x7f080086 -int id parentPanel 0x7f080087 -int id prefenerece_sync_status_textview 0x7f080088 -int id preference_sync_button 0x7f080089 -int id progress_circular 0x7f08008a -int id progress_horizontal 0x7f08008b -int id radio 0x7f08008c -int id right 0x7f08008d -int id right_icon 0x7f08008e -int id right_side 0x7f08008f -int id screen 0x7f080090 -int id scrollIndicatorDown 0x7f080091 -int id scrollIndicatorUp 0x7f080092 -int id scrollView 0x7f080093 -int id search_badge 0x7f080094 -int id search_bar 0x7f080095 -int id search_button 0x7f080096 -int id search_close_btn 0x7f080097 -int id search_edit_frame 0x7f080098 -int id search_go_btn 0x7f080099 -int id search_mag_icon 0x7f08009a -int id search_plate 0x7f08009b -int id search_src_text 0x7f08009c -int id search_voice_btn 0x7f08009d -int id select_dialog_listview 0x7f08009e -int id selection_menu 0x7f08009f -int id shortcut 0x7f0800a0 -int id showCustom 0x7f0800a1 -int id showHome 0x7f0800a2 -int id showTitle 0x7f0800a3 -int id spacer 0x7f0800a4 -int id split_action_bar 0x7f0800a5 -int id src_atop 0x7f0800a6 -int id src_in 0x7f0800a7 -int id src_over 0x7f0800a8 -int id start 0x7f0800a9 -int id submenuarrow 0x7f0800aa -int id submit_area 0x7f0800ab -int id sv_note_edit 0x7f0800ac -int id tabMode 0x7f0800ad -int id tag_transition_group 0x7f0800ae -int id tag_unhandled_key_event_manager 0x7f0800af -int id tag_unhandled_key_listeners 0x7f0800b0 -int id text 0x7f0800b1 -int id text2 0x7f0800b2 -int id textSpacerNoButtons 0x7f0800b3 -int id textSpacerNoTitle 0x7f0800b4 -int id time 0x7f0800b5 -int id title 0x7f0800b6 -int id titleDividerNoCustom 0x7f0800b7 -int id title_template 0x7f0800b8 -int id top 0x7f0800b9 -int id topPanel 0x7f0800ba -int id tv_alert_date 0x7f0800bb -int id tv_folder_name 0x7f0800bc -int id tv_modified_date 0x7f0800bd -int id tv_name 0x7f0800be -int id tv_time 0x7f0800bf -int id tv_title 0x7f0800c0 -int id tv_title_bar 0x7f0800c1 -int id uniform 0x7f0800c2 -int id up 0x7f0800c3 -int id useLogo 0x7f0800c4 -int id widget_bg_image 0x7f0800c5 -int id widget_text 0x7f0800c6 -int id withText 0x7f0800c7 -int id wrap_content 0x7f0800c8 +int id menu_change_view 0x7f080068 +int id menu_delete 0x7f080069 +int id menu_delete_remind 0x7f08006a +int id menu_export_text 0x7f08006b +int id menu_font_size 0x7f08006c +int id menu_list_mode 0x7f08006d +int id menu_new_folder 0x7f08006e +int id menu_new_note 0x7f08006f +int id menu_restore 0x7f080070 +int id menu_search 0x7f080071 +int id menu_send_to_desktop 0x7f080072 +int id menu_setting 0x7f080073 +int id menu_share 0x7f080074 +int id menu_sync 0x7f080075 +int id message 0x7f080076 +int id middle 0x7f080077 +int id minute 0x7f080078 +int id move 0x7f080079 +int id multiply 0x7f08007a +int id navigation_bar 0x7f08007b +int id never 0x7f08007c +int id none 0x7f08007d +int id normal 0x7f08007e +int id note_bg_color_selector 0x7f08007f +int id note_edit_list 0x7f080080 +int id note_edit_view 0x7f080081 +int id note_item 0x7f080082 +int id note_title 0x7f080083 +int id notes_list 0x7f080084 +int id notification_background 0x7f080085 +int id notification_main_column 0x7f080086 +int id notification_main_column_container 0x7f080087 +int id parentPanel 0x7f080088 +int id prefenerece_sync_status_textview 0x7f080089 +int id preference_sync_button 0x7f08008a +int id progress_circular 0x7f08008b +int id progress_horizontal 0x7f08008c +int id radio 0x7f08008d +int id right 0x7f08008e +int id right_icon 0x7f08008f +int id right_side 0x7f080090 +int id screen 0x7f080091 +int id scrollIndicatorDown 0x7f080092 +int id scrollIndicatorUp 0x7f080093 +int id scrollView 0x7f080094 +int id search_badge 0x7f080095 +int id search_bar 0x7f080096 +int id search_button 0x7f080097 +int id search_close_btn 0x7f080098 +int id search_edit_frame 0x7f080099 +int id search_go_btn 0x7f08009a +int id search_mag_icon 0x7f08009b +int id search_plate 0x7f08009c +int id search_src_text 0x7f08009d +int id search_voice_btn 0x7f08009e +int id select_dialog_listview 0x7f08009f +int id selection_menu 0x7f0800a0 +int id shortcut 0x7f0800a1 +int id showCustom 0x7f0800a2 +int id showHome 0x7f0800a3 +int id showTitle 0x7f0800a4 +int id spacer 0x7f0800a5 +int id split_action_bar 0x7f0800a6 +int id src_atop 0x7f0800a7 +int id src_in 0x7f0800a8 +int id src_over 0x7f0800a9 +int id start 0x7f0800aa +int id submenuarrow 0x7f0800ab +int id submit_area 0x7f0800ac +int id sv_note_edit 0x7f0800ad +int id tabMode 0x7f0800ae +int id tag_transition_group 0x7f0800af +int id tag_unhandled_key_event_manager 0x7f0800b0 +int id tag_unhandled_key_listeners 0x7f0800b1 +int id text 0x7f0800b2 +int id text2 0x7f0800b3 +int id textSpacerNoButtons 0x7f0800b4 +int id textSpacerNoTitle 0x7f0800b5 +int id time 0x7f0800b6 +int id title 0x7f0800b7 +int id titleDividerNoCustom 0x7f0800b8 +int id title_template 0x7f0800b9 +int id top 0x7f0800ba +int id topPanel 0x7f0800bb +int id tv_alert_date 0x7f0800bc +int id tv_folder_name 0x7f0800bd +int id tv_modified_date 0x7f0800be +int id tv_name 0x7f0800bf +int id tv_time 0x7f0800c0 +int id tv_title 0x7f0800c1 +int id tv_title_bar 0x7f0800c2 +int id uniform 0x7f0800c3 +int id up 0x7f0800c4 +int id useLogo 0x7f0800c5 +int id widget_bg_image 0x7f0800c6 +int id widget_text 0x7f0800c7 +int id withText 0x7f0800c8 +int id wrap_content 0x7f0800c9 int integer abc_config_activityDefaultDur 0x7f090000 int integer abc_config_activityShortDur 0x7f090001 int integer cancel_button_image_alpha 0x7f090002 @@ -996,79 +997,80 @@ int string format_move_notes_to_folder 0x7f0e0043 int string hint_foler_name 0x7f0e0044 int string info_note_enter_desktop 0x7f0e0045 int string menu_alert 0x7f0e0046 -int string menu_create_folder 0x7f0e0047 -int string menu_delete 0x7f0e0048 -int string menu_deselect_all 0x7f0e0049 -int string menu_export_text 0x7f0e004a -int string menu_folder_change_name 0x7f0e004b -int string menu_folder_delete 0x7f0e004c -int string menu_folder_view 0x7f0e004d -int string menu_font_large 0x7f0e004e -int string menu_font_normal 0x7f0e004f -int string menu_font_size 0x7f0e0050 -int string menu_font_small 0x7f0e0051 -int string menu_font_super 0x7f0e0052 -int string menu_list_mode 0x7f0e0053 -int string menu_move 0x7f0e0054 -int string menu_move_parent_folder 0x7f0e0055 -int string menu_normal_mode 0x7f0e0056 -int string menu_remove_remind 0x7f0e0057 -int string menu_restore 0x7f0e0058 -int string menu_search 0x7f0e0059 -int string menu_select_all 0x7f0e005a -int string menu_select_none 0x7f0e005b -int string menu_select_title 0x7f0e005c -int string menu_send_to_desktop 0x7f0e005d -int string menu_setting 0x7f0e005e -int string menu_share 0x7f0e005f -int string menu_sync 0x7f0e0060 -int string menu_sync_cancel 0x7f0e0061 -int string menu_title_select_folder 0x7f0e0062 -int string note_alert_expired 0x7f0e0063 -int string note_link_email 0x7f0e0064 -int string note_link_other 0x7f0e0065 -int string note_link_tel 0x7f0e0066 -int string note_link_web 0x7f0e0067 -int string notealert_enter 0x7f0e0068 -int string notealert_ok 0x7f0e0069 -int string notelist_menu_new 0x7f0e006a -int string notelist_string_info 0x7f0e006b -int string preferences_account_summary 0x7f0e006c -int string preferences_account_title 0x7f0e006d -int string preferences_add_account 0x7f0e006e -int string preferences_bg_random_appear_title 0x7f0e006f -int string preferences_button_sync_cancel 0x7f0e0070 -int string preferences_button_sync_immediately 0x7f0e0071 -int string preferences_dialog_change_account_title 0x7f0e0072 -int string preferences_dialog_change_account_warn_msg 0x7f0e0073 -int string preferences_dialog_select_account_tips 0x7f0e0074 -int string preferences_dialog_select_account_title 0x7f0e0075 -int string preferences_last_sync_time 0x7f0e0076 -int string preferences_last_sync_time_format 0x7f0e0077 -int string preferences_menu_cancel 0x7f0e0078 -int string preferences_menu_change_account 0x7f0e0079 -int string preferences_menu_remove_account 0x7f0e007a -int string preferences_title 0x7f0e007b -int string preferences_toast_cannot_change_account 0x7f0e007c -int string preferences_toast_success_set_accout 0x7f0e007d -int string search 0x7f0e007e -int string search_hint 0x7f0e007f -int string search_label 0x7f0e0080 -int string search_menu_title 0x7f0e0081 -int string search_setting_description 0x7f0e0082 -int string set_remind_time_message 0x7f0e0083 -int string status_bar_notification_info_overflow 0x7f0e0084 -int string success_sdcard_export 0x7f0e0085 -int string success_sync_account 0x7f0e0086 -int string sync_progress_init_list 0x7f0e0087 -int string sync_progress_login 0x7f0e0088 -int string sync_progress_syncing 0x7f0e0089 -int string ticker_cancel 0x7f0e008a -int string ticker_fail 0x7f0e008b -int string ticker_success 0x7f0e008c -int string ticker_syncing 0x7f0e008d -int string widget_havenot_content 0x7f0e008e -int string widget_under_visit_mode 0x7f0e008f +int string menu_change_view 0x7f0e0047 +int string menu_create_folder 0x7f0e0048 +int string menu_delete 0x7f0e0049 +int string menu_deselect_all 0x7f0e004a +int string menu_export_text 0x7f0e004b +int string menu_folder_change_name 0x7f0e004c +int string menu_folder_delete 0x7f0e004d +int string menu_folder_view 0x7f0e004e +int string menu_font_large 0x7f0e004f +int string menu_font_normal 0x7f0e0050 +int string menu_font_size 0x7f0e0051 +int string menu_font_small 0x7f0e0052 +int string menu_font_super 0x7f0e0053 +int string menu_list_mode 0x7f0e0054 +int string menu_move 0x7f0e0055 +int string menu_move_parent_folder 0x7f0e0056 +int string menu_normal_mode 0x7f0e0057 +int string menu_remove_remind 0x7f0e0058 +int string menu_restore 0x7f0e0059 +int string menu_search 0x7f0e005a +int string menu_select_all 0x7f0e005b +int string menu_select_none 0x7f0e005c +int string menu_select_title 0x7f0e005d +int string menu_send_to_desktop 0x7f0e005e +int string menu_setting 0x7f0e005f +int string menu_share 0x7f0e0060 +int string menu_sync 0x7f0e0061 +int string menu_sync_cancel 0x7f0e0062 +int string menu_title_select_folder 0x7f0e0063 +int string note_alert_expired 0x7f0e0064 +int string note_link_email 0x7f0e0065 +int string note_link_other 0x7f0e0066 +int string note_link_tel 0x7f0e0067 +int string note_link_web 0x7f0e0068 +int string notealert_enter 0x7f0e0069 +int string notealert_ok 0x7f0e006a +int string notelist_menu_new 0x7f0e006b +int string notelist_string_info 0x7f0e006c +int string preferences_account_summary 0x7f0e006d +int string preferences_account_title 0x7f0e006e +int string preferences_add_account 0x7f0e006f +int string preferences_bg_random_appear_title 0x7f0e0070 +int string preferences_button_sync_cancel 0x7f0e0071 +int string preferences_button_sync_immediately 0x7f0e0072 +int string preferences_dialog_change_account_title 0x7f0e0073 +int string preferences_dialog_change_account_warn_msg 0x7f0e0074 +int string preferences_dialog_select_account_tips 0x7f0e0075 +int string preferences_dialog_select_account_title 0x7f0e0076 +int string preferences_last_sync_time 0x7f0e0077 +int string preferences_last_sync_time_format 0x7f0e0078 +int string preferences_menu_cancel 0x7f0e0079 +int string preferences_menu_change_account 0x7f0e007a +int string preferences_menu_remove_account 0x7f0e007b +int string preferences_title 0x7f0e007c +int string preferences_toast_cannot_change_account 0x7f0e007d +int string preferences_toast_success_set_accout 0x7f0e007e +int string search 0x7f0e007f +int string search_hint 0x7f0e0080 +int string search_label 0x7f0e0081 +int string search_menu_title 0x7f0e0082 +int string search_setting_description 0x7f0e0083 +int string set_remind_time_message 0x7f0e0084 +int string status_bar_notification_info_overflow 0x7f0e0085 +int string success_sdcard_export 0x7f0e0086 +int string success_sync_account 0x7f0e0087 +int string sync_progress_init_list 0x7f0e0088 +int string sync_progress_login 0x7f0e0089 +int string sync_progress_syncing 0x7f0e008a +int string ticker_cancel 0x7f0e008b +int string ticker_fail 0x7f0e008c +int string ticker_success 0x7f0e008d +int string ticker_syncing 0x7f0e008e +int string widget_havenot_content 0x7f0e008f +int string widget_under_visit_mode 0x7f0e0090 int style AlertDialog_AppCompat 0x7f0f0000 int style AlertDialog_AppCompat_Light 0x7f0f0001 int style Animation_AppCompat_Dialog 0x7f0f0002 diff --git a/src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt index 084e4d94..13b76e44 100644 --- a/src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt +++ b/src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt @@ -18,7 +18,6 @@ net.micode.notes:styleable/DrawerArrowToggle = 0x7f100014 net.micode.notes:styleable/ActionMenuView = 0x7f100003 net.micode.notes:style/Widget.Support.CoordinatorLayout = 0x7f0f0164 net.micode.notes:style/Widget.Compat.NotificationActionContainer = 0x7f0f0162 -net.micode.notes:style/Widget.AppCompat.Toolbar.Button.Navigation = 0x7f0f0161 net.micode.notes:style/Widget.AppCompat.Toolbar = 0x7f0f0160 net.micode.notes:styleable/MenuGroup = 0x7f10001c net.micode.notes:style/Widget.AppCompat.Spinner.Underlined = 0x7f0f015e @@ -202,58 +201,58 @@ net.micode.notes:style/Base.AlertDialog.AppCompat = 0x7f0f0005 net.micode.notes:style/Animation.AppCompat.Tooltip = 0x7f0f0004 net.micode.notes:style/TextAppearance.AppCompat.Light.SearchResult.Title = 0x7f0f00cd net.micode.notes:style/Animation.AppCompat.DropDownUp = 0x7f0f0003 -net.micode.notes:string/widget_havenot_content = 0x7f0e008e -net.micode.notes:string/ticker_success = 0x7f0e008c -net.micode.notes:string/ticker_fail = 0x7f0e008b -net.micode.notes:string/ticker_cancel = 0x7f0e008a -net.micode.notes:string/success_sync_account = 0x7f0e0086 -net.micode.notes:string/success_sdcard_export = 0x7f0e0085 -net.micode.notes:string/status_bar_notification_info_overflow = 0x7f0e0084 -net.micode.notes:string/set_remind_time_message = 0x7f0e0083 -net.micode.notes:string/search_menu_title = 0x7f0e0081 -net.micode.notes:string/search = 0x7f0e007e +net.micode.notes:string/widget_havenot_content = 0x7f0e008f +net.micode.notes:string/ticker_success = 0x7f0e008d +net.micode.notes:string/ticker_fail = 0x7f0e008c +net.micode.notes:string/ticker_cancel = 0x7f0e008b +net.micode.notes:string/success_sync_account = 0x7f0e0087 +net.micode.notes:string/success_sdcard_export = 0x7f0e0086 +net.micode.notes:string/status_bar_notification_info_overflow = 0x7f0e0085 +net.micode.notes:string/set_remind_time_message = 0x7f0e0084 +net.micode.notes:string/search_menu_title = 0x7f0e0082 +net.micode.notes:string/search = 0x7f0e007f net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.Button.Colored = 0x7f0f0031 -net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0e007d -net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0e007c +net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0e007e +net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0e007d net.micode.notes:style/Base.TextAppearance.AppCompat.SearchResult = 0x7f0f001e -net.micode.notes:string/preferences_title = 0x7f0e007b -net.micode.notes:string/preferences_menu_remove_account = 0x7f0e007a -net.micode.notes:string/preferences_last_sync_time_format = 0x7f0e0077 -net.micode.notes:string/preferences_last_sync_time = 0x7f0e0076 +net.micode.notes:string/preferences_title = 0x7f0e007c +net.micode.notes:string/preferences_menu_remove_account = 0x7f0e007b +net.micode.notes:string/preferences_last_sync_time_format = 0x7f0e0078 +net.micode.notes:string/preferences_last_sync_time = 0x7f0e0077 net.micode.notes:style/RtlOverlay.Widget.AppCompat.PopupMenuItem.InternalGroup = 0x7f0f00b2 -net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0e0074 -net.micode.notes:string/preferences_button_sync_immediately = 0x7f0e0071 +net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0e0075 +net.micode.notes:string/preferences_button_sync_immediately = 0x7f0e0072 net.micode.notes:styleable/GradientColorItem = 0x7f100018 -net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0e006f -net.micode.notes:string/preferences_add_account = 0x7f0e006e -net.micode.notes:string/preferences_account_title = 0x7f0e006d -net.micode.notes:string/preferences_account_summary = 0x7f0e006c -net.micode.notes:string/notelist_string_info = 0x7f0e006b -net.micode.notes:string/notealert_ok = 0x7f0e0069 -net.micode.notes:string/note_link_web = 0x7f0e0067 -net.micode.notes:string/note_link_tel = 0x7f0e0066 -net.micode.notes:string/note_link_email = 0x7f0e0064 -net.micode.notes:string/note_alert_expired = 0x7f0e0063 +net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0e0070 +net.micode.notes:string/preferences_add_account = 0x7f0e006f +net.micode.notes:string/preferences_account_title = 0x7f0e006e +net.micode.notes:string/preferences_account_summary = 0x7f0e006d +net.micode.notes:string/notelist_string_info = 0x7f0e006c +net.micode.notes:string/notealert_ok = 0x7f0e006a +net.micode.notes:string/note_link_web = 0x7f0e0068 +net.micode.notes:string/note_link_tel = 0x7f0e0067 +net.micode.notes:string/note_link_email = 0x7f0e0065 +net.micode.notes:string/note_alert_expired = 0x7f0e0064 net.micode.notes:style/Base.V23.Theme.AppCompat = 0x7f0f0058 -net.micode.notes:string/menu_sync_cancel = 0x7f0e0061 -net.micode.notes:string/menu_sync = 0x7f0e0060 -net.micode.notes:string/menu_share = 0x7f0e005f +net.micode.notes:string/menu_sync_cancel = 0x7f0e0062 +net.micode.notes:string/menu_sync = 0x7f0e0061 +net.micode.notes:string/menu_share = 0x7f0e0060 net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0f00fd -net.micode.notes:string/menu_setting = 0x7f0e005e -net.micode.notes:string/menu_send_to_desktop = 0x7f0e005d -net.micode.notes:string/menu_select_all = 0x7f0e005a +net.micode.notes:string/menu_setting = 0x7f0e005f +net.micode.notes:string/menu_send_to_desktop = 0x7f0e005e +net.micode.notes:string/menu_select_all = 0x7f0e005b net.micode.notes:style/AlertDialog.AppCompat = 0x7f0f0000 -net.micode.notes:string/menu_search = 0x7f0e0059 +net.micode.notes:string/menu_search = 0x7f0e005a 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 = 0x7f0e0080 -net.micode.notes:string/menu_export_text = 0x7f0e004a -net.micode.notes:string/menu_delete = 0x7f0e0048 +net.micode.notes:string/menu_remove_remind = 0x7f0e0058 +net.micode.notes:string/menu_font_super = 0x7f0e0053 +net.micode.notes:string/menu_font_normal = 0x7f0e0050 +net.micode.notes:string/menu_font_large = 0x7f0e004f +net.micode.notes:string/menu_folder_delete = 0x7f0e004d +net.micode.notes:string/menu_folder_change_name = 0x7f0e004c +net.micode.notes:string/search_label = 0x7f0e0081 +net.micode.notes:string/menu_export_text = 0x7f0e004b +net.micode.notes:string/menu_delete = 0x7f0e0049 net.micode.notes:string/info_note_enter_desktop = 0x7f0e0045 net.micode.notes:style/TextAppearance.Widget.AppCompat.Toolbar.Subtitle = 0x7f0f00f5 net.micode.notes:string/format_move_notes_to_folder = 0x7f0e0043 @@ -284,7 +283,7 @@ net.micode.notes:style/Base.TextAppearance.AppCompat.Small = 0x7f0f0021 net.micode.notes:string/abc_searchview_description_query = 0x7f0e0020 net.micode.notes:string/abc_searchview_description_clear = 0x7f0e001f net.micode.notes:string/abc_search_hint = 0x7f0e001e -net.micode.notes:string/sync_progress_login = 0x7f0e0088 +net.micode.notes:string/sync_progress_login = 0x7f0e0089 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 @@ -330,7 +329,7 @@ net.micode.notes:layout/abc_search_dropdown_item_icons_2line = 0x7f0a0018 net.micode.notes:layout/abc_screen_simple = 0x7f0a0015 net.micode.notes:layout/abc_popup_menu_item_layout = 0x7f0a0013 net.micode.notes:layout/abc_list_menu_item_radio = 0x7f0a0011 -net.micode.notes:string/widget_under_visit_mode = 0x7f0e008f +net.micode.notes:string/widget_under_visit_mode = 0x7f0e0090 net.micode.notes:layout/abc_list_menu_item_layout = 0x7f0a0010 net.micode.notes:layout/abc_expanded_menu_layout = 0x7f0a000d net.micode.notes:layout/abc_dialog_title_material = 0x7f0a000c @@ -340,7 +339,7 @@ net.micode.notes:style/Base.Widget.AppCompat.CompoundButton.CheckBox = 0x7f0f007 net.micode.notes:layout/abc_alert_dialog_material = 0x7f0a0009 net.micode.notes:style/Theme.AppCompat.Light = 0x7f0f010b net.micode.notes:style/Animation.AppCompat.Dialog = 0x7f0f0002 -net.micode.notes:string/menu_move_parent_folder = 0x7f0e0055 +net.micode.notes:string/menu_move_parent_folder = 0x7f0e0056 net.micode.notes:layout/abc_alert_dialog_button_bar_material = 0x7f0a0008 net.micode.notes:layout/abc_activity_chooser_view = 0x7f0a0006 net.micode.notes:styleable/AnimatedStateListDrawableTransition = 0x7f100009 @@ -348,60 +347,62 @@ net.micode.notes:layout/abc_action_mode_bar = 0x7f0a0004 net.micode.notes:layout/abc_action_menu_item_layout = 0x7f0a0002 net.micode.notes:layout/abc_action_bar_up_container = 0x7f0a0001 net.micode.notes:integer/status_bar_notification_info_maxnum = 0x7f090004 -net.micode.notes:id/wrap_content = 0x7f0800c8 -net.micode.notes:id/withText = 0x7f0800c7 -net.micode.notes:id/tv_title_bar = 0x7f0800c1 +net.micode.notes:id/wrap_content = 0x7f0800c9 +net.micode.notes:id/withText = 0x7f0800c8 +net.micode.notes:id/tv_title_bar = 0x7f0800c2 net.micode.notes:style/TextAppearance.AppCompat.Widget.ActionMode.Subtitle = 0x7f0f00e1 net.micode.notes:layout/abc_list_menu_item_icon = 0x7f0a000f -net.micode.notes:id/tv_modified_date = 0x7f0800bd -net.micode.notes:id/tv_alert_date = 0x7f0800bb -net.micode.notes:id/title_template = 0x7f0800b8 -net.micode.notes:id/time = 0x7f0800b5 +net.micode.notes:id/tv_modified_date = 0x7f0800be +net.micode.notes:id/tv_alert_date = 0x7f0800bc +net.micode.notes:id/title_template = 0x7f0800b9 +net.micode.notes:id/time = 0x7f0800b6 net.micode.notes:style/Theme.AppCompat.DialogWhenLarge = 0x7f0f010a -net.micode.notes:id/textSpacerNoButtons = 0x7f0800b3 -net.micode.notes:id/tag_unhandled_key_listeners = 0x7f0800b0 -net.micode.notes:id/tag_unhandled_key_event_manager = 0x7f0800af +net.micode.notes:id/textSpacerNoButtons = 0x7f0800b4 +net.micode.notes:id/tag_unhandled_key_listeners = 0x7f0800b1 +net.micode.notes:id/tag_unhandled_key_event_manager = 0x7f0800b0 net.micode.notes:style/TextAppearance.AppCompat.Light.Widget.PopupMenu.Small = 0x7f0f00cf -net.micode.notes:id/tag_transition_group = 0x7f0800ae +net.micode.notes:id/tag_transition_group = 0x7f0800af net.micode.notes:layout/abc_screen_toolbar = 0x7f0a0017 -net.micode.notes:id/tabMode = 0x7f0800ad -net.micode.notes:id/submit_area = 0x7f0800ab -net.micode.notes:string/notealert_enter = 0x7f0e0068 -net.micode.notes:id/src_over = 0x7f0800a8 +net.micode.notes:id/tabMode = 0x7f0800ae +net.micode.notes:id/submit_area = 0x7f0800ac +net.micode.notes:string/notealert_enter = 0x7f0e0069 +net.micode.notes:id/src_over = 0x7f0800a9 net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0e0034 -net.micode.notes:id/spacer = 0x7f0800a4 +net.micode.notes:id/spacer = 0x7f0800a5 net.micode.notes:style/Base.Widget.AppCompat.ActionMode = 0x7f0f006f -net.micode.notes:id/shortcut = 0x7f0800a0 -net.micode.notes:id/selection_menu = 0x7f08009f -net.micode.notes:id/search_plate = 0x7f08009b -net.micode.notes:id/search_close_btn = 0x7f080097 -net.micode.notes:id/search_bar = 0x7f080095 -net.micode.notes:id/scrollIndicatorUp = 0x7f080092 -net.micode.notes:id/right_side = 0x7f08008f +net.micode.notes:id/shortcut = 0x7f0800a1 +net.micode.notes:id/selection_menu = 0x7f0800a0 +net.micode.notes:id/search_plate = 0x7f08009c +net.micode.notes:id/search_close_btn = 0x7f080098 +net.micode.notes:id/search_bar = 0x7f080096 +net.micode.notes:id/scrollIndicatorUp = 0x7f080093 +net.micode.notes:id/right_side = 0x7f080090 net.micode.notes:layout/abc_alert_dialog_title_material = 0x7f0a000a -net.micode.notes:id/right_icon = 0x7f08008e +net.micode.notes:id/right_icon = 0x7f08008f net.micode.notes:string/abc_searchview_description_voice = 0x7f0e0023 -net.micode.notes:id/preference_sync_button = 0x7f080089 +net.micode.notes:id/preference_sync_button = 0x7f08008a net.micode.notes:style/RtlOverlay.Widget.AppCompat.Search.DropDown.Query = 0x7f0f00ba net.micode.notes:attr/fontProviderFetchTimeout = 0x7f030078 -net.micode.notes:id/parentPanel = 0x7f080087 -net.micode.notes:id/notification_main_column_container = 0x7f080086 +net.micode.notes:id/parentPanel = 0x7f080088 +net.micode.notes:id/notification_main_column_container = 0x7f080087 net.micode.notes:style/Widget.AppCompat.ListView.Menu = 0x7f0f014e -net.micode.notes:id/notification_main_column = 0x7f080085 +net.micode.notes:id/notification_main_column = 0x7f080086 net.micode.notes:style/TextAppearance.AppCompat.Widget.PopupMenu.Small = 0x7f0f00ec -net.micode.notes:id/notification_background = 0x7f080084 -net.micode.notes:string/menu_list_mode = 0x7f0e0053 +net.micode.notes:id/notification_background = 0x7f080085 +net.micode.notes:string/menu_list_mode = 0x7f0e0054 net.micode.notes:drawable/abc_list_divider_material = 0x7f070028 -net.micode.notes:id/note_title = 0x7f080082 +net.micode.notes:id/note_title = 0x7f080083 net.micode.notes:attr/actionModeBackground = 0x7f030010 -net.micode.notes:id/normal = 0x7f08007d +net.micode.notes:id/normal = 0x7f08007e net.micode.notes:attr/actionModeSplitBackground = 0x7f03001a -net.micode.notes:id/never = 0x7f08007b -net.micode.notes:id/multiply = 0x7f080079 -net.micode.notes:id/middle = 0x7f080076 -net.micode.notes:id/menu_search = 0x7f080070 -net.micode.notes:id/menu_restore = 0x7f08006f -net.micode.notes:id/menu_delete_remind = 0x7f080069 +net.micode.notes:id/never = 0x7f08007c +net.micode.notes:id/multiply = 0x7f08007a +net.micode.notes:id/middle = 0x7f080077 +net.micode.notes:id/menu_search = 0x7f080071 +net.micode.notes:id/menu_restore = 0x7f080070 +net.micode.notes:id/menu_delete_remind = 0x7f08006a +net.micode.notes:style/Widget.AppCompat.Toolbar.Button.Navigation = 0x7f0f0161 +net.micode.notes:id/menu_change_view = 0x7f080068 net.micode.notes:id/menu_alert = 0x7f080067 net.micode.notes:style/Widget.AppCompat.SeekBar = 0x7f0f0159 net.micode.notes:drawable/notification_bg_normal = 0x7f07008d @@ -413,20 +414,20 @@ net.micode.notes:color/abc_background_cache_hint_selector_material_dark = 0x7f05 net.micode.notes:id/ll_font_normal = 0x7f080064 net.micode.notes:integer/abc_config_activityShortDur = 0x7f090001 net.micode.notes:id/list_item = 0x7f080062 -net.micode.notes:id/top = 0x7f0800b9 +net.micode.notes:id/top = 0x7f0800ba net.micode.notes:id/fill_horizontal = 0x7f080041 net.micode.notes:id/left = 0x7f08005e net.micode.notes:style/TextAppearance.AppCompat.Display4 = 0x7f0f00c7 net.micode.notes:id/iv_super_select = 0x7f08005d net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.ActionBar.Subtitle = 0x7f0f0029 -net.micode.notes:id/note_edit_view = 0x7f080080 +net.micode.notes:id/note_edit_view = 0x7f080081 net.micode.notes:style/TextAppearanceNormal = 0x7f0f00f9 net.micode.notes:id/iv_small_select = 0x7f08005c net.micode.notes:drawable/notification_action_background = 0x7f070088 net.micode.notes:id/iv_bg_white_select = 0x7f080057 net.micode.notes:attr/actionModePasteDrawable = 0x7f030016 net.micode.notes:id/iv_bg_red_select = 0x7f080055 -net.micode.notes:id/widget_text = 0x7f0800c6 +net.micode.notes:id/widget_text = 0x7f0800c7 net.micode.notes:attr/indeterminateProgressStyle = 0x7f030089 net.micode.notes:id/iv_bg_green_select = 0x7f080053 net.micode.notes:style/TextAppearance.AppCompat.Subhead = 0x7f0f00d7 @@ -469,7 +470,7 @@ net.micode.notes:style/Widget.AppCompat.PopupMenu = 0x7f0f014f net.micode.notes:id/center_vertical = 0x7f08002b net.micode.notes:id/btn_new_note = 0x7f080025 net.micode.notes:style/Base.Theme.AppCompat.Dialog.FixedSize = 0x7f0f0040 -net.micode.notes:id/note_item = 0x7f080081 +net.micode.notes:id/note_item = 0x7f080082 net.micode.notes:style/Theme.AppCompat.Dialog.MinWidth = 0x7f0f0109 net.micode.notes:id/italic = 0x7f08004e net.micode.notes:style/Base.Theme.AppCompat.Light.DarkActionBar = 0x7f0f0044 @@ -479,7 +480,7 @@ net.micode.notes:id/bottom = 0x7f080024 net.micode.notes:id/beginning = 0x7f080022 net.micode.notes:attr/colorControlHighlight = 0x7f03004f net.micode.notes:id/async = 0x7f080021 -net.micode.notes:id/title = 0x7f0800b6 +net.micode.notes:id/title = 0x7f0800b7 net.micode.notes:id/iv_bg_white = 0x7f080056 net.micode.notes:dimen/compat_button_inset_horizontal_material = 0x7f06004b net.micode.notes:id/amPm = 0x7f080020 @@ -490,7 +491,7 @@ net.micode.notes:string/delete_remind_time_message = 0x7f0e0032 net.micode.notes:id/actions = 0x7f08001a net.micode.notes:id/action_text = 0x7f080019 net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.PopupMenu.Header = 0x7f0f0034 -net.micode.notes:string/notelist_menu_new = 0x7f0e006a +net.micode.notes:string/notelist_menu_new = 0x7f0e006b net.micode.notes:color/material_grey_50 = 0x7f050037 net.micode.notes:id/action_mode_close_button = 0x7f080017 net.micode.notes:id/action_mode_bar = 0x7f080015 @@ -509,7 +510,7 @@ net.micode.notes:attr/buttonBarPositiveButtonStyle = 0x7f03003b net.micode.notes:id/FUNCTION = 0x7f080002 net.micode.notes:id/iv_bg_blue_select = 0x7f080051 net.micode.notes:attr/autoSizeMinTextSize = 0x7f03002d -net.micode.notes:id/none = 0x7f08007c +net.micode.notes:id/none = 0x7f08007d net.micode.notes:drawable/widget_4x_red = 0x7f0700a1 net.micode.notes:drawable/widget_2x_white = 0x7f07009d net.micode.notes:drawable/widget_2x_green = 0x7f07009b @@ -529,17 +530,17 @@ net.micode.notes:attr/fontFamily = 0x7f030074 net.micode.notes:drawable/notify_panel_notification_icon_bg = 0x7f070093 net.micode.notes:string/abc_font_family_caption_material = 0x7f0e000b net.micode.notes:drawable/notification_template_icon_bg = 0x7f070090 -net.micode.notes:string/search_hint = 0x7f0e007f -net.micode.notes:id/text = 0x7f0800b1 +net.micode.notes:string/search_hint = 0x7f0e0080 +net.micode.notes:id/text = 0x7f0800b2 net.micode.notes:drawable/notification_icon_background = 0x7f07008f net.micode.notes:drawable/notification_bg_normal_pressed = 0x7f07008e net.micode.notes:drawable/abc_edit_text_material = 0x7f070012 net.micode.notes:drawable/notification_bg_low_pressed = 0x7f07008c -net.micode.notes:id/src_in = 0x7f0800a7 +net.micode.notes:id/src_in = 0x7f0800a8 net.micode.notes:attr/paddingStart = 0x7f0300ae net.micode.notes:drawable/notification_bg_low_normal = 0x7f07008b net.micode.notes:style/Base.Widget.AppCompat.Button = 0x7f0f0072 -net.micode.notes:id/note_bg_color_selector = 0x7f08007e +net.micode.notes:id/note_bg_color_selector = 0x7f08007f net.micode.notes:style/Base.Widget.AppCompat.Button.Borderless = 0x7f0f0073 net.micode.notes:style/Base.TextAppearance.AppCompat.SearchResult.Title = 0x7f0f0020 net.micode.notes:anim/abc_tooltip_exit = 0x7f01000b @@ -566,7 +567,7 @@ net.micode.notes:drawable/abc_ic_star_half_black_36dp = 0x7f070023 net.micode.notes:drawable/list_red_middle = 0x7f070076 net.micode.notes:drawable/list_green_down = 0x7f070071 net.micode.notes:style/Widget.AppCompat.ActionBar = 0x7f0f011a -net.micode.notes:id/showCustom = 0x7f0800a1 +net.micode.notes:id/showCustom = 0x7f0800a2 net.micode.notes:id/disableHome = 0x7f080039 net.micode.notes:style/Widget.AppCompat.Light.ActionBar.Solid = 0x7f0f0135 net.micode.notes:drawable/list_footer_bg = 0x7f070070 @@ -576,14 +577,14 @@ net.micode.notes:drawable/list_folder = 0x7f07006f net.micode.notes:id/ifRoom = 0x7f08004b net.micode.notes:drawable/list_blue_up = 0x7f07006e net.micode.notes:dimen/tooltip_margin = 0x7f060071 -net.micode.notes:id/menu_font_size = 0x7f08006b +net.micode.notes:id/menu_font_size = 0x7f08006c net.micode.notes:drawable/list_blue_single = 0x7f07006d net.micode.notes:style/TextAppearance.AppCompat.Title.Inverse = 0x7f0f00da net.micode.notes:string/hint_foler_name = 0x7f0e0044 net.micode.notes:drawable/abc_cab_background_top_material = 0x7f07000e net.micode.notes:drawable/font_super = 0x7f070068 -net.micode.notes:string/menu_deselect_all = 0x7f0e0049 -net.micode.notes:id/minute = 0x7f080077 +net.micode.notes:string/menu_deselect_all = 0x7f0e004a +net.micode.notes:id/minute = 0x7f080078 net.micode.notes:drawable/font_small = 0x7f070067 net.micode.notes:id/iv_medium_select = 0x7f08005b net.micode.notes:attr/selectableItemBackgroundBorderless = 0x7f0300c4 @@ -603,10 +604,10 @@ net.micode.notes:drawable/abc_item_background_holo_dark = 0x7f070026 net.micode.notes:drawable/abc_text_select_handle_middle_mtrl_light = 0x7f07004b net.micode.notes:attr/searchViewStyle = 0x7f0300c1 net.micode.notes:drawable/widget_4x_green = 0x7f0700a0 -net.micode.notes:id/topPanel = 0x7f0800ba +net.micode.notes:id/topPanel = 0x7f0800bb net.micode.notes:dimen/abc_edit_text_inset_bottom_material = 0x7f06002c net.micode.notes:drawable/abc_tab_indicator_mtrl_alpha = 0x7f070046 -net.micode.notes:id/tv_folder_name = 0x7f0800bc +net.micode.notes:id/tv_folder_name = 0x7f0800bd net.micode.notes:drawable/abc_btn_switch_to_on_mtrl_00012 = 0x7f07000c net.micode.notes:drawable/abc_switch_track_mtrl_alpha = 0x7f070044 net.micode.notes:style/Widget.AppCompat.Spinner.DropDown.ActionBar = 0x7f0f015d @@ -633,9 +634,9 @@ 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 = 0x7f080096 +net.micode.notes:id/search_button = 0x7f080097 net.micode.notes:drawable/list_blue_down = 0x7f07006b -net.micode.notes:id/menu_new_note = 0x7f08006e +net.micode.notes:id/menu_new_note = 0x7f08006f net.micode.notes:string/abc_action_bar_up_description = 0x7f0e0001 net.micode.notes:id/iv_bg_green = 0x7f080052 net.micode.notes:drawable/abc_list_selector_holo_light = 0x7f070033 @@ -655,19 +656,19 @@ net.micode.notes:drawable/abc_ic_star_black_48dp = 0x7f070021 net.micode.notes:color/abc_primary_text_material_dark = 0x7f05000a net.micode.notes:drawable/list_red_down = 0x7f070075 net.micode.notes:drawable/list_blue_middle = 0x7f07006c -net.micode.notes:string/preferences_menu_cancel = 0x7f0e0078 +net.micode.notes:string/preferences_menu_cancel = 0x7f0e0079 net.micode.notes:drawable/abc_ic_star_black_36dp = 0x7f070020 net.micode.notes:drawable/abc_ic_star_black_16dp = 0x7f07001f net.micode.notes:drawable/abc_ic_menu_selectall_mtrl_alpha = 0x7f07001c net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f070086 net.micode.notes:id/date = 0x7f080035 -net.micode.notes:id/search_voice_btn = 0x7f08009d +net.micode.notes:id/search_voice_btn = 0x7f08009e net.micode.notes:drawable/abc_ic_menu_paste_mtrl_am_alpha = 0x7f07001b net.micode.notes:drawable/abc_ic_menu_overflow_material = 0x7f07001a net.micode.notes:style/Platform.V21.AppCompat.Light = 0x7f0f00aa net.micode.notes:drawable/abc_ic_menu_cut_mtrl_alpha = 0x7f070019 -net.micode.notes:string/preferences_button_sync_cancel = 0x7f0e0070 -net.micode.notes:id/search_edit_frame = 0x7f080098 +net.micode.notes:string/preferences_button_sync_cancel = 0x7f0e0071 +net.micode.notes:id/search_edit_frame = 0x7f080099 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 @@ -710,11 +711,11 @@ net.micode.notes:id/iv_alert_icon = 0x7f08004f net.micode.notes:color/material_grey_100 = 0x7f050035 net.micode.notes:dimen/text_font_size_large = 0x7f06006a net.micode.notes:dimen/notification_top_pad_large_text = 0x7f060069 -net.micode.notes:id/up = 0x7f0800c3 +net.micode.notes:id/up = 0x7f0800c4 net.micode.notes:color/abc_tint_default = 0x7f050013 -net.micode.notes:id/menu_delete = 0x7f080068 +net.micode.notes:id/menu_delete = 0x7f080069 net.micode.notes:drawable/abc_control_background_material = 0x7f070010 -net.micode.notes:id/src_atop = 0x7f0800a6 +net.micode.notes:id/src_atop = 0x7f0800a7 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 @@ -722,13 +723,13 @@ net.micode.notes:style/TextAppearance.AppCompat.Widget.ActionMode.Subtitle.Inver net.micode.notes:dimen/notification_large_icon_width = 0x7f060060 net.micode.notes:attr/navigationContentDescription = 0x7f0300a7 net.micode.notes:attr/progressBarPadding = 0x7f0300b7 -net.micode.notes:id/menu_list_mode = 0x7f08006c +net.micode.notes:id/menu_list_mode = 0x7f08006d net.micode.notes:style/TextAppearance.Compat.Notification.Info = 0x7f0f00f0 net.micode.notes:style/TextAppearance.AppCompat.Headline = 0x7f0f00c8 net.micode.notes:dimen/notification_large_icon_height = 0x7f06005f net.micode.notes:dimen/notification_content_margin_start = 0x7f06005e net.micode.notes:dimen/notification_action_icon_size = 0x7f06005b -net.micode.notes:id/widget_bg_image = 0x7f0800c5 +net.micode.notes:id/widget_bg_image = 0x7f0800c6 net.micode.notes:dimen/hint_alpha_material_dark = 0x7f060057 net.micode.notes:dimen/highlight_alpha_material_dark = 0x7f060055 net.micode.notes:dimen/compat_button_padding_vertical_material = 0x7f06004e @@ -737,8 +738,8 @@ net.micode.notes:dimen/disabled_alpha_material_light = 0x7f060053 net.micode.notes:attr/colorControlNormal = 0x7f030050 net.micode.notes:dimen/disabled_alpha_material_dark = 0x7f060052 net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0f00fa -net.micode.notes:id/tv_time = 0x7f0800bf -net.micode.notes:id/prefenerece_sync_status_textview = 0x7f080088 +net.micode.notes:id/tv_time = 0x7f0800c0 +net.micode.notes:id/prefenerece_sync_status_textview = 0x7f080089 net.micode.notes:style/Widget.AppCompat.CompoundButton.CheckBox = 0x7f0f012d net.micode.notes:dimen/compat_notification_large_icon_max_height = 0x7f060050 net.micode.notes:style/Widget.Compat.NotificationActionText = 0x7f0f0163 @@ -756,13 +757,13 @@ net.micode.notes:color/primary_material_dark = 0x7f050040 net.micode.notes:dimen/abc_text_size_subtitle_material_toolbar = 0x7f060048 net.micode.notes:id/contentPanel = 0x7f080032 net.micode.notes:dimen/abc_text_size_menu_material = 0x7f060045 -net.micode.notes:id/right = 0x7f08008d +net.micode.notes:id/right = 0x7f08008e net.micode.notes:dimen/abc_text_size_large_material = 0x7f060042 net.micode.notes:dimen/abc_text_size_display_4_material = 0x7f060040 net.micode.notes:dimen/abc_seekbar_track_background_height_material = 0x7f060035 net.micode.notes:dimen/abc_text_size_display_3_material = 0x7f06003f net.micode.notes:dimen/abc_text_size_display_1_material = 0x7f06003d -net.micode.notes:id/note_edit_list = 0x7f08007f +net.micode.notes:id/note_edit_list = 0x7f080080 net.micode.notes:attr/progressBarStyle = 0x7f0300b8 net.micode.notes:dimen/abc_text_size_button_material = 0x7f06003b net.micode.notes:style/Base.Widget.AppCompat.ActionBar.Solid = 0x7f0f0068 @@ -792,14 +793,14 @@ net.micode.notes:style/TextAppearance.AppCompat.Menu = 0x7f0f00d2 net.micode.notes:layout/note_list_footer = 0x7f0a0026 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 = 0x7f0800a9 +net.micode.notes:id/start = 0x7f0800aa net.micode.notes:dimen/abc_dialog_padding_material = 0x7f060024 net.micode.notes:color/switch_thumb_disabled_material_dark = 0x7f05004e net.micode.notes:dimen/abc_dialog_list_padding_top_no_title = 0x7f060021 net.micode.notes:dimen/abc_dialog_fixed_width_minor = 0x7f06001f net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.TextView.SpinnerItem = 0x7f0f0038 net.micode.notes:drawable/abc_btn_check_to_on_mtrl_015 = 0x7f070005 -net.micode.notes:string/search_setting_description = 0x7f0e0082 +net.micode.notes:string/search_setting_description = 0x7f0e0083 net.micode.notes:attr/defaultQueryHint = 0x7f030060 net.micode.notes:dimen/abc_dialog_title_divider_material = 0x7f060026 net.micode.notes:dimen/abc_dialog_fixed_height_minor = 0x7f06001d @@ -822,7 +823,7 @@ net.micode.notes:drawable/abc_text_select_handle_left_mtrl_light = 0x7f070049 net.micode.notes:dimen/abc_button_inset_horizontal_material = 0x7f060012 net.micode.notes:style/ThemeOverlay.AppCompat.Dark.ActionBar = 0x7f0f0116 net.micode.notes:dimen/abc_action_button_min_width_overflow_material = 0x7f06000f -net.micode.notes:string/menu_font_size = 0x7f0e0050 +net.micode.notes:string/menu_font_size = 0x7f0e0051 net.micode.notes:attr/iconifiedByDefault = 0x7f030087 net.micode.notes:dimen/abc_action_button_min_width_material = 0x7f06000e net.micode.notes:attr/actionModeCloseButtonStyle = 0x7f030011 @@ -869,7 +870,7 @@ net.micode.notes:color/material_grey_600 = 0x7f050038 net.micode.notes:style/Base.Widget.AppCompat.RatingBar.Small = 0x7f0f0096 net.micode.notes:drawable/abc_textfield_search_activated_mtrl_alpha = 0x7f070050 net.micode.notes:drawable/abc_btn_check_material = 0x7f070003 -net.micode.notes:id/sv_note_edit = 0x7f0800ac +net.micode.notes:id/sv_note_edit = 0x7f0800ad 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 @@ -880,7 +881,7 @@ net.micode.notes:xml/widget_4x_info = 0x7f110003 net.micode.notes:color/material_deep_teal_200 = 0x7f050033 net.micode.notes:attr/listPreferredItemPaddingRight = 0x7f0300a1 net.micode.notes:layout/select_dialog_multichoice_material = 0x7f0a002e -net.micode.notes:id/search_badge = 0x7f080094 +net.micode.notes:id/search_badge = 0x7f080095 net.micode.notes:attr/autoCompleteTextViewStyle = 0x7f03002b net.micode.notes:color/foreground_material_dark = 0x7f05002c net.micode.notes:drawable/abc_vector_test = 0x7f070053 @@ -914,7 +915,7 @@ net.micode.notes:layout/abc_screen_content_include = 0x7f0a0014 net.micode.notes:color/material_grey_300 = 0x7f050036 net.micode.notes:color/abc_secondary_text_material_dark = 0x7f050010 net.micode.notes:color/bright_foreground_inverse_material_light = 0x7f050021 -net.micode.notes:string/ticker_syncing = 0x7f0e008d +net.micode.notes:string/ticker_syncing = 0x7f0e008e 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 @@ -927,7 +928,7 @@ 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 = 0x7f080083 +net.micode.notes:id/notes_list = 0x7f080084 net.micode.notes:color/abc_tint_spinner = 0x7f050016 net.micode.notes:drawable/abc_ic_ab_back_material = 0x7f070013 net.micode.notes:attr/autoSizeStepGranularity = 0x7f03002f @@ -945,7 +946,7 @@ net.micode.notes:color/abc_primary_text_material_light = 0x7f05000b net.micode.notes:color/secondary_text_default_material_light = 0x7f05004b net.micode.notes:attr/initialActivityCount = 0x7f03008a net.micode.notes:color/abc_btn_colored_text_material = 0x7f050003 -net.micode.notes:id/submenuarrow = 0x7f0800aa +net.micode.notes:id/submenuarrow = 0x7f0800ab 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 @@ -955,7 +956,7 @@ net.micode.notes:styleable/LinearLayoutCompat_Layout = 0x7f10001a net.micode.notes:id/action_menu_divider = 0x7f080013 net.micode.notes:drawable/abc_text_select_handle_left_mtrl_dark = 0x7f070048 net.micode.notes:attr/alertDialogButtonGroupStyle = 0x7f030022 -net.micode.notes:string/menu_normal_mode = 0x7f0e0056 +net.micode.notes:string/menu_normal_mode = 0x7f0e0057 net.micode.notes:string/format_exported_file_location = 0x7f0e0041 net.micode.notes:bool/abc_config_actionMenuItemAllCaps = 0x7f040002 net.micode.notes:dimen/abc_text_size_headline_material = 0x7f060041 @@ -966,12 +967,12 @@ net.micode.notes:color/bright_foreground_material_dark = 0x7f050022 net.micode.notes:bool/abc_action_bar_embed_tabs = 0x7f040000 net.micode.notes:attr/windowNoTitle = 0x7f03010f net.micode.notes:id/action_menu_presenter = 0x7f080014 -net.micode.notes:string/menu_select_none = 0x7f0e005b +net.micode.notes:string/menu_select_none = 0x7f0e005c net.micode.notes:attr/closeItemLayout = 0x7f030047 net.micode.notes:style/Widget.AppCompat.Light.PopupMenu = 0x7f0f0146 net.micode.notes:dimen/abc_alert_dialog_button_bar_height = 0x7f060010 net.micode.notes:drawable/abc_list_divider_mtrl_alpha = 0x7f070029 -net.micode.notes:id/search_mag_icon = 0x7f08009a +net.micode.notes:id/search_mag_icon = 0x7f08009b net.micode.notes:array/menu_share_ways = 0x7f020001 net.micode.notes:attr/textAppearanceLargePopupMenu = 0x7f0300dd net.micode.notes:attr/windowFixedHeightMinor = 0x7f03010a @@ -990,14 +991,14 @@ net.micode.notes:layout/abc_activity_chooser_view_list_item = 0x7f0a0007 net.micode.notes:attr/tooltipFrameBackground = 0x7f0300fe net.micode.notes:style/TextAppearance.AppCompat.Widget.ActionMode.Title = 0x7f0f00e3 net.micode.notes:style/Base.TextAppearance.AppCompat.Menu = 0x7f0f001d -net.micode.notes:id/menu_new_folder = 0x7f08006d +net.micode.notes:id/menu_new_folder = 0x7f08006e net.micode.notes:string/abc_searchview_description_search = 0x7f0e0021 net.micode.notes:drawable/call_record = 0x7f070056 net.micode.notes:style/TextAppearance.AppCompat.SearchResult.Title = 0x7f0f00d4 net.micode.notes:attr/singleChoiceItemLayout = 0x7f0300c9 net.micode.notes:attr/titleTextColor = 0x7f0300f9 net.micode.notes:attr/titleTextAppearance = 0x7f0300f8 -net.micode.notes:string/note_link_other = 0x7f0e0065 +net.micode.notes:string/note_link_other = 0x7f0e0066 net.micode.notes:drawable/abc_textfield_activated_mtrl_alpha = 0x7f07004e net.micode.notes:dimen/notification_subtext_size = 0x7f060067 net.micode.notes:attr/titleMarginStart = 0x7f0300f5 @@ -1016,7 +1017,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 -net.micode.notes:id/split_action_bar = 0x7f0800a5 +net.micode.notes:id/split_action_bar = 0x7f0800a6 net.micode.notes:attr/paddingBottomNoButtons = 0x7f0300ac net.micode.notes:style/Base.Animation.AppCompat.Dialog = 0x7f0f0007 net.micode.notes:attr/buttonPanelSideLayout = 0x7f03003f @@ -1033,7 +1034,7 @@ 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 = 0x7f08008b +net.micode.notes:id/progress_horizontal = 0x7f08008c 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 @@ -1041,15 +1042,15 @@ net.micode.notes:attr/actionMenuTextColor = 0x7f03000f net.micode.notes:style/Base.V7.Theme.AppCompat.Light.Dialog = 0x7f0f0062 net.micode.notes:attr/switchStyle = 0x7f0300da net.micode.notes:id/action_select_all = 0x7f080018 -net.micode.notes:id/scrollIndicatorDown = 0x7f080091 +net.micode.notes:id/scrollIndicatorDown = 0x7f080092 net.micode.notes:attr/textColorSearchUrl = 0x7f0300e6 net.micode.notes:attr/switchPadding = 0x7f0300d9 net.micode.notes:attr/suggestionRowLayout = 0x7f0300d7 net.micode.notes:attr/subtitleTextStyle = 0x7f0300d6 -net.micode.notes:string/menu_move = 0x7f0e0054 +net.micode.notes:string/menu_move = 0x7f0e0055 net.micode.notes:dimen/abc_action_bar_stacked_max_height = 0x7f060009 net.micode.notes:style/Theme.AppCompat.DayNight.NoActionBar = 0x7f0f0106 -net.micode.notes:id/search_go_btn = 0x7f080099 +net.micode.notes:id/search_go_btn = 0x7f08009a net.micode.notes:drawable/notification_template_icon_low_bg = 0x7f070091 net.micode.notes:attr/divider = 0x7f030065 net.micode.notes:attr/subtitleTextColor = 0x7f0300d5 @@ -1058,21 +1059,21 @@ net.micode.notes:string/abc_menu_ctrl_shortcut_label = 0x7f0e0015 net.micode.notes:layout/abc_popup_menu_header_item_layout = 0x7f0a0012 net.micode.notes:dimen/abc_switch_padding = 0x7f060038 net.micode.notes:style/Widget.AppCompat.ProgressBar.Horizontal = 0x7f0f0153 -net.micode.notes:string/sync_progress_init_list = 0x7f0e0087 +net.micode.notes:string/sync_progress_init_list = 0x7f0e0088 net.micode.notes:color/foreground_material_light = 0x7f05002d -net.micode.notes:id/radio = 0x7f08008c +net.micode.notes:id/radio = 0x7f08008d 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 = 0x7f08009c +net.micode.notes:id/search_src_text = 0x7f08009d 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 = 0x7f0800b2 +net.micode.notes:id/text2 = 0x7f0800b3 net.micode.notes:drawable/abc_btn_radio_material = 0x7f070008 -net.micode.notes:id/menu_share = 0x7f080073 +net.micode.notes:id/menu_share = 0x7f080074 net.micode.notes:attr/showTitle = 0x7f0300c8 net.micode.notes:attr/isLightTheme = 0x7f03008b net.micode.notes:style/Base.Widget.AppCompat.ActivityChooserView = 0x7f0f0070 @@ -1118,16 +1119,16 @@ net.micode.notes:attr/checkedTextViewStyle = 0x7f030045 net.micode.notes:drawable/edit_title_green = 0x7f07005e net.micode.notes:drawable/abc_seekbar_thumb_material = 0x7f07003e net.micode.notes:drawable/abc_item_background_holo_light = 0x7f070027 -net.micode.notes:string/menu_folder_view = 0x7f0e004d +net.micode.notes:string/menu_folder_view = 0x7f0e004e net.micode.notes:color/ripple_material_light = 0x7f050048 net.micode.notes:attr/navigationMode = 0x7f0300a9 -net.micode.notes:id/menu_export_text = 0x7f08006a +net.micode.notes:id/menu_export_text = 0x7f08006b net.micode.notes:attr/logo = 0x7f0300a2 net.micode.notes:attr/listPopupWindowStyle = 0x7f03009c net.micode.notes:style/Widget.AppCompat.RatingBar.Small = 0x7f0f0156 net.micode.notes:attr/thumbTintMode = 0x7f0300eb net.micode.notes:attr/actionBarPopupTheme = 0x7f030002 -net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0e0075 +net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0e0076 net.micode.notes:layout/abc_action_bar_title_item = 0x7f0a0000 net.micode.notes:attr/listPreferredItemHeightSmall = 0x7f03009f net.micode.notes:style/Base.V7.Widget.AppCompat.EditText = 0x7f0f0065 @@ -1155,7 +1156,7 @@ net.micode.notes:attr/layout_anchorGravity = 0x7f030091 net.micode.notes:color/primary_dark_material_dark = 0x7f05003e net.micode.notes:attr/layout_anchor = 0x7f030090 net.micode.notes:style/Platform.ThemeOverlay.AppCompat.Light = 0x7f0f00a8 -net.micode.notes:string/menu_font_small = 0x7f0e0051 +net.micode.notes:string/menu_font_small = 0x7f0e0052 net.micode.notes:drawable/list_background = 0x7f07006a net.micode.notes:style/Theme.AppCompat.Light.NoActionBar = 0x7f0f0111 net.micode.notes:color/abc_color_highlight_material = 0x7f050004 @@ -1182,10 +1183,10 @@ net.micode.notes:attr/iconTint = 0x7f030085 net.micode.notes:attr/textAppearanceListItemSmall = 0x7f0300e0 net.micode.notes:attr/layout = 0x7f03008f net.micode.notes:style/Base.Widget.AppCompat.ActionBar.TabView = 0x7f0f006b -net.micode.notes:id/tv_name = 0x7f0800be +net.micode.notes:id/tv_name = 0x7f0800bf net.micode.notes:attr/icon = 0x7f030084 net.micode.notes:style/Widget.AppCompat.Button = 0x7f0f0125 -net.micode.notes:id/uniform = 0x7f0800c2 +net.micode.notes:id/uniform = 0x7f0800c3 net.micode.notes:attr/multiChoiceItemLayout = 0x7f0300a6 net.micode.notes:id/iv_bg_blue = 0x7f080050 net.micode.notes:attr/colorAccent = 0x7f03004b @@ -1198,7 +1199,7 @@ net.micode.notes:style/Base.Widget.AppCompat.Light.ActionBar.TabView = 0x7f0f008 net.micode.notes:drawable/bg_btn_set_color = 0x7f070054 net.micode.notes:style/TextAppearance.AppCompat.Widget.PopupMenu.Large = 0x7f0f00eb net.micode.notes:dimen/hint_pressed_alpha_material_light = 0x7f06005a -net.micode.notes:id/titleDividerNoCustom = 0x7f0800b7 +net.micode.notes:id/titleDividerNoCustom = 0x7f0800b8 net.micode.notes:attr/fontVariationSettings = 0x7f03007c net.micode.notes:layout/note_edit_list_item = 0x7f0a0022 net.micode.notes:attr/fontStyle = 0x7f03007b @@ -1210,10 +1211,10 @@ net.micode.notes:attr/expandActivityOverflowButtonDrawable = 0x7f030071 net.micode.notes:style/Base.Widget.AppCompat.RatingBar.Indicator = 0x7f0f0095 net.micode.notes:drawable/abc_ic_arrow_drop_right_black_24dp = 0x7f070014 net.micode.notes:attr/lastBaselineToBottomHeight = 0x7f03008e -net.micode.notes:id/showTitle = 0x7f0800a3 -net.micode.notes:id/progress_circular = 0x7f08008a +net.micode.notes:id/showTitle = 0x7f0800a4 +net.micode.notes:id/progress_circular = 0x7f08008b net.micode.notes:attr/editTextStyle = 0x7f03006f -net.micode.notes:id/textSpacerNoTitle = 0x7f0800b4 +net.micode.notes:id/textSpacerNoTitle = 0x7f0800b5 net.micode.notes:attr/editTextColor = 0x7f03006e net.micode.notes:attr/editTextBackground = 0x7f03006d net.micode.notes:id/iv_bg_yellow_select = 0x7f080059 @@ -1226,11 +1227,11 @@ net.micode.notes:attr/dividerVertical = 0x7f030068 net.micode.notes:dimen/abc_seekbar_track_progress_height_material = 0x7f060036 net.micode.notes:attr/textAppearanceSmallPopupMenu = 0x7f0300e4 net.micode.notes:style/Base.Widget.AppCompat.SeekBar.Discrete = 0x7f0f009a -net.micode.notes:id/navigation_bar = 0x7f08007a -net.micode.notes:id/menu_sync = 0x7f080074 +net.micode.notes:id/navigation_bar = 0x7f08007b +net.micode.notes:id/menu_sync = 0x7f080075 net.micode.notes:style/Widget.AppCompat.ProgressBar = 0x7f0f0152 net.micode.notes:dimen/abc_text_size_title_material = 0x7f060049 -net.micode.notes:id/menu_setting = 0x7f080072 +net.micode.notes:id/menu_setting = 0x7f080073 net.micode.notes:drawable/edit_title_blue = 0x7f07005d net.micode.notes:style/Theme.AppCompat = 0x7f0f00fe net.micode.notes:attr/dialogTheme = 0x7f030063 @@ -1260,10 +1261,10 @@ net.micode.notes:styleable/TextAppearance = 0x7f100027 net.micode.notes:style/TextAppearance.AppCompat.Widget.Switch = 0x7f0f00ed net.micode.notes:dimen/abc_control_corner_material = 0x7f060018 net.micode.notes:string/abc_font_family_display_1_material = 0x7f0e000c -net.micode.notes:id/useLogo = 0x7f0800c4 +net.micode.notes:id/useLogo = 0x7f0800c5 net.micode.notes:attr/contentInsetStartWithNavigation = 0x7f03005c net.micode.notes:attr/contentInsetStart = 0x7f03005b -net.micode.notes:string/menu_select_title = 0x7f0e005c +net.micode.notes:string/menu_select_title = 0x7f0e005d net.micode.notes:color/material_blue_grey_950 = 0x7f050032 net.micode.notes:id/CTRL = 0x7f080001 net.micode.notes:style/Base.TextAppearance.AppCompat.Title = 0x7f0f0025 @@ -1271,26 +1272,26 @@ net.micode.notes:dimen/abc_dropdownitem_text_padding_right = 0x7f06002b net.micode.notes:attr/paddingTopNoTitle = 0x7f0300af net.micode.notes:attr/contentInsetRight = 0x7f03005a net.micode.notes:style/Base.AlertDialog.AppCompat.Light = 0x7f0f0006 -net.micode.notes:id/menu_send_to_desktop = 0x7f080071 +net.micode.notes:id/menu_send_to_desktop = 0x7f080072 net.micode.notes:id/end = 0x7f08003b net.micode.notes:color/bright_foreground_disabled_material_light = 0x7f05001f net.micode.notes:attr/dropDownListViewStyle = 0x7f03006b net.micode.notes:attr/thumbTextPadding = 0x7f0300e9 net.micode.notes:style/RtlUnderlay.Widget.AppCompat.ActionButton = 0x7f0f00bd net.micode.notes:style/Base.TextAppearance.AppCompat.Button = 0x7f0f000f -net.micode.notes:string/menu_restore = 0x7f0e0058 +net.micode.notes:string/menu_restore = 0x7f0e0059 net.micode.notes:string/app_widget4x4 = 0x7f0e002d net.micode.notes:id/action_mode_bar_stub = 0x7f080016 net.micode.notes:attr/colorPrimaryDark = 0x7f030053 net.micode.notes:style/Widget.AppCompat.ActionButton = 0x7f0f011f net.micode.notes:style/Base.Animation.AppCompat.Tooltip = 0x7f0f0009 -net.micode.notes:string/sync_progress_syncing = 0x7f0e0089 +net.micode.notes:string/sync_progress_syncing = 0x7f0e008a net.micode.notes:attr/contentInsetEnd = 0x7f030057 net.micode.notes:style/AlertDialog.AppCompat.Light = 0x7f0f0001 net.micode.notes:attr/panelBackground = 0x7f0300b0 net.micode.notes:string/abc_capital_off = 0x7f0e0006 net.micode.notes:attr/imageButtonStyle = 0x7f030088 -net.micode.notes:id/showHome = 0x7f0800a2 +net.micode.notes:id/showHome = 0x7f0800a3 net.micode.notes:dimen/abc_action_bar_content_inset_material = 0x7f060000 net.micode.notes:drawable/edit_blue = 0x7f07005a net.micode.notes:style/Widget.AppCompat.TextView.SpinnerItem = 0x7f0f015f @@ -1321,15 +1322,16 @@ net.micode.notes:attr/textAppearanceSearchResultSubtitle = 0x7f0300e2 net.micode.notes:id/collapseActionView = 0x7f080030 net.micode.notes:dimen/abc_dialog_fixed_height_major = 0x7f06001c net.micode.notes:style/TextAppearance.AppCompat.Widget.Button.Borderless.Colored = 0x7f0f00e6 +net.micode.notes:string/menu_change_view = 0x7f0e0047 net.micode.notes:dimen/abc_action_bar_subtitle_bottom_margin_material = 0x7f06000b net.micode.notes:attr/checkboxStyle = 0x7f030044 net.micode.notes:drawable/widget_2x_yellow = 0x7f07009e net.micode.notes:attr/preserveIconSpacing = 0x7f0300b6 -net.micode.notes:string/menu_title_select_folder = 0x7f0e0062 +net.micode.notes:string/menu_title_select_folder = 0x7f0e0063 net.micode.notes:drawable/bg_color_btn_mask = 0x7f070055 net.micode.notes:string/abc_menu_enter_shortcut_label = 0x7f0e0017 net.micode.notes:color/bright_foreground_inverse_material_dark = 0x7f050020 -net.micode.notes:id/message = 0x7f080075 +net.micode.notes:id/message = 0x7f080076 net.micode.notes:drawable/dropdown_icon = 0x7f070059 net.micode.notes:drawable/abc_scrubber_primary_mtrl_alpha = 0x7f07003c net.micode.notes:style/Widget.AppCompat.Spinner = 0x7f0f015b @@ -1344,7 +1346,7 @@ net.micode.notes:attr/gapBetweenBars = 0x7f03007e net.micode.notes:style/TextAppearance.AppCompat = 0x7f0f00bf net.micode.notes:layout/abc_tooltip = 0x7f0a001b net.micode.notes:attr/buttonStyleSmall = 0x7f030041 -net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0e0073 +net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0e0074 net.micode.notes:color/primary_text_default_material_light = 0x7f050044 net.micode.notes:menu/call_note_edit = 0x7f0b0000 net.micode.notes:attr/switchMinWidth = 0x7f0300d8 @@ -1371,7 +1373,7 @@ 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 = 0x7f080093 +net.micode.notes:id/scrollView = 0x7f080094 net.micode.notes:attr/activityChooserViewStyle = 0x7f030021 net.micode.notes:attr/actionDropDownStyle = 0x7f03000c net.micode.notes:attr/textAllCaps = 0x7f0300dc @@ -1384,7 +1386,7 @@ net.micode.notes:attr/buttonTint = 0x7f030042 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 = 0x7f080078 +net.micode.notes:id/move = 0x7f080079 net.micode.notes:id/iv_bg_red = 0x7f080054 net.micode.notes:attr/actionOverflowMenuStyle = 0x7f03001e net.micode.notes:color/abc_input_method_navigation_guard = 0x7f050007 @@ -1393,7 +1395,7 @@ net.micode.notes:attr/color = 0x7f03004a net.micode.notes:color/accent_material_dark = 0x7f050018 net.micode.notes:attr/layout_dodgeInsetEdges = 0x7f030093 net.micode.notes:drawable/notification_bg = 0x7f070089 -net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0e0072 +net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0e0073 net.micode.notes:dimen/text_font_size_super = 0x7f06006e net.micode.notes:attr/alertDialogStyle = 0x7f030024 net.micode.notes:layout/abc_select_dialog_material = 0x7f0a001a @@ -1429,7 +1431,7 @@ net.micode.notes:dimen/abc_alert_dialog_button_dimen = 0x7f060011 net.micode.notes:attr/windowFixedHeightMajor = 0x7f030109 net.micode.notes:attr/ratingBarStyleSmall = 0x7f0300be net.micode.notes:id/delete = 0x7f080038 -net.micode.notes:string/preferences_menu_change_account = 0x7f0e0079 +net.micode.notes:string/preferences_menu_change_account = 0x7f0e007a net.micode.notes:attr/borderlessButtonStyle = 0x7f030037 net.micode.notes:dimen/abc_dialog_min_width_major = 0x7f060022 net.micode.notes:attr/drawerArrowStyle = 0x7f03006a @@ -1451,21 +1453,21 @@ net.micode.notes:drawable/widget_2x_red = 0x7f07009c net.micode.notes:string/abc_shareactionprovider_share_with = 0x7f0e0024 net.micode.notes:attr/actionBarSplitStyle = 0x7f030004 net.micode.notes:style/Widget.AppCompat.ActionBar.TabView = 0x7f0f011e -net.micode.notes:id/select_dialog_listview = 0x7f08009e +net.micode.notes:id/select_dialog_listview = 0x7f08009f net.micode.notes:attr/actionModeShareDrawable = 0x7f030019 net.micode.notes:styleable/CoordinatorLayout = 0x7f100012 net.micode.notes:layout/abc_action_mode_close_item_material = 0x7f0a0005 net.micode.notes:attr/listItemLayout = 0x7f030099 -net.micode.notes:id/screen = 0x7f080090 +net.micode.notes:id/screen = 0x7f080091 net.micode.notes:drawable/edit_title_red = 0x7f07005f net.micode.notes:drawable/abc_list_selector_background_transition_holo_dark = 0x7f07002e -net.micode.notes:id/tv_title = 0x7f0800c0 +net.micode.notes:id/tv_title = 0x7f0800c1 net.micode.notes:color/ripple_material_dark = 0x7f050047 net.micode.notes:style/TextAppearance.AppCompat.Widget.PopupMenu.Header = 0x7f0f00ea net.micode.notes:anim/abc_popup_exit = 0x7f010004 net.micode.notes:integer/cancel_button_image_alpha = 0x7f090002 net.micode.notes:dimen/abc_text_size_medium_material = 0x7f060043 -net.micode.notes:string/menu_create_folder = 0x7f0e0047 +net.micode.notes:string/menu_create_folder = 0x7f0e0048 net.micode.notes:attr/windowActionBar = 0x7f030106 net.micode.notes:drawable/abc_tab_indicator_material = 0x7f070045 net.micode.notes:styleable/AlertDialog = 0x7f100006 diff --git a/src/Notes-master1/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt b/src/Notes-master1/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt index 4679f791..d97d5273 100644 --- a/src/Notes-master1/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt +++ b/src/Notes-master1/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt @@ -762,6 +762,7 @@ id ll_font_normal id ll_font_small id ll_font_super id menu_alert +id menu_change_view id menu_delete id menu_delete_remind id menu_export_text @@ -997,6 +998,7 @@ string format_move_notes_to_folder string hint_foler_name string info_note_enter_desktop string menu_alert +string menu_change_view string menu_create_folder string menu_delete string menu_deselect_all diff --git a/src/Notes-master1/app/build/outputs/apk/debug/app-debug.apk b/src/Notes-master1/app/build/outputs/apk/debug/app-debug.apk index a3ed4f27..78cc87c8 100644 Binary files a/src/Notes-master1/app/build/outputs/apk/debug/app-debug.apk and b/src/Notes-master1/app/build/outputs/apk/debug/app-debug.apk differ diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/data/Notes.java b/src/Notes-master1/app/src/main/java/net/micode/notes/data/Notes.java index be1358b2..ff6056fc 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/data/Notes.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/data/Notes.java @@ -165,6 +165,12 @@ public class Notes { *

Type : INTEGER (long)

*/ public static final String VERSION = "version"; + + /** + * The note or folder group + *

Type : INTEGER (long)

+ */ + public static final String GROUP = "group_num"; } public interface DataColumns { diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java index 47230665..70ea58e4 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java @@ -30,7 +30,7 @@ import net.micode.notes.data.Notes.NoteColumns; public class NotesDatabaseHelper extends SQLiteOpenHelper { private static final String DB_NAME = "note.db"; - private static final int DB_VERSION = 4; + private static final int DB_VERSION = 5; public interface TABLE { public static final String NOTE = "note"; @@ -60,7 +60,8 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { NoteColumns.LOCAL_MODIFIED + " INTEGER NOT NULL DEFAULT 0," + NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," + NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," + - NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" + + NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.GROUP + " INTEGER NOT NULL DEFAULT 0" + ")"; private static final String CREATE_DATA_TABLE_SQL = @@ -322,6 +323,11 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { oldVersion++; } + if (oldVersion == 4){ + upgradeToV5(db); + oldVersion++; + } + if (reCreateTriggers) { reCreateNoteTableTriggers(db); reCreateDataTableTriggers(db); @@ -358,5 +364,12 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { private void upgradeToV4(SQLiteDatabase db) { db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0"); + Log.d("ABC", "four"); + } + + private void upgradeToV5(SQLiteDatabase db) { + db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.GROUP + + " INTEGER NOT NULL DEFAULT 0"); + Log.d("ABC", "fif"); } } diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/model/Note.java b/src/Notes-master1/app/src/main/java/net/micode/notes/model/Note.java index 58d54dc2..a9498163 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/model/Note.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/model/Note.java @@ -50,6 +50,7 @@ public class Note { values.put(NoteColumns.TYPE, Notes.TYPE_NOTE); values.put(NoteColumns.LOCAL_MODIFIED, 1); values.put(NoteColumns.PARENT_ID, folderId); + values.put(NoteColumns.GROUP, folderId); Uri uri = context.getContentResolver().insert(Notes.CONTENT_NOTE_URI, values); long noteId = 0; diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/tool/DataUtils.java b/src/Notes-master1/app/src/main/java/net/micode/notes/tool/DataUtils.java index e9183906..96cacbd5 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/tool/DataUtils.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/tool/DataUtils.java @@ -92,6 +92,7 @@ public class DataUtils { ContentProviderOperation.Builder builder = ContentProviderOperation .newUpdate(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id)); builder.withValue(NoteColumns.PARENT_ID, folderId); + builder.withValue(NoteColumns.GROUP, folderId); builder.withValue(NoteColumns.LOCAL_MODIFIED, 1); operationList.add(builder.build()); } diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java index 4708a936..7d77a97c 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java @@ -597,7 +597,7 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen Log.d(TAG, "Wrong note id, should not happen"); } if (!isSyncMode()) { - if (!DataUtils.batchDeleteNotes(getContentResolver(), ids)) { + if (!DataUtils.batchMoveToFolder(getContentResolver(), ids, Notes.ID_TRASH_FOLER)) { Log.e(TAG, "Delete Note error"); } } else { diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java index aa965880..d922acf0 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -65,6 +65,7 @@ import net.micode.notes.R; import net.micode.notes.data.Notes; import net.micode.notes.data.Notes.NoteColumns; import net.micode.notes.gtask.remote.GTaskSyncService; +import net.micode.notes.model.Note; import net.micode.notes.model.WorkingNote; import net.micode.notes.tool.BackupUtils; import net.micode.notes.tool.DataUtils; @@ -90,6 +91,8 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe private static final int MENU_FOLDER_CHANGE_NAME = 2; + private static int VIEW_WAY = 0; + private static final String PREFERENCE_ADD_INTRODUCTION = "net.micode.notes.introduction"; private enum ListEditState { @@ -133,6 +136,11 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe + NoteColumns.ID + "=" + Notes.ID_CALL_RECORD_FOLDER + " AND " + NoteColumns.NOTES_COUNT + ">0)"; + private static final String ROOT_FOLDER_SELECTION_ALL = "(" + NoteColumns.TYPE + "<>" + + Notes.TYPE_SYSTEM + " AND " + NoteColumns.PARENT_ID + ">?)" + " OR (" + + NoteColumns.ID + "=" + Notes.ID_CALL_RECORD_FOLDER + " AND " + + NoteColumns.NOTES_COUNT + ">0)"; + private final static int REQUEST_CODE_OPEN_NODE = 102; private final static int REQUEST_CODE_NEW_NODE = 103; @@ -410,12 +418,23 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe }; private void startAsyncNotesListQuery() { - String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION - : NORMAL_SELECTION; - mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null, - Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[] { - String.valueOf(mCurrentFolderId) - }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC"); + if (mCurrentFolderId == Notes.ID_ROOT_FOLDER && VIEW_WAY == 1){ + String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION_ALL + : NORMAL_SELECTION; + mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null, + Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[] { + String.valueOf(Notes.ID_TEMPARAY_FOLDER) + }, NoteColumns.GROUP + " ASC," + NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC"); + } + else { + String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION + : NORMAL_SELECTION; + mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null, + Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[] { + String.valueOf(mCurrentFolderId) + }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC"); + } + } private final class BackgroundQueryHandler extends AsyncQueryHandler { @@ -643,6 +662,26 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe values.put(NoteColumns.SNIPPET, name); values.put(NoteColumns.TYPE, Notes.TYPE_FOLDER); mContentResolver.insert(Notes.CONTENT_NOTE_URI, values); + Cursor cursor = getContentResolver().query(Notes.CONTENT_NOTE_URI, new String[] { + NoteColumns.ID + }, + NoteColumns.SNIPPET + "=?", new String[] { + name + }, null); + //get the folderId to be group + if (cursor.moveToFirst()) { + int NOTE_ID_COLUMN = 0; + long mFolderId = cursor.getLong(NOTE_ID_COLUMN); + ContentValues valuess = new ContentValues(); + valuess.put(NoteColumns.GROUP, mFolderId); + Log.d("FIRST", String.valueOf(mFolderId)); + mContentResolver.update(Notes.CONTENT_NOTE_URI, valuess, NoteColumns.ID + + "=?", new String[] { + String.valueOf(mFolderId) + }); + } + cursor.close(); + } dialog.dismiss(); } @@ -831,6 +870,10 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe case R.id.menu_restore: restoreDeletedNodes(); break; + case R.id.menu_change_view: + VIEW_WAY = 1 - VIEW_WAY; + startAsyncNotesListQuery(); + break; default: break; } diff --git a/src/Notes-master1/app/src/main/res/menu/note_list.xml b/src/Notes-master1/app/src/main/res/menu/note_list.xml index 8599b9c5..50b16cc3 100644 --- a/src/Notes-master1/app/src/main/res/menu/note_list.xml +++ b/src/Notes-master1/app/src/main/res/menu/note_list.xml @@ -39,4 +39,7 @@ + + diff --git a/src/Notes-master1/app/src/main/res/values/strings.xml b/src/Notes-master1/app/src/main/res/values/strings.xml index 0842119c..5614870b 100644 --- a/src/Notes-master1/app/src/main/res/values/strings.xml +++ b/src/Notes-master1/app/src/main/res/values/strings.xml @@ -47,6 +47,7 @@ Settings Search Restore + Change view Delete Move to folder %d selected