diff --git a/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.bin b/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.bin index 742cc4f7..e52fd07f 100644 Binary files a/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.bin and b/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.bin differ diff --git a/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.lock b/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.lock index c629be0d..b6c3b755 100644 Binary files a/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.lock and b/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.lock differ diff --git a/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.bin b/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.bin index 5e7ef9a1..5be5a09c 100644 Binary files a/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.bin and b/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.bin differ diff --git a/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.lock b/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.lock index 1210316a..08429830 100644 Binary files a/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.lock and b/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.lock differ diff --git a/src/Notes-master1/.gradle/7.2/fileHashes/resourceHashesCache.bin b/src/Notes-master1/.gradle/7.2/fileHashes/resourceHashesCache.bin index efdee15e..616770b8 100644 Binary files a/src/Notes-master1/.gradle/7.2/fileHashes/resourceHashesCache.bin and b/src/Notes-master1/.gradle/7.2/fileHashes/resourceHashesCache.bin differ diff --git a/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 4a748d81..136a359e 100644 Binary files a/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin index c0a9b6ac..14e5c4f0 100644 Binary files a/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin and b/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/src/Notes-master1/.gradle/checksums/checksums.lock b/src/Notes-master1/.gradle/checksums/checksums.lock index 4b70c24a..46e5e1d0 100644 Binary files a/src/Notes-master1/.gradle/checksums/checksums.lock and b/src/Notes-master1/.gradle/checksums/checksums.lock differ diff --git a/src/Notes-master1/.gradle/checksums/md5-checksums.bin b/src/Notes-master1/.gradle/checksums/md5-checksums.bin index f67b5476..4c81b7f5 100644 Binary files a/src/Notes-master1/.gradle/checksums/md5-checksums.bin and b/src/Notes-master1/.gradle/checksums/md5-checksums.bin differ diff --git a/src/Notes-master1/.gradle/checksums/sha1-checksums.bin b/src/Notes-master1/.gradle/checksums/sha1-checksums.bin index e632471a..4e64ae4a 100644 Binary files a/src/Notes-master1/.gradle/checksums/sha1-checksums.bin and b/src/Notes-master1/.gradle/checksums/sha1-checksums.bin differ diff --git a/src/Notes-master1/.idea/dbnavigator.xml b/src/Notes-master1/.idea/dbnavigator.xml index 8567fda3..d489ebce 100644 --- a/src/Notes-master1/.idea/dbnavigator.xml +++ b/src/Notes-master1/.idea/dbnavigator.xml @@ -26,7 +26,7 @@ - + @@ -36,9 +36,7 @@ - - - + diff --git a/src/Notes-master1/.idea/misc.xml b/src/Notes-master1/.idea/misc.xml index 3437a2ba..ba21ff39 100644 --- a/src/Notes-master1/.idea/misc.xml +++ b/src/Notes-master1/.idea/misc.xml @@ -23,11 +23,15 @@ + + + + diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/0/6/066a3db98a4a279fde40d6ddf92c417b5c93198b b/src/Notes-master1/.idea/sonarlint/issuestore/0/6/066a3db98a4a279fde40d6ddf92c417b5c93198b new file mode 100644 index 00000000..e69de29b diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/5/3/53b98e6d0ece8f8c43934ef63db400be3bbe507c b/src/Notes-master1/.idea/sonarlint/issuestore/5/3/53b98e6d0ece8f8c43934ef63db400be3bbe507c index a4843ed2..a73f24ee 100644 --- a/src/Notes-master1/.idea/sonarlint/issuestore/5/3/53b98e6d0ece8f8c43934ef63db400be3bbe507c +++ b/src/Notes-master1/.idea/sonarlint/issuestore/5/3/53b98e6d0ece8f8c43934ef63db400be3bbe507c @@ -1,39 +1,41 @@ 7 -java:S1116,"Remove this empty statement.( +java:S1116-"Remove this empty statement.( K -java:S1874/"5Remove this use of "CursorAdapter"; it is deprecated.( +java:S18740"5Remove this use of "CursorAdapter"; it is deprecated.( J -java:S2864^"4Iterate over the "entrySet" instead of the "keySet".(਷ +java:S2864_"4Iterate over the "entrySet" instead of the "keySet".(਷ B -java:S1125_"'Remove the unnecessary boolean literal.(ɯ +java:S1125`"'Remove the unnecessary boolean literal.(ɯ J -java:S2864n"4Iterate over the "entrySet" instead of the "keySet".(਷ +java:S2864o"4Iterate over the "entrySet" instead of the "keySet".(਷ B -java:S1125o"'Remove the unnecessary boolean literal.(ɯ +java:S1125p"'Remove the unnecessary boolean literal.(ɯ A -java:S1168|"+Return an empty collection instead of null.( +java:S1168~"+Return an empty collection instead of null.( C -java:S1125"'Remove the unnecessary boolean literal.( +java:S1125"'Remove the unnecessary boolean literal.( t -java:S22930"YReplace the type specification in this constructor call with the diamond operator ("<>").(ə +java:S22931"YReplace the type specification in this constructor call with the diamond operator ("<>").(ə o -java:S2293]"YReplace the type specification in this constructor call with the diamond operator ("<>").( +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 ("<>").(Ȫ +java:S2293n"YReplace the type specification in this constructor call with the diamond operator ("<>").(Ȫ J -java:S1066U"/Merge this if statement with the enclosing one.(ڧ +java:S1066V"/Merge this if statement with the enclosing one.(ڧ  -java:S1319\"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".( +java: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".( +java:S1319m"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".( j java:S1104*"TMake widgetId a static final constant or non-public and provide accessors if needed.(ǎ q java:S1104+"VMake widgetType a static final constant or non-public and provide accessors if needed.(漬 +r +java:S1104,"\Make widgetHavePasswd a static final constant or non-public and provide accessors if needed.( E -java:S5411_"*Use the primitive boolean expression here.(ɯ +java:S5411`"*Use the primitive boolean expression here.(ɯ E -java:S5411o"*Use the primitive boolean expression here.(ɯ +java:S5411p"*Use the primitive boolean expression here.(ɯ F -java:S5411"*Use the primitive boolean expression here.( \ No newline at end of file +java:S5411"*Use the primitive boolean expression here.( \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/6/c/6c40630893054a28c13c2eb04ceb5fa51173b0b6 b/src/Notes-master1/.idea/sonarlint/issuestore/6/c/6c40630893054a28c13c2eb04ceb5fa51173b0b6 index 59add793..c6990ee6 100644 --- a/src/Notes-master1/.idea/sonarlint/issuestore/6/c/6c40630893054a28c13c2eb04ceb5fa51173b0b6 +++ b/src/Notes-master1/.idea/sonarlint/issuestore/6/c/6c40630893054a28c13c2eb04ceb5fa51173b0b6 @@ -1,84 +1,115 @@ + +java:S1186"Add a nested comment explaining why this method is empty, throw an UnsupportedOperationException or complete the implementation.(ۛ n -java:S1450"WRemove the "editText" field and declare it as a local variable in the relevant methods.( +java:S1450"WRemove the "editText" field and declare it as a local variable in the relevant methods.( n -java:S1450"WRemove the "mPattern" field and declare it as a local variable in the relevant methods.( +java:S1450"WRemove the "mPattern" field and declare it as a local variable in the relevant methods.( { -java:S1149"_Replace the synchronized class "StringBuffer" by an unsynchronized one such as "StringBuilder".(᯲ -i java:S100"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( +java:S1149"_Replace the synchronized class "StringBuffer" by an unsynchronized one such as "StringBuilder".(᯲ +{ +java:S1149"_Replace the synchronized class "StringBuffer" by an unsynchronized one such as "StringBuilder".(Ȍ +i java:S100"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( n -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 26 to the 15 allowed.(ݨ +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.(ѯ \ -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.(( +java:S1874"9Remove this use of "setTextAppearance"; it is deprecated.(( K -java:S2864"4Iterate over the "entrySet" instead of the "keySet".(ԇ +java:S2864"4Iterate over the "entrySet" instead of the "keySet".(ԇ N -java:S1135"2Complete the task associated to this TODO comment.( +java:S1135"2Complete the task associated to this TODO comment.( 8 -java:S1116"Remove this empty statement.( +java:S1116"Remove this empty statement.( X -java:S1126"AReplace this if-then-else statement by a single return statement.( +java:S1126"AReplace this if-then-else statement by a single return statement.( 8 -java:S1116"Remove this empty statement.( +java:S1116"Remove this empty statement.( 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.( U -java:S1874"9Remove this use of "setTextAppearance"; it is deprecated.( +java:S1874"9Remove this use of "setTextAppearance"; it is deprecated.( G -java:S1874"0Remove this use of "getColor"; it is deprecated.( +java:S1874"0Remove this use of "getColor"; it is deprecated.( d -java:S3252"MUse static access with "android.text.Spanned" for "SPAN_INCLUSIVE_EXCLUSIVE".( +java:S3252"MUse static access with "android.text.Spanned" for "SPAN_INCLUSIVE_EXCLUSIVE".( U -java:S1874"9Remove this use of "setTextAppearance"; it is deprecated.( +java:S1874"9Remove this use of "setTextAppearance"; it is deprecated.( T -java:S1874"=Remove this use of "EXTRA_SHORTCUT_INTENT"; it is deprecated.(ð +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";Remove this use of "EXTRA_SHORTCUT_NAME"; it is deprecated.( [ -java:S1874"DRemove this use of "EXTRA_SHORTCUT_ICON_RESOURCE"; it is deprecated.(Ǿ -i java:S100"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -p java:S100"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ְ8Ԯ/ -J -java:S1068",Remove this unused "editText" private field.(8/ -t -java:S2293`"YReplace the type specification in this constructor call with the diamond operator ("<>").(ӏ +java:S1874"DRemove this use of "EXTRA_SHORTCUT_ICON_RESOURCE"; it is deprecated.(Ǿ +i java:S100"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( +i java:S100"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ְ +F +java:S1197"*Move the array designators [] to the type.(Ŋ +A +java:S1197"*Move the array designators [] to the type.(Ԅ + +java:S1186"Add a nested comment explaining why this method is empty, throw an UnsupportedOperationException or complete the implementation.(\ +{ +java:S1149"_Replace the synchronized class "StringBuffer" by an unsynchronized one such as "StringBuilder".(Ȍ +O +java:S1854"8Remove this useless assignment to local variable "edit".(ߛ +O java:S106"9Replace this use of System.out or System.err by a logger.( +O java:S106"9Replace this use of System.out or System.err by a logger.( +@ +java:S1481")Remove this unused "edit" local variable.(ߛ +P +java:S2864"4Iterate over the "entrySet" instead of the "keySet".( + +java:S1186 "Add a nested comment explaining why this method is empty, throw an UnsupportedOperationException or complete the implementation.(Կ4 +O java:S106"9Replace this use of System.out or System.err by a logger.( +C +java:S1068",Remove this unused "editText" private field.( +H +java:S1068"1Remove this unused "mRecoListener" private field.(ڕ t -java:S2293i"YReplace the type specification in this constructor call with the diamond operator ("<>").( +java:S2293q"YReplace the type specification in this constructor call with the diamond operator ("<>").(ӏ t -java:S2293r"YReplace the type specification in this constructor call with the diamond operator ("<>").( -o -java:S2293z"YReplace the type specification in this constructor call with the diamond operator ("<>").( +java:S2293z"YReplace the type specification in this constructor call with the diamond operator ("<>").( +u +java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").( +p +java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").( p -java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥 -l java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -l java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ӏ +java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").( +p +java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥 +p +java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").( +l java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( +l java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ӏ ? -java:S1604"(Make this anonymous inner class a lambda(ά +java:S1604"(Make this anonymous inner class a lambda(ά ? -java:S1604"(Make this anonymous inner class a lambda( +java:S1604"(Make this anonymous inner class a lambda( ? -java:S1604"(Make this anonymous inner class a lambda(ߒ +java:S1604"(Make this anonymous inner class a lambda(ߒ ? -java:S1604"(Make this anonymous inner class a lambda( -K -java:S1604"(Make this anonymous inner class a lambda(8/ -F -java:S1604"(Make this anonymous inner class a lambda(ά8ᮼ/ +java:S1604"(Make this anonymous inner class a lambda( +D +java:S1604"(Make this anonymous inner class a lambda( +? +java:S1604"(Make this anonymous inner class a lambda(ά q -java:S1104U"VMake tvModified a static final constant or non-public and provide accessors if needed.(ԣ +java:S1104d"VMake tvModified a static final constant or non-public and provide accessors if needed.(ԣ r -java:S1104W"WMake ivAlertIcon a static final constant or non-public and provide accessors if needed.(න +java:S1104f"WMake ivAlertIcon a static final constant or non-public and provide accessors if needed.(න r -java:S1104Y"WMake tvAlertDate a static final constant or non-public and provide accessors if needed.( +java:S1104h"WMake tvAlertDate a static final constant or non-public and provide accessors if needed.( s -java:S1104["XMake ibSetBgColor a static final constant or non-public and provide accessors if needed.( +java:S1104j"XMake ibSetBgColor a static final constant or non-public and provide accessors if needed.( h -java:S1104]"RMake ivLock a static final constant or non-public and provide accessors if needed.(ؕ +java:S1104l"RMake ivLock a static final constant or non-public and provide accessors if needed.(ؕ +n +java:S1104n"SMake ivRadio a static final constant or non-public and provide accessors if needed.( O -java:S3516"9Refactor this method to not always return the same value.(l \ No newline at end of file +java:S3516"9Refactor this method to not always return the same value.(l \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/7/b/7bccae5ecd745bba36ddfd464ec07b66de678477 b/src/Notes-master1/.idea/sonarlint/issuestore/7/b/7bccae5ecd745bba36ddfd464ec07b66de678477 index 439ace7c..c906d703 100644 --- a/src/Notes-master1/.idea/sonarlint/issuestore/7/b/7bccae5ecd745bba36ddfd464ec07b66de678477 +++ b/src/Notes-master1/.idea/sonarlint/issuestore/7/b/7bccae5ecd745bba36ddfd464ec07b66de678477 @@ -1,4 +1,5 @@ +i java:S116S"TRename this field "time_mode" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( i java:S3008_"SRename this field "VIEW_WAY" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( 7 @@ -8,99 +9,99 @@ java:S1124 [ 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 32 to the 15 allowed.( F -java:S1874"1Remove this use of "AsyncTask"; it is deprecated.(? -? java:S108")Either remove or fill this block of code.(ʥ +java:S1874"1Remove this use of "AsyncTask"; it is deprecated.(? +? java:S108")Either remove or fill this block of code.(ʥ a -java:S1874"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(Ϳ +java:S1874"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(Ϳ K -java:S1874"/Remove this use of "execute"; it is deprecated.(嫏 +java:S1874"/Remove this use of "execute"; it is deprecated.(嫏 h -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 20 to the 15 allowed.(# +java:S3776"RRefactor this method to reduce its Cognitive Complexity from 20 to the 15 allowed.(# N -java:S1135"2Complete the task associated to this TODO comment.( +java:S1135"2Complete the task associated to this TODO comment.( ^ -java:S1126"BReplace this if-then-else statement by a single method invocation.(玒 +java:S1126"BReplace this if-then-else statement by a single method invocation.(玒 N -java:S1135"2Complete the task associated to this TODO comment.( +java:S1135"2Complete the task associated to this TODO comment.( M -java:S2696"6Make the enclosing method "static" or remove this set.( +java:S2696"6Make the enclosing method "static" or remove this set.( M -java:S2696"6Make the enclosing method "static" or remove this set.( +java:S2696"6Make the enclosing method "static" or remove this set.( M -java:S1874"1Remove this use of "AsyncTask"; it is deprecated.(Ч +java:S1874"1Remove this use of "AsyncTask"; it is deprecated.(Ч f -java:S1874"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(ች +java:S1874"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(ች K -java:S1874"/Remove this use of "execute"; it is deprecated.(嫏 +java:S1874"/Remove this use of "execute"; it is deprecated.(嫏 h -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(b -g java:S128"LEnd this switch case with an unconditional break, return or throw statement.(δ -K -java:S3398"/Move this method into "BackgroundQueryHandler".( +java:S3776"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(b +g java:S128"LEnd this switch case with an unconditional break, return or throw statement.(δ < -java:S3398"%Move this method into "ModeCallback".( +java:S3398"%Move this method into "ModeCallback".( A -java:S3398"%Move this method into "ModeCallback".( +java:S3398"%Move this method into "ModeCallback".( +K +java:S3398"/Move this method into "BackgroundQueryHandler".( G -java:S3398"0Move this method into "OnListItemClickListener".( +java:S3398"0Move this method into "OnListItemClickListener".( p -java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥 +java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥 b java:S1192"FDefine a constant instead of duplicating this literal " AND " 5 times.( ] -java:S1192"FDefine a constant instead of duplicating this literal " DESC" 4 times.( -g java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( +java:S1192"FDefine a constant instead of duplicating this literal " DESC" 4 times.( +g java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( > -java:S1604"(Make this anonymous inner class a lambda(̺V +java:S1604"(Make this anonymous inner class a lambda(̺V ? -java:S1604"(Make this anonymous inner class a lambda(ά +java:S1604"(Make this anonymous inner class a lambda(ά ? -java:S1604"(Make this anonymous inner class a lambda(ܴ +java:S1604"(Make this anonymous inner class a lambda(ܴ ? -java:S1604"(Make this anonymous inner class a lambda( +java:S1604"(Make this anonymous inner class a lambda( D -java:S1604"(Make this anonymous inner class a lambda( +java:S1604"(Make this anonymous inner class a lambda( D -java:S1604"(Make this anonymous inner class a lambda( +java:S1604"(Make this anonymous inner class a lambda( ? -java:S1604"(Make this anonymous inner class a lambda( +java:S1604"(Make this anonymous inner class a lambda( ? -java:S1604"(Make this anonymous inner class a lambda(۱ +java:S1604"(Make this anonymous inner class a lambda(۱ ? -java:S1604"(Make this anonymous inner class a lambda(ά +java:S1604"(Make this anonymous inner class a lambda(ά 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"( \ 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/index.pb b/src/Notes-master1/.idea/sonarlint/issuestore/index.pb index b3bcaba6..5c821158 100644 --- a/src/Notes-master1/.idea/sonarlint/issuestore/index.pb +++ b/src/Notes-master1/.idea/sonarlint/issuestore/index.pb @@ -87,31 +87,15 @@ l @@ -98,7 +99,7 @@ - + @@ -110,10 +111,15 @@ + + + + + @@ -199,52 +205,6 @@ - - - - file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 154 - - - - file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 287 - - - - file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 1075 - - - file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 918 - - - file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 293 - - - file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 369 - - - file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 655 - - - file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 718 - - - diff --git a/src/Notes-master1/app/build.gradle b/src/Notes-master1/app/build.gradle index 9c86cdcf..54a9811c 100644 --- a/src/Notes-master1/app/build.gradle +++ b/src/Notes-master1/app/build.gradle @@ -17,6 +17,11 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } } + sourceSets { + main { + jniLibs.srcDirs = ['libs'] + } + } useLibrary 'org.apache.http.legacy' buildFeatures { viewBinding true @@ -26,6 +31,7 @@ android { dependencies { implementation 'com.android.support:appcompat-v7:28.0.0' implementation 'com.android.support.constraint:constraint-layout:2.0.4' + implementation files('libs\\Msc.jar') } sonarqube { properties { diff --git a/src/Notes-master1/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/DialogDeleteSenoteBinding.java b/src/Notes-master1/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/DialogDeleteSenoteBinding.java new file mode 100644 index 00000000..ea133b80 --- /dev/null +++ b/src/Notes-master1/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/DialogDeleteSenoteBinding.java @@ -0,0 +1,58 @@ +// Generated by view binder compiler. Do not edit! +package net.micode.notes.databinding; + +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.viewbinding.ViewBinding; +import android.widget.EditText; +import java.lang.NullPointerException; +import java.lang.Override; +import net.micode.notes.R; + +public final class DialogDeleteSenoteBinding implements ViewBinding { + @NonNull + private final EditText rootView; + + @NonNull + public final EditText etDeleteSenote; + + private DialogDeleteSenoteBinding(@NonNull EditText rootView, @NonNull EditText etDeleteSenote) { + this.rootView = rootView; + this.etDeleteSenote = etDeleteSenote; + } + + @Override + @NonNull + public EditText getRoot() { + return rootView; + } + + @NonNull + public static DialogDeleteSenoteBinding inflate(@NonNull LayoutInflater inflater) { + return inflate(inflater, null, false); + } + + @NonNull + public static DialogDeleteSenoteBinding inflate(@NonNull LayoutInflater inflater, + @Nullable ViewGroup parent, boolean attachToParent) { + View root = inflater.inflate(R.layout.dialog_delete_senote, parent, false); + if (attachToParent) { + parent.addView(root); + } + return bind(root); + } + + @NonNull + public static DialogDeleteSenoteBinding bind(@NonNull View rootView) { + if (rootView == null) { + throw new NullPointerException("rootView"); + } + + EditText etDeleteSenote = (EditText) rootView; + + return new DialogDeleteSenoteBinding((EditText) rootView, etDeleteSenote); + } +} diff --git a/src/Notes-master1/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/NoteEditBinding.java b/src/Notes-master1/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/NoteEditBinding.java index 392730b1..7d42e8cb 100644 --- a/src/Notes-master1/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/NoteEditBinding.java +++ b/src/Notes-master1/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/NoteEditBinding.java @@ -22,6 +22,9 @@ public final class NoteEditBinding implements ViewBinding { @NonNull private final FrameLayout rootView; + @NonNull + public final ImageView btnRadio; + @NonNull public final ImageView btnSetBgColor; @@ -112,9 +115,10 @@ public final class NoteEditBinding implements ViewBinding { @NonNull public final TextView tvModifiedDate; - private NoteEditBinding(@NonNull FrameLayout rootView, @NonNull ImageView btnSetBgColor, - @NonNull LinearLayout fontSizeSelector, @NonNull ImageView ivAlertIcon, - @NonNull ImageView ivBgBlue, @NonNull ImageView ivBgBlueSelect, @NonNull ImageView ivBgGreen, + private NoteEditBinding(@NonNull FrameLayout rootView, @NonNull ImageView btnRadio, + @NonNull ImageView btnSetBgColor, @NonNull LinearLayout fontSizeSelector, + @NonNull ImageView ivAlertIcon, @NonNull ImageView ivBgBlue, + @NonNull ImageView ivBgBlueSelect, @NonNull ImageView ivBgGreen, @NonNull ImageView ivBgGreenSelect, @NonNull ImageView ivBgRed, @NonNull ImageView ivBgRedSelect, @NonNull ImageView ivBgWhite, @NonNull ImageView ivBgWhiteSelect, @NonNull ImageView ivBgYellow, @@ -128,6 +132,7 @@ public final class NoteEditBinding implements ViewBinding { @NonNull LinearLayout svNoteEdit, @NonNull TextView textNum, @NonNull TextView tvAlertDate, @NonNull TextView tvModifiedDate) { this.rootView = rootView; + this.btnRadio = btnRadio; this.btnSetBgColor = btnSetBgColor; this.fontSizeSelector = fontSizeSelector; this.ivAlertIcon = ivAlertIcon; @@ -187,6 +192,12 @@ public final class NoteEditBinding implements ViewBinding { // This is done to optimize the compiled bytecode for size and performance. int id; missingId: { + id = R.id.btn_radio; + ImageView btnRadio = ViewBindings.findChildViewById(rootView, id); + if (btnRadio == null) { + break missingId; + } + id = R.id.btn_set_bg_color; ImageView btnSetBgColor = ViewBindings.findChildViewById(rootView, id); if (btnSetBgColor == null) { @@ -367,7 +378,7 @@ public final class NoteEditBinding implements ViewBinding { break missingId; } - return new NoteEditBinding((FrameLayout) rootView, btnSetBgColor, fontSizeSelector, + return new NoteEditBinding((FrameLayout) rootView, btnRadio, btnSetBgColor, fontSizeSelector, ivAlertIcon, ivBgBlue, ivBgBlueSelect, ivBgGreen, ivBgGreenSelect, ivBgRed, ivBgRedSelect, ivBgWhite, ivBgWhiteSelect, ivBgYellow, ivBgYellowSelect, ivLargeSelect, ivLock, ivMediumSelect, ivSmallSelect, ivSuperSelect, llFontLarge, llFontNormal, llFontSmall, 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 195d6079..12aa40b5 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/compressed_assets/debug/out/assets/iflytek/recognize.xml.jar b/src/Notes-master1/app/build/intermediates/compressed_assets/debug/out/assets/iflytek/recognize.xml.jar new file mode 100644 index 00000000..ccee752a Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/compressed_assets/debug/out/assets/iflytek/recognize.xml.jar differ diff --git a/src/Notes-master1/app/build/intermediates/compressed_assets/debug/out/assets/iflytek/voice_bg.9.png.jar b/src/Notes-master1/app/build/intermediates/compressed_assets/debug/out/assets/iflytek/voice_bg.9.png.jar new file mode 100644 index 00000000..c48fc3d7 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/compressed_assets/debug/out/assets/iflytek/voice_bg.9.png.jar differ diff --git a/src/Notes-master1/app/build/intermediates/compressed_assets/debug/out/assets/iflytek/voice_empty.png.jar b/src/Notes-master1/app/build/intermediates/compressed_assets/debug/out/assets/iflytek/voice_empty.png.jar new file mode 100644 index 00000000..5bad6298 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/compressed_assets/debug/out/assets/iflytek/voice_empty.png.jar differ diff --git a/src/Notes-master1/app/build/intermediates/compressed_assets/debug/out/assets/iflytek/voice_full.png.jar b/src/Notes-master1/app/build/intermediates/compressed_assets/debug/out/assets/iflytek/voice_full.png.jar new file mode 100644 index 00000000..6f46660f Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/compressed_assets/debug/out/assets/iflytek/voice_full.png.jar differ diff --git a/src/Notes-master1/app/build/intermediates/compressed_assets/debug/out/assets/iflytek/waiting.png.jar b/src/Notes-master1/app/build/intermediates/compressed_assets/debug/out/assets/iflytek/waiting.png.jar new file mode 100644 index 00000000..2b1b71a2 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/compressed_assets/debug/out/assets/iflytek/waiting.png.jar differ diff --git a/src/Notes-master1/app/build/intermediates/compressed_assets/debug/out/assets/iflytek/warning.png.jar b/src/Notes-master1/app/build/intermediates/compressed_assets/debug/out/assets/iflytek/warning.png.jar new file mode 100644 index 00000000..a5111412 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/compressed_assets/debug/out/assets/iflytek/warning.png.jar differ diff --git a/src/Notes-master1/app/build/intermediates/data_binding_base_class_log_artifact/debug/out/net.micode.notes-binding_classes.json b/src/Notes-master1/app/build/intermediates/data_binding_base_class_log_artifact/debug/out/net.micode.notes-binding_classes.json index 0e5fcf9f..94400d79 100644 Binary files a/src/Notes-master1/app/build/intermediates/data_binding_base_class_log_artifact/debug/out/net.micode.notes-binding_classes.json and b/src/Notes-master1/app/build/intermediates/data_binding_base_class_log_artifact/debug/out/net.micode.notes-binding_classes.json differ diff --git a/src/Notes-master1/app/build/intermediates/data_binding_layout_info_type_merge/debug/out/dialog_delete_senote-layout.xml b/src/Notes-master1/app/build/intermediates/data_binding_layout_info_type_merge/debug/out/dialog_delete_senote-layout.xml new file mode 100644 index 00000000..62441548 --- /dev/null +++ b/src/Notes-master1/app/build/intermediates/data_binding_layout_info_type_merge/debug/out/dialog_delete_senote-layout.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/data_binding_layout_info_type_merge/debug/out/note_edit-layout.xml b/src/Notes-master1/app/build/intermediates/data_binding_layout_info_type_merge/debug/out/note_edit-layout.xml index 4171b24f..894adce3 100644 --- a/src/Notes-master1/app/build/intermediates/data_binding_layout_info_type_merge/debug/out/note_edit-layout.xml +++ b/src/Notes-master1/app/build/intermediates/data_binding_layout_info_type_merge/debug/out/note_edit-layout.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin index 6b9f8a81..eefe08ba 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 1c181bc9..53ac73fc 100644 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin index ba77cbeb..f5388d03 100644 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin index 2113f81f..812ea9ab 100644 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin index 601f245f..06126c39 100644 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin index 9cd66ec5..f4ae267f 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 ce5af522..ea84e3a7 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 5b370b5a..a3951527 100644 Binary files a/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/src/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debug/out b/src/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debug/out index bf0d87ab..62f94575 100644 --- a/src/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debug/out +++ b/src/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debug/out @@ -1 +1 @@ -4 \ No newline at end of file +6 \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/external_file_lib_dex_archives/debug/0_Msc.jar b/src/Notes-master1/app/build/intermediates/external_file_lib_dex_archives/debug/0_Msc.jar new file mode 100644 index 00000000..696af61b Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/external_file_lib_dex_archives/debug/0_Msc.jar differ diff --git a/src/Notes-master1/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex b/src/Notes-master1/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex index 7bd75351..0ced8f6f 100644 Binary files a/src/Notes-master1/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex and b/src/Notes-master1/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/dataBindingGenBaseClassesDebug/base_builder_log.json b/src/Notes-master1/app/build/intermediates/incremental/dataBindingGenBaseClassesDebug/base_builder_log.json index 1751054b..567660c2 100644 Binary files a/src/Notes-master1/app/build/intermediates/incremental/dataBindingGenBaseClassesDebug/base_builder_log.json and b/src/Notes-master1/app/build/intermediates/incremental/dataBindingGenBaseClassesDebug/base_builder_log.json differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state index 070ed54e..294943f3 100644 Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GgWGKtcdhRITYqlknqdiHk5u960= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GgWGKtcdhRITYqlknqdiHk5u960= new file mode 100644 index 00000000..82d7050c Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GgWGKtcdhRITYqlknqdiHk5u960= differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/LzDmrJnMR82iNgSgDfMICEtrs5E= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/LzDmrJnMR82iNgSgDfMICEtrs5E= new file mode 100644 index 00000000..644b6d1c Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/LzDmrJnMR82iNgSgDfMICEtrs5E= differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lh5eUEU7i_s4uVNaCLBHiy+bVT4= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lh5eUEU7i_s4uVNaCLBHiy+bVT4= new file mode 100644 index 00000000..45e8d00a Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lh5eUEU7i_s4uVNaCLBHiy+bVT4= differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qnOO+n11i0CYfZGNnhQgvni__Ak= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qnOO+n11i0CYfZGNnhQgvni__Ak= new file mode 100644 index 00000000..69b5bbb9 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qnOO+n11i0CYfZGNnhQgvni__Ak= differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index f79d0b52..e86b8be7 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index c6ae0a39..73f5084e 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties index 0583946d..f477b9ef 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,103 +1,104 @@ -#Mon Nov 08 23:54:26 CST 2021 -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_dropdown.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat -D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\account_dialog_title.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat -D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\widget_2x.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\delete.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat -D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\dialog_input_passwd.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_input_passwd.xml.flat -D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_item.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\lock.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_lock.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat -D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\widget_4x.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\menu\\call_note_edit.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_background.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\xml\\preferences.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat -D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_list_dropdown_menu.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\menu\\trash_folder.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_trash_folder.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\clock.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable\\new_note.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat -D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_edit.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\call_record.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_super.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat -D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\activity_splash.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_splash.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\notification.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat -D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\settings_header.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\xml\\searchable.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\xml\\widget_2x_info.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\selected.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\color\\primary_text_dark.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\splash.gif=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_splash.gif.flat -D\:\\Notes-master1\\app\\src\\main\\res\\raw\\introduction=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat -D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\folder_list_item.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\menu\\note_list.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat -D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\datetime_picker.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat -D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\dialog_add_secret.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_add_secret.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\xml\\widget_4x_info.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_options.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\menu\\note_edit.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\menu\\sub_folder.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat -D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_list.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\p1.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_p1.png.flat -D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\dialog_edit_text.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\color\\secondary_text_dark.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\menu\\call_record_folder.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_small.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat -D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\add_account_text.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat -D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_list_footer.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\raw-zh-rCN\\introduction=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat -D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_edit_list_item.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat +#Tue Nov 09 20:01:01 CST 2021 +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\add_account_text.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\radio.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_radio.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\color\\secondary_text_dark.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\xml\\preferences.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\sub_folder.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\dialog_input_passwd.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_input_passwd.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_super.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\folder_list_item.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\widget_4x.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\xml\\widget_2x_info.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_dropdown.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\account_dialog_title.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\color\\primary_text_dark.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\datetime_picker.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\p1.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_p1.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\raw-zh-rCN\\introduction=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_list.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\widget_2x.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\xml\\widget_4x_info.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\notification.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_background.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\call_record.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_options.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\trash_folder.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_trash_folder.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\dialog_edit_text.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\call_note_edit.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_edit.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_small.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\trash_background.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_trash_background.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\lock.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_lock.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_list_footer.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\delete.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\settings_header.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_item.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable\\new_note.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_list.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\raw\\introduction=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\dialog_delete_senote.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_delete_senote.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\selected.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\dialog_add_secret.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_add_secret.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_list_dropdown_menu.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_edit_list_item.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_edit.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\xml\\searchable.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\call_record_folder.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\clock.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml new file mode 100644 index 00000000..dbaa39c6 --- /dev/null +++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml @@ -0,0 +1,150 @@ + + + + 短信 + 邮件 + + + %1$s 条符合“%2$s”的搜索结果 + + "转到主屏幕" + "转到上一层级" + "更多选项" + "完成" + "查看全部" + "选择应用" + "关闭" + "开启" + "Alt+" + "Ctrl+" + "Delete 键" + "Enter 键" + "Fn+" + "Meta+" + "Shift+" + "空格键" + "Sym+" + "Menu+" + "搜索…" + "清除查询" + "搜索查询" + "搜索" + "提交查询" + "语音搜索" + "分享方式" + "使用%s分享" + "收起" + 输入描述语 + 输入密码 + 确认删除文件夹及所包含的便签吗？ + 确认要删除该条便签吗? + 确认要删除所选的 %d 条便签吗? + 确认删除该便签的密码吗？ + 删除 + 便签 + 便签2x2 + 便签4x4 + 删除 + 通话便签 + 取消 + 设置 + 日间模式 + 成功删除提醒 + 不能为空便签设置闹钟提醒 + 不能将空便签发送到桌面 + 要查看的便签不存在 + 导出文本时发生错误，请检查SD卡 + SD卡被占用，不能操作 + 同步已取消 + 同步失败，发生内部错误 + 同步失败，请检查网络和帐号设置 + 导出失败 + 文件夹 %1$s 已存在，请重新命名 + yyyyMMdd + MM月dd日 kk:mm + 已将文本文件(%1$s)输出至SD卡(%2$s)目录 + 已将所选 %1$d 条便签移到 %2$s 文件夹 + 请输入名称 + 已添加到桌面 + 输入密码 + 添加密码 + 提醒我 + 改变视图 + 新建文件夹 + 删除 + 取消全选 + 导出文本 + 修改文件夹名称 + 刪除文件夹 + 查看文件夹 + 大 + 正常 + 文字大小 + 小 + 超大 + 初始排序 + 进入清单模式 + 移动到文件夹 + 上一级文件夹 + 退出清单模式 + 删除提醒 + 删除密码 + 最近删除 + 搜索 + 全选 + 没有选中项，操作无效 + 选中了 %d 项 + 发送到桌面 + 设置 + 分享 + 同步 + 取消同步 + 按时间排序 + 选择文件夹 + 夜间模式 + 已过期 + 字数 + 发送邮件 + 打开地图 + 呼叫电话 + 浏览网页 + 查看 + 知道了 + 新建便签 + ... + 与google task同步便签记录 + 同步账号 + 添加账号 + 新建便签背景颜色随机 + 取消同步 + 立即同步 + 当前帐号 %1$s + 如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复 + 请选择google帐号，便签将与该帐号的google task内容同步。 + 同步便签 + 上次同步于 %1$s + 取消 + 更换账号 + 删除账号 + 设置 + 正在同步中，不能修改同步帐号 + 同步帐号已设置为%1$s + 便签 + 搜索便签 + 正在搜索便签 + "搜索" + 便签中的文字 + 创建提醒 + "999+" + 导出成功 + 与%1$s同步成功 + 正在获取服务器便签列表... + 登录%1$s... + 正在同步本地便签... + 同步已取消 + 同步失败 + 同步成功 + 同步便签... + 没有关联内容，点击新建便签。 + 访客模式下，便签内容不可见 + \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merger.xml index 24b8fd12..f4ea7067 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merger.xml +++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merger.xml @@ -1,5 +1,5 @@ -#ffffffff#ff9e9e9e#1f000000#8a000000 +#ffffffff#ff9e9e9e#1f000000#8a000000 @@ -89,13 +89,13 @@ "999+""999+""999+""999+""999+" + "999+""999+""999+""999+""999+" @@ -179,7 +179,7 @@ truefalsetrue@android:color/black#7fa87f@android:color/black@android:color/black@color/material_deep_teal_200@color/material_deep_teal_500@color/material_grey_800@android:color/white@color/material_grey_850@color/material_grey_50#80ffffff#80000000@color/bright_foreground_material_light@color/bright_foreground_material_dark@android:color/white@android:color/black#ff5a595b#ffd6d7d7#80bebebe#80323232#ffbebebe#ff323232#ff7043#ff5722@android:color/white@android:color/black#6680cbc4#66009688#ff37474f#ff263238#ff21272b#ff80cbc4#ff009688#fff5f5f5#ffe0e0e0#fffafafa#ff757575#ff424242#ff303030#ff212121@android:color/black@color/material_grey_600@color/material_grey_900@color/material_grey_100#ffffffff#de000000#4Dffffff#39000000#33ffffff#1f000000#b3ffffff#8a000000#36ffffff#24000000#ff616161#ffbdbdbd#ffbdbdbd#fff1f1f1#e6616161#e6FFFFFF + truefalsetrue@android:color/black#7fa87f@android:color/black@android:color/black@color/material_deep_teal_200@color/material_deep_teal_500@color/material_grey_800@android:color/white@color/material_grey_850@color/material_grey_50#80ffffff#80000000@color/bright_foreground_material_light@color/bright_foreground_material_dark@android:color/white@android:color/black#ff5a595b#ffd6d7d7#80bebebe#80323232#ffbebebe#ff323232#ff7043#ff5722@android:color/white@android:color/black#6680cbc4#66009688#ff37474f#ff263238#ff21272b#ff80cbc4#ff009688#fff5f5f5#ffe0e0e0#fffafafa#ff757575#ff424242#ff303030#ff212121@android:color/black@color/material_grey_600@color/material_grey_900@color/material_grey_100#ffffffff#de000000#4Dffffff#39000000#33ffffff#1f000000#b3ffffff#8a000000#36ffffff#24000000#ff616161#ffbdbdbd#ffbdbdbd#fff1f1f1#e6616161#e6FFFFFF @@ -2319,14 +2319,14 @@ "होम पेज पर जाएं""ऊपर जाएं""ज़्यादा विकल्प""हो गया""सभी देखें""कोई एप्‍लिकेशन चुनें""बंद""चालू""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""space""Sym+""Menu+""खोजा जा रहा है…""क्‍वेरी साफ़ करें""सर्च क्वेरी""सर्च करें""क्वेरी सबमिट करें""आवाज़ सर्च""इसके साथ शेयर करें""%s के साथ शेयर करें""छोटा करें""सर्च""Idi na početnu""Idi gore""Dodatne opcije""Gotovo""Prikaži sve""Odabir aplikacije""ISKLJUČENO""UKLJUČENO""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""razmaknica""Sym+""Menu+""Pretražite…""Izbriši upit""Upit za pretraživanje""Pretraživanje""Pošalji upit""Glasovno pretraživanje""Dijeljenje sa""Dijeli putem aplikacije %s""Sažmi""Pretraživanje""Ugrás a főoldalra""Felfelé mozgatás""További lehetőségek""Kész""Összes megtekintése""Válasszon ki egy alkalmazást""KI""BE""Alt+""Ctrl+""Delete""Enter""Function+""Meta+""Shift+""Szóköz""Sym+""Menu+""Keresés…""Lekérdezés törlése""Keresési lekérdezés""Keresés""Lekérdezés küldése""Hangalapú keresés""Megosztás a következővel:""Megosztás a következő alkalmazással: %s""Összecsukás""Keresés""Ուղղվել տուն""Ուղղվել վերև""Այլ ընտրանքներ""Պատրաստ է""Տեսնել բոլորը""Ընտրել ծրագիր""ԱՆՋԱՏՎԱԾ""ՄԻԱՑՎԱԾ""Alt+""Ctrl+""Delete""Enter""Function+""Meta+""Shift+""բացատ""Sym+""Menu+""Որոնում...""Մաքրել հարցումը""Որոնման հարցում""Որոնել""Ուղարկել հարցումը""Ձայնային որոնում""Կիսվել""Ուղարկել %s-ին""Թաքցնել""Որոնել""Navigasi ke beranda""Navigasi naik""Opsi lain""Selesai""Lihat semua""Pilih aplikasi""NONAKTIF""AKTIF""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""spasi""Sym+""Menu+""Telusuri...""Hapus kueri""Kueri penelusuran""Telusuri""Kirim kueri""Penelusuran suara""Bagikan dengan""Bagikan ke %s""Ciutkan""Telusuri""Fara heim""Fara upp""Fleiri valkostir""Lokið""Sjá allt""Veldu forrit""SLÖKKT""KVEIKT""Alt+""Ctrl+""delete""enter""Aðgerðarlykill+""Meta+""Shift+""bilslá""Sym+""Valmynd+""Leita…""Hreinsa fyrirspurn""Leitarfyrirspurn""Leita""Senda fyrirspurn""Raddleit""Deila með""Deila með %s""Minnka""Leita""Vai alla home page""Vai in alto""Altre opzioni""Fine""Visualizza tutte""Scegli un\'applicazione""OFF""ON""ALT +""CTRL +""CANC""INVIO""FUNZIONE +""META +""MAIUSC +""barra spaziatrice""SYM +""MENU +""Cerca…""Cancella query""Query di ricerca""Cerca""Invia query""Ricerca vocale""Condividi con""Condividi tramite %s""Comprimi""Ricerca""נווט לדף הבית""נווט למעלה""עוד אפשרויות""בוצע""ראה הכל""בחר אפליקציה""כבוי""פועל""Alt+""Ctrl+‎""delete""Enter""Function+""Meta+""Shift+""מקש רווח""Sym+""תפריט+""חיפוש…""מחק שאילתה""שאילתת חיפוש""חיפוש""שלח שאילתה""חיפוש קולי""שתף עם""שתף עם %s""כווץ""חיפוש""ホームへ移動""上へ移動""その他のオプション""完了""すべて表示""アプリの選択""OFF""ON""Alt+""Ctrl+""Delete""Enter""Function+""Meta+""Shift+""Space""Sym+""Menu+""検索…""検索キーワードを削除""検索キーワード""検索""検索キーワードを送信""音声検索""共有""%sと共有""折りたたむ""検索""მთავარზე ნავიგაცია""ზემოთ ნავიგაცია""მეტი ვარიანტები""დასრულდა""ყველას ნახვა""აპის არჩევა""გამორთულია""ჩართულია""Alt+""Ctrl+""წაშლა""შეყვანა""Function+""Meta+""Shift+""space""Sym+""Menu+""ძიება...""მოთხოვნის გასუფთავება""ძიების მოთხოვნა""ძიება""მოთხოვნის გადაგზავნა""ხმოვანი ძიება""გაზიარება:""გაუზიარეთ %s-ს""აკეცვა""ძიება""Негізгі бетте қозғалу""Жоғары қозғалу""Басқа опциялар""Дайын""Барлығын көру""Қолданбаны таңдау""ӨШІРУЛІ""ҚОСУЛЫ""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""бос орын""Sym+""Mәзір+""Іздеу…""Сұрақты жою""Сұрақты іздеу""Іздеу""Сұрақты жіберу""Дауыс арқылы іздеу""Бөлісу""%s қолданбасымен бөлісу""Тасалау""Іздеу""រកមើល​ទៅ​ដើម""រកមើល​ឡើងលើ""ជម្រើស​ច្រើន​ទៀត""រួចរាល់""មើល​ទាំងអស់""ជ្រើស​កម្មវិធី​​""បិទ""បើក""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""space""Sym+""Menu+""ស្វែងរក…""សម្អាត​សំណួរ""ស្វែងរក​សំណួរ""ស្វែងរក""ដាក់​​​ស្នើ​សំណួរ""ការស្វែងរក​សំឡេង""ចែករំលែក​ជាមួយ""ចែក​រំលែក​ជា​មួយ %s""បង្រួម""ស្វែងរក""ಮುಖಪುಟವನ್ನು ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ""ಮೇಲಕ್ಕೆ ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ""ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳು""ಮುಗಿದಿದೆ""ಎಲ್ಲವನ್ನೂ ನೋಡಿ""ಒಂದು ಅಪ್ಲಿಕೇಶನ್ ಆಯ್ಕೆಮಾಡಿ""ಆಫ್""ಆನ್""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""space""Sym+""Menu+""ಹುಡುಕಿ…""ಪ್ರಶ್ನೆಯನ್ನು ತೆರವುಗೊಳಿಸು""ಪ್ರಶ್ನೆಯನ್ನು ಹುಡುಕಿ""ಹುಡುಕಿ""ಪ್ರಶ್ನೆಯನ್ನು ಸಲ್ಲಿಸು""ಧ್ವನಿ ಹುಡುಕಾಟ""ಇವರೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಿ""%s ನೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಿ""ಸಂಕುಚಿಸು""ಹುಡುಕಿ""홈 탐색""위로 탐색""옵션 더보기""완료""전체 보기""앱 선택""사용 안함""사용""Alt+""Ctrl+""삭제""입력""Function+""Meta+""Shift+""스페이스바""Sym+""Menu+""검색...""검색어 삭제""검색어""검색""검색어 보내기""음성 검색""공유 대상""%s와(과) 공유""접기""검색""Үйгө багыттоо""Жогору""Көбүрөөк мүмкүнчүлүктөр""Даяр""Бардыгын көрүү""Колдонмо тандоо""ӨЧҮК""КҮЙҮК""Alt+""Ctrl+""Delete""Enter""Function+""Meta+""Shift+""боштук""Sym+""Menu+""Издөө…""Талаптарды тазалоо""Издөө талаптары""Издөө""Талап жөнөтүү""Үн аркылуу издөө""Бөлүшүү""%s аркылуу бөлүшүү""Жыйнап коюу""Издөө"48dp12dp14dp440dp60%90%60%90%55%80%"होम पेज पर जाएं""ऊपर जाएं""ज़्यादा विकल्प""हो गया""सभी देखें""कोई एप्‍लिकेशन चुनें""बंद""चालू""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""space""Sym+""Menu+""खोजा जा रहा है…""क्‍वेरी साफ़ करें""सर्च क्वेरी""सर्च करें""क्वेरी सबमिट करें""आवाज़ सर्च""इसके साथ शेयर करें""%s के साथ शेयर करें""छोटा करें""सर्च""Idi na početnu""Idi gore""Dodatne opcije""Gotovo""Prikaži sve""Odabir aplikacije""ISKLJUČENO""UKLJUČENO""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""razmaknica""Sym+""Menu+""Pretražite…""Izbriši upit""Upit za pretraživanje""Pretraživanje""Pošalji upit""Glasovno pretraživanje""Dijeljenje sa""Dijeli putem aplikacije %s""Sažmi""Pretraživanje""Ugrás a főoldalra""Felfelé mozgatás""További lehetőségek""Kész""Összes megtekintése""Válasszon ki egy alkalmazást""KI""BE""Alt+""Ctrl+""Delete""Enter""Function+""Meta+""Shift+""Szóköz""Sym+""Menu+""Keresés…""Lekérdezés törlése""Keresési lekérdezés""Keresés""Lekérdezés küldése""Hangalapú keresés""Megosztás a következővel:""Megosztás a következő alkalmazással: %s""Összecsukás""Keresés""Ուղղվել տուն""Ուղղվել վերև""Այլ ընտրանքներ""Պատրաստ է""Տեսնել բոլորը""Ընտրել ծրագիր""ԱՆՋԱՏՎԱԾ""ՄԻԱՑՎԱԾ""Alt+""Ctrl+""Delete""Enter""Function+""Meta+""Shift+""բացատ""Sym+""Menu+""Որոնում...""Մաքրել հարցումը""Որոնման հարցում""Որոնել""Ուղարկել հարցումը""Ձայնային որոնում""Կիսվել""Ուղարկել %s-ին""Թաքցնել""Որոնել""Navigasi ke beranda""Navigasi naik""Opsi lain""Selesai""Lihat semua""Pilih aplikasi""NONAKTIF""AKTIF""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""spasi""Sym+""Menu+""Telusuri...""Hapus kueri""Kueri penelusuran""Telusuri""Kirim kueri""Penelusuran suara""Bagikan dengan""Bagikan ke %s""Ciutkan""Telusuri""Fara heim""Fara upp""Fleiri valkostir""Lokið""Sjá allt""Veldu forrit""SLÖKKT""KVEIKT""Alt+""Ctrl+""delete""enter""Aðgerðarlykill+""Meta+""Shift+""bilslá""Sym+""Valmynd+""Leita…""Hreinsa fyrirspurn""Leitarfyrirspurn""Leita""Senda fyrirspurn""Raddleit""Deila með""Deila með %s""Minnka""Leita""Vai alla home page""Vai in alto""Altre opzioni""Fine""Visualizza tutte""Scegli un\'applicazione""OFF""ON""ALT +""CTRL +""CANC""INVIO""FUNZIONE +""META +""MAIUSC +""barra spaziatrice""SYM +""MENU +""Cerca…""Cancella query""Query di ricerca""Cerca""Invia query""Ricerca vocale""Condividi con""Condividi tramite %s""Comprimi""Ricerca""נווט לדף הבית""נווט למעלה""עוד אפשרויות""בוצע""ראה הכל""בחר אפליקציה""כבוי""פועל""Alt+""Ctrl+‎""delete""Enter""Function+""Meta+""Shift+""מקש רווח""Sym+""תפריט+""חיפוש…""מחק שאילתה""שאילתת חיפוש""חיפוש""שלח שאילתה""חיפוש קולי""שתף עם""שתף עם %s""כווץ""חיפוש""ホームへ移動""上へ移動""その他のオプション""完了""すべて表示""アプリの選択""OFF""ON""Alt+""Ctrl+""Delete""Enter""Function+""Meta+""Shift+""Space""Sym+""Menu+""検索…""検索キーワードを削除""検索キーワード""検索""検索キーワードを送信""音声検索""共有""%sと共有""折りたたむ""検索""მთავარზე ნავიგაცია""ზემოთ ნავიგაცია""მეტი ვარიანტები""დასრულდა""ყველას ნახვა""აპის არჩევა""გამორთულია""ჩართულია""Alt+""Ctrl+""წაშლა""შეყვანა""Function+""Meta+""Shift+""space""Sym+""Menu+""ძიება...""მოთხოვნის გასუფთავება""ძიების მოთხოვნა""ძიება""მოთხოვნის გადაგზავნა""ხმოვანი ძიება""გაზიარება:""გაუზიარეთ %s-ს""აკეცვა""ძიება""Негізгі бетте қозғалу""Жоғары қозғалу""Басқа опциялар""Дайын""Барлығын көру""Қолданбаны таңдау""ӨШІРУЛІ""ҚОСУЛЫ""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""бос орын""Sym+""Mәзір+""Іздеу…""Сұрақты жою""Сұрақты іздеу""Іздеу""Сұрақты жіберу""Дауыс арқылы іздеу""Бөлісу""%s қолданбасымен бөлісу""Тасалау""Іздеу""រកមើល​ទៅ​ដើម""រកមើល​ឡើងលើ""ជម្រើស​ច្រើន​ទៀត""រួចរាល់""មើល​ទាំងអស់""ជ្រើស​កម្មវិធី​​""បិទ""បើក""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""space""Sym+""Menu+""ស្វែងរក…""សម្អាត​សំណួរ""ស្វែងរក​សំណួរ""ស្វែងរក""ដាក់​​​ស្នើ​សំណួរ""ការស្វែងរក​សំឡេង""ចែករំលែក​ជាមួយ""ចែក​រំលែក​ជា​មួយ %s""បង្រួម""ស្វែងរក""ಮುಖಪುಟವನ್ನು ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ""ಮೇಲಕ್ಕೆ ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ""ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳು""ಮುಗಿದಿದೆ""ಎಲ್ಲವನ್ನೂ ನೋಡಿ""ಒಂದು ಅಪ್ಲಿಕೇಶನ್ ಆಯ್ಕೆಮಾಡಿ""ಆಫ್""ಆನ್""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""space""Sym+""Menu+""ಹುಡುಕಿ…""ಪ್ರಶ್ನೆಯನ್ನು ತೆರವುಗೊಳಿಸು""ಪ್ರಶ್ನೆಯನ್ನು ಹುಡುಕಿ""ಹುಡುಕಿ""ಪ್ರಶ್ನೆಯನ್ನು ಸಲ್ಲಿಸು""ಧ್ವನಿ ಹುಡುಕಾಟ""ಇವರೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಿ""%s ನೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಿ""ಸಂಕುಚಿಸು""ಹುಡುಕಿ""홈 탐색""위로 탐색""옵션 더보기""완료""전체 보기""앱 선택""사용 안함""사용""Alt+""Ctrl+""삭제""입력""Function+""Meta+""Shift+""스페이스바""Sym+""Menu+""검색...""검색어 삭제""검색어""검색""검색어 보내기""음성 검색""공유 대상""%s와(과) 공유""접기""검색""Үйгө багыттоо""Жогору""Көбүрөөк мүмкүнчүлүктөр""Даяр""Бардыгын көрүү""Колдонмо тандоо""ӨЧҮК""КҮЙҮК""Alt+""Ctrl+""Delete""Enter""Function+""Meta+""Shift+""боштук""Sym+""Menu+""Издөө…""Талаптарды тазалоо""Издөө талаптары""Издөө""Талап жөнөтүү""Үн аркылуу издөө""Бөлүшүү""%s аркылуу бөлүшүү""Жыйнап коюу""Издөө"48dp12dp14dp440dp60%90%60%90%55%80%0px0px"Điều hướng về trang chủ""Điều hướng lên trên""Tùy chọn khác""Xong""Xem tất cả""Chọn một ứng dụng""TẮT""BẬT""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""phím cách""Sym+""Menu+""Tìm kiếm…""Xóa truy vấn""Tìm kiếm truy vấn""Tìm kiếm""Gửi truy vấn""Tìm kiếm bằng giọng nói""Chia sẻ với""Chia sẻ với %s""Thu gọn""Tìm kiếm""Điều hướng về trang chủ""Điều hướng lên trên""Tùy chọn khác""Xong""Xem tất cả""Chọn một ứng dụng""TẮT""BẬT""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""phím cách""Sym+""Menu+""Tìm kiếm…""Xóa truy vấn""Tìm kiếm truy vấn""Tìm kiếm""Gửi truy vấn""Tìm kiếm bằng giọng nói""Chia sẻ với""Chia sẻ với %s""Thu gọn""Tìm kiếm"60%90%50%70%45%72%"转到主屏幕""转到上一层级""更多选项""完成""查看全部""选择应用""关闭""开启""Alt+""Ctrl+""Delete 键""Enter 键""Fn+""Meta+""Shift+""空格键""Sym+""Menu+""搜索…""清除查询""搜索查询""搜索""提交查询""语音搜索""分享方式""使用%s分享""收起""搜索""瀏覽主頁""向上瀏覽""更多選項""完成""顯示全部""選擇應用程式""關閉""開啟""Alt +""Ctrl +""刪除""Enter 鍵""Fn +""Meta +""Shift +""空白鍵""Sym +""Menu +""搜尋…""清除查詢""搜尋查詢""搜尋""提交查詢""語音搜尋""分享對象""使用「%s」分享""收合""搜尋""瀏覽首頁""向上瀏覽""更多選項""完成""查看全部""選擇應用程式""關閉""開啟""Alt +""Ctrl +""Delete 鍵""Enter 鍵""Fn +""Meta +""Shift +""空格鍵""Sym +""Menu +""搜尋…""清除查詢""搜尋查詢""搜尋""提交查詢""語音搜尋""選擇分享對象""與「%s」分享""收合""搜尋""Zulazulela ekhaya""Zulazulela phezulu""Izinketho eziningi""Kwenziwe""Buka konke""Khetha uhlelo lokusebenza""VALIWE""VULIWE""Alt+""Ctrl+""susa""enter""Function+""Meta+""Shift+""space""Sym+""Imenyu+""Iyasesha...""Sula inkinga""Umbuzo wosesho""Sesha""Hambisa umbuzo""Ukusesha ngezwi""Yabelana no-""Yabelana ne-%s""Goqa""Sesha" + 60%90%50%70%45%72%"转到主屏幕""转到上一层级""更多选项""完成""查看全部""选择应用""关闭""开启""Alt+""Ctrl+""Delete 键""Enter 键""Fn+""Meta+""Shift+""空格键""Sym+""Menu+""搜索…""清除查询""搜索查询""搜索""提交查询""语音搜索""分享方式""使用%s分享""收起""搜索""瀏覽主頁""向上瀏覽""更多選項""完成""顯示全部""選擇應用程式""關閉""開啟""Alt +""Ctrl +""刪除""Enter 鍵""Fn +""Meta +""Shift +""空白鍵""Sym +""Menu +""搜尋…""清除查詢""搜尋查詢""搜尋""提交查詢""語音搜尋""分享對象""使用「%s」分享""收合""搜尋""瀏覽首頁""向上瀏覽""更多選項""完成""查看全部""選擇應用程式""關閉""開啟""Alt +""Ctrl +""Delete 鍵""Enter 鍵""Fn +""Meta +""Shift +""空格鍵""Sym +""Menu +""搜尋…""清除查詢""搜尋查詢""搜尋""提交查詢""語音搜尋""選擇分享對象""與「%s」分享""收合""搜尋""Zulazulela ekhaya""Zulazulela phezulu""Izinketho eziningi""Kwenziwe""Buka konke""Khetha uhlelo lokusebenza""VALIWE""VULIWE""Alt+""Ctrl+""susa""enter""Function+""Meta+""Shift+""space""Sym+""Imenyu+""Iyasesha...""Sula inkinga""Umbuzo wosesho""Sesha""Hambisa umbuzo""Ukusesha ngezwi""Yabelana no-""Yabelana ne-%s""Goqa""Sesha" @@ -2817,17 +2817,7 @@ /> - - 短信 - 邮件 - 字数便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 - %1$s 条符合“%2$s”的搜索结果 - - 短信 - 郵件 - 字數便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 - %1$s 條符合”%2$s“的搜尋結果 - + -%s --%s --%s @@ -2835,11 +2825,14 @@ Messaging Email - #335b5b5b#FF039BE5#FF01579B#FF40C4FF#FF00B0FF#6600000033sp26sp20sp17sp14sp + + + + #335b5b5b#FF039BE5#FF01579B#FF40C4FF#FF00B0FF#6600000033sp26sp20sp17sp14sp %1$s result for \"%2$s\" %1$s results for \"%2$s\" - light modenight modeLengthNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchRestoreChange viewTime OrderInit OrderDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderAdd secretDelete secretSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Confirm to delete secret of this note?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameInput describeInput passwordInput passwordSearching NotesSearch notesText in your notesNotessetcancel - - - + + 短信 + 邮件 + 字数便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 + %1$s 条符合“%2$s”的搜索结果 + 最近删除夜间模式确认删除该便签的密码吗？输入密码删除密码改变视图按时间排序添加密码输入密码日间模式初始排序输入描述语 + 短信 + 郵件 + 字數便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 + %1$s 條符合”%2$s“的搜尋結果 + diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml index 8b924a7a..c95d575a 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index d219752b..27042ce9 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 @@ -#Tue Nov 09 00:03:28 CST 2021 -base.0=D\:\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex +#Tue Nov 09 20:11:39 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 f4021837..3e0c4e84 100644 Binary files a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 index 0f66e43b..29dd0cbb 100644 Binary files a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 and b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class index 860ba8ce..4161188c 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/DatetimePickerBinding.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/DatetimePickerBinding.class index 64e9e6e3..267b67e8 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/DatetimePickerBinding.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/DatetimePickerBinding.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/DialogAddSecretBinding.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/DialogAddSecretBinding.class index 124a27c3..9b3c2413 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/DialogAddSecretBinding.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/DialogAddSecretBinding.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/DialogDeleteSenoteBinding.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/DialogDeleteSenoteBinding.class new file mode 100644 index 00000000..c0a99d19 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/DialogDeleteSenoteBinding.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/DialogEditTextBinding.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/DialogEditTextBinding.class index c7430cb8..222d64f7 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/DialogEditTextBinding.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/DialogEditTextBinding.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/DialogInputPasswdBinding.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/DialogInputPasswdBinding.class index 6d52b01a..dd588f37 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/DialogInputPasswdBinding.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/DialogInputPasswdBinding.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/FolderListItemBinding.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/FolderListItemBinding.class index 7dce4abe..7188143f 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/FolderListItemBinding.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/FolderListItemBinding.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteEditBinding.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteEditBinding.class index 3c9976db..07190488 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteEditBinding.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteEditBinding.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteEditListItemBinding.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteEditListItemBinding.class index 6fca9dc8..92eb75d0 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteEditListItemBinding.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteEditListItemBinding.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteItemBinding.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteItemBinding.class index 8954c13b..ca43dfd6 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteItemBinding.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteItemBinding.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteListBinding.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteListBinding.class index b8d1348a..26b8734d 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteListBinding.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteListBinding.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteListDropdownMenuBinding.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteListDropdownMenuBinding.class index 65851627..3de55741 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteListDropdownMenuBinding.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteListDropdownMenuBinding.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteListFooterBinding.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteListFooterBinding.class index ae2e93bf..18452c64 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteListFooterBinding.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteListFooterBinding.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/SettingsHeaderBinding.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/SettingsHeaderBinding.class index 838aecad..cace4f4e 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/SettingsHeaderBinding.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/SettingsHeaderBinding.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/Widget2xBinding.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/Widget2xBinding.class index 191b8be1..36328eb7 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/Widget2xBinding.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/Widget2xBinding.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/Widget4xBinding.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/Widget4xBinding.class index df6417c4..7446a27c 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/Widget4xBinding.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/Widget4xBinding.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class index 3cf68703..bcce4c49 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class index 0709764a..a39ba561 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 d6279ff9..4cd9c049 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/JsonParser.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/JsonParser.class new file mode 100644 index 00000000..9a9dd4ba Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/JsonParser.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class index 9acf1def..5d011848 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class index 691ae975..a9b95714 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class index 535d9f63..0ffc769e 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class index 12f7e655..294401af 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class index 7654f976..0d9fe0b6 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$6.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$6.class index 3ceba11a..13bd5bf5 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$6.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$6.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$7.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$7.class index e7c4f194..e78f6d6e 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$7.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$7.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$8.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$8.class new file mode 100644 index 00000000..a7bf4a41 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$8.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class index 8a91aa23..f6693d63 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$MyInitListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$MyInitListener.class new file mode 100644 index 00000000..bed627b9 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$MyInitListener.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$MyRecognizerDialogListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$MyRecognizerDialogListener.class new file mode 100644 index 00000000..925fc0d2 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$MyRecognizerDialogListener.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 8059ff9d..84c5cef8 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/NoteItemData.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class index d7a0eb63..a6ca1a0e 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class index faef58cc..16735863 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class index c43643f8..55a8c351 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class index 9b012960..a2406ade 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class index 7b330a8f..4673c609 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 0aea84b6..7f99bd82 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 30180956..208d4955 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 bedd7cef..a85ac7a7 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 a5314533..15836853 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 401f21f5..d04a70b7 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 25535745..4c8017ba 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 6faed80b..d3c01556 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 cc823b89..25581263 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$ModeCallback.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class index 2e801644..549eb7b2 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$OnListItemClickListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class index f1f2cfe1..1a03fd7f 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 b1240fdb..5f9c75d0 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/NotesListAdapter$AppWidgetAttribute.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class index 5d8717b6..4de0b09c 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class index b58eac37..13ea3a12 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.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 e7080a13..2bf9c9b0 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class index f7aee14d..191f3d76 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 3ded3469..eaf5fa2f 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 5a07c836..a9152e27 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class index 40905326..f8df0f00 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class index 2310a0f7..8cf37128 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class differ diff --git a/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index c8fc8a3d..e49490f4 100644 --- a/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -5,233 +5,261 @@ 5 android:versionName="0.1" > 6 7 D:\Notes-master1\app\src\main\AndroidManifest.xml:7:5-44 +7-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:8:5-44 8 android:minSdkVersion="16" -8-->D:\Notes-master1\app\src\main\AndroidManifest.xml:7:15-41 +8-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:8:15-41 9 android:targetSdkVersion="23" /> -9-->D:\Notes-master1\app\src\main\AndroidManifest.xml:7:5-44 +9-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:8:5-44 10 11 -11-->D:\Notes-master1\app\src\main\AndroidManifest.xml:9:5-81 -11-->D:\Notes-master1\app\src\main\AndroidManifest.xml:9:22-78 +11-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:10:5-81 +11-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:10:22-78 12 -12-->D:\Notes-master1\app\src\main\AndroidManifest.xml:10:5-88 -12-->D:\Notes-master1\app\src\main\AndroidManifest.xml:10:22-85 +12-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:11:5-88 +12-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:11:22-85 13 -13-->D:\Notes-master1\app\src\main\AndroidManifest.xml:11:5-67 -13-->D:\Notes-master1\app\src\main\AndroidManifest.xml:11:22-64 +13-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:12:5-67 +13-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:12:22-64 14 -14-->D:\Notes-master1\app\src\main\AndroidManifest.xml:12:5-72 -14-->D:\Notes-master1\app\src\main\AndroidManifest.xml:12:22-69 +14-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:13:5-72 +14-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:13:22-69 15 -15-->D:\Notes-master1\app\src\main\AndroidManifest.xml:13:5-74 -15-->D:\Notes-master1\app\src\main\AndroidManifest.xml:13:22-71 +15-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:14:5-74 +15-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:14:22-71 16 -16-->D:\Notes-master1\app\src\main\AndroidManifest.xml:14:5-80 -16-->D:\Notes-master1\app\src\main\AndroidManifest.xml:14:22-77 +16-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:15:5-80 +16-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:15:22-77 17 -17-->D:\Notes-master1\app\src\main\AndroidManifest.xml:15:5-71 -17-->D:\Notes-master1\app\src\main\AndroidManifest.xml:15:22-68 +17-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:16:5-71 +17-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:16:22-68 18 -18-->D:\Notes-master1\app\src\main\AndroidManifest.xml:16:5-74 -18-->D:\Notes-master1\app\src\main\AndroidManifest.xml:16:22-71 +18-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:17:5-74 +18-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:17:22-71 19 -19-->D:\Notes-master1\app\src\main\AndroidManifest.xml:17:5-81 -19-->D:\Notes-master1\app\src\main\AndroidManifest.xml:17:22-78 -20 -21 D:\Notes-master1\app\src\main\AndroidManifest.xml:19:5-117:19 -22 android:appComponentFactory="android.support.v4.app.CoreComponentFactory" -22-->[com.android.support:support-compat:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\2b9474e47639de47b19dc72cadc6eaea\transformed\support-compat-28.0.0\AndroidManifest.xml:22:18-91 -23 android:debuggable="true" -24 android:icon="@drawable/icon_app" -24-->D:\Notes-master1\app\src\main\AndroidManifest.xml:20:9-42 -25 android:label="@string/app_name" > -25-->D:\Notes-master1\app\src\main\AndroidManifest.xml:21:9-41 -26 D:\Notes-master1\app\src\main\AndroidManifest.xml:23:9-35:20 -27 android:name="net.micode.notes.ui.NotesListActivity" -27-->D:\Notes-master1\app\src\main\AndroidManifest.xml:24:13-49 -28 android:configChanges="keyboardHidden|orientation|screenSize" -28-->D:\Notes-master1\app\src\main\AndroidManifest.xml:25:13-74 -29 android:label="@string/app_name" -29-->D:\Notes-master1\app\src\main\AndroidManifest.xml:26:13-45 -30 android:launchMode="singleTop" -30-->D:\Notes-master1\app\src\main\AndroidManifest.xml:27:13-43 -31 android:theme="@style/Theme.AppCompat.Light.DarkActionBar" -31-->D:\Notes-master1\app\src\main\AndroidManifest.xml:28:13-71 -32 android:uiOptions="splitActionBarWhenNarrow" -32-->D:\Notes-master1\app\src\main\AndroidManifest.xml:29:13-57 -33 android:windowSoftInputMode="adjustPan" > -33-->D:\Notes-master1\app\src\main\AndroidManifest.xml:30:13-52 -34 -34-->D:\Notes-master1\app\src\main\AndroidManifest.xml:31:13-34:29 -35 -35-->D:\Notes-master1\app\src\main\AndroidManifest.xml:32:17-69 -35-->D:\Notes-master1\app\src\main\AndroidManifest.xml:32:25-66 -36 -37 -37-->D:\Notes-master1\app\src\main\AndroidManifest.xml:33:17-77 -37-->D:\Notes-master1\app\src\main\AndroidManifest.xml:33:27-74 -38 -39 -40 D:\Notes-master1\app\src\main\AndroidManifest.xml:36:9-58:20 -41 android:name="net.micode.notes.ui.NoteEditActivity" -41-->D:\Notes-master1\app\src\main\AndroidManifest.xml:37:13-48 -42 android:configChanges="keyboardHidden|orientation|screenSize" -42-->D:\Notes-master1\app\src\main\AndroidManifest.xml:38:13-74 -43 android:launchMode="singleTop" -43-->D:\Notes-master1\app\src\main\AndroidManifest.xml:39:13-43 -44 android:theme="@style/Theme.AppCompat.Light.DarkActionBar" > -44-->D:\Notes-master1\app\src\main\AndroidManifest.xml:40:13-71 -45 -45-->D:\Notes-master1\app\src\main\AndroidManifest.xml:41:13-48:29 -46 -46-->D:\Notes-master1\app\src\main\AndroidManifest.xml:42:17-79 -46-->D:\Notes-master1\app\src\main\AndroidManifest.xml:42:25-76 -47 -48 -48-->D:\Notes-master1\app\src\main\AndroidManifest.xml:44:17-76 -48-->D:\Notes-master1\app\src\main\AndroidManifest.xml:44:27-73 -49 -50 -50-->D:\Notes-master1\app\src\main\AndroidManifest.xml:46:17-78 -50-->D:\Notes-master1\app\src\main\AndroidManifest.xml:46:23-75 -51 -51-->D:\Notes-master1\app\src\main\AndroidManifest.xml:46:17-78 -51-->D:\Notes-master1\app\src\main\AndroidManifest.xml:46:23-75 -52 -53 -53-->D:\Notes-master1\app\src\main\AndroidManifest.xml:49:13-53:29 -54 -54-->D:\Notes-master1\app\src\main\AndroidManifest.xml:50:17-71 -54-->D:\Notes-master1\app\src\main\AndroidManifest.xml:50:25-68 -55 -56 -56-->D:\Notes-master1\app\src\main\AndroidManifest.xml:44:17-76 -56-->D:\Notes-master1\app\src\main\AndroidManifest.xml:44:27-73 -57 -58 -59 D:\Notes-master1\app\src\main\AndroidManifest.xml:55:13-57:54 -60 android:name="android.app.searchable" -60-->D:\Notes-master1\app\src\main\AndroidManifest.xml:56:17-54 -61 android:resource="@xml/searchable" /> -61-->D:\Notes-master1\app\src\main\AndroidManifest.xml:57:17-51 -62 -63 D:\Notes-master1\app\src\main\AndroidManifest.xml:59:9-63:78 -64 android:name="net.micode.notes.ui.AlarmAlertActivity" -64-->D:\Notes-master1\app\src\main\AndroidManifest.xml:60:13-50 -65 android:label="@string/app_name" -65-->D:\Notes-master1\app\src\main\AndroidManifest.xml:61:13-45 -66 android:launchMode="singleInstance" -66-->D:\Notes-master1\app\src\main\AndroidManifest.xml:62:13-48 -67 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" /> -67-->D:\Notes-master1\app\src\main\AndroidManifest.xml:63:13-75 -68 D:\Notes-master1\app\src\main\AndroidManifest.xml:64:9-68:63 -69 android:name="net.micode.notes.ui.NotesPreferenceActivity" -69-->D:\Notes-master1\app\src\main\AndroidManifest.xml:65:13-55 -70 android:label="@string/preferences_title" -70-->D:\Notes-master1\app\src\main\AndroidManifest.xml:66:13-54 -71 android:launchMode="singleTop" -71-->D:\Notes-master1\app\src\main\AndroidManifest.xml:67:13-43 -72 android:theme="@android:style/Theme.Holo.Light" /> -72-->D:\Notes-master1\app\src\main\AndroidManifest.xml:68:13-60 -73 -74 D:\Notes-master1\app\src\main\AndroidManifest.xml:70:9-72:52 -75 android:name="android.app.default_searchable" -75-->D:\Notes-master1\app\src\main\AndroidManifest.xml:71:13-58 -76 android:value=".ui.NoteEditActivity" /> -76-->D:\Notes-master1\app\src\main\AndroidManifest.xml:72:13-49 -77 -78 D:\Notes-master1\app\src\main\AndroidManifest.xml:74:9-77:43 -79 android:name="net.micode.notes.data.NotesProvider" -79-->D:\Notes-master1\app\src\main\AndroidManifest.xml:75:13-47 -80 android:authorities="micode_notes" -80-->D:\Notes-master1\app\src\main\AndroidManifest.xml:76:13-47 -81 android:multiprocess="true" /> -81-->D:\Notes-master1\app\src\main\AndroidManifest.xml:77:13-40 -82 -83 D:\Notes-master1\app\src\main\AndroidManifest.xml:79:9-91:20 -84 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -84-->D:\Notes-master1\app\src\main\AndroidManifest.xml:80:13-57 -85 android:label="@string/app_widget2x2" > -85-->D:\Notes-master1\app\src\main\AndroidManifest.xml:81:13-50 -86 -86-->D:\Notes-master1\app\src\main\AndroidManifest.xml:82:13-86:29 -87 -87-->D:\Notes-master1\app\src\main\AndroidManifest.xml:83:17-84 -87-->D:\Notes-master1\app\src\main\AndroidManifest.xml:83:25-81 -88 -88-->D:\Notes-master1\app\src\main\AndroidManifest.xml:84:17-85 -88-->D:\Notes-master1\app\src\main\AndroidManifest.xml:84:25-82 -89 -89-->D:\Notes-master1\app\src\main\AndroidManifest.xml:85:17-85 -89-->D:\Notes-master1\app\src\main\AndroidManifest.xml:85:25-82 -90 -91 -92 D:\Notes-master1\app\src\main\AndroidManifest.xml:88:13-90:58 -93 android:name="android.appwidget.provider" -93-->D:\Notes-master1\app\src\main\AndroidManifest.xml:89:17-58 -94 android:resource="@xml/widget_2x_info" /> -94-->D:\Notes-master1\app\src\main\AndroidManifest.xml:90:17-55 -95 -96 D:\Notes-master1\app\src\main\AndroidManifest.xml:92:9-104:20 -97 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -97-->D:\Notes-master1\app\src\main\AndroidManifest.xml:93:13-57 -98 android:label="@string/app_widget4x4" > -98-->D:\Notes-master1\app\src\main\AndroidManifest.xml:94:13-50 -99 -99-->D:\Notes-master1\app\src\main\AndroidManifest.xml:82:13-86:29 -100 -100-->D:\Notes-master1\app\src\main\AndroidManifest.xml:83:17-84 -100-->D:\Notes-master1\app\src\main\AndroidManifest.xml:83:25-81 -101 -101-->D:\Notes-master1\app\src\main\AndroidManifest.xml:84:17-85 -101-->D:\Notes-master1\app\src\main\AndroidManifest.xml:84:25-82 -102 -102-->D:\Notes-master1\app\src\main\AndroidManifest.xml:85:17-85 -102-->D:\Notes-master1\app\src\main\AndroidManifest.xml:85:25-82 -103 -104 -105 D:\Notes-master1\app\src\main\AndroidManifest.xml:88:13-90:58 -106 android:name="android.appwidget.provider" -106-->D:\Notes-master1\app\src\main\AndroidManifest.xml:89:17-58 -107 android:resource="@xml/widget_4x_info" /> -107-->D:\Notes-master1\app\src\main\AndroidManifest.xml:90:17-55 -108 -109 -109-->D:\Notes-master1\app\src\main\AndroidManifest.xml:105:9-109:20 -109-->D:\Notes-master1\app\src\main\AndroidManifest.xml:105:19-55 -110 -110-->D:\Notes-master1\app\src\main\AndroidManifest.xml:106:13-108:29 -111 -111-->D:\Notes-master1\app\src\main\AndroidManifest.xml:107:17-79 -111-->D:\Notes-master1\app\src\main\AndroidManifest.xml:107:25-76 -112 -113 -114 D:\Notes-master1\app\src\main\AndroidManifest.xml:110:9-112:41 -115 android:name="net.micode.notes.ui.AlarmReceiver" -115-->D:\Notes-master1\app\src\main\AndroidManifest.xml:111:13-45 -116 android:process=":remote" /> -116-->D:\Notes-master1\app\src\main\AndroidManifest.xml:112:13-38 -117 -118 D:\Notes-master1\app\src\main\AndroidManifest.xml:114:9-116:40 -119 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -119-->D:\Notes-master1\app\src\main\AndroidManifest.xml:115:13-58 -120 android:exported="false" /> -120-->D:\Notes-master1\app\src\main\AndroidManifest.xml:116:13-37 -121 -122 -123 +19-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:18:5-81 +19-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:18:22-78 +20 +20-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:12:5-67 +20-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:12:22-64 +21 +21-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:120:5-71 +21-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:120:22-68 +22 +22-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:121:5-79 +22-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:121:22-76 +23 +23-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:122:5-76 +23-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:122:22-73 +24 +24-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:123:5-79 +24-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:123:22-76 +25 +25-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:124:5-75 +25-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:124:22-72 +26 +26-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:126:5-127:47 +26-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:126:22-70 +27 +27-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:10:5-81 +27-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:10:22-78 +28 +28-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:129:5-80 +28-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:129:22-77 +29 +30 E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:20:5-118:19 +31 android:appComponentFactory="android.support.v4.app.CoreComponentFactory" +31-->[com.android.support:support-compat:28.0.0] C:\Users\小超人\.gradle\caches\transforms-3\2b9474e47639de47b19dc72cadc6eaea\transformed\support-compat-28.0.0\AndroidManifest.xml:22:18-91 +32 android:debuggable="true" +33 android:icon="@drawable/icon_app" +33-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:21:9-42 +34 android:label="@string/app_name" +34-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:22:9-41 +35 android:testOnly="true" > +36 E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:24:9-36:20 +37 android:name="net.micode.notes.ui.NotesListActivity" +37-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:25:13-49 +38 android:configChanges="keyboardHidden|orientation|screenSize" +38-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:26:13-74 +39 android:label="@string/app_name" +39-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:27:13-45 +40 android:launchMode="singleTop" +40-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:28:13-43 +41 android:theme="@style/Theme.AppCompat.Light.DarkActionBar" +41-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:29:13-71 +42 android:uiOptions="splitActionBarWhenNarrow" +42-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:30:13-57 +43 android:windowSoftInputMode="adjustPan" > +43-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:31:13-52 +44 +44-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:32:13-35:29 +45 +45-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:33:17-69 +45-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:33:25-66 +46 +47 +47-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:34:17-77 +47-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:34:27-74 +48 +49 +50 E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:37:9-59:20 +51 android:name="net.micode.notes.ui.NoteEditActivity" +51-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:38:13-48 +52 android:configChanges="keyboardHidden|orientation|screenSize" +52-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:39:13-74 +53 android:launchMode="singleTop" +53-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:40:13-43 +54 android:theme="@style/Theme.AppCompat.Light.DarkActionBar" > +54-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:41:13-71 +55 +55-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:42:13-49:29 +56 +56-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:43:17-79 +56-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:43:25-76 +57 +58 +58-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:45:17-76 +58-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:45:27-73 +59 +60 +60-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:47:17-78 +60-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:47:23-75 +61 +61-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:47:17-78 +61-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:47:23-75 +62 +63 +63-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:50:13-54:29 +64 +64-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:51:17-71 +64-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:51:25-68 +65 +66 +66-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:45:17-76 +66-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:45:27-73 +67 +68 +69 E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:56:13-58:54 +70 android:name="android.app.searchable" +70-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:57:17-54 +71 android:resource="@xml/searchable" /> +71-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:58:17-51 +72 +73 E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:60:9-64:78 +74 android:name="net.micode.notes.ui.AlarmAlertActivity" +74-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:61:13-50 +75 android:label="@string/app_name" +75-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:62:13-45 +76 android:launchMode="singleInstance" +76-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:63:13-48 +77 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" /> +77-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:64:13-75 +78 E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:65:9-69:63 +79 android:name="net.micode.notes.ui.NotesPreferenceActivity" +79-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:66:13-55 +80 android:label="@string/preferences_title" +80-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:67:13-54 +81 android:launchMode="singleTop" +81-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:68:13-43 +82 android:theme="@android:style/Theme.Holo.Light" /> +82-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:69:13-60 +83 +84 E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:71:9-73:52 +85 android:name="android.app.default_searchable" +85-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:72:13-58 +86 android:value=".ui.NoteEditActivity" /> +86-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:73:13-49 +87 +88 E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:75:9-78:43 +89 android:name="net.micode.notes.data.NotesProvider" +89-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:76:13-47 +90 android:authorities="micode_notes" +90-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:77:13-47 +91 android:multiprocess="true" /> +91-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:78:13-40 +92 +93 E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:80:9-92:20 +94 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" +94-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:81:13-57 +95 android:label="@string/app_widget2x2" > +95-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:82:13-50 +96 +96-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:83:13-87:29 +97 +97-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:84:17-84 +97-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:84:25-81 +98 +98-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:85:17-85 +98-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:85:25-82 +99 +99-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:86:17-85 +99-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:86:25-82 +100 +101 +102 E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:89:13-91:58 +103 android:name="android.appwidget.provider" +103-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:90:17-58 +104 android:resource="@xml/widget_2x_info" /> +104-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:91:17-55 +105 +106 E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:93:9-105:20 +107 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" +107-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:94:13-57 +108 android:label="@string/app_widget4x4" > +108-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:95:13-50 +109 +109-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:83:13-87:29 +110 +110-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:84:17-84 +110-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:84:25-81 +111 +111-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:85:17-85 +111-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:85:25-82 +112 +112-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:86:17-85 +112-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:86:25-82 +113 +114 +115 E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:89:13-91:58 +116 android:name="android.appwidget.provider" +116-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:90:17-58 +117 android:resource="@xml/widget_4x_info" /> +117-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:91:17-55 +118 +119 +119-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:106:9-110:20 +119-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:106:19-55 +120 +120-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:107:13-109:29 +121 +121-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:108:17-79 +121-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:108:25-76 +122 +123 +124 E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:111:9-113:41 +125 android:name="net.micode.notes.ui.AlarmReceiver" +125-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:112:13-45 +126 android:process=":remote" /> +126-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:113:13-38 +127 +128 E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:115:9-117:40 +129 android:name="net.micode.notes.gtask.remote.GTaskSyncService" +129-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:116:13-58 +130 android:exported="false" /> +130-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:117:13-37 +131 +132 +133 diff --git a/src/Notes-master1/app/build/intermediates/merged_assets/debug/out/iflytek/recognize.xml b/src/Notes-master1/app/build/intermediates/merged_assets/debug/out/iflytek/recognize.xml new file mode 100644 index 00000000..78300c13 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_assets/debug/out/iflytek/recognize.xml differ diff --git a/src/Notes-master1/app/build/intermediates/merged_assets/debug/out/iflytek/voice_bg.9.png b/src/Notes-master1/app/build/intermediates/merged_assets/debug/out/iflytek/voice_bg.9.png new file mode 100644 index 00000000..217f9dcd Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_assets/debug/out/iflytek/voice_bg.9.png differ diff --git a/src/Notes-master1/app/build/intermediates/merged_assets/debug/out/iflytek/voice_empty.png b/src/Notes-master1/app/build/intermediates/merged_assets/debug/out/iflytek/voice_empty.png new file mode 100644 index 00000000..08ffc438 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_assets/debug/out/iflytek/voice_empty.png differ diff --git a/src/Notes-master1/app/build/intermediates/merged_assets/debug/out/iflytek/voice_full.png b/src/Notes-master1/app/build/intermediates/merged_assets/debug/out/iflytek/voice_full.png new file mode 100644 index 00000000..4bf5bbc2 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_assets/debug/out/iflytek/voice_full.png differ diff --git a/src/Notes-master1/app/build/intermediates/merged_assets/debug/out/iflytek/waiting.png b/src/Notes-master1/app/build/intermediates/merged_assets/debug/out/iflytek/waiting.png new file mode 100644 index 00000000..d13bb33b Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_assets/debug/out/iflytek/waiting.png differ diff --git a/src/Notes-master1/app/build/intermediates/merged_assets/debug/out/iflytek/warning.png b/src/Notes-master1/app/build/intermediates/merged_assets/debug/out/iflytek/warning.png new file mode 100644 index 00000000..48150ffd Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_assets/debug/out/iflytek/warning.png differ diff --git a/src/Notes-master1/app/build/intermediates/merged_java_res/debug/base.jar b/src/Notes-master1/app/build/intermediates/merged_java_res/debug/base.jar index 32d3e83b..b010b177 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_java_res/debug/base.jar and b/src/Notes-master1/app/build/intermediates/merged_java_res/debug/base.jar differ diff --git a/src/Notes-master1/app/build/intermediates/merged_jni_libs/debug/out/Msc.jar b/src/Notes-master1/app/build/intermediates/merged_jni_libs/debug/out/Msc.jar new file mode 100644 index 00000000..ce39afbd Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_jni_libs/debug/out/Msc.jar differ diff --git a/src/Notes-master1/app/build/intermediates/merged_jni_libs/debug/out/arm64-v8a/libmsc.so b/src/Notes-master1/app/build/intermediates/merged_jni_libs/debug/out/arm64-v8a/libmsc.so new file mode 100644 index 00000000..80a85096 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_jni_libs/debug/out/arm64-v8a/libmsc.so differ diff --git a/src/Notes-master1/app/build/intermediates/merged_jni_libs/debug/out/armeabi-v7a/libmsc.so b/src/Notes-master1/app/build/intermediates/merged_jni_libs/debug/out/armeabi-v7a/libmsc.so new file mode 100644 index 00000000..dd26a727 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_jni_libs/debug/out/armeabi-v7a/libmsc.so differ diff --git a/src/Notes-master1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/src/Notes-master1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml index 7b3565f8..b8ea6ece 100644 --- a/src/Notes-master1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml +++ b/src/Notes-master1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml @@ -17,12 +17,22 @@ + + + + + + + + + + android:label="@string/app_name" + android:testOnly="true" > + + + + + + + + + + android:label="@string/app_name" + android:testOnly="true" > + + + + + + + + + + android:label="@string/app_name" + android:testOnly="true" > @@ -115,5 +116,15 @@ android:name=".gtask.remote.GTaskSyncService" android:exported="false" /> + + + + + + + + + \ No newline at end of file diff --git a/src/Notes-master1/app/src/main/Jnilibs/arm64-v8a/libmsc.so b/src/Notes-master1/app/src/main/Jnilibs/arm64-v8a/libmsc.so new file mode 100644 index 00000000..80a85096 Binary files /dev/null and b/src/Notes-master1/app/src/main/Jnilibs/arm64-v8a/libmsc.so differ diff --git a/src/Notes-master1/app/src/main/Jnilibs/armeabi-v7a/libmsc.so b/src/Notes-master1/app/src/main/Jnilibs/armeabi-v7a/libmsc.so new file mode 100644 index 00000000..dd26a727 Binary files /dev/null and b/src/Notes-master1/app/src/main/Jnilibs/armeabi-v7a/libmsc.so differ diff --git a/src/Notes-master1/app/src/main/assets/iflytek/recognize.xml b/src/Notes-master1/app/src/main/assets/iflytek/recognize.xml new file mode 100644 index 00000000..78300c13 Binary files /dev/null and b/src/Notes-master1/app/src/main/assets/iflytek/recognize.xml differ diff --git a/src/Notes-master1/app/src/main/assets/iflytek/voice_bg.9.png b/src/Notes-master1/app/src/main/assets/iflytek/voice_bg.9.png new file mode 100644 index 00000000..217f9dcd Binary files /dev/null and b/src/Notes-master1/app/src/main/assets/iflytek/voice_bg.9.png differ diff --git a/src/Notes-master1/app/src/main/assets/iflytek/voice_empty.png b/src/Notes-master1/app/src/main/assets/iflytek/voice_empty.png new file mode 100644 index 00000000..08ffc438 Binary files /dev/null and b/src/Notes-master1/app/src/main/assets/iflytek/voice_empty.png differ diff --git a/src/Notes-master1/app/src/main/assets/iflytek/voice_full.png b/src/Notes-master1/app/src/main/assets/iflytek/voice_full.png new file mode 100644 index 00000000..4bf5bbc2 Binary files /dev/null and b/src/Notes-master1/app/src/main/assets/iflytek/voice_full.png differ diff --git a/src/Notes-master1/app/src/main/assets/iflytek/waiting.png b/src/Notes-master1/app/src/main/assets/iflytek/waiting.png new file mode 100644 index 00000000..d13bb33b Binary files /dev/null and b/src/Notes-master1/app/src/main/assets/iflytek/waiting.png differ diff --git a/src/Notes-master1/app/src/main/assets/iflytek/warning.png b/src/Notes-master1/app/src/main/assets/iflytek/warning.png new file mode 100644 index 00000000..48150ffd Binary files /dev/null and b/src/Notes-master1/app/src/main/assets/iflytek/warning.png differ diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Task.java b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Task.java index 0a49f6bd..922d6047 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Task.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Task.java @@ -182,19 +182,21 @@ public class Task extends Node { } try { - JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); - JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA); + if (js!=null) { + JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); + JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA); - if (note.getInt(NoteColumns.TYPE) != Notes.TYPE_NOTE) { - Log.e(TAG, "invalid type"); - return; - } + if (note.getInt(NoteColumns.TYPE) != Notes.TYPE_NOTE) { + Log.e(TAG, "invalid type"); + return; + } - for (int i = 0; i < dataArray.length(); i++) { - JSONObject data = dataArray.getJSONObject(i); - if (TextUtils.equals(data.getString(DataColumns.MIME_TYPE), DataConstants.NOTE)) { - setName(data.getString(DataColumns.CONTENT)); - break; + for (int i = 0; i < dataArray.length(); i++) { + JSONObject data = dataArray.getJSONObject(i); + if (TextUtils.equals(data.getString(DataColumns.MIME_TYPE), DataConstants.NOTE)) { + setName(data.getString(DataColumns.CONTENT)); + break; + } } } diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/TaskList.java b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/TaskList.java index f0732fd7..e2394f68 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/TaskList.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/TaskList.java @@ -135,21 +135,23 @@ public class TaskList extends Node { } try { - JSONObject folder = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); - - if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) { - String name = folder.getString(NoteColumns.SNIPPET); - setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + name); - } else if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) { - if (folder.getLong(NoteColumns.ID) == Notes.ID_ROOT_FOLDER) - setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT); - else if (folder.getLong(NoteColumns.ID) == Notes.ID_CALL_RECORD_FOLDER) - setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX - + GTaskStringUtils.FOLDER_CALL_NOTE); - else - Log.e(TAG, "invalid system folder"); - } else { - Log.e(TAG, "error type"); + if (js != null) { + JSONObject folder = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); + + if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) { + String name = folder.getString(NoteColumns.SNIPPET); + setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + name); + } else if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) { + if (folder.getLong(NoteColumns.ID) == Notes.ID_ROOT_FOLDER) + setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT); + else if (folder.getLong(NoteColumns.ID) == Notes.ID_CALL_RECORD_FOLDER) + setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + + GTaskStringUtils.FOLDER_CALL_NOTE); + else + Log.e(TAG, "invalid system folder"); + } else { + Log.e(TAG, "error type"); + } } } catch (JSONException e) { Log.e(TAG, e.toString()); @@ -205,7 +207,7 @@ public class TaskList extends Node { return SYNC_ACTION_UPDATE_REMOTE; } else { // for folder conflicts, just apply local modification - return SYNC_ACTION_UPDATE_REMOTE; + return SYNC_ACTION_UPDATE_LOCAL; } } } catch (Exception e) { diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java index 1ba21776..f58684b7 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java @@ -306,11 +306,8 @@ public class GTaskClient { input = new InflaterInputStream(entity.getContent(), inflater); } - try { - InputStreamReader isr = new InputStreamReader(input); - BufferedReader br = new BufferedReader(isr); + try (InputStreamReader isr = new InputStreamReader(input); BufferedReader br = new BufferedReader(isr)){ StringBuilder sb = new StringBuilder(); - while (true) { String buff = br.readLine(); if (buff == null) { diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/tool/BackupUtils.java b/src/Notes-master1/app/src/main/java/net/micode/notes/tool/BackupUtils.java index 9698e4ed..c5efb78e 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/tool/BackupUtils.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/tool/BackupUtils.java @@ -328,7 +328,11 @@ public class BackupUtils { filedir.mkdir(); } if (!file.exists()) { - file.createNewFile(); + boolean bool = file.createNewFile(); + if(bool == false) + Log.e(TAG,"generateFileMountedOnSDcard: createNewFile false"); + else + Log.e(TAG,"generateFileMountedOnSDcard: createNewFile true"); } return file; } catch (SecurityException e) { diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java index c7f5afbe..b04323e0 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java @@ -16,12 +16,6 @@ package net.micode.notes.ui; -import java.util.Calendar; - -import net.micode.notes.R; -import net.micode.notes.ui.DateTimePicker; -import net.micode.notes.ui.DateTimePicker.OnDateTimeChangedListener; - import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; @@ -29,6 +23,11 @@ import android.content.DialogInterface.OnClickListener; import android.text.format.DateFormat; import android.text.format.DateUtils; +import net.micode.notes.R; +import net.micode.notes.ui.DateTimePicker.OnDateTimeChangedListener; + +import java.util.Calendar; + public class DateTimePickerDialog extends AlertDialog implements OnClickListener { private Calendar mDate = Calendar.getInstance(); @@ -77,7 +76,7 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener DateUtils.FORMAT_SHOW_YEAR | DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_SHOW_TIME; - flag |= mIs24HourView ? DateUtils.FORMAT_24HOUR : DateUtils.FORMAT_24HOUR; + flag |= mIs24HourView ? DateUtils.FORMAT_24HOUR : DateUtils.FORMAT_12HOUR; setTitle(DateUtils.formatDateTime(this.getContext(), date, flag)); } diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/JsonParser.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/JsonParser.java new file mode 100644 index 00000000..da91ca9c --- /dev/null +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/JsonParser.java @@ -0,0 +1,84 @@ +package net.micode.notes.ui; + +import org.json.JSONArray; +import org.json.JSONObject; +import org.json.JSONTokener; + +public class JsonParser { + public static String parseIatResult(String json) { + StringBuffer ret = new StringBuffer() ; + try { + JSONTokener tokener = new JSONTokener(json) ; + JSONObject joResult = new JSONObject(tokener) ; + + JSONArray words = joResult.getJSONArray("ws" ); + for (int i = 0; i < words.length(); i++) { + JSONArray items = words.getJSONObject(i).getJSONArray("cw" ); + JSONObject obj = items.getJSONObject(0 ); + ret.append(obj.getString("w" )); + } + } catch (Exception e) { + e.printStackTrace(); + } + return ret.toString(); + } + + public static String parseGrammarResult(String json) { + StringBuffer ret = new StringBuffer() ; + try { + JSONTokener tokener = new JSONTokener(json) ; + JSONObject joResult = new JSONObject(tokener) ; + + JSONArray words = joResult.getJSONArray("ws" ); + for (int i = 0; i < words.length(); i++) { + JSONArray items = words.getJSONObject(i).getJSONArray("cw" ); + for (int j = 0; j < items.length() ; j++) + { + JSONObject obj = items.getJSONObject(j); + if (obj.getString("w").contains( "nomatch")) + { + ret.append( "没有匹配结果.") ; + return ret.toString(); + } + ret.append( "【结果】" + obj.getString("w" )); + ret.append("【置信度】 " + obj.getInt("sc" )); + ret.append("\n "); + } + } + } catch (Exception e) { + e.printStackTrace(); + ret.append(" 没有匹配结果 ."); + } + return ret.toString(); + } + + public static String parseLocalGrammarResult(String json) { + StringBuffer ret = new StringBuffer() ; + try { + JSONTokener tokener = new JSONTokener(json) ; + JSONObject joResult = new JSONObject(tokener) ; + + JSONArray words = joResult.getJSONArray("ws" ); + for (int i = 0; i < words.length(); i++) { + JSONArray items = words.getJSONObject(i).getJSONArray("cw" ); + for (int j = 0; j < items.length() ; j++) + { + JSONObject obj = items.getJSONObject(j); + if (obj.getString("w").contains( "nomatch")) + { + ret.append( "没有匹配结果.") ; + return ret.toString(); + } + ret.append( "【结果】" + obj.getString("w" )); + ret.append("\n "); + } + } + ret.append("【置信度】 " + joResult.optInt("sc" )); + + } catch (Exception e) { + e.printStackTrace(); + ret.append(" 没有匹配结果 ."); + } + return ret.toString(); + } +} \ No newline at end of file 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 49a1ee3f..cfd33186 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java @@ -16,10 +16,7 @@ package net.micode.notes.ui; -import android.app.Dialog; -import android.content.ContentValues; -import android.support.v7.app.AppCompatActivity; -import android.app.Activity; +import android.Manifest; import android.app.AlarmManager; import android.app.AlertDialog; import android.app.PendingIntent; @@ -30,9 +27,13 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; +import android.content.pm.PackageManager; import android.graphics.Paint; import android.os.Bundle; import android.preference.PreferenceManager; +import android.support.v4.app.ActivityCompat; +import android.support.v4.content.ContextCompat; +import android.support.v7.app.AppCompatActivity; import android.text.Editable; import android.text.Spannable; import android.text.SpannableString; @@ -49,7 +50,6 @@ import android.view.View; import android.view.View.OnClickListener; import android.view.WindowManager; import android.view.inputmethod.InputMethodManager; -import android.widget.Button; import android.widget.CheckBox; import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; @@ -59,6 +59,16 @@ import android.widget.LinearLayout; import android.widget.TextView; import android.widget.Toast; +import com.iflytek.cloud.ErrorCode; +import com.iflytek.cloud.InitListener; +import com.iflytek.cloud.RecognizerListener; +import com.iflytek.cloud.RecognizerResult; +import com.iflytek.cloud.SpeechConstant; +import com.iflytek.cloud.SpeechError; +import com.iflytek.cloud.SpeechUtility; +import com.iflytek.cloud.ui.RecognizerDialog; +import com.iflytek.cloud.ui.RecognizerDialogListener; + import net.micode.notes.R; import net.micode.notes.data.Notes; import net.micode.notes.data.Notes.TextNote; @@ -72,8 +82,13 @@ import net.micode.notes.ui.NoteEditText.OnTextViewChangeListener; import net.micode.notes.widget.NoteWidgetProvider_2x; import net.micode.notes.widget.NoteWidgetProvider_4x; +import org.json.JSONException; +import org.json.JSONObject; + +import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashMap; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -91,6 +106,8 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen public ImageView ibSetBgColor; public ImageView ivLock; + + public ImageView ivRadio; } private static final Map sBgSelectorBtnsMap = new HashMap(); @@ -161,6 +178,7 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen private EditText editText; private TextView textView; + private HashMap mIatResults = new LinkedHashMap(); private String Textchange(String oriText){ StringBuffer stringBuffer = new StringBuffer(oriText); @@ -225,6 +243,8 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen } initResources(); count(); + initSpeech() ; + initPermission(); } /** @@ -444,6 +464,8 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen mNoteHeaderHolder.ivLock = (ImageView) findViewById(R.id.iv_lock); mNoteHeaderHolder.tvAlertDate = (TextView) findViewById(R.id.tv_alert_date); mNoteHeaderHolder.ibSetBgColor = (ImageView) findViewById(R.id.btn_set_bg_color); + mNoteHeaderHolder.ivRadio = (ImageView) findViewById(R.id.btn_radio); + mNoteHeaderHolder.ivRadio.setOnClickListener(this); mNoteHeaderHolder.ibSetBgColor.setOnClickListener(this); mNoteEditor = (EditText) findViewById(R.id.note_edit_view); mNoteEditorPanel = findViewById(R.id.sv_note_edit); @@ -505,7 +527,9 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen mNoteBgColorSelector.setVisibility(View.VISIBLE); findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility( View.VISIBLE); - } else if (sBgSelectorBtnsMap.containsKey(id)) { + } else if (id == R.id.btn_radio) { + startSpeechDialog(); + }else if (sBgSelectorBtnsMap.containsKey(id)) { findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility( View.GONE); mWorkingNote.setBgColorId(sBgSelectorBtnsMap.get(id)); @@ -1015,4 +1039,125 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0); } + private void initSpeech() { + // 将“12345678”替换成您申请的 APPID，申请地址： http://www.xfyun.cn + // 请勿在 “ =”与 appid 之间添加任务空字符或者转义符 + SpeechUtility.createUtility( this, SpeechConstant. APPID + "=d00e4c21" ); + } + + private void initPermission() { + String permissions[] = {Manifest.permission.RECORD_AUDIO, + Manifest.permission.ACCESS_NETWORK_STATE, + Manifest.permission.INTERNET, + Manifest.permission.WRITE_EXTERNAL_STORAGE + }; + + ArrayList toApplyList = new ArrayList(); + + for (String perm : permissions) { + if (PackageManager.PERMISSION_GRANTED != ContextCompat.checkSelfPermission(this, perm)) { + toApplyList.add(perm); + } + } + String tmpList[] = new String[toApplyList.size()]; + if (!toApplyList.isEmpty()) { + ActivityCompat.requestPermissions(this, toApplyList.toArray(tmpList), 123); + } + + } + + + @Override + public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) { + + } + + private void startSpeechDialog() { + RecognizerDialog mDialog = new RecognizerDialog(this, new MyInitListener()) ; + + mDialog.setParameter(SpeechConstant.LANGUAGE, "zh_cn" ); + mDialog.setParameter(SpeechConstant.ACCENT, "mandarin" ); + + mDialog.setListener( new MyRecognizerDialogListener()) ; + + mDialog.show() ; + } + + class MyRecognizerDialogListener implements RecognizerDialogListener { + + public void onResult(RecognizerResult results, boolean isLast) { + String result = results.getResultString(); + showTip(result) ; + System.out.println(" 没有解析的 :" + result); + + String text = JsonParser.parseIatResult(result) ; + System.out.println(" 解析后的 :" + text); + + String sn = null; + try { + JSONObject resultJson = new JSONObject(results.getResultString()) ; + sn = resultJson.optString("sn" ); + } catch (JSONException e) { + e.printStackTrace(); + } + NoteEditText edit = (NoteEditText) findViewById(R.id.et_edit_text); + mIatResults.put(sn, text) ; + + StringBuffer resultBuffer = new StringBuffer(); + for (String key : mIatResults.keySet()) { + resultBuffer.append(mIatResults .get(key)); + } + String input = mNoteEditor.getText() + resultBuffer.toString(); + mNoteEditor.setText(input); + mNoteEditor.setSelection(mNoteEditor.length()) ; + getWorkingText(); + } + @Override + public void onError(SpeechError speechError) { + + } + } + + class MyInitListener implements InitListener { + + @Override + public void onInit(int code) { + if (code != ErrorCode.SUCCESS) { + showTip("初始化失败 "); + } + + } + } + + private RecognizerListener mRecoListener = new RecognizerListener() { + public void onResult(RecognizerResult results, boolean isLast) { + Log.e (TAG, results.getResultString()); + System.out.println(results.getResultString()) ; + showTip(results.getResultString()) ; + } + + public void onError(SpeechError error) { + showTip(error.getPlainDescription(true)) ; + Log. e(TAG, "error.getPlainDescription(true)==" + error.getPlainDescription(true )); + } + + public void onBeginOfSpeech() { + showTip(" 开始录音 "); + } + + public void onVolumeChanged(int volume, byte[] data) { + showTip(" 声音改变了 "); + } + + public void onEndOfSpeech() { + showTip(" 结束录音 "); + } + + public void onEvent(int eventType, int arg1 , int arg2, Bundle obj) { + } + }; + + private void showTip (String data) { + Toast.makeText( this, data, Toast.LENGTH_SHORT).show() ; + } } diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteItemData.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteItemData.java index b35d07f4..99afba77 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteItemData.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteItemData.java @@ -84,6 +84,7 @@ public class NoteItemData { private boolean mIsOnlyOneItem; private boolean mIsOneNoteFollowingFolder; private boolean mIsMultiNotesFollowingFolder; + private boolean mIsNotesFollowItsFolder; public NoteItemData(Context context, Cursor cursor) { mId = cursor.getLong(ID_COLUMN); @@ -127,12 +128,17 @@ public class NoteItemData { mIsOnlyOneItem = (cursor.getCount() == 1); mIsMultiNotesFollowingFolder = false; mIsOneNoteFollowingFolder = false; + mIsNotesFollowItsFolder = false; if (mType == Notes.TYPE_NOTE && !mIsFirstItem) { int position = cursor.getPosition(); + int parent_id = cursor.getInt(PARENT_ID_COLUMN); if (cursor.moveToPrevious()) { if (cursor.getInt(TYPE_COLUMN) == Notes.TYPE_FOLDER || cursor.getInt(TYPE_COLUMN) == Notes.TYPE_SYSTEM) { + if (cursor.getInt(ID_COLUMN) == parent_id) { + mIsNotesFollowItsFolder = true; + } if (cursor.getCount() > (position + 1)) { mIsMultiNotesFollowingFolder = true; } else { @@ -243,4 +249,8 @@ public class NoteItemData { public static int getNoteType(Cursor cursor) { return cursor.getInt(TYPE_COLUMN); } + + public boolean isNotesFollowItsFolder() { + return mIsNotesFollowItsFolder; + } } 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 f0379390..5e78b597 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 @@ -79,8 +79,8 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.util.HashSet; -public class NotesListActivity extends AppCompatActivity implements OnClickListener, OnItemLongClickListener { - private int time_mode = 1; +public class NotesListActivity extends AppCompatActivity implements OnClickListener, OnItemLongClickListener { + private int time_mode = 0; private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0; @@ -175,20 +175,14 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe if (!sp.getBoolean(PREFERENCE_ADD_INTRODUCTION, false)) { StringBuilder sb = new StringBuilder(); InputStream in = null; - try { + try (InputStreamReader isr = new InputStreamReader(in);BufferedReader br = new BufferedReader(isr)){ in = getResources().openRawResource(R.raw.introduction); - if (in != null) { - InputStreamReader isr = new InputStreamReader(in); - BufferedReader br = new BufferedReader(isr); - char [] buf = new char[1024]; - int len = 0; - while ((len = br.read(buf)) > 0) { - sb.append(buf, 0, len); + char [] buf = new char[1024]; + int len = 0; + while ((len = br.read(buf)) > 0) { + sb.append(buf, 0, len); } - } else { - Log.e(TAG, "Read introduction file error"); - return; - } + } catch (IOException e) { e.printStackTrace(); return; @@ -442,7 +436,12 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC"); } } - + if (mCurrentFolderId == Notes.ID_TRASH_FOLER) { + getWindow().setBackgroundDrawableResource(R.drawable.trash_background); + } + else { + getWindow().setBackgroundDrawableResource(R.drawable.list_background); + } } @@ -499,8 +498,14 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe } private void batchDelete() { - new AsyncTask>() { - protected HashSet doInBackground(Void... unused) { + for(AppWidgetAttribute widget : mNotesListAdapter.getSelectedWidget()) { + if (widget.widgetHavePasswd == 1) { + Toast.makeText(this, "选中的便签中有加密便签，不能\n删除,需将便签解密后才能删除", Toast.LENGTH_SHORT).show(); + return; + } + } + new AsyncTask>() { + protected HashSet doInBackground(Params... unused) { HashSet widgets = mNotesListAdapter.getSelectedWidget(); if (!isSyncMode()) { if (mCurrentFolderId == Notes.ID_TRASH_FOLER){ diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java index 62d1da61..89af442d 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java @@ -41,6 +41,7 @@ public class NotesListAdapter extends CursorAdapter { public static class AppWidgetAttribute { public int widgetId; public int widgetType; + public long widgetHavePasswd; }; public NotesListAdapter(Context context) { @@ -115,6 +116,7 @@ public class NotesListAdapter extends CursorAdapter { NoteItemData item = new NoteItemData(mContext, c); widget.widgetId = item.getWidgetId(); widget.widgetType = item.getWidgetType(); + widget.widgetHavePasswd = item.getHavePassword(); itemSet.add(widget); /** * Don't close cursor here, only the adapter could close it diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListItem.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListItem.java index 9c0c21c2..b1e5f7ce 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListItem.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListItem.java @@ -131,7 +131,9 @@ public class NotesListItem extends LinearLayout { private void setBackground(NoteItemData data) { int id = data.getBgColorId(); if (data.getType() == Notes.TYPE_NOTE) { - if (data.isSingle() || data.isOneFollowingFolder()) { + if (data.isNotesFollowItsFolder()) { + setBackgroundResource(NoteItemBgResources.getNoteBgNormalRes(id)); + } else if (data.isSingle() || data.isOneFollowingFolder()) { setBackgroundResource(NoteItemBgResources.getNoteBgSingleRes(id)); } else if (data.isLast()) { setBackgroundResource(NoteItemBgResources.getNoteBgLastRes(id)); diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/radio.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/radio.png new file mode 100644 index 00000000..d18f825d Binary files /dev/null and b/src/Notes-master1/app/src/main/res/drawable-hdpi/radio.png differ diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/trash_background.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/trash_background.png new file mode 100644 index 00000000..087e1f97 Binary files /dev/null and b/src/Notes-master1/app/src/main/res/drawable-hdpi/trash_background.png differ diff --git a/src/Notes-master1/app/src/main/res/layout/dialog_delete_senote.xml b/src/Notes-master1/app/src/main/res/layout/dialog_delete_senote.xml new file mode 100644 index 00000000..ab30673f --- /dev/null +++ b/src/Notes-master1/app/src/main/res/layout/dialog_delete_senote.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/src/Notes-master1/app/src/main/res/layout/note_edit.xml b/src/Notes-master1/app/src/main/res/layout/note_edit.xml index 1705a57e..81554cd5 100644 --- a/src/Notes-master1/app/src/main/res/layout/note_edit.xml +++ b/src/Notes-master1/app/src/main/res/layout/note_edit.xml @@ -137,6 +137,13 @@ android:background="@drawable/bg_color_btn_mask" android:layout_gravity="top|right" /> + + + + \ No newline at end of file diff --git a/src/Notes-master1/app/src/main/res/menu/trash_folder.xml b/src/Notes-master1/app/src/main/res/menu/trash_folder.xml index 5b83114e..72298cdc 100644 --- a/src/Notes-master1/app/src/main/res/menu/trash_folder.xml +++ b/src/Notes-master1/app/src/main/res/menu/trash_folder.xml @@ -1,4 +1,9 @@ - + + \ No newline at end of file diff --git a/src/Notes-master1/app/src/main/res/values-zh-rCN/strings.xml b/src/Notes-master1/app/src/main/res/values-zh-rCN/strings.xml index 642ed60f..ead9c922 100644 --- a/src/Notes-master1/app/src/main/res/values-zh-rCN/strings.xml +++ b/src/Notes-master1/app/src/main/res/values-zh-rCN/strings.xml @@ -120,6 +120,20 @@ 便签 设置 取消 + + 日间模式 + 夜间模式 + 最近删除 + 改变视图 + 按时间排序 + 初始排序 + 添加密码 + 删除密码 + 确认删除该便签的密码吗？ + 输入描述语 + 输入密码 + 输入密码 + %1$s 条符合“%2$s”的搜索结果 diff --git a/src/Notes-master1/local.properties b/src/Notes-master1/local.properties index 3eac9fe9..b1388833 100644 --- a/src/Notes-master1/local.properties +++ b/src/Notes-master1/local.properties @@ -4,5 +4,5 @@ # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -#Mon Nov 08 16:59:38 CST 2021 -sdk.dir=D\:\\SDK +#Tue Nov 09 08:12:19 CST 2021 +sdk.dir=E\:\\SDK