diff --git a/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.bin b/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.bin
index f6607863..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 5c523e34..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 7d322091..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 88151c0f..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 80eeb738..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 125621fc..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 21bcd76d..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/.idea/dbnavigator.xml b/src/Notes-master1/.idea/dbnavigator.xml
index fb44a9fb..d489ebce 100644
--- a/src/Notes-master1/.idea/dbnavigator.xml
+++ b/src/Notes-master1/.idea/dbnavigator.xml
@@ -26,7 +26,7 @@
-
+
diff --git a/src/Notes-master1/.idea/misc.xml b/src/Notes-master1/.idea/misc.xml
index d80fb203..ba21ff39 100644
--- a/src/Notes-master1/.idea/misc.xml
+++ b/src/Notes-master1/.idea/misc.xml
@@ -27,8 +27,11 @@
+
+
+
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/0/e/0e854f4195c0d44c8ada29e4ad9b0cb3970cb0e6 b/src/Notes-master1/.idea/sonarlint/issuestore/0/e/0e854f4195c0d44c8ada29e4ad9b0cb3970cb0e6
index 41edf84d..54bd0128 100644
--- a/src/Notes-master1/.idea/sonarlint/issuestore/0/e/0e854f4195c0d44c8ada29e4ad9b0cb3970cb0e6
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/0/e/0e854f4195c0d44c8ada29e4ad9b0cb3970cb0e6
@@ -34,6 +34,6 @@ java:S1319
T
java:S1155-">Use isEmpty() to check whether the collection is empty or not.(
S
-java:S2589f"8Remove this expression which always evaluates to "false"(Ύ
+java:S2589>"8Remove this expression which always evaluates to "false"(Ύ
S
-java:S2589>"8Remove this expression which always evaluates to "false"(Ύ
\ No newline at end of file
+java:S2589f"8Remove this expression which always evaluates to "false"(Ύ
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/4/6/4623bd3eb8366c31819ef25a6dc50fee4400c6d6 b/src/Notes-master1/.idea/sonarlint/issuestore/4/6/4623bd3eb8366c31819ef25a6dc50fee4400c6d6
deleted file mode 100644
index 461af098..00000000
--- a/src/Notes-master1/.idea/sonarlint/issuestore/4/6/4623bd3eb8366c31819ef25a6dc50fee4400c6d6
+++ /dev/null
@@ -1,12 +0,0 @@
-
-m
-java:S37768"RRefactor this method to reduce its Cognitive Complexity from 27 to the 15 allowed.(
-O
-java:S1874D"9Remove this use of "setTextAppearance"; it is deprecated.(
-O
-java:S1874K"9Remove this use of "setTextAppearance"; it is deprecated.(
-O
-java:S1874U"9Remove this use of "setTextAppearance"; it is deprecated.(
-f java:S117s"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(
-f java:S117x"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(㷔
-f java:S117y"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(Õ
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/5/3/53b98e6d0ece8f8c43934ef63db400be3bbe507c b/src/Notes-master1/.idea/sonarlint/issuestore/5/3/53b98e6d0ece8f8c43934ef63db400be3bbe507c
index c3923a25..a73f24ee 100644
--- a/src/Notes-master1/.idea/sonarlint/issuestore/5/3/53b98e6d0ece8f8c43934ef63db400be3bbe507c
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/5/3/53b98e6d0ece8f8c43934ef63db400be3bbe507c
@@ -11,10 +11,10 @@ J
java:S2864o"4Iterate over the "entrySet" instead of the "keySet".(
B
java:S1125p"'Remove the unnecessary boolean literal.(ɯ
-H
-java:S1168~"+Return an empty collection instead of null.(8ͭ/
-J
-java:S1125"'Remove the unnecessary boolean literal.(8ͭ/
+A
+java:S1168~"+Return an empty collection instead of null.(
+C
+java:S1125"'Remove the unnecessary boolean literal.(
t
java:S22931"YReplace the type specification in this constructor call with the diamond operator ("<>").(ə
o
@@ -31,11 +31,11 @@ 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.(漬
-y
-java:S1104,"\Make widgetHavePasswd a static final constant or non-public and provide accessors if needed.(8/
+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.(ɯ
E
java:S5411p"*Use the primitive boolean expression here.(ɯ
-M
-java:S5411"*Use the primitive boolean expression here.(8ͭ/
\ No newline at end of file
+F
+java:S5411"*Use the primitive boolean expression here.(
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/6/c/6c40630893054a28c13c2eb04ceb5fa51173b0b6 b/src/Notes-master1/.idea/sonarlint/issuestore/6/c/6c40630893054a28c13c2eb04ceb5fa51173b0b6
new file mode 100644
index 00000000..c6990ee6
--- /dev/null
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/6/c/6c40630893054a28c13c2eb04ceb5fa51173b0b6
@@ -0,0 +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.(
+n
+java:S1450"WRemove the "mPattern" field and declare it as a local variable in the relevant methods.(
+{
+java:S1149"_Replace the synchronized class "StringBuffer" by an unsynchronized one such as "StringBuilder".(᯲
+{
+java:S1149"_Replace the synchronized class "StringBuffer" by an unsynchronized one such as "StringBuilder".(Ȍ
+i java:S100"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(
+n
+java:S3776"RRefactor this method to reduce its Cognitive Complexity from 26 to the 15 allowed.(ݨ
+W
+java:S1874"@Remove this use of "SOFT_INPUT_ADJUST_RESIZE"; it is deprecated.(ѯ
+\
+java:S1874"@Remove this use of "SOFT_INPUT_ADJUST_RESIZE"; it is deprecated.(ң
+O
+java:S1874"9Remove this use of "setTextAppearance"; it is deprecated.((
+K
+java:S2864"4Iterate over the "entrySet" instead of the "keySet".(ԇ
+N
+java:S1135"2Complete the task associated to this TODO comment.(
+8
+java:S1116"Remove this empty statement.(
+X
+java:S1126"AReplace this if-then-else statement by a single return statement.(
+8
+java:S1116"Remove this empty statement.(
+P
+java:S1874"9Remove this use of "PreferenceManager"; it is deprecated.(
+Z
+java:S1874"CRemove this use of "getDefaultSharedPreferences"; it is deprecated.(
+U
+java:S1874"9Remove this use of "setTextAppearance"; it is deprecated.(
+G
+java:S1874"0Remove this use of "getColor"; it is deprecated.(
+d
+java:S3252"MUse static access with "android.text.Spanned" for "SPAN_INCLUSIVE_EXCLUSIVE".(
+U
+java:S1874"9Remove this use of "setTextAppearance"; it is deprecated.(
+T
+java:S1874"=Remove this use of "EXTRA_SHORTCUT_INTENT"; it is deprecated.(ð
+R
+java:S1874";Remove this use of "EXTRA_SHORTCUT_NAME"; it is deprecated.(
+[
+java:S1874"DRemove this use of "EXTRA_SHORTCUT_ICON_RESOURCE"; it is deprecated.(Ǿ
+i java:S100"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(
+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:S2293q"YReplace the type specification in this constructor call with the diamond operator ("<>").(ӏ
+t
+java:S2293z"YReplace the type specification in this constructor call with the diamond operator ("<>").(
+u
+java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(
+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 ("<>").(
+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(
+D
+java:S1604"(Make this anonymous inner class a lambda(
+?
+java:S1604"(Make this anonymous inner class a lambda(ά
+q
+java:S1104d"VMake tvModified a static final constant or non-public and provide accessors if needed.(ԣ
+r
+java:S1104f"WMake ivAlertIcon a static final constant or non-public and provide accessors if needed.(න
+r
+java:S1104h"WMake tvAlertDate a static final constant or non-public and provide accessors if needed.(
+s
+java:S1104j"XMake ibSetBgColor a static final constant or non-public and provide accessors if needed.(
+h
+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
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/7/b/7bccae5ecd745bba36ddfd464ec07b66de678477 b/src/Notes-master1/.idea/sonarlint/issuestore/7/b/7bccae5ecd745bba36ddfd464ec07b66de678477
index 4952694d..c906d703 100644
--- a/src/Notes-master1/.idea/sonarlint/issuestore/7/b/7bccae5ecd745bba36ddfd464ec07b66de678477
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/7/b/7bccae5ecd745bba36ddfd464ec07b66de678477
@@ -1,5 +1,5 @@
-n java:S116S"TRename this field "time_mode" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(
+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
@@ -40,68 +40,68 @@ java:S1874
java:S1116"Remove this empty statement.(
i
java:S3776"RRefactor this method to reduce its Cognitive Complexity from 32 to the 15 allowed.(
-M
-java:S1874"1Remove this use of "AsyncTask"; it is deprecated.(?8/
-F java:S108")Either remove or fill this block of code.(ʥ8/
+F
+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".(Ϳ
+K
+java:S1874"/Remove this use of "execute"; it is deprecated.(嫏
h
-java:S1874"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(Ϳ8/
-R
-java:S1874"/Remove this use of "execute"; it is deprecated.(嫏8/
-o
-java:S3776"RRefactor this method to reduce its Cognitive Complexity from 20 to the 15 allowed.(#8/
-U
-java:S1135"2Complete the task associated to this TODO comment.(8/
-e
-java:S1126"BReplace this if-then-else statement by a single method invocation.(玒8/
-U
-java:S1135"2Complete the task associated to this TODO comment.(8/
-T
-java:S2696"6Make the enclosing method "static" or remove this set.(8/
-T
-java:S2696"6Make the enclosing method "static" or remove this set.(8/
-T
-java:S1874"1Remove this use of "AsyncTask"; it is deprecated.(Ч8/
-m
-java:S1874"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(ች8/
-R
-java:S1874"/Remove this use of "execute"; it is deprecated.(嫏8/
-o
-java:S3776"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(b8/
-n java:S128"LEnd this switch case with an unconditional break, return or throw statement.(δ8¼/
+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:S1126"BReplace this if-then-else statement by a single method invocation.(玒
N
-java:S3398"0Move this method into "OnListItemClickListener".(8ȼ/
-H
-java:S3398"%Move this method into "ModeCallback".(8ȼ/
+java:S1135"2Complete the task associated to this TODO comment.(
+M
+java:S2696"6Make the enclosing method "static" or remove this set.(
+M
+java:S2696"6Make the enclosing method "static" or remove this set.(
+M
+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".(ች
+K
+java:S1874"/Remove this use of "execute"; it is deprecated.(嫏
+h
+java:S3776"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(b
+g java:S128"LEnd this switch case with an unconditional break, return or throw statement.(δ
<
java:S3398"%Move this method into "ModeCallback".(
+A
+java:S3398"%Move this method into "ModeCallback".(
K
java:S3398"/Move this method into "BackgroundQueryHandler".(
-w
-java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥8ʼ/
+G
+java:S3398"0Move this method into "OnListItemClickListener".(
+p
+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.(
-n java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(8Ӽ/
+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(ά
?
java:S1604"(Make this anonymous inner class a lambda(ܴ
-F
-java:S1604"(Make this anonymous inner class a lambda(8ּ/
-K
-java:S1604"(Make this anonymous inner class a lambda(8ּ/
-K
-java:S1604"(Make this anonymous inner class a lambda(8ּ/
-F
-java:S1604"(Make this anonymous inner class a lambda(8/
-F
-java:S1604"(Make this anonymous inner class a lambda(۱8/
-F
-java:S1604"(Make this anonymous inner class a lambda(ά8/
-n
-java:S1301"KReplace this "switch" statement by "if" statements to increase readability.(ד8ؼ/
+?
+java:S1604"(Make this anonymous inner class a lambda(
+D
+java:S1604"(Make this anonymous inner class a lambda(
+D
+java:S1604"(Make this anonymous inner class a lambda(
+?
+java:S1604"(Make this anonymous inner class a lambda(
+?
+java:S1604"(Make this anonymous inner class a lambda(۱
+?
+java:S1604"(Make this anonymous inner class a lambda(ά
+g
+java:S1301"KReplace this "switch" statement by "if" statements to increase readability.(ד
Z
java:S2583"CChange this condition so that it does not always evaluate to "true"(
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/d/9/d92e16000f49ca8e38a8b0a8ef8d26ecfa0c30ff b/src/Notes-master1/.idea/sonarlint/issuestore/d/9/d92e16000f49ca8e38a8b0a8ef8d26ecfa0c30ff
deleted file mode 100644
index ffb60b3d..00000000
--- a/src/Notes-master1/.idea/sonarlint/issuestore/d/9/d92e16000f49ca8e38a8b0a8ef8d26ecfa0c30ff
+++ /dev/null
@@ -1,12 +0,0 @@
-
-s
-java:S4144"\Update this method so that its implementation is not identical to "getParentId" on line 203.(
->
-java:S1125^"(Remove the unnecessary boolean literals.(
-m
-java:S3776}"RRefactor this method to reduce its Cognitive Complexity from 22 to the 15 allowed.(
-C
-java:S1125~"(Remove the unnecessary boolean literals.(
->
-java:S1125"(Remove the unnecessary boolean literals.(
-s java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ٮ8/
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/index.pb b/src/Notes-master1/.idea/sonarlint/issuestore/index.pb
index 5fc59a54..5c821158 100644
--- a/src/Notes-master1/.idea/sonarlint/issuestore/index.pb
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/index.pb
@@ -87,17 +87,15 @@ l
-
-
-
-
-
-
+
-
-
-
-
+
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
+
+
+
@@ -604,10 +153,15 @@
+
+
+
+
+
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/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 832f0b4f..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 6aea6b69..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/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 864c97f5..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 0aabafff..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 f806f6fa..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 9c600f34..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 27949810..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 83079bd3..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 41f794f4..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 66022339..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/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 73756f7e..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 ea13d802..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/mergeDebugAssets/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
index d86314b8..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 40de823c..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 73b3eadd..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,6 +1,7 @@
-#Tue Nov 09 08:54:37 CST 2021
+#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
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 8c9e4801..f4ea7067 100644
--- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merger.xml
+++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merger.xml
@@ -2817,7 +2817,7 @@
/>
-
+
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/stripped.dir/layout/dialog_delete_senote.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/stripped.dir/layout/dialog_delete_senote.xml
deleted file mode 100644
index ab30673f..00000000
--- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/stripped.dir/layout/dialog_delete_senote.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
\ 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 e042d446..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 09:13:48 CST 2021
+#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 dce6f99a..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/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
index 47c81db3..c0a99d19 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/DialogDeleteSenoteBinding.class 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/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.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
index 0d8cc025..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/NotesListItem.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class
index 0cc2ab23..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 bf844f5e..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,234 +5,261 @@
5 android:versionName="0.1" >
6
7 E:\git\xcr_weihu\src\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-->E:\git\xcr_weihu\src\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-->E:\git\xcr_weihu\src\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-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:9:5-81
-11-->E:\git\xcr_weihu\src\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-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:10:5-88
-12-->E:\git\xcr_weihu\src\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-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:11:5-67
-13-->E:\git\xcr_weihu\src\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-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:12:5-72
-14-->E:\git\xcr_weihu\src\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-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:13:5-74
-15-->E:\git\xcr_weihu\src\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-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:14:5-80
-16-->E:\git\xcr_weihu\src\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-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:15:5-71
-17-->E:\git\xcr_weihu\src\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-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:16:5-74
-18-->E:\git\xcr_weihu\src\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-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:17:5-81
-19-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:17:22-78
-20
-21 E:\git\xcr_weihu\src\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\小超人\.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-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:20:9-42
-25 android:label="@string/app_name"
-25-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:21:9-41
-26 android:testOnly="true" >
-27 E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:23:9-35:20
-28 android:name="net.micode.notes.ui.NotesListActivity"
-28-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:24:13-49
-29 android:configChanges="keyboardHidden|orientation|screenSize"
-29-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:25:13-74
-30 android:label="@string/app_name"
-30-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:26:13-45
-31 android:launchMode="singleTop"
-31-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:27:13-43
-32 android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
-32-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:28:13-71
-33 android:uiOptions="splitActionBarWhenNarrow"
-33-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:29:13-57
-34 android:windowSoftInputMode="adjustPan" >
-34-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:30:13-52
-35
-35-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:31:13-34:29
-36
-36-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:32:17-69
-36-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:32:25-66
-37
-38
-38-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:33:17-77
-38-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:33:27-74
-39
-40
-41 E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:36:9-58:20
-42 android:name="net.micode.notes.ui.NoteEditActivity"
-42-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:37:13-48
-43 android:configChanges="keyboardHidden|orientation|screenSize"
-43-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:38:13-74
-44 android:launchMode="singleTop"
-44-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:39:13-43
-45 android:theme="@style/Theme.AppCompat.Light.DarkActionBar" >
-45-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:40:13-71
-46
-46-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:41:13-48:29
-47
-47-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:42:17-79
-47-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:42:25-76
-48
-49
-49-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:44:17-76
-49-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:44:27-73
-50
-51
-51-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:46:17-78
-51-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:46:23-75
-52
-52-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:46:17-78
-52-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:46:23-75
-53
-54
-54-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:49:13-53:29
-55
-55-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:50:17-71
-55-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:50:25-68
-56
-57
-57-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:44:17-76
-57-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:44:27-73
-58
+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 E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:55:13-57:54
-61 android:name="android.app.searchable"
-61-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:56:17-54
-62 android:resource="@xml/searchable" />
-62-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:57:17-51
-63
-64 E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:59:9-63:78
-65 android:name="net.micode.notes.ui.AlarmAlertActivity"
-65-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:60:13-50
-66 android:label="@string/app_name"
-66-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:61:13-45
-67 android:launchMode="singleInstance"
-67-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:62:13-48
-68 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" />
-68-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:63:13-75
-69 E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:64:9-68:63
-70 android:name="net.micode.notes.ui.NotesPreferenceActivity"
-70-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:65:13-55
-71 android:label="@string/preferences_title"
-71-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:66:13-54
-72 android:launchMode="singleTop"
-72-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:67:13-43
-73 android:theme="@android:style/Theme.Holo.Light" />
-73-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:68:13-60
-74
-75 E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:70:9-72:52
-76 android:name="android.app.default_searchable"
-76-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:71:13-58
-77 android:value=".ui.NoteEditActivity" />
-77-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:72:13-49
-78
-79 E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:74:9-77:43
-80 android:name="net.micode.notes.data.NotesProvider"
-80-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:75:13-47
-81 android:authorities="micode_notes"
-81-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:76:13-47
-82 android:multiprocess="true" />
-82-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:77:13-40
+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:79:9-91:20
-85 android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
-85-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:80:13-57
-86 android:label="@string/app_widget2x2" >
-86-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:81:13-50
-87
-87-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:82:13-86:29
-88
-88-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:83:17-84
-88-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:83:25-81
-89
-89-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:84:17-85
-89-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:84:25-82
-90
-90-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:85:17-85
-90-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:85:25-82
-91
+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:88:13-90:58
-94 android:name="android.appwidget.provider"
-94-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:89:17-58
-95 android:resource="@xml/widget_2x_info" />
-95-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:90:17-55
-96
-97 E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:92:9-104:20
-98 android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
-98-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:93:13-57
-99 android:label="@string/app_widget4x4" >
-99-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:94:13-50
-100
-100-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:82:13-86:29
-101
-101-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:83:17-84
-101-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:83:25-81
-102
-102-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:84:17-85
-102-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:84:25-82
-103
-103-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:85:17-85
-103-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:85:25-82
-104
-105
-106 E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:88:13-90:58
-107 android:name="android.appwidget.provider"
-107-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:89:17-58
-108 android:resource="@xml/widget_4x_info" />
-108-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:90:17-55
-109
-110
-110-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:105:9-109:20
-110-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:105:19-55
-111
-111-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:106:13-108:29
-112
-112-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:107:17-79
-112-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:107:25-76
+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:110:9-112:41
-116 android:name="net.micode.notes.ui.AlarmReceiver"
-116-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:111:13-45
-117 android:process=":remote" />
-117-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:112:13-38
-118
-119 E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:114:9-116:40
-120 android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-120-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:115:13-58
-121 android:exported="false" />
-121-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:116:13-37
-122
-123
-124
+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_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 483a811d..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,6 +17,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -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/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/NotesListActivity.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
index f8379197..d6c4116d 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
@@ -80,7 +80,7 @@ import java.io.InputStreamReader;
import java.util.HashSet;
public class NotesListActivity extends AppCompatActivity implements OnClickListener, OnItemLongClickListener {
- private int time_mode = 1;
+ private int time_mode = 0;
private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0;
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/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”的搜索结果