diff --git a/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.bin b/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.bin
index a33b5c39..a1705bd4 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 033e7bd5..687e3ec4 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 0cc73af8..9c736fe1 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 fede15c7..34f30cfb 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 28c8d0a9..137e6e77 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 377fe3a1..74d7ec8a 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 2bef2b11..fd6210fe 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/Notes-master1.iml b/src/Notes-master1/.idea/Notes-master1.iml
new file mode 100644
index 00000000..a6000a56
--- /dev/null
+++ b/src/Notes-master1/.idea/Notes-master1.iml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/dbnavigator.xml b/src/Notes-master1/.idea/dbnavigator.xml
index 382398ee..dd4201fc 100644
--- a/src/Notes-master1/.idea/dbnavigator.xml
+++ b/src/Notes-master1/.idea/dbnavigator.xml
@@ -24,14 +24,7 @@
-
-
-
-
-
-
-
-
+
diff --git a/src/Notes-master1/.idea/misc.xml b/src/Notes-master1/.idea/misc.xml
index b51cea0b..9431ee1c 100644
--- a/src/Notes-master1/.idea/misc.xml
+++ b/src/Notes-master1/.idea/misc.xml
@@ -18,6 +18,8 @@
+
+
diff --git a/src/Notes-master1/.idea/modules.xml b/src/Notes-master1/.idea/modules.xml
new file mode 100644
index 00000000..5e29cc57
--- /dev/null
+++ b/src/Notes-master1/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/0/8/08c35f02f11c35ae9ebf8db0a482054dfa1cf493 b/src/Notes-master1/.idea/sonarlint/issuestore/0/8/08c35f02f11c35ae9ebf8db0a482054dfa1cf493
index c1008224..e69de29b 100644
--- a/src/Notes-master1/.idea/sonarlint/issuestore/0/8/08c35f02f11c35ae9ebf8db0a482054dfa1cf493
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/0/8/08c35f02f11c35ae9ebf8db0a482054dfa1cf493
@@ -1,11 +0,0 @@
-
-s
-java:S4144"\Update this method so that its implementation is not identical to "getParentId" on line 185.(
->
-java:S1125T"(Remove the unnecessary boolean literals.(
-m
-java:S3776p"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(
-C
-java:S1125q"(Remove the unnecessary boolean literals.(
->
-java:S1125r"(Remove the unnecessary boolean literals.(
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/2/8/283f16cc23da56ca65616082bc810304d3511d0a b/src/Notes-master1/.idea/sonarlint/issuestore/2/8/283f16cc23da56ca65616082bc810304d3511d0a
index a4843ed2..e69de29b 100644
--- a/src/Notes-master1/.idea/sonarlint/issuestore/2/8/283f16cc23da56ca65616082bc810304d3511d0a
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/2/8/283f16cc23da56ca65616082bc810304d3511d0a
@@ -1,39 +0,0 @@
-
-7
-java:S1116,"Remove this empty statement.(
-K
-java:S1874/"5Remove this use of "CursorAdapter"; it is deprecated.(
-J
-java:S2864^"4Iterate over the "entrySet" instead of the "keySet".(
-B
-java:S1125_"'Remove the unnecessary boolean literal.(ɯ
-J
-java:S2864n"4Iterate over the "entrySet" instead of the "keySet".(
-B
-java:S1125o"'Remove the unnecessary boolean literal.(ɯ
-A
-java:S1168|"+Return an empty collection instead of null.(
-C
-java:S1125"'Remove the unnecessary boolean literal.(
-t
-java:S22930"YReplace the type specification in this constructor call with the diamond operator ("<>").(ə
-o
-java:S2293]"YReplace the type specification in this constructor call with the diamond operator ("<>").(
-o
-java:S2293m"YReplace the type specification in this constructor call with the diamond operator ("<>").(Ȫ
-J
-java:S1066U"/Merge this if statement with the enclosing one.(ڧ
-
-java:S1319\"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".(
-
-java:S1319l"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".(
-j
-java:S1104*"TMake widgetId a static final constant or non-public and provide accessors if needed.(ǎ
-q
-java:S1104+"VMake widgetType a static final constant or non-public and provide accessors if needed.(漬
-E
-java:S5411_"*Use the primitive boolean expression here.(ɯ
-E
-java:S5411o"*Use the primitive boolean expression here.(ɯ
-F
-java:S5411"*Use the primitive boolean expression here.(
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/3/2/32360bf24febc78f20db52498c7576b3d8650d56 b/src/Notes-master1/.idea/sonarlint/issuestore/3/2/32360bf24febc78f20db52498c7576b3d8650d56
index e00702e0..e69de29b 100644
--- a/src/Notes-master1/.idea/sonarlint/issuestore/3/2/32360bf24febc78f20db52498c7576b3d8650d56
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/3/2/32360bf24febc78f20db52498c7576b3d8650d56
@@ -1,39 +0,0 @@
-
-U
-java:S1118&":Add a private constructor to hide the implicit public one.(
-Z
-java:S2147E"DCombine this catch with the one at line 67, which has the same body.(暩
-[
-java:S2147m"ECombine this catch with the one at line 107, which has the same body.(暩
-k
-java:S3252"OUse static access with "net.micode.notes.data.Notes$DataColumns" for "NOTE_ID".(
-m
-java:S3252"QUse static access with "net.micode.notes.data.Notes$DataColumns" for "MIME_TYPE".(
-f
-java:S3252"OUse static access with "net.micode.notes.data.Notes$DataColumns" for "NOTE_ID".(ʹ
-m
-java:S3252"QUse static access with "net.micode.notes.data.Notes$DataColumns" for "MIME_TYPE".(
-t
-java:S22932"YReplace the type specification in this constructor call with the diamond operator ("<>").(л
-t
-java:S2293Z"YReplace the type specification in this constructor call with the diamond operator ("<>").(л
-u
-java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(ª
-b
-java:S1192D"GDefine a constant instead of duplicating this literal "%s: %s" 4 times.(
-j
-java:S1192y"HDefine a constant instead of duplicating this literal "=? AND " 4 times.(8̑/
-J
-java:S1066"/Merge this if statement with the enclosing one.(䲜
-v
-java:S1319("`The type of "ids" should be an interface such as "Set" rather than the implementation "HashSet".(
-{
-java:S1319S"`The type of "ids" should be an interface such as "Set" rather than the implementation "HashSet".(
-
-java:S1319"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".(
-T
-java:S1155-">Use isEmpty() to check whether the collection is empty or not.(
-S
-java:S2589>"8Remove this expression which always evaluates to "false"(Ύ
-S
-java:S2589f"8Remove this expression which always evaluates to "false"(Ύ
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/5/d/5dfe6902d8ec740690f88d644e74362c3be08fad b/src/Notes-master1/.idea/sonarlint/issuestore/5/d/5dfe6902d8ec740690f88d644e74362c3be08fad
index 505f811c..a66973f6 100644
--- a/src/Notes-master1/.idea/sonarlint/issuestore/5/d/5dfe6902d8ec740690f88d644e74362c3be08fad
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/5/d/5dfe6902d8ec740690f88d644e74362c3be08fad
@@ -1,9 +1,12 @@
m
-java:S37763"RRefactor this method to reduce its Cognitive Complexity from 16 to the 15 allowed.(
+java:S37766"RRefactor this method to reduce its Cognitive Complexity from 21 to the 15 allowed.(
O
-java:S1874?"9Remove this use of "setTextAppearance"; it is deprecated.(
+java:S1874B"9Remove this use of "setTextAppearance"; it is deprecated.(
O
-java:S1874F"9Remove this use of "setTextAppearance"; it is deprecated.(
+java:S1874I"9Remove this use of "setTextAppearance"; it is deprecated.(
O
-java:S1874P"9Remove this use of "setTextAppearance"; it is deprecated.(
\ No newline at end of file
+java:S1874S"9Remove this use of "setTextAppearance"; it is deprecated.(
+f java:S117f"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(
+f java:S117k"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(㷔
+f java:S117l"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(Õ
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/8/7/876016634c6642b35109680ccac740dc8271b236 b/src/Notes-master1/.idea/sonarlint/issuestore/8/7/876016634c6642b35109680ccac740dc8271b236
index d0fcee2c..e69de29b 100644
--- a/src/Notes-master1/.idea/sonarlint/issuestore/8/7/876016634c6642b35109680ccac740dc8271b236
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/8/7/876016634c6642b35109680ccac740dc8271b236
@@ -1,11 +0,0 @@
-
-3
-java:S2386A"Make this member "protected".(
-8
-java:S2386K"Make this member "protected".(㳎
-X
-java:S1126"AReplace this if-then-else statement by a single return statement.(
-?
-java:S1125"(Remove the unnecessary boolean literals.(
-F
-java:S1066"/Merge this if statement with the enclosing one.(
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/a/7/a7641cfac724321d508c2a284223a711011a93f5 b/src/Notes-master1/.idea/sonarlint/issuestore/a/7/a7641cfac724321d508c2a284223a711011a93f5
index d1433502..e69de29b 100644
--- a/src/Notes-master1/.idea/sonarlint/issuestore/a/7/a7641cfac724321d508c2a284223a711011a93f5
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/a/7/a7641cfac724321d508c2a284223a711011a93f5
@@ -1,13 +0,0 @@
-
-U
-java:S11181":Add a private constructor to hide the implicit public one.(͓
-^
-java:S1214@"CMove constants defined in this interfaces to another class or enum.(⸫
-Z
-java:S1214"CMove constants defined in this interfaces to another class or enum.(
-V
-java:S1118":Add a private constructor to hide the implicit public one.(
-Q
-java:S1118":Add a private constructor to hide the implicit public one.(߀
-f
-java:S11929"KDefine a constant instead of duplicating this literal "content://" 4 times.(
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32 b/src/Notes-master1/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32
index 77f37cff..47b31837 100644
--- a/src/Notes-master1/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32
@@ -4,98 +4,98 @@ java:S3008^"SRename this field "VIEW_WAY" to match the regular expression '^[a-
7
java:S1116d"Remove this empty statement.(
a
-java:S1124"EReorder the modifiers to comply with the Java Language Specification.(
+java:S1124"EReorder the modifiers to comply with the Java Language Specification.(
[
-java:S1124"EReorder the modifiers to comply with the Java Language Specification.(Ѿk
+java:S1124"EReorder the modifiers to comply with the Java Language Specification.(Ѿk
n
-java:S3776"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.(
+java:S3776"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.(
2
-java:S3626"Remove this redundant jump.(݅
+java:S3626"Remove this redundant jump.(݅
2
-java:S3626"Remove this redundant jump.(݅
+java:S3626"Remove this redundant jump.(݅
2
-java:S3626"Remove this redundant jump.(݅
+java:S3626"Remove this redundant jump.(݅
P
-java:S1874"9Remove this use of "PreferenceManager"; it is deprecated.(
+java:S1874"9Remove this use of "PreferenceManager"; it is deprecated.(
Z
-java:S1874"CRemove this use of "getDefaultSharedPreferences"; it is deprecated.(
+java:S1874"CRemove this use of "getDefaultSharedPreferences"; it is deprecated.(
N
-java:S1135"2Complete the task associated to this TODO comment.(̐
+java:S1135"2Complete the task associated to this TODO comment.(̐
F
-java:S2093"*Change this "try" to a try-with-resources.(
+java:S2093"*Change this "try" to a try-with-resources.(
o
-java:S1450"XRemove the "mMoveMenu" field and declare it as a local variable in the relevant methods.(
+java:S1450"XRemove the "mMoveMenu" field and declare it as a local variable in the relevant methods.(
n
-java:S3252"RUse static access with "android.widget.AbsListView" for "MultiChoiceModeListener".(
+java:S3252"RUse static access with "android.widget.AbsListView" for "MultiChoiceModeListener".(
N
-java:S1135"2Complete the task associated to this TODO comment.(
+java:S1135"2Complete the task associated to this TODO comment.(
N
-java:S1135"2Complete the task associated to this TODO comment.(
+java:S1135"2Complete the task associated to this TODO comment.(
U
-java:S1874"9Remove this use of "getDefaultDisplay"; it is deprecated.(ĸ
+java:S1874"9Remove this use of "getDefaultDisplay"; it is deprecated.(ĸ
M
-java:S1874"1Remove this use of "getHeight"; it is deprecated.(
+java:S1874"1Remove this use of "getHeight"; it is deprecated.(
8
-java:S1116"Remove this empty statement.(
+java:S1116"Remove this empty statement.(
i
-java:S3776"RRefactor this method to reduce its Cognitive Complexity from 29 to the 15 allowed.(
+java:S3776"RRefactor this method to reduce its Cognitive Complexity from 29 to the 15 allowed.(
F
-java:S1874"1Remove this use of "AsyncTask"; it is deprecated.(?
-? java:S108")Either remove or fill this block of code.(ʥ
+java:S1874"1Remove this use of "AsyncTask"; it is deprecated.(?
+? java:S108")Either remove or fill this block of code.(ʥ
a
-java:S1874"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(Ϳ
+java:S1874"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(Ϳ
K
-java:S1874"/Remove this use of "execute"; it is deprecated.(嫏
+java:S1874"/Remove this use of "execute"; it is deprecated.(嫏
h
-java:S3776"RRefactor this method to reduce its Cognitive Complexity from 20 to the 15 allowed.(#
+java:S3776"RRefactor this method to reduce its Cognitive Complexity from 20 to the 15 allowed.(#
N
-java:S1135"2Complete the task associated to this TODO comment.(
+java:S1135"2Complete the task associated to this TODO comment.(
^
-java:S1126"BReplace this if-then-else statement by a single method invocation.(玒
+java:S1126"BReplace this if-then-else statement by a single method invocation.(玒
N
-java:S1135"2Complete the task associated to this TODO comment.(
+java:S1135"2Complete the task associated to this TODO comment.(
M
-java:S2696"6Make the enclosing method "static" or remove this set.(
-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
+java:S2696"6Make the enclosing method "static" or remove this set.(
+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ُ/
G
-java:S3398"0Move this method into "OnListItemClickListener".(
-<
-java:S3398"%Move this method into "ModeCallback".(
-A
-java:S3398"%Move this method into "ModeCallback".(
+java:S3398"0Move this method into "OnListItemClickListener".(
K
-java:S3398"/Move this method into "BackgroundQueryHandler".(
+java:S3398"/Move this method into "BackgroundQueryHandler".(
+H
+java:S3398"%Move this method into "ModeCallback".(8ُ/
+<
+java:S3398"%Move this method into "ModeCallback".(
p
-java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥
+java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥
b
-java:S1192"FDefine a constant instead of duplicating this literal " AND " 4 times.(
-]
-java:S1192"FDefine a constant instead of duplicating this literal " DESC" 3 times.(
-g java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(
+java:S1192"FDefine a constant instead of duplicating this literal " AND " 5 times.(
+d
+java:S1192"FDefine a constant instead of duplicating this literal " DESC" 4 times.(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(̺V
?
-java:S1604"(Make this anonymous inner class a lambda(ά
+java:S1604"(Make this anonymous inner class a lambda(ά
?
-java:S1604"(Make this anonymous inner class a lambda(ܴ
+java:S1604"(Make this anonymous inner class a lambda(ܴ
D
-java:S1604"(Make this anonymous inner class a lambda(
+java:S1604"(Make this anonymous inner class a lambda(
?
-java:S1604"(Make this anonymous inner class a lambda(
+java:S1604"(Make this anonymous inner class a lambda(
?
-java:S1604"(Make this anonymous inner class a lambda(۱
+java:S1604"(Make this anonymous inner class a lambda(۱
?
-java:S1604"(Make this anonymous inner class a lambda(ά
+java:S1604"(Make this anonymous inner class a lambda(ά
g
-java:S1301"KReplace this "switch" statement by "if" statements to increase readability.(ד
-Z
-java:S2583"CChange this condition so that it does not always evaluate to "true"(Ѷ
+java:S1301"KReplace this "switch" statement by "if" statements to increase readability.(ד
Z
-java:S2583"CChange this condition so that it does not always evaluate to "true"(
\ No newline at end of file
+java:S2583"CChange this condition so that it does not always evaluate to "true"(
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/index.pb b/src/Notes-master1/.idea/sonarlint/issuestore/index.pb
index e321d6f1..bdae16ff 100644
--- a/src/Notes-master1/.idea/sonarlint/issuestore/index.pb
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/index.pb
@@ -27,8 +27,6 @@ t
Dapp/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java,1\7\175d8fa829f0a7ced6aa11970f112de6ad144628
t
Dapp/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java,2\b\2b687ab930681e3885683578d43df600a0a20982
-<
-build.gradle,f\0\f07866736216be0ee2aba49e392191aeae700a35
d
4app/src/main/java/net/micode/notes/data/Contact.java,9\a\9a3a19793537958b8b1b03a81985999e22705a2f
\
@@ -37,8 +35,6 @@ g
7app/src/main/java/net/micode/notes/gtask/data/Task.java,d\1\d187f1271655c3d91661a39fe6de395b6a9f290a
~
Napp/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java,5\f\5f6162ca79fcea353b280c5dc84973a9c37d2c74
-@
-app/build.gradle,f\4\f4a01d6a4fcb971362ec00a83903fd3902f52164
Oapp/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java,0\f\0f0f0549145d0e2bfb972ba1ed2e2c38bfd6d1b1
h
@@ -51,8 +47,6 @@ i
9app/src/main/java/net/micode/notes/ui/DateTimePicker.java,6\c\6cbf8bd9aa98eff862b1dc067330ba66ba4493aa
k
;app/src/main/java/net/micode/notes/tool/ResourceParser.java,c\6\c65f5dc8218ef1da6f6bfb5d1b14aea855a54d7f
-h
-8app/src/main/java/net/micode/notes/ui/NotesListItem.java,5\d\5dfe6902d8ec740690f88d644e74362c3be08fad
r
Bapp/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java,d\a\da57ce446af85bbd9aefee65e969869f0cff78b0
g
@@ -69,23 +63,29 @@ P
app/src/main/AndroidManifest.xml,8\c\8c55c3ccc257e5907959013f99656e4c8ec3903e
j
:app/src/main/java/net/micode/notes/data/NotesProvider.java,6\a\6a65e747031f27aef20597b4181148a9fbf963d5
-g
-7app/src/main/java/net/micode/notes/ui/NoteItemData.java,0\8\08c35f02f11c35ae9ebf8db0a482054dfa1cf493
-i
-9app/src/main/java/net/micode/notes/model/WorkingNote.java,8\7\876016634c6642b35109680ccac740dc8271b236
b
2app/src/main/java/net/micode/notes/model/Note.java,d\d\dd970bd8ce083850fca1d4d159647ccd110e57cb
-b
-2app/src/main/java/net/micode/notes/data/Notes.java,a\7\a7641cfac724321d508c2a284223a711011a93f5
p
@app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java,1\e\1eb2363b523dbcae43d3c6e4790c64436af61b13
m
=app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java,f\9\f9f49497f95afd327db7a7a512612aa1089003d4
-f
-6app/src/main/java/net/micode/notes/tool/DataUtils.java,3\2\32360bf24febc78f20db52498c7576b3d8650d56
k
;app/src/main/java/net/micode/notes/ui/NoteEditActivity.java,5\7\577f30d26378ec8a2bd2e4a43f3c79b3f04c402c
+b
+2app/src/main/java/net/micode/notes/data/Notes.java,a\7\a7641cfac724321d508c2a284223a711011a93f5
+k
+;app/src/main/java/net/micode/notes/ui/NotesListAdapter.java,2\8\283f16cc23da56ca65616082bc810304d3511d0a
+<
+build.gradle,f\0\f07866736216be0ee2aba49e392191aeae700a35
+f
+6app/src/main/java/net/micode/notes/tool/DataUtils.java,3\2\32360bf24febc78f20db52498c7576b3d8650d56
+g
+7app/src/main/java/net/micode/notes/ui/NoteItemData.java,0\8\08c35f02f11c35ae9ebf8db0a482054dfa1cf493
+i
+9app/src/main/java/net/micode/notes/model/WorkingNote.java,8\7\876016634c6642b35109680ccac740dc8271b236
+@
+app/build.gradle,f\4\f4a01d6a4fcb971362ec00a83903fd3902f52164
l
-
+
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/workspace.xml b/src/Notes-master1/.idea/workspace.xml
index 92193bf3..9b084559 100644
--- a/src/Notes-master1/.idea/workspace.xml
+++ b/src/Notes-master1/.idea/workspace.xml
@@ -12,13 +12,643 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -93,7 +723,7 @@
-
+
@@ -190,49 +820,49 @@
file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
- 147
-
+ 149
+
file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
- 280
-
+ 282
+
file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
- 963
+ 976
file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
- 825
+ 834
file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
- 286
+ 288
file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
- 362
+ 364
file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
- 567
+ 574
file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
- 570
+ 577
file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
- 633
+ 640
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 14ce031c..e05373c5 100644
Binary files a/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin
index 7a59e8bd..1f8ababb 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 fe02d4d8..ea7c2ec4 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 d68755fa..601f245f 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 df7125b2..9f265c18 100644
Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin differ
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin
index e60a0512..dc48e82c 100644
Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin differ
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_0/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_056c9ff9f01f5b0ff60a1d0b5eaf3d3db1d0da0a2aa87fe1669a154eb7c58529_bucket_0/graph.bin
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_0/graph.bin
rename to src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_056c9ff9f01f5b0ff60a1d0b5eaf3d3db1d0da0a2aa87fe1669a154eb7c58529_bucket_0/graph.bin
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_1/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_056c9ff9f01f5b0ff60a1d0b5eaf3d3db1d0da0a2aa87fe1669a154eb7c58529_bucket_1/graph.bin
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_1/graph.bin
rename to src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_056c9ff9f01f5b0ff60a1d0b5eaf3d3db1d0da0a2aa87fe1669a154eb7c58529_bucket_1/graph.bin
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_2/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_056c9ff9f01f5b0ff60a1d0b5eaf3d3db1d0da0a2aa87fe1669a154eb7c58529_bucket_2/graph.bin
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_2/graph.bin
rename to src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_056c9ff9f01f5b0ff60a1d0b5eaf3d3db1d0da0a2aa87fe1669a154eb7c58529_bucket_2/graph.bin
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_3/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_056c9ff9f01f5b0ff60a1d0b5eaf3d3db1d0da0a2aa87fe1669a154eb7c58529_bucket_3/graph.bin
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_3/graph.bin
rename to src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_056c9ff9f01f5b0ff60a1d0b5eaf3d3db1d0da0a2aa87fe1669a154eb7c58529_bucket_3/graph.bin
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5a4f98e904550470630ccd2e9184ffd356634f14ea3b6d426bb7c371337589b0_bucket_0/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_056c9ff9f01f5b0ff60a1d0b5eaf3d3db1d0da0a2aa87fe1669a154eb7c58529_bucket_4/graph.bin
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5a4f98e904550470630ccd2e9184ffd356634f14ea3b6d426bb7c371337589b0_bucket_0/graph.bin
rename to src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_056c9ff9f01f5b0ff60a1d0b5eaf3d3db1d0da0a2aa87fe1669a154eb7c58529_bucket_4/graph.bin
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5a4f98e904550470630ccd2e9184ffd356634f14ea3b6d426bb7c371337589b0_bucket_1/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_056c9ff9f01f5b0ff60a1d0b5eaf3d3db1d0da0a2aa87fe1669a154eb7c58529_bucket_5/graph.bin
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5a4f98e904550470630ccd2e9184ffd356634f14ea3b6d426bb7c371337589b0_bucket_1/graph.bin
rename to src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_056c9ff9f01f5b0ff60a1d0b5eaf3d3db1d0da0a2aa87fe1669a154eb7c58529_bucket_5/graph.bin
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5a4f98e904550470630ccd2e9184ffd356634f14ea3b6d426bb7c371337589b0_bucket_2/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5a4f98e904550470630ccd2e9184ffd356634f14ea3b6d426bb7c371337589b0_bucket_2/graph.bin
deleted file mode 100644
index 601f245f..00000000
Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5a4f98e904550470630ccd2e9184ffd356634f14ea3b6d426bb7c371337589b0_bucket_2/graph.bin and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5a4f98e904550470630ccd2e9184ffd356634f14ea3b6d426bb7c371337589b0_bucket_3/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5a4f98e904550470630ccd2e9184ffd356634f14ea3b6d426bb7c371337589b0_bucket_3/graph.bin
deleted file mode 100644
index 601f245f..00000000
Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5a4f98e904550470630ccd2e9184ffd356634f14ea3b6d426bb7c371337589b0_bucket_3/graph.bin and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5a4f98e904550470630ccd2e9184ffd356634f14ea3b6d426bb7c371337589b0_bucket_4/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5a4f98e904550470630ccd2e9184ffd356634f14ea3b6d426bb7c371337589b0_bucket_4/graph.bin
deleted file mode 100644
index 601f245f..00000000
Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5a4f98e904550470630ccd2e9184ffd356634f14ea3b6d426bb7c371337589b0_bucket_4/graph.bin and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5a4f98e904550470630ccd2e9184ffd356634f14ea3b6d426bb7c371337589b0_bucket_5/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5a4f98e904550470630ccd2e9184ffd356634f14ea3b6d426bb7c371337589b0_bucket_5/graph.bin
deleted file mode 100644
index 601f245f..00000000
Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5a4f98e904550470630ccd2e9184ffd356634f14ea3b6d426bb7c371337589b0_bucket_5/graph.bin and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_967a0ed9aa7f78cf50d9c5afc467ab3745fece2db152e8641f9aea092bde2ced_bucket_0/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_967a0ed9aa7f78cf50d9c5afc467ab3745fece2db152e8641f9aea092bde2ced_bucket_0/graph.bin
deleted file mode 100644
index 601f245f..00000000
Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_967a0ed9aa7f78cf50d9c5afc467ab3745fece2db152e8641f9aea092bde2ced_bucket_0/graph.bin and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_967a0ed9aa7f78cf50d9c5afc467ab3745fece2db152e8641f9aea092bde2ced_bucket_1/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_967a0ed9aa7f78cf50d9c5afc467ab3745fece2db152e8641f9aea092bde2ced_bucket_1/graph.bin
deleted file mode 100644
index 601f245f..00000000
Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_967a0ed9aa7f78cf50d9c5afc467ab3745fece2db152e8641f9aea092bde2ced_bucket_1/graph.bin and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_967a0ed9aa7f78cf50d9c5afc467ab3745fece2db152e8641f9aea092bde2ced_bucket_2/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_967a0ed9aa7f78cf50d9c5afc467ab3745fece2db152e8641f9aea092bde2ced_bucket_2/graph.bin
deleted file mode 100644
index 601f245f..00000000
Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_967a0ed9aa7f78cf50d9c5afc467ab3745fece2db152e8641f9aea092bde2ced_bucket_2/graph.bin and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_967a0ed9aa7f78cf50d9c5afc467ab3745fece2db152e8641f9aea092bde2ced_bucket_3/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_967a0ed9aa7f78cf50d9c5afc467ab3745fece2db152e8641f9aea092bde2ced_bucket_3/graph.bin
deleted file mode 100644
index 601f245f..00000000
Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_967a0ed9aa7f78cf50d9c5afc467ab3745fece2db152e8641f9aea092bde2ced_bucket_3/graph.bin and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_967a0ed9aa7f78cf50d9c5afc467ab3745fece2db152e8641f9aea092bde2ced_bucket_4/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_967a0ed9aa7f78cf50d9c5afc467ab3745fece2db152e8641f9aea092bde2ced_bucket_4/graph.bin
deleted file mode 100644
index 601f245f..00000000
Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_967a0ed9aa7f78cf50d9c5afc467ab3745fece2db152e8641f9aea092bde2ced_bucket_4/graph.bin and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_967a0ed9aa7f78cf50d9c5afc467ab3745fece2db152e8641f9aea092bde2ced_bucket_5/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_967a0ed9aa7f78cf50d9c5afc467ab3745fece2db152e8641f9aea092bde2ced_bucket_5/graph.bin
deleted file mode 100644
index 601f245f..00000000
Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_967a0ed9aa7f78cf50d9c5afc467ab3745fece2db152e8641f9aea092bde2ced_bucket_5/graph.bin and /dev/null 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 9d5d339f..eab17f71 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 6b905fb0..56c56733 100644
Binary files a/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ
diff --git a/src/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debug/out b/src/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debug/out
index bf0d87ab..62f94575 100644
--- a/src/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debug/out
+++ b/src/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debug/out
@@ -1 +1 @@
-4
\ No newline at end of file
+6
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state
index ca2f4a1e..869e6656 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/6TIfGNH1KPBsEbPbyP81l3mpNXI= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/2g6Cx59kgGMmC3vaiF1Nkjciv6Y=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6TIfGNH1KPBsEbPbyP81l3mpNXI=
rename to src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/2g6Cx59kgGMmC3vaiF1Nkjciv6Y=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3yuxLDmxFdVtaXROb6R1dLvsoDw= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3yuxLDmxFdVtaXROb6R1dLvsoDw=
deleted file mode 100644
index a19a2a51..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3yuxLDmxFdVtaXROb6R1dLvsoDw= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/71XAuZh83gXpN9Xej8P7DZE+TW8= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6Tu3HOkTDHE5aYDXmS2dolySIEc=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/71XAuZh83gXpN9Xej8P7DZE+TW8=
rename to src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6Tu3HOkTDHE5aYDXmS2dolySIEc=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/PiopnnM2GszzEO8NSafwdX54Mdk= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6iSx44oUggla66KKnhTGNtQ+Kks=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/PiopnnM2GszzEO8NSafwdX54Mdk=
rename to src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6iSx44oUggla66KKnhTGNtQ+Kks=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ncbvxLOLgvkQ998BwH8zL4SHySo= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/8iAo7TSwCmQqWlRXt6U0tna86kw=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ncbvxLOLgvkQ998BwH8zL4SHySo=
rename to src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/8iAo7TSwCmQqWlRXt6U0tna86kw=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/YklGnISXfx3AuEw_KGHcYreWe4w= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/90zBq0rJwfZ6_3Adzsxbfu2xPh0=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/YklGnISXfx3AuEw_KGHcYreWe4w=
rename to src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/90zBq0rJwfZ6_3Adzsxbfu2xPh0=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/BgO87y5lH9+X9IZ5g3AnTSQcJII= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/BgO87y5lH9+X9IZ5g3AnTSQcJII=
deleted file mode 100644
index e27d24ae..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/BgO87y5lH9+X9IZ5g3AnTSQcJII= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GT1hsmEANwrCq7sQ5nuy9WMgAfM= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GT1hsmEANwrCq7sQ5nuy9WMgAfM=
deleted file mode 100644
index 06e914d8..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GT1hsmEANwrCq7sQ5nuy9WMgAfM= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/+qQPP4ly9nBu0JFMQ1RwWyTg98I= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/I0l9tvmCFo3y7e_4Mp7aJToYy1M=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/+qQPP4ly9nBu0JFMQ1RwWyTg98I=
rename to src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/I0l9tvmCFo3y7e_4Mp7aJToYy1M=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CFRm8IK6zenAYbjhsET1is_fxSw= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/JqdoOlvdqa7mnlg4E0EDxi+jQR0=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CFRm8IK6zenAYbjhsET1is_fxSw=
rename to src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/JqdoOlvdqa7mnlg4E0EDxi+jQR0=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/eu4sbM2z8otBrAm8_CE4L5ItTtU= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KbmFVS0HILi3SqyJqjYtZlBwvzg=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/eu4sbM2z8otBrAm8_CE4L5ItTtU=
rename to src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KbmFVS0HILi3SqyJqjYtZlBwvzg=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/L1Z8LD2CXmyMLVBGQWHjUxeWvBI= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/L1Z8LD2CXmyMLVBGQWHjUxeWvBI=
deleted file mode 100644
index 865488d1..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/L1Z8LD2CXmyMLVBGQWHjUxeWvBI= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NJY2za5CTmkC6GmWwKlXgk+vAVE= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NJY2za5CTmkC6GmWwKlXgk+vAVE=
deleted file mode 100644
index 2b56acdb..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NJY2za5CTmkC6GmWwKlXgk+vAVE= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QJH5K29tpAP4GDQJU7jNbYY1YnQ= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QJH5K29tpAP4GDQJU7jNbYY1YnQ=
deleted file mode 100644
index e7159a9a..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QJH5K29tpAP4GDQJU7jNbYY1YnQ= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CE1WuYdw3lB4rIwtnna6iDpswi4= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QMA3Hi4iw5c9B98I+RQFbVxBOGs=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CE1WuYdw3lB4rIwtnna6iDpswi4=
rename to src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QMA3Hi4iw5c9B98I+RQFbVxBOGs=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/S00XUbzW_7z7mNTePBtrdvGIDW8= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/S00XUbzW_7z7mNTePBtrdvGIDW8=
deleted file mode 100644
index 2dae2f9b..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/S00XUbzW_7z7mNTePBtrdvGIDW8= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9ccf831OBotyj0pIkpV9zFty1ec= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SMxpaCj2KxONY+Knb0nIWNeTn0A=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9ccf831OBotyj0pIkpV9zFty1ec=
rename to src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SMxpaCj2KxONY+Knb0nIWNeTn0A=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SwXj+1+2q3G4OpwTBKUcqrzEzas= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SwXj+1+2q3G4OpwTBKUcqrzEzas=
deleted file mode 100644
index f61d7629..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SwXj+1+2q3G4OpwTBKUcqrzEzas= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/WJ3Xci8v7MzZNPrnHsvJ9Nap+PY= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/WJ3Xci8v7MzZNPrnHsvJ9Nap+PY=
deleted file mode 100644
index 25547cc9..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/WJ3Xci8v7MzZNPrnHsvJ9Nap+PY= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/XMpIGV0NlmQ5P+zejRbXKRU9oOI= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/XMpIGV0NlmQ5P+zejRbXKRU9oOI=
deleted file mode 100644
index feebff2e..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/XMpIGV0NlmQ5P+zejRbXKRU9oOI= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/XjMXkratVhre7m6qO6JaLEo_dxA= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/XjMXkratVhre7m6qO6JaLEo_dxA=
deleted file mode 100644
index 1423435f..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/XjMXkratVhre7m6qO6JaLEo_dxA= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1_W15q7LeuWkNGTYPuth9dRTgeI= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/_d2RL4OQAJk8U11_R+QRAA1v+Hk=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1_W15q7LeuWkNGTYPuth9dRTgeI=
rename to src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/_d2RL4OQAJk8U11_R+QRAA1v+Hk=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/_deTPkWANkUHb8vgXxkq56Kiyas= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/_deTPkWANkUHb8vgXxkq56Kiyas=
deleted file mode 100644
index 27924dd4..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/_deTPkWANkUHb8vgXxkq56Kiyas= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/abIjr6qwCq0e6zz7k8_9iL+UJXE= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/abIjr6qwCq0e6zz7k8_9iL+UJXE=
deleted file mode 100644
index 371b4414..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/abIjr6qwCq0e6zz7k8_9iL+UJXE= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/HKy3YZCRdmIzWnsofS_uNfcxQeU= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/adw7QYibDRLBF+sXs16Ev0zmEEU=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/HKy3YZCRdmIzWnsofS_uNfcxQeU=
rename to src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/adw7QYibDRLBF+sXs16Ev0zmEEU=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/f3tGX7tl2UXTrGDyrXmR_LBrRlw= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/bvZ7tsg4LnFnp+GUzkNcUj13hQQ=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/f3tGX7tl2UXTrGDyrXmR_LBrRlw=
rename to src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/bvZ7tsg4LnFnp+GUzkNcUj13hQQ=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/fQgF1OYkCoSe9JLQ_4gnykSwaak= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/fQgF1OYkCoSe9JLQ_4gnykSwaak=
deleted file mode 100644
index 2365cb90..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/fQgF1OYkCoSe9JLQ_4gnykSwaak= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/faGw4VI3Xaerit9mSWcMyw8wmlg= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/faGw4VI3Xaerit9mSWcMyw8wmlg=
deleted file mode 100644
index d0dcd9ca..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/faGw4VI3Xaerit9mSWcMyw8wmlg= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/fsoIgGdxI41ux4ST6G5stapr5Po= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/fsoIgGdxI41ux4ST6G5stapr5Po=
deleted file mode 100644
index 32d47c06..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/fsoIgGdxI41ux4ST6G5stapr5Po= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SPt4WVLyQHYXrPTyi3EjMUuZaRY= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/gZsvIWthOdyBHb2ImuuV3ummgYA=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SPt4WVLyQHYXrPTyi3EjMUuZaRY=
rename to src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/gZsvIWthOdyBHb2ImuuV3ummgYA=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/gtC1u8wslap_73arZOPY7fT_gAo= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/gtC1u8wslap_73arZOPY7fT_gAo=
deleted file mode 100644
index 3c086f36..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/gtC1u8wslap_73arZOPY7fT_gAo= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DSC95mXyQ37bUs3AOctxRjluLT4= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/j4yejSjIDyNRJruXTLrRH1goQfg=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DSC95mXyQ37bUs3AOctxRjluLT4=
rename to src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/j4yejSjIDyNRJruXTLrRH1goQfg=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/dI+OlassKbBCJ+UNLcU5wPRDCis= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jTL3nVyltHJWTayuQpfpi2l3jVE=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/dI+OlassKbBCJ+UNLcU5wPRDCis=
rename to src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jTL3nVyltHJWTayuQpfpi2l3jVE=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Eyp1VbPa8XUDyQiI42UWz0Iqzcw= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/kVuWFk3v38bk_s3DhT3HBimZi5A=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Eyp1VbPa8XUDyQiI42UWz0Iqzcw=
rename to src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/kVuWFk3v38bk_s3DhT3HBimZi5A=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ktSEYahBM8WSsQHNOa49EYXB4t4= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ktSEYahBM8WSsQHNOa49EYXB4t4=
deleted file mode 100644
index b12b2871..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ktSEYahBM8WSsQHNOa49EYXB4t4= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/B07JTKqtB5Koiazp21vSNgzDVNo= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/kxOJ6omnkGTGSLkWkK6uvE3WPbA=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/B07JTKqtB5Koiazp21vSNgzDVNo=
rename to src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/kxOJ6omnkGTGSLkWkK6uvE3WPbA=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/m+_tCwwiv5SoNae2toaRJjp9hvk= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/m+_tCwwiv5SoNae2toaRJjp9hvk=
deleted file mode 100644
index e9e76081..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/m+_tCwwiv5SoNae2toaRJjp9hvk= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/mNGktEv1NB68FOE69HaMKHQCKYA= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/mNGktEv1NB68FOE69HaMKHQCKYA=
deleted file mode 100644
index e49acf79..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/mNGktEv1NB68FOE69HaMKHQCKYA= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/maXRyFfuaSiVWhgV9Gt12AIBwEQ= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/maXRyFfuaSiVWhgV9Gt12AIBwEQ=
deleted file mode 100644
index 483b42ca..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/maXRyFfuaSiVWhgV9Gt12AIBwEQ= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/nTjk6IqIJpVZV_NUEp0HKSFN3VA= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/nTjk6IqIJpVZV_NUEp0HKSFN3VA=
deleted file mode 100644
index 6bb2c493..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/nTjk6IqIJpVZV_NUEp0HKSFN3VA= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Ys80OmkQuF03DIwI1Yzd7lyrYrA= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/oMRbVSO127SynEO0PF52lM6BI0U=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Ys80OmkQuF03DIwI1Yzd7lyrYrA=
rename to src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/oMRbVSO127SynEO0PF52lM6BI0U=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/pqfTNCxc4EuqkeHe6s14d_T_tBY= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/pqfTNCxc4EuqkeHe6s14d_T_tBY=
deleted file mode 100644
index 083d96b0..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/pqfTNCxc4EuqkeHe6s14d_T_tBY= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/UuRc09vK1JiV+lfTSi45YsFicFs= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/pwD31j3uqAmZXTP9V1JknNCyqas=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/UuRc09vK1JiV+lfTSi45YsFicFs=
rename to src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/pwD31j3uqAmZXTP9V1JknNCyqas=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/q7qSLdWOjEsEzvrdwsNcFG8IJX0= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/q7qSLdWOjEsEzvrdwsNcFG8IJX0=
deleted file mode 100644
index 1c79806c..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/q7qSLdWOjEsEzvrdwsNcFG8IJX0= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/iepOrlkSd9uYzTz3DqQhDT26HG4= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qy5QdwgYhkqfo9rupIMs5Zct0xg=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/iepOrlkSd9uYzTz3DqQhDT26HG4=
rename to src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qy5QdwgYhkqfo9rupIMs5Zct0xg=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rNcGm0Yh413NKF9wFHcIUZ1uMDA= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rNcGm0Yh413NKF9wFHcIUZ1uMDA=
deleted file mode 100644
index a69b1ec0..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rNcGm0Yh413NKF9wFHcIUZ1uMDA= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/7A+XEty06gSC0Xwr3IRVW8YNcwI= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rnWhB17wx6vpupDzhGOxQJ7WRrw=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/7A+XEty06gSC0Xwr3IRVW8YNcwI=
rename to src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rnWhB17wx6vpupDzhGOxQJ7WRrw=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/aA6PciI2hDlCtKoFsCp8SFlGOC4= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rp6ras1ObNzlZRWN6IWuQckK_Y8=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/aA6PciI2hDlCtKoFsCp8SFlGOC4=
rename to src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rp6ras1ObNzlZRWN6IWuQckK_Y8=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6_Xr8MN4V_jojb9S+COBHI_Srnk= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rqTNaZPL59fCsVwBdjnx5tMkjkc=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6_Xr8MN4V_jojb9S+COBHI_Srnk=
rename to src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rqTNaZPL59fCsVwBdjnx5tMkjkc=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tJTnU9hSkZzShOpGq5ac_yD85IQ= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tJTnU9hSkZzShOpGq5ac_yD85IQ=
deleted file mode 100644
index b6ac9fe4..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tJTnU9hSkZzShOpGq5ac_yD85IQ= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tlOQ4AWBT9N_OakX+0GHFLOrbJU= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tlOQ4AWBT9N_OakX+0GHFLOrbJU=
deleted file mode 100644
index 0fb7130e..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tlOQ4AWBT9N_OakX+0GHFLOrbJU= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/BFVD5c90+7r0ufN5bLaShYIYihs= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vHe4xZfNMnHIevDWSOtu8t6vf_M=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/BFVD5c90+7r0ufN5bLaShYIYihs=
rename to src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vHe4xZfNMnHIevDWSOtu8t6vf_M=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wvk_xhi7h3g93XU7CUJjCfnvGeo= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wvk_xhi7h3g93XU7CUJjCfnvGeo=
deleted file mode 100644
index 8d3e7638..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wvk_xhi7h3g93XU7CUJjCfnvGeo= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/x0+kjpJ3lzo5MJBZbjNUetT2Io4= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/x0+kjpJ3lzo5MJBZbjNUetT2Io4=
deleted file mode 100644
index 87586a52..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/x0+kjpJ3lzo5MJBZbjNUetT2Io4= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/D7v7dC236B94H99iBTR_lhdWY2w= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ynHVpgIVzjlbrmfz8TCVsRMqMYk=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/D7v7dC236B94H99iBTR_lhdWY2w=
rename to src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ynHVpgIVzjlbrmfz8TCVsRMqMYk=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zo5qwgKQ64nEwlD+Ps2ZZmTFduY= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zo5qwgKQ64nEwlD+Ps2ZZmTFduY=
deleted file mode 100644
index c063f2b9..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zo5qwgKQ64nEwlD+Ps2ZZmTFduY= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
index f79d0b52..5f73504e 100644
--- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
+++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
@@ -1,2 +1,2 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
index c6ae0a39..31c6a6ee 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 c9a9a7e5..a345ff20 100644
--- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
+++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
@@ -1,97 +1,97 @@
-#Thu Nov 04 00:03:42 CST 2021
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_dropdown.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\delete.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\menu\\call_note_edit.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_background.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\layout\\note_list.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\xml\\preferences.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\layout\\note_item.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\menu\\trash_folder.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_trash_folder.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\layout\\add_account_text.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_edit_text.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_footer.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\clock.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit_list_item.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable\\new_note.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\call_record.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_super.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\notification.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\layout\\widget_4x.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\xml\\searchable.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\xml\\widget_2x_info.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\selected.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\color\\primary_text_dark.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\raw\\introduction=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\layout\\datetime_picker.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\menu\\note_list.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\xml\\widget_4x_info.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_options.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\menu\\note_edit.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\menu\\sub_folder.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\layout\\folder_list_item.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\layout\\widget_2x.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\color\\secondary_text_dark.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\menu\\call_record_folder.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_small.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\raw-zh-rCN\\introduction=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\layout\\settings_header.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\layout\\account_dialog_title.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
+#Thu Nov 04 15:41:45 CST 2021
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\raw\\introduction=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\call_record.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_dropdown.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit_list_item.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_item.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable\\new_note.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_small.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_background.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\settings_header.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\raw-zh-rCN\\introduction=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_list.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_footer.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\add_account_text.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_edit_text.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_list.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\widget_4x.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\menu\\trash_folder.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_trash_folder.xml.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\datetime_picker.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\menu\\sub_folder.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\color\\primary_text_dark.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\account_dialog_title.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\xml\\widget_4x_info.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\menu\\call_note_edit.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_super.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\color\\secondary_text_dark.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\delete.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\folder_list_item.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\menu\\call_record_folder.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\xml\\widget_2x_info.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\notification.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\clock.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\xml\\searchable.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\layout\\widget_2x.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_edit.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\selected.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_options.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\xml\\preferences.xml=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
+E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
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
index 29ce164f..40d0f3bd 100644
--- 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
@@ -91,6 +91,7 @@
取消同步
选择文件夹
已过期
+ 字数
发送邮件
打开地图
呼叫电话
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
index 6952d77b..3cf1a7a1 100644
--- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
+++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
@@ -91,6 +91,7 @@
取消同步
選擇文件夾
已過期
+ 字數
發送郵件
打開地圖
呼叫電話
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml
index 76330680..5d0f69c1 100644
--- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml
+++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml
@@ -313,6 +313,7 @@
Font size
Small
Super
+ Init Order
Enter check list
Move to folder
Parent folder
@@ -328,8 +329,10 @@
Share
Sync
Cancel syncing
+ Time Order
Select folder
Expired
+ Length
Send email
Open map
Call
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 09b853da..5d8d052c 100644
--- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merger.xml
+++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merger.xml
@@ -1,5 +1,5 @@
-
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
index 8b924a7a..3ca953af 100644
--- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
+++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
@@ -1,2 +1,2 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
index a4788518..8a644df3 100644
--- a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Thu Nov 04 00:03:47 CST 2021
-base.0=D\:\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
+#Thu Nov 04 15:41:57 CST 2021
+base.0=E\:\\git\\xcr_weihu_dev\\src\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
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 dca61dc1..24bd1cbf 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/gtask/remote/GTaskASyncTask.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class
index 33286f0b..a1e8381e 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class
index c8d2922d..b140e43f 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class
index c9b4d093..e114a4ea 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class
index ac7300fc..4b323e97 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 ab9ce99a..1735e5a3 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class
index 58d68753..696c2fe0 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
index 14c09428..26f0a8a6 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class
index 8081c102..deb00a22 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class
index d202bf63..94a2be5e 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class
index 59c539e3..13079ff2 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class
index 14caec84..032b935d 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class
index 624498e2..dab6d63b 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class
index 033bda0a..bf0b1cd6 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class
index f4ee9b53..734fa22d 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class
index b909b8e3..ce136f7f 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
index 8dc203e4..bfe50d6d 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class
index e8c1fe3c..d64b851e 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class
index db11d2b1..b5a42ed5 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class
index aa9e373f..587f2f1e 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class
index 12863784..cf3960ec 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class
index 161cbc68..0b9a77b6 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class
index 6a0ede77..bb562d4e 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
index 9e3a285b..dc16eced 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
index 202ded9c..f7542104 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 9ced5c6e..2da7cc03 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class
index 3991932d..84165e8f 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class
index b2372c1a..66bdcb32 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 d3abcd7b..285972a2 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 ae103155..30b3f1bc 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/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 cbb26511..5599e55e 100644
--- a/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
+++ b/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
@@ -21,253 +21,254 @@
21
22 D:\Notes-master1\app\src\main\AndroidManifest.xml
+23-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml
24 android:targetSdkVersion="14" />
-24-->D:\Notes-master1\app\src\main\AndroidManifest.xml
+24-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml
25
26
-26-->D:\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81
-26-->D:\Notes-master1\app\src\main\AndroidManifest.xml:25:22-78
+26-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81
+26-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:25:22-78
27
-27-->D:\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88
-27-->D:\Notes-master1\app\src\main\AndroidManifest.xml:26:22-85
+27-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88
+27-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:26:22-85
28
-28-->D:\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67
-28-->D:\Notes-master1\app\src\main\AndroidManifest.xml:27:22-64
+28-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67
+28-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:27:22-64
29
-29-->D:\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72
-29-->D:\Notes-master1\app\src\main\AndroidManifest.xml:28:22-69
+29-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72
+29-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:28:22-69
30
-30-->D:\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74
-30-->D:\Notes-master1\app\src\main\AndroidManifest.xml:29:22-71
+30-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74
+30-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:29:22-71
31
-31-->D:\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80
-31-->D:\Notes-master1\app\src\main\AndroidManifest.xml:30:22-77
+31-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80
+31-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:30:22-77
32
-32-->D:\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71
-32-->D:\Notes-master1\app\src\main\AndroidManifest.xml:31:22-68
+32-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71
+32-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:31:22-68
33
-33-->D:\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74
-33-->D:\Notes-master1\app\src\main\AndroidManifest.xml:32:22-71
+33-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74
+33-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:32:22-71
34
-34-->D:\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81
-34-->D:\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78
+34-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81
+34-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78
35
36 D:\Notes-master1\app\src\main\AndroidManifest.xml:35:5-149:19
+36-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:35:5-149:19
37 android:appComponentFactory="android.support.v4.app.CoreComponentFactory"
-37-->[com.android.support:support-compat:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\2b9474e47639de47b19dc72cadc6eaea\transformed\support-compat-28.0.0\AndroidManifest.xml:22:18-91
+37-->[com.android.support:support-compat:28.0.0] C:\Users\小超人\.gradle\caches\transforms-3\2b9474e47639de47b19dc72cadc6eaea\transformed\support-compat-28.0.0\AndroidManifest.xml:22:18-91
38 android:debuggable="true"
39 android:icon="@drawable/icon_app"
-39-->D:\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42
-40 android:label="@string/app_name" >
-40-->D:\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41
-41 D:\Notes-master1\app\src\main\AndroidManifest.xml:38:9-51:20
-42 android:name="net.micode.notes.ui.NotesListActivity"
-42-->D:\Notes-master1\app\src\main\AndroidManifest.xml:39:13-49
-43 android:configChanges="keyboardHidden|orientation|screenSize"
-43-->D:\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74
-44 android:label="@string/app_name"
-44-->D:\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45
-45 android:launchMode="singleTop"
-45-->D:\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43
-46 android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
-46-->D:\Notes-master1\app\src\main\AndroidManifest.xml:43:13-71
-47 android:uiOptions="splitActionBarWhenNarrow"
-47-->D:\Notes-master1\app\src\main\AndroidManifest.xml:44:13-57
-48 android:windowSoftInputMode="adjustPan" >
-48-->D:\Notes-master1\app\src\main\AndroidManifest.xml:45:13-52
-49
-49-->D:\Notes-master1\app\src\main\AndroidManifest.xml:47:13-50:29
-50
-50-->D:\Notes-master1\app\src\main\AndroidManifest.xml:48:17-69
-50-->D:\Notes-master1\app\src\main\AndroidManifest.xml:48:25-66
-51
-52
-52-->D:\Notes-master1\app\src\main\AndroidManifest.xml:49:17-77
-52-->D:\Notes-master1\app\src\main\AndroidManifest.xml:49:27-74
-53
-54
-55 D:\Notes-master1\app\src\main\AndroidManifest.xml:53:9-81:20
-56 android:name="net.micode.notes.ui.NoteEditActivity"
-56-->D:\Notes-master1\app\src\main\AndroidManifest.xml:54:13-48
-57 android:configChanges="keyboardHidden|orientation|screenSize"
-57-->D:\Notes-master1\app\src\main\AndroidManifest.xml:55:13-74
-58 android:launchMode="singleTop"
-58-->D:\Notes-master1\app\src\main\AndroidManifest.xml:56:13-43
-59 android:theme="@style/Theme.AppCompat.Light.DarkActionBar" >
-59-->D:\Notes-master1\app\src\main\AndroidManifest.xml:57:13-71
-60
-60-->D:\Notes-master1\app\src\main\AndroidManifest.xml:59:13-64:29
-61
-61-->D:\Notes-master1\app\src\main\AndroidManifest.xml:60:17-69
-61-->D:\Notes-master1\app\src\main\AndroidManifest.xml:60:25-66
-62
-63
-63-->D:\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76
-63-->D:\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73
-64
-65
-65-->D:\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78
-65-->D:\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75
-66
-66-->D:\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78
-66-->D:\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75
-67
-68
-68-->D:\Notes-master1\app\src\main\AndroidManifest.xml:66:13-71:29
-69
-69-->D:\Notes-master1\app\src\main\AndroidManifest.xml:67:17-79
-69-->D:\Notes-master1\app\src\main\AndroidManifest.xml:67:25-76
-70
-71
-71-->D:\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76
-71-->D:\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73
-72
-73
-73-->D:\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78
-73-->D:\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75
-74
-74-->D:\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78
-74-->D:\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75
-75
-76
-76-->D:\Notes-master1\app\src\main\AndroidManifest.xml:73:13-76:29
-77
-77-->D:\Notes-master1\app\src\main\AndroidManifest.xml:74:17-71
-77-->D:\Notes-master1\app\src\main\AndroidManifest.xml:74:25-68
-78
-79
-79-->D:\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76
-79-->D:\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73
-80
-81
-82 D:\Notes-master1\app\src\main\AndroidManifest.xml:78:13-80:54
-83 android:name="android.app.searchable"
-83-->D:\Notes-master1\app\src\main\AndroidManifest.xml:79:17-54
-84 android:resource="@xml/searchable" />
-84-->D:\Notes-master1\app\src\main\AndroidManifest.xml:80:17-51
-85
-86
-87 D:\Notes-master1\app\src\main\AndroidManifest.xml:83:9-86:43
-88 android:name="net.micode.notes.data.NotesProvider"
-88-->D:\Notes-master1\app\src\main\AndroidManifest.xml:84:13-63
-89 android:authorities="micode_notes"
-89-->D:\Notes-master1\app\src\main\AndroidManifest.xml:85:13-47
-90 android:multiprocess="true" />
-90-->D:\Notes-master1\app\src\main\AndroidManifest.xml:86:13-40
-91
-92 D:\Notes-master1\app\src\main\AndroidManifest.xml:88:9-100:20
-93 android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
-93-->D:\Notes-master1\app\src\main\AndroidManifest.xml:89:13-57
-94 android:label="@string/app_widget2x2" >
-94-->D:\Notes-master1\app\src\main\AndroidManifest.xml:90:13-50
-95
-95-->D:\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29
-96
-96-->D:\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84
-96-->D:\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81
-97
-97-->D:\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85
-97-->D:\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82
-98
-98-->D:\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85
-98-->D:\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82
-99
-100
-101 D:\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58
-102 android:name="android.appwidget.provider"
-102-->D:\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58
-103 android:resource="@xml/widget_2x_info" />
-103-->D:\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55
-104
-105 D:\Notes-master1\app\src\main\AndroidManifest.xml:101:9-114:20
-106 android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
-106-->D:\Notes-master1\app\src\main\AndroidManifest.xml:102:13-57
-107 android:label="@string/app_widget4x4" >
-107-->D:\Notes-master1\app\src\main\AndroidManifest.xml:103:13-50
-108
-108-->D:\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29
-109
-109-->D:\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84
-109-->D:\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81
-110
-110-->D:\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85
-110-->D:\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82
-111
-111-->D:\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85
-111-->D:\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82
-112
-113
-114 D:\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58
-115 android:name="android.appwidget.provider"
-115-->D:\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58
-116 android:resource="@xml/widget_4x_info" />
-116-->D:\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55
-117
-118
-118-->D:\Notes-master1\app\src\main\AndroidManifest.xml:116:9-120:20
-118-->D:\Notes-master1\app\src\main\AndroidManifest.xml:116:19-55
-119
-119-->D:\Notes-master1\app\src\main\AndroidManifest.xml:117:13-119:29
-120
-120-->D:\Notes-master1\app\src\main\AndroidManifest.xml:118:17-79
-120-->D:\Notes-master1\app\src\main\AndroidManifest.xml:118:25-76
-121
-122
-123 D:\Notes-master1\app\src\main\AndroidManifest.xml:122:9-125:20
-124 android:name="net.micode.notes.ui.AlarmReceiver"
-124-->D:\Notes-master1\app\src\main\AndroidManifest.xml:123:13-61
-125 android:process=":remote" >
-125-->D:\Notes-master1\app\src\main\AndroidManifest.xml:124:13-38
-126
-127
-128 D:\Notes-master1\app\src\main\AndroidManifest.xml:127:9-132:20
-129 android:name="net.micode.notes.ui.AlarmAlertActivity"
-129-->D:\Notes-master1\app\src\main\AndroidManifest.xml:128:13-50
-130 android:label="@string/app_name"
-130-->D:\Notes-master1\app\src\main\AndroidManifest.xml:129:13-45
-131 android:launchMode="singleInstance"
-131-->D:\Notes-master1\app\src\main\AndroidManifest.xml:130:13-48
-132 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
-132-->D:\Notes-master1\app\src\main\AndroidManifest.xml:131:13-75
-133
-134 D:\Notes-master1\app\src\main\AndroidManifest.xml:134:9-139:20
-135 android:name="net.micode.notes.ui.NotesPreferenceActivity"
-135-->D:\Notes-master1\app\src\main\AndroidManifest.xml:135:13-71
-136 android:label="@string/preferences_title"
-136-->D:\Notes-master1\app\src\main\AndroidManifest.xml:136:13-54
-137 android:launchMode="singleTop"
-137-->D:\Notes-master1\app\src\main\AndroidManifest.xml:137:13-43
-138 android:theme="@android:style/Theme.Holo.Light" >
-138-->D:\Notes-master1\app\src\main\AndroidManifest.xml:138:13-60
-139
-140
-141 D:\Notes-master1\app\src\main\AndroidManifest.xml:141:9-144:19
-142 android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-142-->D:\Notes-master1\app\src\main\AndroidManifest.xml:142:13-74
-143 android:exported="false" >
-143-->D:\Notes-master1\app\src\main\AndroidManifest.xml:143:13-37
-144
-145
-146 D:\Notes-master1\app\src\main\AndroidManifest.xml:146:9-148:52
-147 android:name="android.app.default_searchable"
-147-->D:\Notes-master1\app\src\main\AndroidManifest.xml:147:13-58
-148 android:value=".ui.NoteEditActivity" />
-148-->D:\Notes-master1\app\src\main\AndroidManifest.xml:148:13-49
-149
-150
-151
+39-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42
+40 android:label="@string/app_name"
+40-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41
+41 android:testOnly="true" >
+42 E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:38:9-51:20
+43 android:name="net.micode.notes.ui.NotesListActivity"
+43-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:39:13-49
+44 android:configChanges="keyboardHidden|orientation|screenSize"
+44-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74
+45 android:label="@string/app_name"
+45-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45
+46 android:launchMode="singleTop"
+46-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43
+47 android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
+47-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:43:13-71
+48 android:uiOptions="splitActionBarWhenNarrow"
+48-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:44:13-57
+49 android:windowSoftInputMode="adjustPan" >
+49-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:45:13-52
+50
+50-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:47:13-50:29
+51
+51-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:48:17-69
+51-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:48:25-66
+52
+53
+53-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:49:17-77
+53-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:49:27-74
+54
+55
+56 E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:53:9-81:20
+57 android:name="net.micode.notes.ui.NoteEditActivity"
+57-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:54:13-48
+58 android:configChanges="keyboardHidden|orientation|screenSize"
+58-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:55:13-74
+59 android:launchMode="singleTop"
+59-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:56:13-43
+60 android:theme="@style/Theme.AppCompat.Light.DarkActionBar" >
+60-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:57:13-71
+61
+61-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:59:13-64:29
+62
+62-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:60:17-69
+62-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:60:25-66
+63
+64
+64-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76
+64-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73
+65
+66
+66-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78
+66-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75
+67
+67-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78
+67-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75
+68
+69
+69-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:66:13-71:29
+70
+70-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:67:17-79
+70-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:67:25-76
+71
+72
+72-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76
+72-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73
+73
+74
+74-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78
+74-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75
+75
+75-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78
+75-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75
+76
+77
+77-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:73:13-76:29
+78
+78-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:74:17-71
+78-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:74:25-68
+79
+80
+80-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76
+80-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73
+81
+82
+83 E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:78:13-80:54
+84 android:name="android.app.searchable"
+84-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:79:17-54
+85 android:resource="@xml/searchable" />
+85-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:80:17-51
+86
+87
+88 E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:83:9-86:43
+89 android:name="net.micode.notes.data.NotesProvider"
+89-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:84:13-63
+90 android:authorities="micode_notes"
+90-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:85:13-47
+91 android:multiprocess="true" />
+91-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:86:13-40
+92
+93 E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:88:9-100:20
+94 android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
+94-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:89:13-57
+95 android:label="@string/app_widget2x2" >
+95-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:90:13-50
+96
+96-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29
+97
+97-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84
+97-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81
+98
+98-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85
+98-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82
+99
+99-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85
+99-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82
+100
+101
+102 E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58
+103 android:name="android.appwidget.provider"
+103-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58
+104 android:resource="@xml/widget_2x_info" />
+104-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55
+105
+106 E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:101:9-114:20
+107 android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
+107-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:102:13-57
+108 android:label="@string/app_widget4x4" >
+108-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:103:13-50
+109
+109-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29
+110
+110-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84
+110-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81
+111
+111-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85
+111-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82
+112
+112-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85
+112-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82
+113
+114
+115 E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58
+116 android:name="android.appwidget.provider"
+116-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58
+117 android:resource="@xml/widget_4x_info" />
+117-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55
+118
+119
+119-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:116:9-120:20
+119-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:116:19-55
+120
+120-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:117:13-119:29
+121
+121-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:118:17-79
+121-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:118:25-76
+122
+123
+124 E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:122:9-125:20
+125 android:name="net.micode.notes.ui.AlarmReceiver"
+125-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:123:13-61
+126 android:process=":remote" >
+126-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:124:13-38
+127
+128
+129 E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:127:9-132:20
+130 android:name="net.micode.notes.ui.AlarmAlertActivity"
+130-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:128:13-50
+131 android:label="@string/app_name"
+131-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:129:13-45
+132 android:launchMode="singleInstance"
+132-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:130:13-48
+133 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
+133-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:131:13-75
+134
+135 E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:134:9-139:20
+136 android:name="net.micode.notes.ui.NotesPreferenceActivity"
+136-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:135:13-71
+137 android:label="@string/preferences_title"
+137-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:136:13-54
+138 android:launchMode="singleTop"
+138-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:137:13-43
+139 android:theme="@android:style/Theme.Holo.Light" >
+139-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:138:13-60
+140
+141
+142 E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:141:9-144:19
+143 android:name="net.micode.notes.gtask.remote.GTaskSyncService"
+143-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:142:13-74
+144 android:exported="false" >
+144-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:143:13-37
+145
+146
+147 E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:146:9-148:52
+148 android:name="android.app.default_searchable"
+148-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:147:13-58
+149 android:value=".ui.NoteEditActivity" />
+149-->E:\git\xcr_weihu_dev\src\Notes-master1\app\src\main\AndroidManifest.xml:148:13-49
+150
+151
+152
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 aa51151c..eb169d7f 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
@@ -37,7 +37,8 @@
android:appComponentFactory="android.support.v4.app.CoreComponentFactory"
android:debuggable="true"
android:icon="@drawable/icon_app"
- android:label="@string/app_name" >
+ android:label="@string/app_name"
+ android:testOnly="true" >
+ android:label="@string/app_name"
+ android:testOnly="true" >
+ android:label="@string/app_name"
+ android:testOnly="true" >
"
+ Notes.TYPE_SYSTEM + " AND " + NoteColumns.PARENT_ID + "=?)" + " OR ("
+ NoteColumns.ID + "=" + Notes.ID_CALL_RECORD_FOLDER + " AND "
@@ -418,23 +420,28 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe
};
private void startAsyncNotesListQuery() {
- if (mCurrentFolderId == Notes.ID_ROOT_FOLDER && VIEW_WAY == 1){
- String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION_ALL
- : NORMAL_SELECTION;
- mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null,
- Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[] {
- String.valueOf(Notes.ID_TEMPARAY_FOLDER)
- }, NoteColumns.GROUP + " ASC," + NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC");
+ if (mOrderBy == 1){
+ orderByTime();
}
- else {
- String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION
- : NORMAL_SELECTION;
- mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null,
- Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[] {
- String.valueOf(mCurrentFolderId)
- }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC");
+ else{
+ if (mCurrentFolderId == Notes.ID_ROOT_FOLDER && VIEW_WAY == 1){
+ String selection = ROOT_FOLDER_SELECTION_ALL;
+ mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null,
+ Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[] {
+ String.valueOf(Notes.ID_TEMPARAY_FOLDER)
+ }, NoteColumns.GROUP + " ASC," + NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC");
+ }
+ else {
+ String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION
+ : NORMAL_SELECTION;
+ mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null,
+ Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[] {
+ String.valueOf(mCurrentFolderId)
+ }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC");
+ }
}
+
}
private final class BackgroundQueryHandler extends AsyncQueryHandler {
@@ -818,6 +825,8 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe
// set sync or sync_cancel
menu.findItem(R.id.menu_sync).setTitle(
GTaskSyncService.isSyncing() ? R.string.menu_sync_cancel : R.string.menu_sync);
+ menu.findItem(R.id.menu_time_order).setTitle(
+ (mOrderBy == 0) ? R.string.menu_time_order : R.string.menu_init_order);
} else if (mState == ListEditState.SUB_FOLDER) {
if (mCurrentFolderId == Notes.ID_TRASH_FOLER){
getMenuInflater().inflate(R.menu.trash_folder, menu);
@@ -874,6 +883,10 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe
VIEW_WAY = 1 - VIEW_WAY;
startAsyncNotesListQuery();
break;
+ case R.id.menu_time_order:
+ mOrderBy = 1 - mOrderBy;
+ startAsyncNotesListQuery();
+ break;
default:
break;
}
@@ -1021,4 +1034,13 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe
mTitleBar.setText("trash folder");
mTitleBar.setVisibility(View.VISIBLE);
}
+
+ private void orderByTime() {
+ String selection = "(" + NoteColumns.TYPE + "="
+ + Notes.TYPE_NOTE + " AND " + NoteColumns.PARENT_ID + ">?)";
+ mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null,
+ Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[]{
+ String.valueOf(Notes.ID_TEMPARAY_FOLDER)
+ }, NoteColumns.ALERTED_DATE + " ASC," + NoteColumns.MODIFIED_DATE + " DESC");
+ }
}
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListItem.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListItem.java
index a015457c..eb69a8cc 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListItem.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListItem.java
@@ -29,6 +29,9 @@ import net.micode.notes.data.Notes;
import net.micode.notes.tool.DataUtils;
import net.micode.notes.tool.ResourceParser.NoteItemBgResources;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
public class NotesListItem extends LinearLayout {
private ImageView mAlert;
@@ -94,8 +97,21 @@ public class NotesListItem extends LinearLayout {
}
}
}
- mTime.setText(DateUtils.getRelativeTimeSpanString(data.getModifiedDate()));
-
+ if (data.getType() == Notes.TYPE_NOTE){
+ if(data.getAlertDate() == 0){
+ CharSequence ss_data = "Have no time";
+ mTime.setText(ss_data);
+ }
+ else{
+ Date dateOld = new Date(data.getAlertDate());
+ String ss_data = new SimpleDateFormat("yyyy-MM-dd").format(dateOld);
+ CharSequence cc_data = ss_data;
+ mTime.setText(cc_data);
+ }
+ }
+ else {
+ mTime.setText(DateUtils.getRelativeTimeSpanString(data.getModifiedDate()));
+ }
setBackground(data);
}
diff --git a/src/Notes-master1/app/src/main/res/menu/note_list.xml b/src/Notes-master1/app/src/main/res/menu/note_list.xml
index 50b16cc3..227c94c9 100644
--- a/src/Notes-master1/app/src/main/res/menu/note_list.xml
+++ b/src/Notes-master1/app/src/main/res/menu/note_list.xml
@@ -42,4 +42,7 @@
+
+
diff --git a/src/Notes-master1/app/src/main/res/values/strings.xml b/src/Notes-master1/app/src/main/res/values/strings.xml
index a8dba55d..9acd9b40 100644
--- a/src/Notes-master1/app/src/main/res/values/strings.xml
+++ b/src/Notes-master1/app/src/main/res/values/strings.xml
@@ -49,6 +49,8 @@
Search
Restore
Change view
+ Time Order
+ Init Order
Delete
Move to folder
%d selected
diff --git a/src/Notes-master1/local.properties b/src/Notes-master1/local.properties
index 8a55b474..c630626f 100644
--- a/src/Notes-master1/local.properties
+++ b/src/Notes-master1/local.properties
@@ -4,5 +4,5 @@
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
-#Wed Nov 03 08:18:45 CST 2021
-sdk.dir=D\:\\SDK
+#Thu Nov 04 15:35:03 CST 2021
+sdk.dir=E\:\\SDK