diff --git a/.gradle/7.5/checksums/checksums.lock b/.gradle/7.5/checksums/checksums.lock
index e00105e..9db14bc 100644
Binary files a/.gradle/7.5/checksums/checksums.lock and b/.gradle/7.5/checksums/checksums.lock differ
diff --git a/.gradle/7.5/checksums/md5-checksums.bin b/.gradle/7.5/checksums/md5-checksums.bin
deleted file mode 100644
index b015dc6..0000000
Binary files a/.gradle/7.5/checksums/md5-checksums.bin and /dev/null differ
diff --git a/.gradle/7.5/checksums/sha1-checksums.bin b/.gradle/7.5/checksums/sha1-checksums.bin
deleted file mode 100644
index 5056ab3..0000000
Binary files a/.gradle/7.5/checksums/sha1-checksums.bin and /dev/null differ
diff --git a/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock b/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock
index 7cd24dc..8a111de 100644
Binary files a/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock and b/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock differ
diff --git a/.gradle/7.5/executionHistory/executionHistory.bin b/.gradle/7.5/executionHistory/executionHistory.bin
index e46c240..8beafae 100644
Binary files a/.gradle/7.5/executionHistory/executionHistory.bin and b/.gradle/7.5/executionHistory/executionHistory.bin differ
diff --git a/.gradle/7.5/executionHistory/executionHistory.lock b/.gradle/7.5/executionHistory/executionHistory.lock
index 7a5491a..2a30bac 100644
Binary files a/.gradle/7.5/executionHistory/executionHistory.lock and b/.gradle/7.5/executionHistory/executionHistory.lock differ
diff --git a/.gradle/7.5/fileHashes/fileHashes.bin b/.gradle/7.5/fileHashes/fileHashes.bin
index e895576..a734527 100644
Binary files a/.gradle/7.5/fileHashes/fileHashes.bin and b/.gradle/7.5/fileHashes/fileHashes.bin differ
diff --git a/.gradle/7.5/fileHashes/fileHashes.lock b/.gradle/7.5/fileHashes/fileHashes.lock
index 187346e..3406c3f 100644
Binary files a/.gradle/7.5/fileHashes/fileHashes.lock and b/.gradle/7.5/fileHashes/fileHashes.lock differ
diff --git a/.gradle/7.5/fileHashes/resourceHashesCache.bin b/.gradle/7.5/fileHashes/resourceHashesCache.bin
index ca57e69..8a629e8 100644
Binary files a/.gradle/7.5/fileHashes/resourceHashesCache.bin and b/.gradle/7.5/fileHashes/resourceHashesCache.bin differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 3ea7f41..37ef7b5 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties
index 3c8ed93..35fb573 100644
--- a/.gradle/buildOutputCleanup/cache.properties
+++ b/.gradle/buildOutputCleanup/cache.properties
@@ -1,2 +1,2 @@
-#Wed Mar 15 19:05:18 CST 2023
+#Mon Apr 10 21:32:01 HKT 2023
gradle.version=7.5
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
index 1fbec17..6bbc209 100644
Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe
index 34d372b..bf7ef31 100644
Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ
diff --git a/.idea/.gitignore b/.idea/.gitignore
index 26d3352..359bb53 100644
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -1,3 +1,3 @@
-# Default ignored files
+# 默认忽略的文件
/shelf/
/workspace.xml
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 57d3af1..5d23646 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -7,11 +7,11 @@
<deviceKey>
<Key>
<type value="VIRTUAL_DEVICE_PATH" />
- <value value="C:\Users\6\.android\avd\Pixel_XL_API_23.avd" />
+ <value value="C:\Users\82590\.android\avd\Pixel_XL_API_28.avd" />
</Key>
</deviceKey>
</Target>
</targetSelectedWithDropDown>
- <timeTargetWasSelectedWithDropDown value="2023-03-15T11:23:52.206163700Z" />
+ <timeTargetWasSelectedWithDropDown value="2023-04-10T13:35:46.860465400Z" />
</component>
</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a33cee7..cbbe561 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
<option name="testRunner" value="GRADLE" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
- <option name="gradleJvm" value="17" />
+ <option name="gradleJvm" value="#JAVA_HOME" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 8ddd1c7..3260f90 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
- <component name="ProjectRootManager" version="2" languageLevel="JDK_17_PREVIEW" project-jdk-name="17" project-jdk-type="JavaSDK" />
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_17_PREVIEW" project-jdk-name="liberica-17" project-jdk-type="JavaSDK">
+ <output url="file://$PROJECT_DIR$/build/classes" />
+ </component>
<component name="ProjectType">
<option name="id" value="Android" />
</component>
diff --git a/.idea/sonarlint/issuestore/0/8/08c35f02f11c35ae9ebf8db0a482054dfa1cf493 b/.idea/sonarlint/issuestore/0/8/08c35f02f11c35ae9ebf8db0a482054dfa1cf493
new file mode 100644
index 0000000..c100822
--- /dev/null
+++ b/.idea/sonarlint/issuestore/0/8/08c35f02f11c35ae9ebf8db0a482054dfa1cf493
@@ -0,0 +1,11 @@
+
+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/.idea/sonarlint/issuestore/2/8/283f16cc23da56ca65616082bc810304d3511d0a b/.idea/sonarlint/issuestore/2/8/283f16cc23da56ca65616082bc810304d3511d0a
new file mode 100644
index 0000000..69f4968
--- /dev/null
+++ b/.idea/sonarlint/issuestore/2/8/283f16cc23da56ca65616082bc810304d3511d0a
@@ -0,0 +1,39 @@
+
+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.(�漬�����
+C
+java:S5411_"(Use a primitive boolean expression here.(ɯ�������
+C
+java:S5411o"(Use a primitive boolean expression here.(ɯ�������
+D
+java:S5411�"(Use a primitive boolean expression here.(���������
+7
+java:S1116," Remove this empty statement.(���������
+D
+java:S1874/".Remove this use of "<init>"; 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.(���������
\ No newline at end of file
diff --git a/.idea/sonarlint/issuestore/3/2/32360bf24febc78f20db52498c7576b3d8650d56 b/.idea/sonarlint/issuestore/3/2/32360bf24febc78f20db52498c7576b3d8650d56
new file mode 100644
index 0000000..367ade5
--- /dev/null
+++ b/.idea/sonarlint/issuestore/3/2/32360bf24febc78f20db52498c7576b3d8650d56
@@ -0,0 +1,35 @@
+
+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.(���������
+c
+java:S1192x"HDefine a constant instead of duplicating this literal "=? AND " 4 times.(���������
+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".(���������
+U
+java:S1118&":Add a private constructor to hide the implicit public one.(���������
+T
+java:S1155-">Use isEmpty() to check whether the collection is empty or not.(����
+Z
+java:S2147E"DCombine this catch with the one at line 67, which has the same body.(暩�
+[
+java:S2147l"ECombine this catch with the one at line 106, which has the same body.(暩�
+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".(���������
\ No newline at end of file
diff --git a/.idea/sonarlint/issuestore/5/0/503adcf2a0be1ecdb94a15efba4433b6589877b9 b/.idea/sonarlint/issuestore/5/0/503adcf2a0be1ecdb94a15efba4433b6589877b9
new file mode 100644
index 0000000..b2dcf84
--- /dev/null
+++ b/.idea/sonarlint/issuestore/5/0/503adcf2a0be1ecdb94a15efba4433b6589877b9
@@ -0,0 +1,14 @@
+
+o
+java:S22933"YReplace the type specification in this constructor call with the diamond operator ("<>").(����
+D
+java:S1604�"(Make this anonymous inner class a lambda(���������
+f
+java:S1301o"KReplace this "switch" statement by "if" statements to increase readability.(��������
+M
+java:S1135i"2Complete the task associated to this TODO comment.(���������
+< java:S131o""Add a default case to this switch.(��������
+^
+java:S1126�"BReplace this if-then-else statement by a single method invocation.(�忥�����
+P
+java:S2864�"4Iterate over the "entrySet" instead of the "keySet".(�������
\ No newline at end of file
diff --git a/.idea/sonarlint/issuestore/5/d/5dfe6902d8ec740690f88d644e74362c3be08fad b/.idea/sonarlint/issuestore/5/d/5dfe6902d8ec740690f88d644e74362c3be08fad
new file mode 100644
index 0000000..c2e6fb3
--- /dev/null
+++ b/.idea/sonarlint/issuestore/5/d/5dfe6902d8ec740690f88d644e74362c3be08fad
@@ -0,0 +1,3 @@
+
+m
+java:S37763"RRefactor this method to reduce its Cognitive Complexity from 16 to the 15 allowed.(���������
\ No newline at end of file
diff --git a/.idea/sonarlint/issuestore/f/9/f9f49497f95afd327db7a7a512612aa1089003d4 b/.idea/sonarlint/issuestore/f/9/f9f49497f95afd327db7a7a512612aa1089003d4
new file mode 100644
index 0000000..fafb6c2
--- /dev/null
+++ b/.idea/sonarlint/issuestore/f/9/f9f49497f95afd327db7a7a512612aa1089003d4
@@ -0,0 +1,7 @@
+
+3
+java:S2386!" Make this member "protected".(�Ꙗ
+D
+java:S1874*".Remove this use of "<init>"; it is deprecated.(�
+M
+java:S1135+"2Complete the task associated to this TODO comment.(���������
\ No newline at end of file
diff --git a/.idea/sonarlint/issuestore/index.pb b/.idea/sonarlint/issuestore/index.pb
new file mode 100644
index 0000000..c1d5e39
--- /dev/null
+++ b/.idea/sonarlint/issuestore/index.pb
@@ -0,0 +1,29 @@
+
+g
+7app/src/main/java/net/micode/notes/ui/NoteItemData.java,0\8\08c35f02f11c35ae9ebf8db0a482054dfa1cf493
+m
+=app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java,f\9\f9f49497f95afd327db7a7a512612aa1089003d4
+k
+;app/src/main/java/net/micode/notes/ui/NotesListAdapter.java,2\8\283f16cc23da56ca65616082bc810304d3511d0a
+h
+8app/src/main/java/net/micode/notes/ui/NotesListItem.java,5\d\5dfe6902d8ec740690f88d644e74362c3be08fad
+f
+6app/src/main/java/net/micode/notes/tool/DataUtils.java,3\2\32360bf24febc78f20db52498c7576b3d8650d56
+d
+4app/src/main/java/net/micode/notes/data/Contact.java,9\a\9a3a19793537958b8b1b03a81985999e22705a2f
+b
+2app/src/main/java/net/micode/notes/data/Notes.java,a\7\a7641cfac724321d508c2a284223a711011a93f5
+g
+7app/src/main/java/net/micode/notes/ui/NoteEditText.java,5\0\503adcf2a0be1ecdb94a15efba4433b6589877b9
+7
+gradlew,5\b\5bbfa66edb4db3c7c33c5181f43510990d3307f9
+@
+app/build.gradle,f\4\f4a01d6a4fcb971362ec00a83903fd3902f52164
+i
+9app/src/main/java/net/micode/notes/model/WorkingNote.java,8\7\876016634c6642b35109680ccac740dc8271b236
+p
+@app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java,1\e\1eb2363b523dbcae43d3c6e4790c64436af61b13
+<
+ build.gradle,f\0\f07866736216be0ee2aba49e392191aeae700a35
+k
+;app/src/main/java/net/micode/notes/ui/NoteEditActivity.java,5\7\577f30d26378ec8a2bd2e4a43f3c79b3f04c402c
\ No newline at end of file
diff --git a/.idea/sonarlint/securityhotspotstore/0/8/08c35f02f11c35ae9ebf8db0a482054dfa1cf493 b/.idea/sonarlint/securityhotspotstore/0/8/08c35f02f11c35ae9ebf8db0a482054dfa1cf493
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/securityhotspotstore/2/8/283f16cc23da56ca65616082bc810304d3511d0a b/.idea/sonarlint/securityhotspotstore/2/8/283f16cc23da56ca65616082bc810304d3511d0a
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/securityhotspotstore/3/2/32360bf24febc78f20db52498c7576b3d8650d56 b/.idea/sonarlint/securityhotspotstore/3/2/32360bf24febc78f20db52498c7576b3d8650d56
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/securityhotspotstore/5/0/503adcf2a0be1ecdb94a15efba4433b6589877b9 b/.idea/sonarlint/securityhotspotstore/5/0/503adcf2a0be1ecdb94a15efba4433b6589877b9
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/securityhotspotstore/5/d/5dfe6902d8ec740690f88d644e74362c3be08fad b/.idea/sonarlint/securityhotspotstore/5/d/5dfe6902d8ec740690f88d644e74362c3be08fad
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/securityhotspotstore/f/9/f9f49497f95afd327db7a7a512612aa1089003d4 b/.idea/sonarlint/securityhotspotstore/f/9/f9f49497f95afd327db7a7a512612aa1089003d4
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/securityhotspotstore/index.pb b/.idea/sonarlint/securityhotspotstore/index.pb
new file mode 100644
index 0000000..addcf86
--- /dev/null
+++ b/.idea/sonarlint/securityhotspotstore/index.pb
@@ -0,0 +1,29 @@
+
+k
+;app/src/main/java/net/micode/notes/ui/NotesListAdapter.java,2\8\283f16cc23da56ca65616082bc810304d3511d0a
+g
+7app/src/main/java/net/micode/notes/ui/NoteItemData.java,0\8\08c35f02f11c35ae9ebf8db0a482054dfa1cf493
+h
+8app/src/main/java/net/micode/notes/ui/NotesListItem.java,5\d\5dfe6902d8ec740690f88d644e74362c3be08fad
+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
+d
+4app/src/main/java/net/micode/notes/data/Contact.java,9\a\9a3a19793537958b8b1b03a81985999e22705a2f
+b
+2app/src/main/java/net/micode/notes/data/Notes.java,a\7\a7641cfac724321d508c2a284223a711011a93f5
+g
+7app/src/main/java/net/micode/notes/ui/NoteEditText.java,5\0\503adcf2a0be1ecdb94a15efba4433b6589877b9
+7
+gradlew,5\b\5bbfa66edb4db3c7c33c5181f43510990d3307f9
+@
+app/build.gradle,f\4\f4a01d6a4fcb971362ec00a83903fd3902f52164
+i
+9app/src/main/java/net/micode/notes/model/WorkingNote.java,8\7\876016634c6642b35109680ccac740dc8271b236
+p
+@app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java,1\e\1eb2363b523dbcae43d3c6e4790c64436af61b13
+<
+ build.gradle,f\0\f07866736216be0ee2aba49e392191aeae700a35
+k
+;app/src/main/java/net/micode/notes/ui/NoteEditActivity.java,5\7\577f30d26378ec8a2bd2e4a43f3c79b3f04c402c
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 9025680..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="VcsDirectoryMappings">
- <mapping directory="$PROJECT_DIR$/MINOTES" vcs="Git" />
- <mapping directory="$PROJECT_DIR$/app/MINOTEScauc636" vcs="Git" />
- </component>
-</project>
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 2071b23..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,9 +0,0 @@
-MIT License
-
-Copyright (c) <year> <copyright holders>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/README.md b/README.md
deleted file mode 100644
index 9091b14..0000000
--- a/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# MINOTES
-
diff --git a/app/MINOTEScauc636 b/app/MINOTEScauc636
deleted file mode 160000
index 585043b..0000000
--- a/app/MINOTEScauc636
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 585043bed315bde7d152eebdcc8470e117379652
diff --git a/app/build.gradle b/app/build.gradle
index 05b071b..9187d07 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,7 +1,7 @@
apply plugin: 'com.android.application'
android {
- compileSdk 14
+ compileSdk 21
buildToolsVersion "33.0.2"
defaultConfig {
diff --git a/app/build/intermediates/apk/debug/app-debug.apk b/app/build/intermediates/apk/debug/app-debug.apk
index 55bdc14..f7b6e66 100644
Binary files a/app/build/intermediates/apk/debug/app-debug.apk and b/app/build/intermediates/apk/debug/app-debug.apk differ
diff --git a/app/build/intermediates/app_metadata/debug/app-metadata.properties b/app/build/intermediates/app_metadata/debug/app-metadata.properties
index 1d16f01..260f1ee 100644
--- a/app/build/intermediates/app_metadata/debug/app-metadata.properties
+++ b/app/build/intermediates/app_metadata/debug/app-metadata.properties
@@ -1,2 +1,2 @@
appMetadataVersion=1.1
-androidGradlePluginVersion=7.4.1
+androidGradlePluginVersion=7.4.2
diff --git a/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
index a54964f..508abff 100644
Binary files a/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ
diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin
index 5da30a9..601f245 100644
Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin and b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin differ
diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin
index 3a2bec1..601f245 100644
Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin and b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin differ
diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin
index 631d73d..601f245 100644
Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin and b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin differ
diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin
index 2b518b8..601f245 100644
Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin and b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin differ
diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin
index a01edb7..601f245 100644
Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin and b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin differ
diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin
index 232edbe..601f245 100644
Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin and b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin differ
diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a46b064aecc016ea50cb5d0feecb56e7294ac6dad542076165552d5ba1a8a9e9_bucket_0/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a46b064aecc016ea50cb5d0feecb56e7294ac6dad542076165552d5ba1a8a9e9_bucket_0/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a46b064aecc016ea50cb5d0feecb56e7294ac6dad542076165552d5ba1a8a9e9_bucket_0/graph.bin and /dev/null differ
diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a46b064aecc016ea50cb5d0feecb56e7294ac6dad542076165552d5ba1a8a9e9_bucket_1/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a46b064aecc016ea50cb5d0feecb56e7294ac6dad542076165552d5ba1a8a9e9_bucket_1/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a46b064aecc016ea50cb5d0feecb56e7294ac6dad542076165552d5ba1a8a9e9_bucket_1/graph.bin and /dev/null differ
diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a46b064aecc016ea50cb5d0feecb56e7294ac6dad542076165552d5ba1a8a9e9_bucket_2/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a46b064aecc016ea50cb5d0feecb56e7294ac6dad542076165552d5ba1a8a9e9_bucket_2/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a46b064aecc016ea50cb5d0feecb56e7294ac6dad542076165552d5ba1a8a9e9_bucket_2/graph.bin and /dev/null differ
diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a46b064aecc016ea50cb5d0feecb56e7294ac6dad542076165552d5ba1a8a9e9_bucket_3/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a46b064aecc016ea50cb5d0feecb56e7294ac6dad542076165552d5ba1a8a9e9_bucket_3/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a46b064aecc016ea50cb5d0feecb56e7294ac6dad542076165552d5ba1a8a9e9_bucket_3/graph.bin and /dev/null differ
diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a46b064aecc016ea50cb5d0feecb56e7294ac6dad542076165552d5ba1a8a9e9_bucket_4/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a46b064aecc016ea50cb5d0feecb56e7294ac6dad542076165552d5ba1a8a9e9_bucket_4/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a46b064aecc016ea50cb5d0feecb56e7294ac6dad542076165552d5ba1a8a9e9_bucket_4/graph.bin and /dev/null differ
diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a46b064aecc016ea50cb5d0feecb56e7294ac6dad542076165552d5ba1a8a9e9_bucket_5/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a46b064aecc016ea50cb5d0feecb56e7294ac6dad542076165552d5ba1a8a9e9_bucket_5/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a46b064aecc016ea50cb5d0feecb56e7294ac6dad542076165552d5ba1a8a9e9_bucket_5/graph.bin and /dev/null differ
diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a46b064aecc016ea50cb5d0feecb56e7294ac6dad542076165552d5ba1a8a9e9_bucket_6/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a46b064aecc016ea50cb5d0feecb56e7294ac6dad542076165552d5ba1a8a9e9_bucket_6/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a46b064aecc016ea50cb5d0feecb56e7294ac6dad542076165552d5ba1a8a9e9_bucket_6/graph.bin and /dev/null differ
diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a46b064aecc016ea50cb5d0feecb56e7294ac6dad542076165552d5ba1a8a9e9_bucket_7/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a46b064aecc016ea50cb5d0feecb56e7294ac6dad542076165552d5ba1a8a9e9_bucket_7/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a46b064aecc016ea50cb5d0feecb56e7294ac6dad542076165552d5ba1a8a9e9_bucket_7/graph.bin and /dev/null differ
diff --git a/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
index 8d54895..8b42c58 100644
Binary files a/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ
diff --git a/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
index 61e9c9a..59fa4ff 100644
Binary files a/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ
diff --git a/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
index 00cc852..873d836 100644
--- a/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
+++ b/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
@@ -1,96 +1,97 @@
-#Wed Mar 15 19:13:58 CST 2023
-net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
-net.micode.notes.app-main-7\:/menu/sub_folder.xml=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
-net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
-net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
-net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
-net.micode.notes.app-main-7\:/layout/widget_4x.xml=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
-net.micode.notes.app-main-7\:/layout/note_edit.xml=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
-net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
-net.micode.notes.app-main-7\:/xml/preferences.xml=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
-net.micode.notes.app-main-7\:/menu/call_record_folder.xml=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
-net.micode.notes.app-main-7\:/layout/widget_2x.xml=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
-net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
-net.micode.notes.app-main-7\:/layout/add_account_text.xml=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
-net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
-net.micode.notes.app-main-7\:/layout/settings_header.xml=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
-net.micode.notes.app-main-7\:/menu/note_list.xml=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
-net.micode.notes.app-main-7\:/menu/call_note_edit.xml=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
-net.micode.notes.app-main-7\:/drawable/new_note.xml=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
-net.micode.notes.app-main-7\:/layout/note_list.xml=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
-net.micode.notes.app-main-7\:/color/primary_text_dark.xml=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
-net.micode.notes.app-main-7\:/layout/datetime_picker.xml=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
-net.micode.notes.app-main-7\:/raw/introduction=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
-net.micode.notes.app-main-7\:/menu/note_list_options.xml=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
-net.micode.notes.app-main-7\:/layout/note_item.xml=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
-net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
-net.micode.notes.app-main-7\:/layout/note_list_footer.xml=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
-net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
-net.micode.notes.app-main-7\:/xml/searchable.xml=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
-net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
-net.micode.notes.app-main-7\:/layout/folder_list_item.xml=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
-net.micode.notes.app-main-7\:/menu/note_edit.xml=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
+#Thu Apr 27 19:48:33 HKT 2023
+net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
+net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
+net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
+net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
+net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
+net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
+net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
+net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
+net.micode.notes.app-main-7\:/layout/settings_header.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
+net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
+net.micode.notes.app-main-7\:/raw/introduction=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/font_color_green.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_color_green.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
+net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
+net.micode.notes.app-main-7\:/layout/note_list_footer.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
+net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
+net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
+net.micode.notes.app-main-7\:/menu/sub_folder.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
+net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
+net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
+net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
+net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
+net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
+net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
+net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
+net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
+net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
+net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
+net.micode.notes.app-main-7\:/menu/note_list_options.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
+net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
+net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
+net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
+net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
diff --git a/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
deleted file mode 100644
index d65e0cc..0000000
--- a/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="menu_share_ways">
- <item>短信</item>
- <item>邮件</item>
- </string-array>
- <plurals name="search_results_title">
- <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 条符合“<ns1:g id="SEARCH">%2$s</ns1:g>”的搜索结果</item>
- </plurals>
- <string name="alert_message_delete_folder">确认删除文件夹及所包含的便签吗？</string>
- <string name="alert_message_delete_note">确认要删除该条便签吗?</string>
- <string name="alert_message_delete_notes">确认要删除所选的 %d 条便签吗?</string>
- <string name="alert_title_delete">删除</string>
- <string name="app_name">便签</string>
- <string name="app_widget2x2">便签2x2</string>
- <string name="app_widget4x4">便签4x4</string>
- <string name="button_delete">删除</string>
- <string name="call_record_folder_name">通话便签</string>
- <string name="datetime_dialog_cancel">取消</string>
- <string name="datetime_dialog_ok">设置</string>
- <string name="delete_remind_time_message">成功删除提醒</string>
- <string name="error_note_empty_for_clock">不能为空便签设置闹钟提醒</string>
- <string name="error_note_empty_for_send_to_desktop">不能将空便签发送到桌面</string>
- <string name="error_note_not_exist">要查看的便签不存在</string>
- <string name="error_sdcard_export">导出文本时发生错误，请检查SD卡</string>
- <string name="error_sdcard_unmounted">SD卡被占用，不能操作</string>
- <string name="error_sync_cancelled">同步已取消</string>
- <string name="error_sync_internal">同步失败，发生内部错误</string>
- <string name="error_sync_network">同步失败，请检查网络和帐号设置</string>
- <string name="failed_sdcard_export">导出失败</string>
- <string name="folder_exist">文件夹 %1$s 已存在，请重新命名</string>
- <string name="format_date_ymd">yyyyMMdd</string>
- <string name="format_datetime_mdhm">MM月dd日 kk:mm</string>
- <string name="format_exported_file_location">已将文本文件(%1$s)输出至SD卡(%2$s)目录</string>
- <string name="format_move_notes_to_folder">已将所选 %1$d 条便签移到 %2$s 文件夹</string>
- <string name="hint_foler_name">请输入名称</string>
- <string name="info_note_enter_desktop">已添加到桌面</string>
- <string name="menu_alert">提醒我</string>
- <string name="menu_create_folder">新建文件夹</string>
- <string name="menu_delete">删除</string>
- <string name="menu_deselect_all">取消全选</string>
- <string name="menu_export_text">导出文本</string>
- <string name="menu_folder_change_name">修改文件夹名称</string>
- <string name="menu_folder_delete">刪除文件夹</string>
- <string name="menu_folder_view">查看文件夹</string>
- <string name="menu_font_large">大</string>
- <string name="menu_font_normal">正常</string>
- <string name="menu_font_size">文字大小</string>
- <string name="menu_font_small">小</string>
- <string name="menu_font_super">超大</string>
- <string name="menu_list_mode">进入清单模式</string>
- <string name="menu_move">移动到文件夹</string>
- <string name="menu_move_parent_folder">上一级文件夹</string>
- <string name="menu_normal_mode">退出清单模式</string>
- <string name="menu_remove_remind">删除提醒</string>
- <string name="menu_search">搜索</string>
- <string name="menu_select_all">全选</string>
- <string name="menu_select_none">没有选中项，操作无效</string>
- <string name="menu_select_title">选中了 %d 项</string>
- <string name="menu_send_to_desktop">发送到桌面</string>
- <string name="menu_setting">设置</string>
- <string name="menu_share">分享</string>
- <string name="menu_sync">同步</string>
- <string name="menu_sync_cancel">取消同步</string>
- <string name="menu_title_select_folder">选择文件夹</string>
- <string name="note_alert_expired">已过期</string>
- <string name="note_link_email">发送邮件</string>
- <string name="note_link_other">打开地图</string>
- <string name="note_link_tel">呼叫电话</string>
- <string name="note_link_web">浏览网页</string>
- <string name="notealert_enter">查看</string>
- <string name="notealert_ok">知道了</string>
- <string name="notelist_menu_new">新建便签</string>
- <string name="notelist_string_info">...</string>
- <string name="preferences_account_summary">与google task同步便签记录</string>
- <string name="preferences_account_title">同步账号</string>
- <string name="preferences_add_account">添加账号</string>
- <string name="preferences_bg_random_appear_title">新建便签背景颜色随机</string>
- <string name="preferences_button_sync_cancel">取消同步</string>
- <string name="preferences_button_sync_immediately">立即同步</string>
- <string name="preferences_dialog_change_account_title">当前帐号 %1$s</string>
- <string name="preferences_dialog_change_account_warn_msg">如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复</string>
- <string name="preferences_dialog_select_account_tips">请选择google帐号，便签将与该帐号的google task内容同步。</string>
- <string name="preferences_dialog_select_account_title">同步便签</string>
- <string name="preferences_last_sync_time">上次同步于 %1$s</string>
- <string name="preferences_menu_cancel">取消</string>
- <string name="preferences_menu_change_account">更换账号</string>
- <string name="preferences_menu_remove_account">删除账号</string>
- <string name="preferences_title">设置</string>
- <string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帐号</string>
- <string name="preferences_toast_success_set_accout">同步帐号已设置为%1$s</string>
- <string name="search">便签</string>
- <string name="search_hint">搜索便签</string>
- <string name="search_label">正在搜索便签</string>
- <string name="search_setting_description">便签中的文字</string>
- <string name="set_remind_time_message">创建提醒</string>
- <string name="success_sdcard_export">导出成功</string>
- <string name="success_sync_account">与%1$s同步成功</string>
- <string name="sync_progress_init_list">正在获取服务器便签列表...</string>
- <string name="sync_progress_login">登录%1$s...</string>
- <string name="sync_progress_syncing">正在同步本地便签...</string>
- <string name="ticker_cancel">同步已取消</string>
- <string name="ticker_fail">同步失败</string>
- <string name="ticker_success">同步成功</string>
- <string name="ticker_syncing">同步便签...</string>
- <string name="widget_havenot_content">没有关联内容，点击新建便签。</string>
- <string name="widget_under_visit_mode">访客模式下，便签内容不可见</string>
-</resources>
\ No newline at end of file
diff --git a/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
deleted file mode 100644
index 226b5bc..0000000
--- a/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="menu_share_ways">
- <item>短信</item>
- <item>郵件</item>
- </string-array>
- <plurals name="search_results_title">
- <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 條符合”<ns1:g id="SEARCH">%2$s</ns1:g>“的搜尋結果</item>
- </plurals>
- <string name="alert_message_delete_folder">確認刪除檔夾及所包含的便簽嗎？</string>
- <string name="alert_message_delete_note">确认要删除該條便籤嗎?</string>
- <string name="alert_message_delete_notes">确认要刪除所選的 %d 條便籤嗎?</string>
- <string name="alert_title_delete">刪除</string>
- <string name="app_name">便簽</string>
- <string name="app_widget2x2">便簽2x2</string>
- <string name="app_widget4x4">便簽4x4</string>
- <string name="button_delete">刪除</string>
- <string name="call_record_folder_name">通話便籤</string>
- <string name="datetime_dialog_cancel">取消</string>
- <string name="datetime_dialog_ok">設置</string>
- <string name="delete_remind_time_message">成功刪除提醒</string>
- <string name="error_note_empty_for_clock">不能爲空便籤設置鬧鐘提醒</string>
- <string name="error_note_empty_for_send_to_desktop">不能將空便籤發送到桌面</string>
- <string name="error_note_not_exist">要查看的便籤不存在</string>
- <string name="error_sdcard_export">導出TXT時發生錯誤，請檢查SD卡</string>
- <string name="error_sdcard_unmounted">SD卡被佔用，不能操作</string>
- <string name="error_sync_cancelled">同步已取消</string>
- <string name="error_sync_internal">同步失敗，發生內部錯誤</string>
- <string name="error_sync_network">同步失敗，請檢查網絡和帳號設置</string>
- <string name="failed_sdcard_export">導出失敗</string>
- <string name="folder_exist">文件夾 %1$s 已存在，請重新命名</string>
- <string name="format_date_ymd">yyyyMMdd</string>
- <string name="format_datetime_mdhm">MM月dd日 kk:mm</string>
- <string name="format_exported_file_location">已將文本文件(%1$s)導出至SD(%2$s)目錄</string>
- <string name="format_move_notes_to_folder">已將所選 %1$d 便籤移到 %2$s 文件夾</string>
- <string name="hint_foler_name">請輸入名稱</string>
- <string name="info_note_enter_desktop">已添加到桌面</string>
- <string name="menu_alert">提醒我</string>
- <string name="menu_create_folder">新建文件夾</string>
- <string name="menu_delete">刪除</string>
- <string name="menu_deselect_all">取消全選</string>
- <string name="menu_export_text">導出文本</string>
- <string name="menu_folder_change_name">修改文件夾名稱</string>
- <string name="menu_folder_delete">刪除文件夾</string>
- <string name="menu_folder_view">查看文件夾</string>
- <string name="menu_font_large">大</string>
- <string name="menu_font_normal">正常</string>
- <string name="menu_font_size">文字大小</string>
- <string name="menu_font_small">小</string>
- <string name="menu_font_super">超大</string>
- <string name="menu_list_mode">進入清單模式</string>
- <string name="menu_move">移動到文件夾</string>
- <string name="menu_move_parent_folder">上一級文件夾</string>
- <string name="menu_normal_mode">退出清單模式</string>
- <string name="menu_remove_remind">刪除提醒</string>
- <string name="menu_search">搜尋</string>
- <string name="menu_select_all">全選</string>
- <string name="menu_select_none">沒有選中項，操作無效</string>
- <string name="menu_select_title">選中了 %d 項</string>
- <string name="menu_send_to_desktop">發送到桌面</string>
- <string name="menu_setting">設置</string>
- <string name="menu_share">分享</string>
- <string name="menu_sync">同步</string>
- <string name="menu_sync_cancel">取消同步</string>
- <string name="menu_title_select_folder">選擇文件夾</string>
- <string name="note_alert_expired">已過期</string>
- <string name="note_link_email">發送郵件</string>
- <string name="note_link_other">打開地圖</string>
- <string name="note_link_tel">呼叫電話</string>
- <string name="note_link_web">浏覽網頁</string>
- <string name="notealert_enter">查看</string>
- <string name="notealert_ok">知道了</string>
- <string name="notelist_menu_new">新建便簽</string>
- <string name="notelist_string_info">...</string>
- <string name="preferences_account_summary">与google task同步便簽記錄</string>
- <string name="preferences_account_title">同步賬號</string>
- <string name="preferences_add_account">添加賬號</string>
- <string name="preferences_bg_random_appear_title">新建便籤背景顏色隨機</string>
- <string name="preferences_button_sync_cancel">取消同步</string>
- <string name="preferences_button_sync_immediately">立即同步</string>
- <string name="preferences_dialog_change_account_title">當前帳號 %1$s</string>
- <string name="preferences_dialog_change_account_warn_msg">如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復</string>
- <string name="preferences_dialog_select_account_tips">請選擇google帳號，便簽將與該帳號的google task內容同步。</string>
- <string name="preferences_dialog_select_account_title">同步便簽</string>
- <string name="preferences_last_sync_time">上次同步于 %1$s</string>
- <string name="preferences_menu_cancel">取消</string>
- <string name="preferences_menu_change_account">更換賬號</string>
- <string name="preferences_menu_remove_account">刪除賬號</string>
- <string name="preferences_title">設置</string>
- <string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帳號</string>
- <string name="preferences_toast_success_set_accout">同步帳號已設置為%1$s</string>
- <string name="search">便籤</string>
- <string name="search_hint">搜索便籤</string>
- <string name="search_label">正在搜索便籤</string>
- <string name="search_setting_description">便籤中的文字</string>
- <string name="set_remind_time_message">創建提醒</string>
- <string name="success_sdcard_export">導出成功</string>
- <string name="success_sync_account">與%1$s同步成功</string>
- <string name="sync_progress_init_list">正在獲取服務器便籤列表...</string>
- <string name="sync_progress_login">登陸%1$s...</string>
- <string name="sync_progress_syncing">正在同步本地便籤...</string>
- <string name="ticker_cancel">同步已取消</string>
- <string name="ticker_fail">同步失敗</string>
- <string name="ticker_success">同步成功</string>
- <string name="ticker_syncing">同步便簽...</string>
- <string name="widget_havenot_content">沒有關聯內容，點擊新建便簽。</string>
- <string name="widget_under_visit_mode">訪客模式下，便籤內容不可見</string>
-</resources>
\ No newline at end of file
diff --git a/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
deleted file mode 100644
index e49b0c3..0000000
--- a/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="format_for_exported_note">
- <item>-%s</item>
- <item>--%s</item>
- <item>--%s</item>
- <item>--%s</item>
- </string-array>
- <string-array name="menu_share_ways">
- <item>Messaging</item>
- <item>Email</item>
- </string-array>
- <color name="user_query_highlight">#335b5b5b</color>
- <dimen name="text_font_size_large">26sp</dimen>
- <dimen name="text_font_size_medium">20sp</dimen>
- <dimen name="text_font_size_normal">17sp</dimen>
- <dimen name="text_font_size_small">14sp</dimen>
- <dimen name="text_font_size_super">33sp</dimen>
- <plurals name="search_results_title">
- <item quantity="one"><ns1:g example="1" id="number">%1$s</ns1:g> result for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
-
- <item quantity="other"><ns1:g example="15" id="number">%1$s</ns1:g> results for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
- </plurals>
- <string name="alert_message_delete_folder">Confirm to delete folder and its notes?</string>
- <string name="alert_message_delete_note">Confirm to delete this note?</string>
- <string name="alert_message_delete_notes">Confirm to delete the selected %d notes?</string>
- <string name="alert_title_delete">Delete selected notes</string>
- <string name="app_name">Notes</string>
- <string name="app_widget2x2">Notes 2x2</string>
- <string name="app_widget4x4">Notes 4x4</string>
- <string name="button_delete">Delete</string>
- <string name="call_record_folder_name">Call notes</string>
- <string name="datetime_dialog_cancel">cancel</string>
- <string name="datetime_dialog_ok">set</string>
- <string name="delete_remind_time_message">Delete reminder successfully</string>
- <string name="error_note_empty_for_clock">Sorry, can not set clock on empty note</string>
- <string name="error_note_empty_for_send_to_desktop">Sorry, can not send and empty note to home</string>
- <string name="error_note_not_exist">The note is not exist</string>
- <string name="error_sdcard_export">Export failed, please check SD card</string>
- <string name="error_sdcard_unmounted">SD card busy, not available now</string>
- <string name="error_sync_cancelled">Sync is canceled</string>
- <string name="error_sync_internal">Sync failed, internal error occurs</string>
- <string name="error_sync_network">Sync failed, please check network and account settings</string>
- <string name="failed_sdcard_export">Export fail</string>
- <string name="file_name_txt_format">notes_%s.txt</string>
- <string name="file_path">/MIUI/notes/</string>
- <string name="folder_exist">The folder %1$s exist, please rename</string>
- <string name="format_date_ymd">yyyyMMdd</string>
- <string name="format_datetime_mdhm">MMMd kk:mm</string>
- <string name="format_exported_file_location">Export text file (%1$s) to SD (%2$s) directory</string>
- <string name="format_folder_files_count">(%d)</string>
- <string name="format_move_notes_to_folder">Have moved selected %1$d notes to %2$s folder</string>
- <string name="hint_foler_name">Input name</string>
- <string name="info_note_enter_desktop">Note added to home</string>
- <string name="menu_alert">Remind me</string>
- <string name="menu_create_folder">New Folder</string>
- <string name="menu_delete">Delete</string>
- <string name="menu_deselect_all">Deselect all</string>
- <string name="menu_export_text">Export text</string>
- <string name="menu_folder_change_name">Change folder name</string>
- <string name="menu_folder_delete">Delete folder</string>
- <string name="menu_folder_view">View folder</string>
- <string name="menu_font_large">Large</string>
- <string name="menu_font_normal">Medium</string>
- <string name="menu_font_size">Font size</string>
- <string name="menu_font_small">Small</string>
- <string name="menu_font_super">Super</string>
- <string name="menu_list_mode">Enter check list</string>
- <string name="menu_move">Move to folder</string>
- <string name="menu_move_parent_folder">Parent folder</string>
- <string name="menu_normal_mode">Leave check list</string>
- <string name="menu_remove_remind">Delete reminder</string>
- <string name="menu_search">Search</string>
- <string name="menu_select_all">Select all</string>
- <string name="menu_select_none">Nothing selected, the operation is invalid</string>
- <string name="menu_select_title">%d selected</string>
- <string name="menu_send_to_desktop">Send to home</string>
- <string name="menu_setting">Settings</string>
- <string name="menu_share">Share</string>
- <string name="menu_sync">Sync</string>
- <string name="menu_sync_cancel">Cancel syncing</string>
- <string name="menu_title_select_folder">Select folder</string>
- <string name="note_alert_expired">Expired</string>
- <string name="note_link_email">Send email</string>
- <string name="note_link_other">Open map</string>
- <string name="note_link_tel">Call</string>
- <string name="note_link_web">Browse web</string>
- <string name="notealert_enter">Take a look</string>
- <string name="notealert_ok">Got it</string>
- <string name="notelist_menu_new">Add note</string>
- <string name="notelist_string_info">...</string>
- <string name="preferences_account_summary">Sync notes with google task</string>
- <string name="preferences_account_title">Sync account</string>
- <string name="preferences_add_account">Add account</string>
- <string name="preferences_bg_random_appear_title">New note background color random</string>
- <string name="preferences_button_sync_cancel">Cancel syncing</string>
- <string name="preferences_button_sync_immediately">Sync immediately</string>
- <string name="preferences_dialog_change_account_title">Current account %1$s</string>
- <string name="preferences_dialog_change_account_warn_msg">All sync related information will be deleted, which may result in duplicated items sometime</string>
- <string name="preferences_dialog_select_account_tips">Please select a google account. Local notes will be synced with google task.</string>
- <string name="preferences_dialog_select_account_title">Sync notes</string>
- <string name="preferences_last_sync_time">Last sync time %1$s</string>
- <string name="preferences_last_sync_time_format">yyyy-MM-dd hh:mm:ss</string>
- <string name="preferences_menu_cancel">Cancel</string>
- <string name="preferences_menu_change_account">Change sync account</string>
- <string name="preferences_menu_remove_account">Remove sync account</string>
- <string name="preferences_title">Settings</string>
- <string name="preferences_toast_cannot_change_account">Cannot change the account because sync is in progress</string>
- <string name="preferences_toast_success_set_accout">%1$s has been set as the sync account</string>
- <string name="search">Notes</string>
- <string name="search_hint">Search notes</string>
- <string name="search_label">Searching Notes</string>
- <string name="search_setting_description">Text in your notes</string>
- <string name="set_remind_time_message">Set reminder</string>
- <string name="success_sdcard_export">Export successful</string>
- <string name="success_sync_account">Sync is successful with account %1$s</string>
- <string name="sync_progress_init_list">Getting remote note list...</string>
- <string name="sync_progress_login">Logging into %1$s...</string>
- <string name="sync_progress_syncing">Synchronize local notes with Google Task...</string>
- <string name="ticker_cancel">Sync is canceled</string>
- <string name="ticker_fail">Sync is failed</string>
- <string name="ticker_success">Sync is successful</string>
- <string name="ticker_syncing">Syncing notes...</string>
- <string name="widget_havenot_content">No associated note found, click to create associated note.</string>
- <string name="widget_under_visit_mode">Privacy mode，can not see note content</string>
- <style name="HighlightTextAppearancePrimary">
- <item name="android:textSize">@dimen/text_font_size_normal</item>
- <item name="android:textColor">@color/primary_text_dark</item>
- </style>
- <style name="HighlightTextAppearanceSecondary">
- <item name="android:textSize">@dimen/text_font_size_small</item>
- <item name="android:textColor">@color/secondary_text_dark</item>
- </style>
- <style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
- <item name="android:displayOptions"/>
- <item name="android:visibility">gone</item>
- </style>
- <style name="NoteTheme" parent="@android:style/Theme.Holo.Light">
- <item name="android:actionBarStyle">@style/NoteActionBarStyle</item>
- </style>
- <style name="TextAppearanceLarge">
- <item name="android:textSize">@dimen/text_font_size_large</item>
- <item name="android:textColorLink">#0000ff</item>
- </style>
- <style name="TextAppearanceMedium">
- <item name="android:textSize">@dimen/text_font_size_medium</item>
- <item name="android:textColorLink">#0000ff</item>
- </style>
- <style name="TextAppearanceNormal">
- <item name="android:textSize">@dimen/text_font_size_normal</item>
- <item name="android:textColorLink">#0000ff</item>
- </style>
- <style name="TextAppearancePrimaryItem">
- <item name="android:textSize">@dimen/text_font_size_normal</item>
- <item name="android:textColor">@color/primary_text_dark</item>
- </style>
- <style name="TextAppearanceSecondaryItem">
- <item name="android:textSize">@dimen/text_font_size_small</item>
- <item name="android:textColor">@color/secondary_text_dark</item>
- </style>
- <style name="TextAppearanceSuper">
- <item name="android:textSize">@dimen/text_font_size_super</item>
- <item name="android:textColorLink">#0000ff</item>
- </style>
- <style name="TextAppearanceUnderMenuIcon">
- <item name="android:textSize">@dimen/text_font_size_normal</item>
- <item name="android:textColor">@android:color/black</item>
- </style>
-</resources>
\ No newline at end of file
diff --git a/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
index dc4c4ed..ebdc9da 100644
--- a/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
+++ b/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<merger version="3" xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\programingg\Notes-master1\app\src\main\res"/><source path="E:\programingg\Notes-master1\app\build\generated\res\rs\debug"/><source path="E:\programingg\Notes-master1\app\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\programingg\Notes-master1\app\src\main\res"><file name="primary_text_dark" path="E:\programingg\Notes-master1\app\src\main\res\color\primary_text_dark.xml" qualifiers="" type="color"/><file name="secondary_text_dark" path="E:\programingg\Notes-master1\app\src\main\res\color\secondary_text_dark.xml" qualifiers="" type="color"/><file name="new_note" path="E:\programingg\Notes-master1\app\src\main\res\drawable\new_note.xml" qualifiers="" type="drawable"/><file name="bg_btn_set_color" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\bg_btn_set_color.png" qualifiers="hdpi-v4" type="drawable"/><file name="bg_color_btn_mask" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\bg_color_btn_mask.png" qualifiers="hdpi-v4" type="drawable"/><file name="call_record" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\call_record.png" qualifiers="hdpi-v4" type="drawable"/><file name="clock" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\clock.png" qualifiers="hdpi-v4" type="drawable"/><file name="delete" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\delete.png" qualifiers="hdpi-v4" type="drawable"/><file name="dropdown_icon" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\dropdown_icon.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_blue" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\edit_blue.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_green" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\edit_green.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_red" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\edit_red.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_blue" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\edit_title_blue.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_green" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\edit_title_green.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_red" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\edit_title_red.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_white" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\edit_title_white.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_yellow" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\edit_title_yellow.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_white" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\edit_white.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_yellow" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\edit_yellow.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_large" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\font_large.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_normal" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\font_normal.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_size_selector_bg" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\font_size_selector_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_small" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\font_small.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_super" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\font_super.png" qualifiers="hdpi-v4" type="drawable"/><file name="icon_app" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\icon_app.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_background" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\list_background.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_down" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\list_blue_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_middle" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\list_blue_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_single" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\list_blue_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_up" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\list_blue_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_folder" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\list_folder.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_footer_bg" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\list_footer_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_down" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\list_green_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_middle" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\list_green_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_single" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\list_green_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_up" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\list_green_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_down" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\list_red_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_middle" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\list_red_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_single" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\list_red_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_up" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\list_red_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_down" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\list_white_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_middle" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\list_white_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_single" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\list_white_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_up" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\list_white_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_down" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\list_yellow_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_middle" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\list_yellow_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_single" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\list_yellow_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_up" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\list_yellow_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="menu_delete" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\menu_delete.png" qualifiers="hdpi-v4" type="drawable"/><file name="menu_move" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\menu_move.png" qualifiers="hdpi-v4" type="drawable"/><file name="new_note_normal" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\new_note_normal.png" qualifiers="hdpi-v4" type="drawable"/><file name="new_note_pressed" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\new_note_pressed.png" qualifiers="hdpi-v4" type="drawable"/><file name="note_edit_color_selector_panel" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\note_edit_color_selector_panel.png" qualifiers="hdpi-v4" type="drawable"/><file name="notification" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\notification.png" qualifiers="hdpi-v4" type="drawable"/><file name="search_result" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\search_result.png" qualifiers="hdpi-v4" type="drawable"/><file name="selected" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\selected.png" qualifiers="hdpi-v4" type="drawable"/><file name="title_alert" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\title_alert.png" qualifiers="hdpi-v4" type="drawable"/><file name="title_bar_bg" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\title_bar_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_blue" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\widget_2x_blue.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_green" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\widget_2x_green.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_red" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\widget_2x_red.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_white" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\widget_2x_white.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_yellow" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\widget_2x_yellow.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_blue" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\widget_4x_blue.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_green" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\widget_4x_green.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_red" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\widget_4x_red.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_white" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\widget_4x_white.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_yellow" path="E:\programingg\Notes-master1\app\src\main\res\drawable-hdpi\widget_4x_yellow.png" qualifiers="hdpi-v4" type="drawable"/><file name="account_dialog_title" path="E:\programingg\Notes-master1\app\src\main\res\layout\account_dialog_title.xml" qualifiers="" type="layout"/><file name="add_account_text" path="E:\programingg\Notes-master1\app\src\main\res\layout\add_account_text.xml" qualifiers="" type="layout"/><file name="datetime_picker" path="E:\programingg\Notes-master1\app\src\main\res\layout\datetime_picker.xml" qualifiers="" type="layout"/><file name="dialog_edit_text" path="E:\programingg\Notes-master1\app\src\main\res\layout\dialog_edit_text.xml" qualifiers="" type="layout"/><file name="folder_list_item" path="E:\programingg\Notes-master1\app\src\main\res\layout\folder_list_item.xml" qualifiers="" type="layout"/><file name="note_edit" path="E:\programingg\Notes-master1\app\src\main\res\layout\note_edit.xml" qualifiers="" type="layout"/><file name="note_edit_list_item" path="E:\programingg\Notes-master1\app\src\main\res\layout\note_edit_list_item.xml" qualifiers="" type="layout"/><file name="note_item" path="E:\programingg\Notes-master1\app\src\main\res\layout\note_item.xml" qualifiers="" type="layout"/><file name="note_list" path="E:\programingg\Notes-master1\app\src\main\res\layout\note_list.xml" qualifiers="" type="layout"/><file name="note_list_dropdown_menu" path="E:\programingg\Notes-master1\app\src\main\res\layout\note_list_dropdown_menu.xml" qualifiers="" type="layout"/><file name="note_list_footer" path="E:\programingg\Notes-master1\app\src\main\res\layout\note_list_footer.xml" qualifiers="" type="layout"/><file name="settings_header" path="E:\programingg\Notes-master1\app\src\main\res\layout\settings_header.xml" qualifiers="" type="layout"/><file name="widget_2x" path="E:\programingg\Notes-master1\app\src\main\res\layout\widget_2x.xml" qualifiers="" type="layout"/><file name="widget_4x" path="E:\programingg\Notes-master1\app\src\main\res\layout\widget_4x.xml" qualifiers="" type="layout"/><file name="call_note_edit" path="E:\programingg\Notes-master1\app\src\main\res\menu\call_note_edit.xml" qualifiers="" type="menu"/><file name="call_record_folder" path="E:\programingg\Notes-master1\app\src\main\res\menu\call_record_folder.xml" qualifiers="" type="menu"/><file name="note_edit" path="E:\programingg\Notes-master1\app\src\main\res\menu\note_edit.xml" qualifiers="" type="menu"/><file name="note_list" path="E:\programingg\Notes-master1\app\src\main\res\menu\note_list.xml" qualifiers="" type="menu"/><file name="note_list_dropdown" path="E:\programingg\Notes-master1\app\src\main\res\menu\note_list_dropdown.xml" qualifiers="" type="menu"/><file name="note_list_options" path="E:\programingg\Notes-master1\app\src\main\res\menu\note_list_options.xml" qualifiers="" type="menu"/><file name="sub_folder" path="E:\programingg\Notes-master1\app\src\main\res\menu\sub_folder.xml" qualifiers="" type="menu"/><file name="introduction" path="E:\programingg\Notes-master1\app\src\main\res\raw\introduction" qualifiers="" type="raw"/><file name="introduction" path="E:\programingg\Notes-master1\app\src\main\res\raw-zh-rCN\introduction" qualifiers="zh-rCN" type="raw"/><file path="E:\programingg\Notes-master1\app\src\main\res\values\arrays.xml" qualifiers=""><string-array name="format_for_exported_note">
+<merger version="3" xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Work-java\MINOTES\minotes\app\src\main\res"/><source path="D:\Work-java\MINOTES\minotes\app\build\generated\res\rs\debug"/><source path="D:\Work-java\MINOTES\minotes\app\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Work-java\MINOTES\minotes\app\src\main\res"><file name="primary_text_dark" path="D:\Work-java\MINOTES\minotes\app\src\main\res\color\primary_text_dark.xml" qualifiers="" type="color"/><file name="secondary_text_dark" path="D:\Work-java\MINOTES\minotes\app\src\main\res\color\secondary_text_dark.xml" qualifiers="" type="color"/><file name="new_note" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable\new_note.xml" qualifiers="" type="drawable"/><file name="bg_btn_set_color" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\bg_btn_set_color.png" qualifiers="hdpi-v4" type="drawable"/><file name="bg_color_btn_mask" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\bg_color_btn_mask.png" qualifiers="hdpi-v4" type="drawable"/><file name="call_record" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\call_record.png" qualifiers="hdpi-v4" type="drawable"/><file name="clock" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\clock.png" qualifiers="hdpi-v4" type="drawable"/><file name="delete" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\delete.png" qualifiers="hdpi-v4" type="drawable"/><file name="dropdown_icon" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\dropdown_icon.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_blue" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\edit_blue.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_green" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\edit_green.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_red" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\edit_red.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_blue" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\edit_title_blue.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_green" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\edit_title_green.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_red" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\edit_title_red.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_white" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\edit_title_white.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_yellow" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\edit_title_yellow.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_white" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\edit_white.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_yellow" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\edit_yellow.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_color_green" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\font_color_green.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_large" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\font_large.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_normal" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\font_normal.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_size_selector_bg" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\font_size_selector_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_small" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\font_small.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_super" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\font_super.png" qualifiers="hdpi-v4" type="drawable"/><file name="icon_app" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\icon_app.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_background" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\list_background.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_down" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\list_blue_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_middle" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\list_blue_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_single" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\list_blue_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_up" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\list_blue_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_folder" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\list_folder.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_footer_bg" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\list_footer_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_down" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\list_green_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_middle" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\list_green_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_single" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\list_green_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_up" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\list_green_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_down" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\list_red_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_middle" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\list_red_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_single" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\list_red_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_up" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\list_red_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_down" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\list_white_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_middle" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\list_white_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_single" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\list_white_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_up" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\list_white_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_down" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\list_yellow_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_middle" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\list_yellow_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_single" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\list_yellow_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_up" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\list_yellow_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="menu_delete" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\menu_delete.png" qualifiers="hdpi-v4" type="drawable"/><file name="menu_move" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\menu_move.png" qualifiers="hdpi-v4" type="drawable"/><file name="new_note_normal" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\new_note_normal.png" qualifiers="hdpi-v4" type="drawable"/><file name="new_note_pressed" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\new_note_pressed.png" qualifiers="hdpi-v4" type="drawable"/><file name="note_edit_color_selector_panel" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\note_edit_color_selector_panel.png" qualifiers="hdpi-v4" type="drawable"/><file name="notification" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\notification.png" qualifiers="hdpi-v4" type="drawable"/><file name="search_result" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\search_result.png" qualifiers="hdpi-v4" type="drawable"/><file name="selected" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\selected.png" qualifiers="hdpi-v4" type="drawable"/><file name="title_alert" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\title_alert.png" qualifiers="hdpi-v4" type="drawable"/><file name="title_bar_bg" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\title_bar_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_blue" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\widget_2x_blue.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_green" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\widget_2x_green.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_red" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\widget_2x_red.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_white" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\widget_2x_white.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_yellow" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\widget_2x_yellow.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_blue" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\widget_4x_blue.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_green" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\widget_4x_green.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_red" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\widget_4x_red.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_white" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\widget_4x_white.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_yellow" path="D:\Work-java\MINOTES\minotes\app\src\main\res\drawable-hdpi\widget_4x_yellow.png" qualifiers="hdpi-v4" type="drawable"/><file name="account_dialog_title" path="D:\Work-java\MINOTES\minotes\app\src\main\res\layout\account_dialog_title.xml" qualifiers="" type="layout"/><file name="add_account_text" path="D:\Work-java\MINOTES\minotes\app\src\main\res\layout\add_account_text.xml" qualifiers="" type="layout"/><file name="datetime_picker" path="D:\Work-java\MINOTES\minotes\app\src\main\res\layout\datetime_picker.xml" qualifiers="" type="layout"/><file name="dialog_edit_text" path="D:\Work-java\MINOTES\minotes\app\src\main\res\layout\dialog_edit_text.xml" qualifiers="" type="layout"/><file name="folder_list_item" path="D:\Work-java\MINOTES\minotes\app\src\main\res\layout\folder_list_item.xml" qualifiers="" type="layout"/><file name="note_edit" path="D:\Work-java\MINOTES\minotes\app\src\main\res\layout\note_edit.xml" qualifiers="" type="layout"/><file name="note_edit_list_item" path="D:\Work-java\MINOTES\minotes\app\src\main\res\layout\note_edit_list_item.xml" qualifiers="" type="layout"/><file name="note_item" path="D:\Work-java\MINOTES\minotes\app\src\main\res\layout\note_item.xml" qualifiers="" type="layout"/><file name="note_list" path="D:\Work-java\MINOTES\minotes\app\src\main\res\layout\note_list.xml" qualifiers="" type="layout"/><file name="note_list_dropdown_menu" path="D:\Work-java\MINOTES\minotes\app\src\main\res\layout\note_list_dropdown_menu.xml" qualifiers="" type="layout"/><file name="note_list_footer" path="D:\Work-java\MINOTES\minotes\app\src\main\res\layout\note_list_footer.xml" qualifiers="" type="layout"/><file name="settings_header" path="D:\Work-java\MINOTES\minotes\app\src\main\res\layout\settings_header.xml" qualifiers="" type="layout"/><file name="widget_2x" path="D:\Work-java\MINOTES\minotes\app\src\main\res\layout\widget_2x.xml" qualifiers="" type="layout"/><file name="widget_4x" path="D:\Work-java\MINOTES\minotes\app\src\main\res\layout\widget_4x.xml" qualifiers="" type="layout"/><file name="call_note_edit" path="D:\Work-java\MINOTES\minotes\app\src\main\res\menu\call_note_edit.xml" qualifiers="" type="menu"/><file name="call_record_folder" path="D:\Work-java\MINOTES\minotes\app\src\main\res\menu\call_record_folder.xml" qualifiers="" type="menu"/><file name="note_edit" path="D:\Work-java\MINOTES\minotes\app\src\main\res\menu\note_edit.xml" qualifiers="" type="menu"/><file name="note_list" path="D:\Work-java\MINOTES\minotes\app\src\main\res\menu\note_list.xml" qualifiers="" type="menu"/><file name="note_list_dropdown" path="D:\Work-java\MINOTES\minotes\app\src\main\res\menu\note_list_dropdown.xml" qualifiers="" type="menu"/><file name="note_list_options" path="D:\Work-java\MINOTES\minotes\app\src\main\res\menu\note_list_options.xml" qualifiers="" type="menu"/><file name="sub_folder" path="D:\Work-java\MINOTES\minotes\app\src\main\res\menu\sub_folder.xml" qualifiers="" type="menu"/><file name="introduction" path="D:\Work-java\MINOTES\minotes\app\src\main\res\raw\introduction" qualifiers="" type="raw"/><file name="introduction" path="D:\Work-java\MINOTES\minotes\app\src\main\res\raw-zh-rCN\introduction" qualifiers="zh-rCN" type="raw"/><file path="D:\Work-java\MINOTES\minotes\app\src\main\res\values\arrays.xml" qualifiers=""><string-array name="format_for_exported_note">
<item>-%s</item>
<item>--%s</item>
<item>--%s</item>
@@ -7,11 +7,19 @@
</string-array><string-array name="menu_share_ways">
<item>Messaging</item>
<item>Email</item>
- </string-array></file><file path="E:\programingg\Notes-master1\app\src\main\res\values\colors.xml" qualifiers=""><color name="user_query_highlight">#335b5b5b</color></file><file path="E:\programingg\Notes-master1\app\src\main\res\values\dimens.xml" qualifiers=""><dimen name="text_font_size_super">33sp</dimen><dimen name="text_font_size_large">26sp</dimen><dimen name="text_font_size_medium">20sp</dimen><dimen name="text_font_size_normal">17sp</dimen><dimen name="text_font_size_small">14sp</dimen></file><file path="E:\programingg\Notes-master1\app\src\main\res\values\strings.xml" qualifiers=""><string name="app_name">Notes</string><string name="app_widget2x2">Notes 2x2</string><string name="app_widget4x4">Notes 4x4</string><string name="widget_havenot_content">No associated note found, click to create associated note.</string><string name="widget_under_visit_mode">Privacy mode，can not see note content</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">Add note</string><string name="delete_remind_time_message">Delete reminder successfully</string><string name="set_remind_time_message">Set reminder</string><string name="note_alert_expired">Expired</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MMMd kk:mm</string><string name="notealert_ok">Got it</string><string name="notealert_enter">Take a look</string><string name="note_link_tel">Call</string><string name="note_link_email">Send email</string><string name="note_link_web">Browse web</string><string name="note_link_other">Open map</string><string name="file_path">/MIUI/notes/</string><string name="file_name_txt_format">notes_%s.txt</string><string name="format_folder_files_count">(%d)</string><string name="menu_create_folder">New Folder</string><string name="menu_export_text">Export text</string><string name="menu_sync">Sync</string><string name="menu_sync_cancel">Cancel syncing</string><string name="menu_setting">Settings</string><string name="menu_search">Search</string><string name="menu_delete">Delete</string><string name="menu_move">Move to folder</string><string name="menu_select_title">%d selected</string><string name="menu_select_none">Nothing selected, the operation is invalid</string><string name="menu_select_all">Select all</string><string name="menu_deselect_all">Deselect all</string><string name="menu_font_size">Font size</string><string name="menu_font_small">Small</string><string name="menu_font_normal">Medium</string><string name="menu_font_large">Large</string><string name="menu_font_super">Super</string><string name="menu_list_mode">Enter check list</string><string name="menu_normal_mode">Leave check list</string><string name="menu_folder_view">View folder</string><string name="menu_folder_delete">Delete folder</string><string name="menu_folder_change_name">Change folder name</string><string name="folder_exist">The folder %1$s exist, please rename</string><string name="menu_share">Share</string><string name="menu_send_to_desktop">Send to home</string><string name="menu_alert">Remind me</string><string name="menu_remove_remind">Delete reminder</string><string name="menu_title_select_folder">Select folder</string><string name="menu_move_parent_folder">Parent folder</string><string name="info_note_enter_desktop">Note added to home</string><string name="alert_message_delete_folder">Confirm to delete folder and its notes?</string><string name="alert_title_delete">Delete selected notes</string><string name="alert_message_delete_notes">Confirm to delete the selected %d notes?</string><string name="alert_message_delete_note">Confirm to delete this note?</string><string name="format_move_notes_to_folder">Have moved selected %1$d notes to %2$s folder</string><string name="error_sdcard_unmounted">SD card busy, not available now</string><string name="error_sdcard_export">Export failed, please check SD card</string><string name="error_note_not_exist">The note is not exist</string><string name="error_note_empty_for_clock">Sorry, can not set clock on empty note</string><string name="error_note_empty_for_send_to_desktop">Sorry, can not send and empty note to home</string><string name="success_sdcard_export">Export successful</string><string name="failed_sdcard_export">Export fail</string><string name="format_exported_file_location">Export text file (%1$s) to SD (%2$s) directory</string><string name="ticker_syncing">Syncing notes...</string><string name="ticker_success">Sync is successful</string><string name="ticker_fail">Sync is failed</string><string name="ticker_cancel">Sync is canceled</string><string name="success_sync_account">Sync is successful with account %1$s</string><string name="error_sync_network">Sync failed, please check network and account settings</string><string name="error_sync_internal">Sync failed, internal error occurs</string><string name="error_sync_cancelled">Sync is canceled</string><string name="sync_progress_login">Logging into %1$s...</string><string name="sync_progress_init_list">Getting remote note list...</string><string name="sync_progress_syncing">Synchronize local notes with Google Task...</string><string name="preferences_title">Settings</string><string name="preferences_account_title">Sync account</string><string name="preferences_account_summary">Sync notes with google task</string><string name="preferences_last_sync_time">Last sync time %1$s</string><string name="preferences_last_sync_time_format">yyyy-MM-dd hh:mm:ss</string><string name="preferences_add_account">Add account</string><string name="preferences_menu_change_account">Change sync account</string><string name="preferences_menu_remove_account">Remove sync account</string><string name="preferences_menu_cancel">Cancel</string><string name="preferences_button_sync_immediately">Sync immediately</string><string name="preferences_button_sync_cancel">Cancel syncing</string><string name="preferences_dialog_change_account_title">Current account %1$s</string><string name="preferences_dialog_change_account_warn_msg">All sync related information will be deleted, which may result in duplicated items sometime</string><string name="preferences_dialog_select_account_title">Sync notes</string><string name="preferences_dialog_select_account_tips">Please select a google account. Local notes will be synced with google task.</string><string name="preferences_toast_cannot_change_account">Cannot change the account because sync is in progress</string><string name="preferences_toast_success_set_accout">%1$s has been set as the sync account</string><string name="preferences_bg_random_appear_title">New note background color random</string><string name="button_delete">Delete</string><string name="call_record_folder_name">Call notes</string><string name="hint_foler_name">Input name</string><string name="search_label">Searching Notes</string><string name="search_hint">Search notes</string><string name="search_setting_description">Text in your notes</string><string name="search">Notes</string><string name="datetime_dialog_ok">set</string><string name="datetime_dialog_cancel">cancel</string><plurals name="search_results_title">
+ </string-array></file><file path="D:\Work-java\MINOTES\minotes\app\src\main\res\values\colors.xml" qualifiers=""><color name="user_query_highlight">#335b5b5b</color></file><file path="D:\Work-java\MINOTES\minotes\app\src\main\res\values\dimens.xml" qualifiers=""><dimen name="text_font_size_super">33sp</dimen><dimen name="text_font_size_large">26sp</dimen><dimen name="text_font_size_medium">20sp</dimen><dimen name="text_font_size_normal">17sp</dimen><dimen name="text_font_size_small">14sp</dimen></file><file path="D:\Work-java\MINOTES\minotes\app\src\main\res\values\FontColor.xml" qualifiers=""><color name="Green">#00FF00</color><color name="Red">#FF0000</color><color name="Blue">#0000FF</color><color name="Yellow">#FFFF00</color><color name="Default">#000000</color><color name="Bright_Blue">#00FFFF</color></file><file path="D:\Work-java\MINOTES\minotes\app\src\main\res\values\strings.xml" qualifiers=""><string name="app_name">Notes</string><string name="app_widget2x2">Notes 2x2</string><string name="app_widget4x4">Notes 4x4</string><string name="widget_havenot_content">No associated note found, click to create associated note.</string><string name="widget_under_visit_mode">Privacy mode，can not see note content</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">Add note</string><string name="delete_remind_time_message">Delete reminder successfully</string><string name="set_remind_time_message">Set reminder</string><string name="note_alert_expired">Expired</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MMMd kk:mm</string><string name="notealert_ok">Got it</string><string name="notealert_enter">Take a look</string><string name="note_link_tel">Call</string><string name="note_link_email">Send email</string><string name="note_link_web">Browse web</string><string name="note_link_other">Open map</string><string name="file_path">/MIUI/notes/</string><string name="file_name_txt_format">notes_%s.txt</string><string name="format_folder_files_count">(%d)</string><string name="menu_create_folder">New Folder</string><string name="menu_export_text">Export text</string><string name="menu_sync">Sync</string><string name="menu_sync_cancel">Cancel syncing</string><string name="menu_setting">Settings</string><string name="menu_search">Search</string><string name="menu_delete">Delete</string><string name="menu_move">Move to folder</string><string name="menu_select_title">%d selected</string><string name="menu_select_none">Nothing selected, the operation is invalid</string><string name="menu_select_all">Select all</string><string name="menu_deselect_all">Deselect all</string><string name="menu_font_size">Font size</string><string name="menu_font_small">Small</string><string name="menu_font_normal">Medium</string><string name="menu_font_large">Large</string><string name="menu_font_super">Super</string><string name="menu_list_mode">Enter check list</string><string name="menu_normal_mode">Leave check list</string><string name="menu_folder_view">View folder</string><string name="menu_folder_delete">Delete folder</string><string name="menu_folder_change_name">Change folder name</string><string name="folder_exist">The folder %1$s exist, please rename</string><string name="menu_share">Share</string><string name="menu_send_to_desktop">Send to home</string><string name="menu_alert">Remind me</string><string name="menu_remove_remind">Delete reminder</string><string name="menu_title_select_folder">Select folder</string><string name="menu_move_parent_folder">Parent folder</string><string name="info_note_enter_desktop">Note added to home</string><string name="alert_message_delete_folder">Confirm to delete folder and its notes?</string><string name="alert_title_delete">Delete selected notes</string><string name="alert_message_delete_notes">Confirm to delete the selected %d notes?</string><string name="alert_message_delete_note">Confirm to delete this note?</string><string name="format_move_notes_to_folder">Have moved selected %1$d notes to %2$s folder</string><string name="menu_change_font_color">Change Selected Text Color</string><string name="menu_insert_img">Insert Image</string><string name="error_sdcard_unmounted">SD card busy, not available now</string><string name="error_sdcard_export">Export failed, please check SD card</string><string name="error_note_not_exist">The note is not exist</string><string name="error_note_empty_for_clock">Sorry, can not set clock on empty note</string><string name="error_note_empty_for_send_to_desktop">Sorry, can not send and empty note to home</string><string name="success_sdcard_export">Export successful</string><string name="failed_sdcard_export">Export fail</string><string name="format_exported_file_location">Export text file (%1$s) to SD (%2$s) directory</string><string name="ticker_syncing">Syncing notes...</string><string name="ticker_success">Sync is successful</string><string name="ticker_fail">Sync is failed</string><string name="ticker_cancel">Sync is canceled</string><string name="success_sync_account">Sync is successful with account %1$s</string><string name="error_sync_network">Sync failed, please check network and account settings</string><string name="error_sync_internal">Sync failed, internal error occurs</string><string name="error_sync_cancelled">Sync is canceled</string><string name="sync_progress_login">Logging into %1$s...</string><string name="sync_progress_init_list">Getting remote note list...</string><string name="sync_progress_syncing">Synchronize local notes with Google Task...</string><string name="preferences_title">Settings</string><string name="preferences_account_title">Sync account</string><string name="preferences_account_summary">Sync notes with google task</string><string name="preferences_last_sync_time">Last sync time %1$s</string><string name="preferences_last_sync_time_format">yyyy-MM-dd hh:mm:ss</string><string name="preferences_add_account">Add account</string><string name="preferences_menu_change_account">Change sync account</string><string name="preferences_menu_remove_account">Remove sync account</string><string name="preferences_menu_cancel">Cancel</string><string name="preferences_button_sync_immediately">Sync immediately</string><string name="preferences_button_sync_cancel">Cancel syncing</string><string name="preferences_dialog_change_account_title">Current account %1$s</string><string name="preferences_dialog_change_account_warn_msg">All sync related information will be deleted, which may result in duplicated items sometime</string><string name="preferences_dialog_select_account_title">Sync notes</string><string name="preferences_dialog_select_account_tips">Please select a google account. Local notes will be synced with google task.</string><string name="preferences_toast_cannot_change_account">Cannot change the account because sync is in progress</string><string name="preferences_toast_success_set_accout">%1$s has been set as the sync account</string><string name="preferences_bg_random_appear_title">New note background color random</string><string name="button_delete">Delete</string><string name="call_record_folder_name">Call notes</string><string name="hint_foler_name">Input name</string><string name="search_label">Searching Notes</string><string name="search_hint">Search notes</string><string name="search_setting_description">Text in your notes</string><string name="search">Notes</string><string name="datetime_dialog_ok">set</string><string name="datetime_dialog_cancel">cancel</string><string name="change_txt_color">改变文本颜色</string><plurals name="search_results_title">
<item quantity="one"><ns1:g example="1" id="number">%1$s</ns1:g> result for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
<item quantity="other"><ns1:g example="15" id="number">%1$s</ns1:g> results for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
- </plurals></file><file path="E:\programingg\Notes-master1\app\src\main\res\values\styles.xml" qualifiers=""><style name="TextAppearanceSuper">
+ </plurals></file><file path="D:\Work-java\MINOTES\minotes\app\src\main\res\values\styles.xml" qualifiers=""><style name="TextColorGreen">
+ <item name="android:textColor">@color/Green</item>
+ </style><style name="TextColorRed">
+ <item name="android:textColor">@color/Red</item>
+ </style><style name="TextColorDefault">
+ <item name="android:textColor">@color/Default</item>
+ </style><style name="TextColorBrightBlue">
+ <item name="android:textColor">@color/Bright_Blue</item>
+ </style><style name="TextAppearanceSuper">
<item name="android:textSize">@dimen/text_font_size_super</item>
<item name="android:textColorLink">#0000ff</item>
</style><style name="TextAppearanceLarge">
@@ -42,15 +50,15 @@
<item name="android:actionBarStyle">@style/NoteActionBarStyle</item>
</style><style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
<item name="android:displayOptions"/>
- <item name="android:visibility">gone</item>
- </style></file><file path="E:\programingg\Notes-master1\app\src\main\res\values-zh-rCN\arrays.xml" qualifiers="zh-rCN"><string-array name="menu_share_ways">
+ <item name="android:visibility">visible</item>
+ </style></file><file path="D:\Work-java\MINOTES\minotes\app\src\main\res\values-zh-rCN\arrays.xml" qualifiers="zh-rCN"><string-array name="menu_share_ways">
<item>短信</item>
<item>邮件</item>
- </string-array></file><file path="E:\programingg\Notes-master1\app\src\main\res\values-zh-rCN\strings.xml" qualifiers="zh-rCN"><string name="app_name">便签</string><string name="app_widget2x2">便签2x2</string><string name="app_widget4x4">便签4x4</string><string name="widget_havenot_content">没有关联内容，点击新建便签。</string><string name="widget_under_visit_mode">访客模式下，便签内容不可见</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">新建便签</string><string name="delete_remind_time_message">成功删除提醒</string><string name="set_remind_time_message">创建提醒</string><string name="note_alert_expired">已过期</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MM月dd日 kk:mm</string><string name="notealert_ok">知道了</string><string name="notealert_enter">查看</string><string name="note_link_tel">呼叫电话</string><string name="note_link_email">发送邮件</string><string name="note_link_web">浏览网页</string><string name="note_link_other">打开地图</string><string name="menu_create_folder">新建文件夹</string><string name="menu_export_text">导出文本</string><string name="menu_sync">同步</string><string name="menu_sync_cancel">取消同步</string><string name="menu_setting">设置</string><string name="menu_search">搜索</string><string name="menu_delete">删除</string><string name="menu_move">移动到文件夹</string><string name="menu_select_title">选中了 %d 项</string><string name="menu_select_none">没有选中项，操作无效</string><string name="menu_select_all">全选</string><string name="menu_deselect_all">取消全选</string><string name="menu_font_size">文字大小</string><string name="menu_font_small">小</string><string name="menu_font_normal">正常</string><string name="menu_font_large">大</string><string name="menu_font_super">超大</string><string name="menu_list_mode">进入清单模式</string><string name="menu_normal_mode">退出清单模式</string><string name="menu_folder_view">查看文件夹</string><string name="menu_folder_delete">刪除文件夹</string><string name="menu_folder_change_name">修改文件夹名称</string><string name="folder_exist">文件夹 %1$s 已存在，请重新命名</string><string name="menu_share">分享</string><string name="menu_send_to_desktop">发送到桌面</string><string name="menu_alert">提醒我</string><string name="menu_remove_remind">删除提醒</string><string name="menu_title_select_folder">选择文件夹</string><string name="menu_move_parent_folder">上一级文件夹</string><string name="info_note_enter_desktop">已添加到桌面</string><string name="alert_title_delete">删除</string><string name="alert_message_delete_notes">确认要删除所选的 %d 条便签吗?</string><string name="alert_message_delete_note">确认要删除该条便签吗?</string><string name="alert_message_delete_folder">确认删除文件夹及所包含的便签吗？</string><string name="format_move_notes_to_folder">已将所选 %1$d 条便签移到 %2$s 文件夹</string><string name="error_sdcard_unmounted">SD卡被占用，不能操作</string><string name="error_sdcard_export">导出文本时发生错误，请检查SD卡</string><string name="error_note_not_exist">要查看的便签不存在</string><string name="error_note_empty_for_clock">不能为空便签设置闹钟提醒</string><string name="error_note_empty_for_send_to_desktop">不能将空便签发送到桌面</string><string name="success_sdcard_export">导出成功</string><string name="failed_sdcard_export">导出失败</string><string name="format_exported_file_location">已将文本文件(%1$s)输出至SD卡(%2$s)目录</string><string name="ticker_syncing">同步便签...</string><string name="ticker_success">同步成功</string><string name="ticker_fail">同步失败</string><string name="ticker_cancel">同步已取消</string><string name="success_sync_account">与%1$s同步成功</string><string name="error_sync_network">同步失败，请检查网络和帐号设置</string><string name="error_sync_internal">同步失败，发生内部错误</string><string name="error_sync_cancelled">同步已取消</string><string name="sync_progress_login">登录%1$s...</string><string name="sync_progress_init_list">正在获取服务器便签列表...</string><string name="sync_progress_syncing">正在同步本地便签...</string><string name="preferences_title">设置</string><string name="preferences_account_title">同步账号</string><string name="preferences_account_summary">与google task同步便签记录</string><string name="preferences_last_sync_time">上次同步于 %1$s</string><string name="preferences_add_account">添加账号</string><string name="preferences_menu_change_account">更换账号</string><string name="preferences_menu_remove_account">删除账号</string><string name="preferences_menu_cancel">取消</string><string name="preferences_button_sync_immediately">立即同步</string><string name="preferences_button_sync_cancel">取消同步</string><string name="preferences_dialog_change_account_title">当前帐号 %1$s</string><string name="preferences_dialog_change_account_warn_msg">如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复</string><string name="preferences_dialog_select_account_title">同步便签</string><string name="preferences_dialog_select_account_tips">请选择google帐号，便签将与该帐号的google task内容同步。</string><string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帐号</string><string name="preferences_toast_success_set_accout">同步帐号已设置为%1$s</string><string name="preferences_bg_random_appear_title">新建便签背景颜色随机</string><string name="button_delete">删除</string><string name="call_record_folder_name">通话便签</string><string name="hint_foler_name">请输入名称</string><string name="search_label">正在搜索便签</string><string name="search_hint">搜索便签</string><string name="search_setting_description">便签中的文字</string><string name="search">便签</string><string name="datetime_dialog_ok">设置</string><string name="datetime_dialog_cancel">取消</string><plurals name="search_results_title">
+ </string-array></file><file path="D:\Work-java\MINOTES\minotes\app\src\main\res\values-zh-rCN\strings.xml" qualifiers="zh-rCN"><string name="app_name">便签</string><string name="app_widget2x2">便签2x2</string><string name="app_widget4x4">便签4x4</string><string name="widget_havenot_content">没有关联内容，点击新建便签。</string><string name="widget_under_visit_mode">访客模式下，便签内容不可见</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">新建便签</string><string name="delete_remind_time_message">成功删除提醒</string><string name="set_remind_time_message">创建提醒</string><string name="note_alert_expired">已过期</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MM月dd日 kk:mm</string><string name="notealert_ok">知道了</string><string name="notealert_enter">查看</string><string name="note_link_tel">呼叫电话</string><string name="note_link_email">发送邮件</string><string name="note_link_web">浏览网页</string><string name="note_link_other">打开地图</string><string name="file_path">/MIUI/notes/</string><string name="file_name_txt_format">notes_%s.txt</string><string name="format_folder_files_count">(%d)</string><string name="menu_create_folder">新建文件夹</string><string name="menu_export_text">导出文本</string><string name="menu_sync">同步</string><string name="menu_sync_cancel">取消同步</string><string name="menu_setting">设置</string><string name="menu_search">搜索</string><string name="menu_delete">删除</string><string name="menu_move">移动到文件夹</string><string name="menu_select_title">选中了 %d 项</string><string name="menu_select_none">没有选中项，操作无效</string><string name="menu_select_all">全选</string><string name="menu_deselect_all">取消全选</string><string name="menu_font_size">文字大小</string><string name="menu_font_small">小</string><string name="menu_font_normal">正常</string><string name="menu_font_large">大</string><string name="menu_font_super">超大</string><string name="menu_list_mode">进入清单模式</string><string name="menu_normal_mode">退出清单模式</string><string name="menu_folder_view">查看文件夹</string><string name="menu_folder_delete">刪除文件夹</string><string name="menu_folder_change_name">修改文件夹名称</string><string name="folder_exist">文件夹 %1$s 已存在，请重新命名</string><string name="menu_share">分享</string><string name="menu_send_to_desktop">发送到桌面</string><string name="menu_alert">提醒我</string><string name="menu_remove_remind">删除提醒</string><string name="menu_title_select_folder">选择文件夹</string><string name="menu_move_parent_folder">上一级文件夹</string><string name="info_note_enter_desktop">已添加到桌面</string><string name="alert_title_delete">删除</string><string name="alert_message_delete_notes">确认要删除所选的 %d 条便签吗?</string><string name="alert_message_delete_note">确认要删除该条便签吗?</string><string name="alert_message_delete_folder">确认删除文件夹及所包含的便签吗？</string><string name="format_move_notes_to_folder">已将所选 %1$d 条便签移到 %2$s 文件夹</string><string name="menu_change_font_color">更改选中文本颜色</string><string name="menu_insert_img">插入图片</string><string name="error_sdcard_unmounted">SD卡被占用，不能操作</string><string name="error_sdcard_export">导出文本时发生错误，请检查SD卡</string><string name="error_note_not_exist">要查看的便签不存在</string><string name="error_note_empty_for_clock">不能为空便签设置闹钟提醒</string><string name="error_note_empty_for_send_to_desktop">不能将空便签发送到桌面</string><string name="success_sdcard_export">导出成功</string><string name="failed_sdcard_export">导出失败</string><string name="format_exported_file_location">已将文本文件(%1$s)输出至SD卡(%2$s)目录</string><string name="ticker_syncing">同步便签...</string><string name="ticker_success">同步成功</string><string name="ticker_fail">同步失败</string><string name="ticker_cancel">同步已取消</string><string name="success_sync_account">与%1$s同步成功</string><string name="error_sync_network">同步失败，请检查网络和帐号设置</string><string name="error_sync_internal">同步失败，发生内部错误</string><string name="error_sync_cancelled">同步已取消</string><string name="sync_progress_login">登录%1$s...</string><string name="sync_progress_init_list">正在获取服务器便签列表...</string><string name="sync_progress_syncing">正在同步本地便签...</string><string name="preferences_title">设置</string><string name="preferences_account_title">同步账号</string><string name="preferences_account_summary">与google task同步便签记录</string><string name="preferences_last_sync_time">上次同步于 %1$s</string><string name="preferences_last_sync_time_format">yyyy-MM-dd hh:mm:ss</string><string name="preferences_add_account">添加账号</string><string name="preferences_menu_change_account">更换账号</string><string name="preferences_menu_remove_account">删除账号</string><string name="preferences_menu_cancel">取消</string><string name="preferences_button_sync_immediately">立即同步</string><string name="preferences_button_sync_cancel">取消同步</string><string name="preferences_dialog_change_account_title">当前帐号 %1$s</string><string name="preferences_dialog_change_account_warn_msg">如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复</string><string name="preferences_dialog_select_account_title">同步便签</string><string name="preferences_dialog_select_account_tips">请选择google帐号，便签将与该帐号的google task内容同步。</string><string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帐号</string><string name="preferences_toast_success_set_accout">同步帐号已设置为%1$s</string><string name="preferences_bg_random_appear_title">新建便签背景颜色随机</string><string name="button_delete">删除</string><string name="call_record_folder_name">通话便签</string><string name="hint_foler_name">请输入名称</string><string name="search_label">正在搜索便签</string><string name="search_hint">搜索便签</string><string name="search_setting_description">便签中的文字</string><string name="search">便签</string><string name="datetime_dialog_ok">设置</string><string name="datetime_dialog_cancel">取消</string><string name="change_txt_color">改变文本颜色</string><plurals name="search_results_title">
<item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 条符合“<ns1:g id="SEARCH">%2$s</ns1:g>”的搜索结果</item>
- </plurals></file><file path="E:\programingg\Notes-master1\app\src\main\res\values-zh-rTW\arrays.xml" qualifiers="zh-rTW"><string-array name="menu_share_ways">
+ </plurals></file><file path="D:\Work-java\MINOTES\minotes\app\src\main\res\values-zh-rTW\arrays.xml" qualifiers="zh-rTW"><string-array name="menu_share_ways">
<item>短信</item>
<item>郵件</item>
- </string-array></file><file path="E:\programingg\Notes-master1\app\src\main\res\values-zh-rTW\strings.xml" qualifiers="zh-rTW"><string name="app_name">便簽</string><string name="app_widget2x2">便簽2x2</string><string name="app_widget4x4">便簽4x4</string><string name="widget_havenot_content">沒有關聯內容，點擊新建便簽。</string><string name="widget_under_visit_mode">訪客模式下，便籤內容不可見</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">新建便簽</string><string name="delete_remind_time_message">成功刪除提醒</string><string name="set_remind_time_message">創建提醒</string><string name="note_alert_expired">已過期</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MM月dd日 kk:mm</string><string name="notealert_ok">知道了</string><string name="notealert_enter">查看</string><string name="note_link_tel">呼叫電話</string><string name="note_link_email">發送郵件</string><string name="note_link_web">浏覽網頁</string><string name="note_link_other">打開地圖</string><string name="format_move_notes_to_folder">已將所選 %1$d 便籤移到 %2$s 文件夾</string><string name="menu_create_folder">新建文件夾</string><string name="menu_export_text">導出文本</string><string name="menu_sync">同步</string><string name="menu_sync_cancel">取消同步</string><string name="menu_setting">設置</string><string name="menu_search">搜尋</string><string name="menu_delete">刪除</string><string name="menu_move">移動到文件夾</string><string name="menu_select_title">選中了 %d 項</string><string name="menu_select_none">沒有選中項，操作無效</string><string name="menu_select_all">全選</string><string name="menu_deselect_all">取消全選</string><string name="menu_font_size">文字大小</string><string name="menu_font_small">小</string><string name="menu_font_normal">正常</string><string name="menu_font_large">大</string><string name="menu_font_super">超大</string><string name="menu_list_mode">進入清單模式</string><string name="menu_normal_mode">退出清單模式</string><string name="menu_folder_view">查看文件夾</string><string name="menu_folder_delete">刪除文件夾</string><string name="menu_folder_change_name">修改文件夾名稱</string><string name="folder_exist">文件夾 %1$s 已存在，請重新命名</string><string name="menu_share">分享</string><string name="menu_send_to_desktop">發送到桌面</string><string name="menu_alert">提醒我</string><string name="menu_remove_remind">刪除提醒</string><string name="menu_title_select_folder">選擇文件夾</string><string name="menu_move_parent_folder">上一級文件夾</string><string name="info_note_enter_desktop">已添加到桌面</string><string name="alert_title_delete">刪除</string><string name="alert_message_delete_notes">确认要刪除所選的 %d 條便籤嗎?</string><string name="alert_message_delete_note">确认要删除該條便籤嗎?</string><string name="alert_message_delete_folder">確認刪除檔夾及所包含的便簽嗎？</string><string name="error_sdcard_unmounted">SD卡被佔用，不能操作</string><string name="error_sdcard_export">導出TXT時發生錯誤，請檢查SD卡</string><string name="error_note_not_exist">要查看的便籤不存在</string><string name="error_note_empty_for_clock">不能爲空便籤設置鬧鐘提醒</string><string name="error_note_empty_for_send_to_desktop">不能將空便籤發送到桌面</string><string name="success_sdcard_export">導出成功</string><string name="failed_sdcard_export">導出失敗</string><string name="format_exported_file_location">已將文本文件(%1$s)導出至SD(%2$s)目錄</string><string name="ticker_syncing">同步便簽...</string><string name="ticker_success">同步成功</string><string name="ticker_fail">同步失敗</string><string name="ticker_cancel">同步已取消</string><string name="success_sync_account">與%1$s同步成功</string><string name="error_sync_network">同步失敗，請檢查網絡和帳號設置</string><string name="error_sync_internal">同步失敗，發生內部錯誤</string><string name="error_sync_cancelled">同步已取消</string><string name="sync_progress_login">登陸%1$s...</string><string name="sync_progress_init_list">正在獲取服務器便籤列表...</string><string name="sync_progress_syncing">正在同步本地便籤...</string><string name="preferences_title">設置</string><string name="preferences_account_title">同步賬號</string><string name="preferences_account_summary">与google task同步便簽記錄</string><string name="preferences_last_sync_time">上次同步于 %1$s</string><string name="preferences_add_account">添加賬號</string><string name="preferences_menu_change_account">更換賬號</string><string name="preferences_menu_remove_account">刪除賬號</string><string name="preferences_menu_cancel">取消</string><string name="preferences_button_sync_immediately">立即同步</string><string name="preferences_button_sync_cancel">取消同步</string><string name="preferences_dialog_change_account_title">當前帳號 %1$s</string><string name="preferences_dialog_change_account_warn_msg">如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復</string><string name="preferences_dialog_select_account_title">同步便簽</string><string name="preferences_dialog_select_account_tips">請選擇google帳號，便簽將與該帳號的google task內容同步。</string><string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帳號</string><string name="preferences_toast_success_set_accout">同步帳號已設置為%1$s</string><string name="preferences_bg_random_appear_title">新建便籤背景顏色隨機</string><string name="button_delete">刪除</string><string name="call_record_folder_name">通話便籤</string><string name="hint_foler_name">請輸入名稱</string><string name="search_label">正在搜索便籤</string><string name="search_hint">搜索便籤</string><string name="search_setting_description">便籤中的文字</string><string name="search">便籤</string><string name="datetime_dialog_ok">設置</string><string name="datetime_dialog_cancel">取消</string><plurals name="search_results_title">
+ </string-array></file><file path="D:\Work-java\MINOTES\minotes\app\src\main\res\values-zh-rTW\strings.xml" qualifiers="zh-rTW"><string name="app_name">便簽</string><string name="app_widget2x2">便簽2x2</string><string name="app_widget4x4">便簽4x4</string><string name="widget_havenot_content">沒有關聯內容，點擊新建便簽。</string><string name="widget_under_visit_mode">訪客模式下，便籤內容不可見</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">新建便簽</string><string name="delete_remind_time_message">成功刪除提醒</string><string name="set_remind_time_message">創建提醒</string><string name="note_alert_expired">已過期</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MM月dd日 kk:mm</string><string name="notealert_ok">知道了</string><string name="notealert_enter">查看</string><string name="note_link_tel">呼叫電話</string><string name="note_link_email">發送郵件</string><string name="note_link_web">浏覽網頁</string><string name="note_link_other">打開地圖</string><string name="format_move_notes_to_folder">已將所選 %1$d 便籤移到 %2$s 文件夾</string><string name="file_path">/MIUI/notes/</string><string name="file_name_txt_format">notes_%s.txt</string><string name="format_folder_files_count">(%d)</string><string name="menu_create_folder">新建文件夾</string><string name="menu_export_text">導出文本</string><string name="menu_sync">同步</string><string name="menu_sync_cancel">取消同步</string><string name="menu_setting">設置</string><string name="menu_search">搜尋</string><string name="menu_delete">刪除</string><string name="menu_move">移動到文件夾</string><string name="menu_select_title">選中了 %d 項</string><string name="menu_select_none">沒有選中項，操作無效</string><string name="menu_select_all">全選</string><string name="menu_deselect_all">取消全選</string><string name="menu_font_size">文字大小</string><string name="menu_font_small">小</string><string name="menu_font_normal">正常</string><string name="menu_font_large">大</string><string name="menu_font_super">超大</string><string name="menu_list_mode">進入清單模式</string><string name="menu_normal_mode">退出清單模式</string><string name="menu_folder_view">查看文件夾</string><string name="menu_folder_delete">刪除文件夾</string><string name="menu_folder_change_name">修改文件夾名稱</string><string name="folder_exist">文件夾 %1$s 已存在，請重新命名</string><string name="menu_share">分享</string><string name="menu_send_to_desktop">發送到桌面</string><string name="menu_alert">提醒我</string><string name="menu_remove_remind">刪除提醒</string><string name="menu_title_select_folder">選擇文件夾</string><string name="menu_move_parent_folder">上一級文件夾</string><string name="info_note_enter_desktop">已添加到桌面</string><string name="alert_title_delete">刪除</string><string name="alert_message_delete_notes">确认要刪除所選的 %d 條便籤嗎?</string><string name="alert_message_delete_note">确认要删除該條便籤嗎?</string><string name="alert_message_delete_folder">確認刪除檔夾及所包含的便簽嗎？</string><string name="menu_change_font_color">更改选中文本颜色</string><string name="menu_insert_img">插入图像</string><string name="error_sdcard_unmounted">SD卡被佔用，不能操作</string><string name="error_sdcard_export">導出TXT時發生錯誤，請檢查SD卡</string><string name="error_note_not_exist">要查看的便籤不存在</string><string name="error_note_empty_for_clock">不能爲空便籤設置鬧鐘提醒</string><string name="error_note_empty_for_send_to_desktop">不能將空便籤發送到桌面</string><string name="success_sdcard_export">導出成功</string><string name="failed_sdcard_export">導出失敗</string><string name="format_exported_file_location">已將文本文件(%1$s)導出至SD(%2$s)目錄</string><string name="ticker_syncing">同步便簽...</string><string name="ticker_success">同步成功</string><string name="ticker_fail">同步失敗</string><string name="ticker_cancel">同步已取消</string><string name="success_sync_account">與%1$s同步成功</string><string name="error_sync_network">同步失敗，請檢查網絡和帳號設置</string><string name="error_sync_internal">同步失敗，發生內部錯誤</string><string name="error_sync_cancelled">同步已取消</string><string name="sync_progress_login">登陸%1$s...</string><string name="sync_progress_init_list">正在獲取服務器便籤列表...</string><string name="sync_progress_syncing">正在同步本地便籤...</string><string name="preferences_title">設置</string><string name="preferences_account_title">同步賬號</string><string name="preferences_account_summary">与google task同步便簽記錄</string><string name="preferences_last_sync_time">上次同步于 %1$s</string><string name="preferences_last_sync_time_format">yyyy-MM-dd hh:mm:ss</string><string name="preferences_add_account">添加賬號</string><string name="preferences_menu_change_account">更換賬號</string><string name="preferences_menu_remove_account">刪除賬號</string><string name="preferences_menu_cancel">取消</string><string name="preferences_button_sync_immediately">立即同步</string><string name="preferences_button_sync_cancel">取消同步</string><string name="preferences_dialog_change_account_title">當前帳號 %1$s</string><string name="preferences_dialog_change_account_warn_msg">如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復</string><string name="preferences_dialog_select_account_title">同步便簽</string><string name="preferences_dialog_select_account_tips">請選擇google帳號，便簽將與該帳號的google task內容同步。</string><string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帳號</string><string name="preferences_toast_success_set_accout">同步帳號已設置為%1$s</string><string name="preferences_bg_random_appear_title">新建便籤背景顏色隨機</string><string name="button_delete">刪除</string><string name="call_record_folder_name">通話便籤</string><string name="hint_foler_name">請輸入名稱</string><string name="search_label">正在搜索便籤</string><string name="search_hint">搜索便籤</string><string name="search_setting_description">便籤中的文字</string><string name="search">便籤</string><string name="datetime_dialog_ok">設置</string><string name="datetime_dialog_cancel">取消</string><string name="change_txt_color">改变文本颜色</string><plurals name="search_results_title">
<item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 條符合”<ns1:g id="SEARCH">%2$s</ns1:g>“的搜尋結果</item>
- </plurals></file><file name="preferences" path="E:\programingg\Notes-master1\app\src\main\res\xml\preferences.xml" qualifiers="" type="xml"/><file name="searchable" path="E:\programingg\Notes-master1\app\src\main\res\xml\searchable.xml" qualifiers="" type="xml"/><file name="widget_2x_info" path="E:\programingg\Notes-master1\app\src\main\res\xml\widget_2x_info.xml" qualifiers="" type="xml"/><file name="widget_4x_info" path="E:\programingg\Notes-master1\app\src\main\res\xml\widget_4x_info.xml" qualifiers="" type="xml"/></source><source path="E:\programingg\Notes-master1\app\build\generated\res\rs\debug"/><source path="E:\programingg\Notes-master1\app\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\programingg\Notes-master1\app\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\programingg\Notes-master1\app\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><mergedItems/></merger>
\ No newline at end of file
+ </plurals></file><file name="preferences" path="D:\Work-java\MINOTES\minotes\app\src\main\res\xml\preferences.xml" qualifiers="" type="xml"/><file name="searchable" path="D:\Work-java\MINOTES\minotes\app\src\main\res\xml\searchable.xml" qualifiers="" type="xml"/><file name="widget_2x_info" path="D:\Work-java\MINOTES\minotes\app\src\main\res\xml\widget_2x_info.xml" qualifiers="" type="xml"/><file name="widget_4x_info" path="D:\Work-java\MINOTES\minotes\app\src\main\res\xml\widget_4x_info.xml" qualifiers="" type="xml"/></source><source path="D:\Work-java\MINOTES\minotes\app\build\generated\res\rs\debug"/><source path="D:\Work-java\MINOTES\minotes\app\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Work-java\MINOTES\minotes\app\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Work-java\MINOTES\minotes\app\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><mergedItems/></merger>
\ No newline at end of file
diff --git a/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
index 801d567..c9f5d16 100644
--- a/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
+++ b/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\programingg\Notes-master1\app\src\main\assets"/><source path="E:\programingg\Notes-master1\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\programingg\Notes-master1\app\src\debug\assets"/></dataSet></merger>
\ No newline at end of file
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Work-java\MINOTES\minotes\app\src\main\assets"/><source path="D:\Work-java\MINOTES\minotes\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Work-java\MINOTES\minotes\app\src\debug\assets"/></dataSet></merger>
\ No newline at end of file
diff --git a/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
index 31b4b76..4f557c8 100644
--- a/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
+++ b/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\programingg\Notes-master1\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\programingg\Notes-master1\app\src\debug\jniLibs"/></dataSet></merger>
\ No newline at end of file
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Work-java\MINOTES\minotes\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Work-java\MINOTES\minotes\app\src\debug\jniLibs"/></dataSet></merger>
\ No newline at end of file
diff --git a/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
index 6ed567a..08d6782 100644
--- a/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
+++ b/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\programingg\Notes-master1\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\programingg\Notes-master1\app\src\debug\shaders"/></dataSet></merger>
\ No newline at end of file
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Work-java\MINOTES\minotes\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Work-java\MINOTES\minotes\app\src\debug\shaders"/></dataSet></merger>
\ No newline at end of file
diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
index c699421..9e2119c 100644
--- a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Wed Mar 15 19:23:55 CST 2023
-base.0=E\:\\programingg\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
+#Thu Apr 27 20:45:53 HKT 2023
+base.0=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
renamed.0=classes.dex
path.0=classes.dex
diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
index cfa6488..603c336 100644
Binary files a/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ
diff --git a/app/build/intermediates/incremental/processDebugResources/resources-list-for-resources-debug.ap_.txt b/app/build/intermediates/incremental/processDebugResources/resources-list-for-resources-debug.ap_.txt
new file mode 100644
index 0000000..5aafad5
--- /dev/null
+++ b/app/build/intermediates/incremental/processDebugResources/resources-list-for-resources-debug.ap_.txt
@@ -0,0 +1 @@
+C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\color_primary_text_dark.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\color_secondary_text_dark.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_bg_btn_set_color.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_bg_color_btn_mask.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_call_record.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_clock.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_delete.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_dropdown_icon.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_blue.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_green.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_red.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_blue.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_green.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_red.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_white.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_yellow.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_white.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_yellow.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_font_color_green.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_font_large.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_font_normal.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_font_size_selector_bg.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_font_small.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_font_super.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_icon_app.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_background.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_blue_down.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_blue_middle.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_blue_single.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_blue_up.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_folder.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_footer_bg.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_green_down.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_green_middle.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_green_single.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_green_up.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_red_down.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_red_middle.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_red_single.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_red_up.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_white_down.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_white_middle.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_white_single.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_white_up.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_yellow_down.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_yellow_middle.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_yellow_single.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_list_yellow_up.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_menu_delete.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_menu_move.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_new_note_normal.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_new_note_pressed.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_note_edit_color_selector_panel.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_notification.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_search_result.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_selected.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_title_alert.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_title_bar_bg.9.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_blue.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_green.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_red.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_white.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_yellow.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_blue.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_green.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_red.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_white.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_yellow.png.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\drawable_new_note.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\layout_account_dialog_title.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\layout_add_account_text.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\layout_datetime_picker.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\layout_dialog_edit_text.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\layout_folder_list_item.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\layout_note_edit.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\layout_note_edit_list_item.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\layout_note_item.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\layout_note_list.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\layout_note_list_dropdown_menu.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\layout_note_list_footer.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\layout_settings_header.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\layout_widget_2x.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\layout_widget_4x.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\menu_call_note_edit.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\menu_call_record_folder.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\menu_note_edit.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\menu_note_list.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\menu_note_list_dropdown.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\menu_note_list_options.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\menu_sub_folder.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\raw-zh-rCN_introduction.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\raw_introduction.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\values-zh-rCN_values-zh-rCN.arsc.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\values-zh-rTW_values-zh-rTW.arsc.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\values_values.arsc.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\xml_preferences.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\xml_searchable.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\xml_widget_2x_info.xml.flat C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug\xml_widget_4x_info.xml.flat
\ No newline at end of file
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class
index c31b006..f50998a 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class
index 20ff3f7..fcb0da5 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class
index 5236c5e..3459064 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class
index 099f3ba..6a5f5ae 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class
index 2783ae3..7d14912 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class
index 1a059ce..c916ef7 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class
index 75665c2..60c0b58 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class
index a98e2d4..c78621a 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class
index eb2611b..5ffa71d 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class
index 7be3b8a..4544bd1 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class
index afad37e..2b0fbe6 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class
index f246eb8..e65832c 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class
index 18da491..19436e0 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class
index c40e945..3415c24 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class
index d2041cc..eb9d7e2 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class
index df71afc..b0b793e 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class
index a8b5858..3091c3e 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class
index 59b1fff..9ea668c 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class
index 6af3200..4eda7f5 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/FontColorParser$TextAppearanceResources.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/FontColorParser$TextAppearanceResources.class
new file mode 100644
index 0000000..4d3861f
Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/FontColorParser$TextAppearanceResources.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/FontColorParser.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/FontColorParser.class
new file mode 100644
index 0000000..4cd7f80
Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/FontColorParser.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class
index 76971f6..1fcadcc 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class
index 5868ba7..8f484dd 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class
index e8542fb..a3157df 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class
index 51317a3..b9de96e 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class
index a1d202d..2c06336 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class
index a41b775..70c303c 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class
index 029286f..526325f 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class
index e65c35c..1adcb3b 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class
index de51bad..b6ef076 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class
index d04cbe7..d39a51e 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class
index 505c291..cd461f8 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class
index 415e755..b92ae75 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class
index 7f6cc71..3d51519 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class
index ddd74fd..eeb6b6d 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class
index d805d20..2939c8e 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class
index 45d174e..bc44cf0 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class
index 383f2f5..1a2b75f 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class
index f7afcae..259aa97 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class
index 24c7362..e1d83ca 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class
index 1725d92..c569e6a 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class
index 8e1f0bf..be18b58 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
index 26e0ea0..d1b13cf 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class
index 2040186..5af1391 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class
index 3a1b2fa..3e3c5f5 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class
index 771aa91..6b55fb8 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class
index 8b49661..201dc95 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class
index 70299f5..e2bccbe 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class
index 4b38b8c..9dc928a 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class
index fb39036..f8d11c2 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class
index fe71934..4bd4777 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class
index d3fdd7c..527392c 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class
index b598c32..33f1629 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
index a86271b..d1cd65d 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class
index 4d1fc47..0000a99 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class
index fadd4fc..b9e2606 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class
index 3981f16..3d7a7fc 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class
index 99e161f..de35790 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class
index 4d23237..7801541 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class
index 1e7b9f0..7fbad50 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
index 6c2b8ff..f733a10 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
index e4a168f..bffc0d9 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class
index 2bdb58b..18be735 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class
index 5e432e9..18da5bc 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class
index 3f69317..4636402 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class
index 00ee0c3..a28a718 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class
index 8523228..730a969 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class
index d91bc85..b50388a 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class
index 99c7a64..29b0b3b 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class
index 17e4d3b..a784ff5 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class
index 7b80036..986f023 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class
index d9abeb9..123239b 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class
index 39e534a..0cd3584 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class
index 2e15406..619e22f 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class
index a19956f..953b301 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class
index b06613f..23a80dd 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class
index b11cc4f..bf63eab 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class
index f7e3c77..5e50ae9 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class differ
diff --git a/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
index 778d049..90e91b7 100644
--- a/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
+++ b/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
@@ -20,254 +20,254 @@
20 android:versionName="0.1" >
21
22 <uses-sdk
-22-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
+22-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:23:5-44
23 android:minSdkVersion="14"
-23-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:23:15-41
+23-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:23:15-41
24 android:targetSdkVersion="14" />
-24-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
+24-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:23:5-44
25
26 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-26-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81
-26-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:25:22-78
+26-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:25:5-81
+26-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:25:22-78
27 <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
-27-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88
-27-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:26:22-85
+27-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:26:5-88
+27-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:26:22-85
28 <uses-permission android:name="android.permission.INTERNET" />
-28-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67
-28-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:27:22-64
+28-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:27:5-67
+28-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:27:22-64
29 <uses-permission android:name="android.permission.READ_CONTACTS" />
-29-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72
-29-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:28:22-69
+29-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:28:5-72
+29-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:28:22-69
30 <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-30-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74
-30-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:29:22-71
+30-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:29:5-74
+30-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:29:22-71
31 <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-31-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80
-31-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:30:22-77
+31-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:30:5-80
+31-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:30:22-77
32 <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-32-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71
-32-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:31:22-68
+32-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:31:5-71
+32-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:31:22-68
33 <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-33-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74
-33-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:32:22-71
+33-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:32:5-74
+33-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:32:22-71
34 <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-34-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81
-34-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78
+34-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:33:5-81
+34-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:33:22-78
35
36 <application
-36-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:35:5-149:19
+36-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:35:5-149:19
37 android:debuggable="true"
38 android:icon="@drawable/icon_app"
-38-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42
+38-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:36:9-42
39 android:label="@string/app_name"
-39-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41
+39-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:37:9-41
40 android:testOnly="true" >
41 <activity
-41-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:38:9-51:20
+41-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:38:9-51:20
42 android:name="net.micode.notes.ui.NotesListActivity"
-42-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:39:13-49
+42-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:39:13-49
43 android:configChanges="keyboardHidden|orientation|screenSize"
-43-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74
+43-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:40:13-74
44 android:label="@string/app_name"
-44-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45
+44-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:41:13-45
45 android:launchMode="singleTop"
-45-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43
+45-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:42:13-43
46 android:theme="@style/NoteTheme"
-46-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:43:13-45
+46-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:43:13-45
47 android:uiOptions="splitActionBarWhenNarrow"
-47-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:44:13-57
+47-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:44:13-57
48 android:windowSoftInputMode="adjustPan" >
-48-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:45:13-52
+48-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:45:13-52
49 <intent-filter>
-49-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:47:13-50:29
+49-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:47:13-50:29
50 <action android:name="android.intent.action.MAIN" />
-50-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:48:17-69
-50-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:48:25-66
+50-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:48:17-69
+50-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:48:25-66
51
52 <category android:name="android.intent.category.LAUNCHER" />
-52-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:49:17-77
-52-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:49:27-74
+52-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:49:17-77
+52-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:49:27-74
53 </intent-filter>
54 </activity>
55 <activity
-55-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:53:9-81:20
+55-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:53:9-81:20
56 android:name="net.micode.notes.ui.NoteEditActivity"
-56-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:54:13-48
+56-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:54:13-48
57 android:configChanges="keyboardHidden|orientation|screenSize"
-57-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:55:13-74
+57-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:55:13-74
58 android:launchMode="singleTop"
-58-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:56:13-43
+58-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:56:13-43
59 android:theme="@style/NoteTheme" >
-59-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:57:13-45
+59-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:57:13-45
60 <intent-filter>
-60-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:59:13-64:29
+60-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:59:13-64:29
61 <action android:name="android.intent.action.VIEW" />
-61-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:60:17-69
-61-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:60:25-66
+61-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:60:17-69
+61-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:60:25-66
62
63 <category android:name="android.intent.category.DEFAULT" />
-63-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76
-63-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73
+63-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:61:17-76
+63-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:61:27-73
64
65 <data android:mimeType="vnd.android.cursor.item/text_note" />
-65-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78
-65-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75
+65-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:62:17-78
+65-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:62:23-75
66 <data android:mimeType="vnd.android.cursor.item/call_note" />
-66-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78
-66-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75
+66-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:62:17-78
+66-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:62:23-75
67 </intent-filter>
68 <intent-filter>
-68-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:66:13-71:29
+68-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:66:13-71:29
69 <action android:name="android.intent.action.INSERT_OR_EDIT" />
-69-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:67:17-79
-69-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:67:25-76
+69-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:67:17-79
+69-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:67:25-76
70
71 <category android:name="android.intent.category.DEFAULT" />
-71-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76
-71-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73
+71-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:61:17-76
+71-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:61:27-73
72
73 <data android:mimeType="vnd.android.cursor.item/text_note" />
-73-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78
-73-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75
+73-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:62:17-78
+73-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:62:23-75
74 <data android:mimeType="vnd.android.cursor.item/call_note" />
-74-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78
-74-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75
+74-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:62:17-78
+74-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:62:23-75
75 </intent-filter>
76 <intent-filter>
-76-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:73:13-76:29
+76-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:73:13-76:29
77 <action android:name="android.intent.action.SEARCH" />
-77-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:74:17-71
-77-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:74:25-68
+77-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:74:17-71
+77-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:74:25-68
78
79 <category android:name="android.intent.category.DEFAULT" />
-79-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76
-79-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73
+79-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:61:17-76
+79-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:61:27-73
80 </intent-filter>
81
82 <meta-data
-82-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:78:13-80:54
+82-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:78:13-80:54
83 android:name="android.app.searchable"
-83-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:79:17-54
+83-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:79:17-54
84 android:resource="@xml/searchable" />
-84-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:80:17-51
+84-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:80:17-51
85 </activity>
86
87 <provider
-87-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:83:9-86:43
+87-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:83:9-86:43
88 android:name="net.micode.notes.data.NotesProvider"
-88-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:84:13-63
+88-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:84:13-63
89 android:authorities="micode_notes"
-89-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:85:13-47
+89-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:85:13-47
90 android:multiprocess="true" />
-90-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:86:13-40
+90-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:86:13-40
91
92 <receiver
-92-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:88:9-100:20
+92-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:88:9-100:20
93 android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
-93-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:89:13-57
+93-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:89:13-57
94 android:label="@string/app_widget2x2" >
-94-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:90:13-50
+94-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:90:13-50
95 <intent-filter>
-95-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29
+95-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:91:13-95:29
96 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-96-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84
-96-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81
+96-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:92:17-84
+96-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:92:25-81
97 <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-97-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85
-97-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82
+97-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:93:17-85
+97-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:93:25-82
98 <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-98-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85
-98-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82
+98-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:94:17-85
+98-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:94:25-82
99 </intent-filter>
100
101 <meta-data
-101-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58
+101-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:97:13-99:58
102 android:name="android.appwidget.provider"
-102-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58
+102-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:98:17-58
103 android:resource="@xml/widget_2x_info" />
-103-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55
+103-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:99:17-55
104 </receiver>
105 <receiver
-105-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:101:9-114:20
+105-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:101:9-114:20
106 android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
-106-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:102:13-57
+106-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:102:13-57
107 android:label="@string/app_widget4x4" >
-107-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:103:13-50
+107-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:103:13-50
108 <intent-filter>
-108-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29
+108-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:91:13-95:29
109 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-109-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84
-109-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81
+109-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:92:17-84
+109-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:92:25-81
110 <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-110-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85
-110-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82
+110-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:93:17-85
+110-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:93:25-82
111 <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-111-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85
-111-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82
+111-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:94:17-85
+111-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:94:25-82
112 </intent-filter>
113
114 <meta-data
-114-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58
+114-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:97:13-99:58
115 android:name="android.appwidget.provider"
-115-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58
+115-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:98:17-58
116 android:resource="@xml/widget_4x_info" />
-116-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55
+116-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:99:17-55
117 </receiver>
118 <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
-118-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:116:9-120:20
-118-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:116:19-55
+118-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:116:9-120:20
+118-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:116:19-55
119 <intent-filter>
-119-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:117:13-119:29
+119-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:117:13-119:29
120 <action android:name="android.intent.action.BOOT_COMPLETED" />
-120-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:118:17-79
-120-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:118:25-76
+120-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:118:17-79
+120-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:118:25-76
121 </intent-filter>
122 </receiver>
123 <receiver
-123-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:122:9-125:20
+123-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:122:9-125:20
124 android:name="net.micode.notes.ui.AlarmReceiver"
-124-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:123:13-61
+124-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:123:13-61
125 android:process=":remote" >
-125-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:124:13-38
+125-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:124:13-38
126 </receiver>
127
128 <activity
-128-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:127:9-132:20
+128-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:127:9-132:20
129 android:name="net.micode.notes.ui.AlarmAlertActivity"
-129-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:128:13-50
+129-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:128:13-50
130 android:label="@string/app_name"
-130-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:129:13-45
+130-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:129:13-45
131 android:launchMode="singleInstance"
-131-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:130:13-48
+131-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:130:13-48
132 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
-132-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:131:13-75
+132-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:131:13-75
133 </activity>
134 <activity
-134-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:134:9-139:20
+134-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:134:9-139:20
135 android:name="net.micode.notes.ui.NotesPreferenceActivity"
-135-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:135:13-71
+135-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:135:13-71
136 android:label="@string/preferences_title"
-136-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:136:13-54
+136-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:136:13-54
137 android:launchMode="singleTop"
-137-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:137:13-43
+137-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:137:13-43
138 android:theme="@android:style/Theme.Holo.Light" >
-138-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:138:13-60
+138-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:138:13-60
139 </activity>
140
141 <service
-141-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:141:9-144:19
+141-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:141:9-144:19
142 android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-142-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:142:13-74
+142-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:142:13-74
143 android:exported="false" >
-143-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:143:13-37
+143-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:143:13-37
144 </service>
145
146 <meta-data
-146-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:146:9-148:52
+146-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:146:9-148:52
147 android:name="android.app.default_searchable"
-147-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:147:13-58
+147-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:147:13-58
148 android:value=".ui.NoteEditActivity" />
-148-->E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:148:13-49
+148-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:148:13-49
149 </application>
150
151</manifest>
diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_font_color_green.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_font_color_green.png.flat
new file mode 100644
index 0000000..9567b1d
Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_font_color_green.png.flat differ
diff --git a/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat b/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat
index 951dd2f..f22ae63 100644
Binary files a/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat and b/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat differ
diff --git a/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat b/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat
index c2c61cc..50229ff 100644
Binary files a/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat and b/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat differ
diff --git a/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat
index 035ddcd..9e45558 100644
Binary files a/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat and b/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat differ
diff --git a/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat b/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat
index 1043ced..cda43a8 100644
Binary files a/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat and b/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat differ
diff --git a/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/app/build/intermediates/merged_res/debug/values_values.arsc.flat
index ea0ebfc..3640e7f 100644
Binary files a/app/build/intermediates/merged_res/debug/values_values.arsc.flat and b/app/build/intermediates/merged_res/debug/values_values.arsc.flat differ
diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
index 4ed204a..2430049 100644
--- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
+++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
@@ -4,7 +4,7 @@
"outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat",
"map": [
{
- "source": "E:\\programingg\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+ "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
"from": {
"startLines": "18",
"startColumns": "4",
@@ -23,22 +23,22 @@
}
},
{
- "source": "E:\\programingg\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+ "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
"from": {
- "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029",
- "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
- "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
+ "startLines": "128,74,73,72,71,19,20,21,118,119,127,126,125,26,82,83,81,80,79,95,94,93,85,39,38,63,29,30,86,40,75,120,70,66,77,41,47,52,42,62,61,60,56,55,53,54,57,78,58,48,69,59,67,46,51,50,49,65,45,64,43,44,68,28,34,36,33,35,32,31,25,24,102,101,105,117,110,109,111,112,114,113,103,104,108,106,107,100,115,116,124,122,121,123,27,84,92,97,96,98,91,90,89,88,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "6947,3667,3601,3528,3478,827,867,915,6446,6491,6895,6841,6791,1199,4142,4210,4083,4018,3955,4873,4813,4750,4342,1849,1798,3049,1369,1422,4396,1911,3740,6548,3419,3206,3846,1970,2251,2497,2023,2989,2936,2885,2690,2642,2548,2596,2736,3906,2783,2294,3360,2833,3249,2208,2450,2394,2339,3151,2164,3109,2073,2114,3301,1318,1623,1719,1576,1672,1529,1484,1148,1095,5248,5189,5471,6372,5782,5713,5846,5924,6107,6034,5323,5389,5658,5528,5593,5140,6211,6294,6753,6646,6598,6691,1261,4287,4691,4986,4928,5053,4643,4598,4550,4499,963,1029",
+ "endLines": "130,74,73,72,71,19,20,21,118,119,127,126,125,26,82,83,81,80,79,95,94,93,85,39,38,63,29,30,86,40,75,120,70,66,77,41,47,52,42,62,61,60,56,55,53,54,57,78,58,48,69,59,67,46,51,50,49,65,45,64,43,44,68,28,34,36,33,35,32,31,25,24,102,101,105,117,110,109,111,112,114,113,103,104,108,106,107,100,115,116,124,122,121,123,27,84,92,97,96,98,91,90,89,88,22,23",
+ "endColumns": "14,72,65,72,49,39,47,47,44,56,51,53,49,61,67,76,58,64,62,54,59,62,53,61,50,59,52,61,84,58,80,49,58,42,59,52,42,50,49,59,52,50,45,47,47,45,46,48,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,81,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "7119,3735,3662,3596,3523,862,910,958,6486,6543,6942,6890,6836,1256,4205,4282,4137,4078,4013,4923,4868,4808,4391,1906,1844,3104,1417,1479,4476,1965,3816,6593,3473,3244,3901,2018,2289,2543,2068,3044,2984,2931,2731,2685,2591,2637,2778,3950,2828,2334,3414,2880,3296,2246,2492,2445,2389,3201,2203,3146,2109,2159,3355,1364,1667,1763,1618,1714,1571,1524,1194,1143,5318,5243,5523,6441,5841,5777,5919,6029,6206,6102,5384,5466,5708,5588,5653,5184,6289,6367,6786,6686,6641,6748,1313,4337,4745,5048,4981,5110,4686,4638,4593,4545,1024,1090"
},
"to": {
- "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925",
- "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
- "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
+ "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,936,990,1040,1102,1170,1247,1306,1371,1434,1489,1549,1612,1666,1728,1779,1839,1892,1954,2039,2098,2179,2229,2288,2331,2391,2444,2487,2538,2588,2648,2701,2752,2798,2846,2894,2940,2987,3036,3086,3131,3190,3242,3294,3337,3384,3440,3495,3550,3594,3636,3677,3727,3786,3837,3886,3935,3982,4029,4076,4121,4172,4225,4300,4359,4416,4490,4554,4623,4701,4811,4915,4988,5054,5136,5191,5256,5321,5370,5453,5531,5569,5614,5662,5724,5781,5836,5895,5962,6020,6082,6130,6175,6223,6274,6340",
+ "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113",
+ "endColumns": "14,72,65,72,49,39,47,47,44,56,51,53,49,61,67,76,58,64,62,54,59,62,53,61,50,59,52,61,84,58,80,49,58,42,59,52,42,50,49,59,52,50,45,47,47,45,46,48,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,81,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "379,452,518,591,641,681,729,777,822,879,931,985,1035,1097,1165,1242,1301,1366,1429,1484,1544,1607,1661,1723,1774,1834,1887,1949,2034,2093,2174,2224,2283,2326,2386,2439,2482,2533,2583,2643,2696,2747,2793,2841,2889,2935,2982,3031,3081,3126,3185,3237,3289,3332,3379,3435,3490,3545,3589,3631,3672,3722,3781,3832,3881,3930,3977,4024,4071,4116,4167,4220,4295,4354,4411,4485,4549,4618,4696,4806,4910,4983,5049,5131,5186,5251,5316,5365,5448,5526,5564,5609,5657,5719,5776,5831,5890,5957,6015,6077,6125,6170,6218,6269,6335,6401"
}
}
]
@@ -47,62 +47,62 @@
"outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat",
"map": [
{
- "source": "E:\\programingg\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml",
+ "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values\\FontColor.xml",
"from": {
- "startLines": "19,26",
- "startColumns": "4,4",
- "startOffsets": "739,1047",
- "endLines": "24,29",
- "endColumns": "19,19",
- "endOffsets": "1041,1162"
+ "startLines": "4,7,6,2,3,5",
+ "startColumns": "4,4,4,4,4,4",
+ "startOffsets": "133,255,213,55,95,172",
+ "endColumns": "38,45,41,39,37,40",
+ "endOffsets": "167,296,250,90,128,208"
},
"to": {
- "startLines": "2,8",
- "startColumns": "4,4",
- "startOffsets": "105,300",
- "endLines": "7,11",
- "endColumns": "19,19",
- "endOffsets": "295,415"
+ "startLines": "12,13,14,15,16,17",
+ "startColumns": "4,4,4,4,4,4",
+ "startOffsets": "420,459,505,547,587,625",
+ "endColumns": "38,45,41,39,37,40",
+ "endOffsets": "454,500,542,582,620,661"
}
},
{
- "source": "E:\\programingg\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml",
+ "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values\\strings.xml",
"from": {
- "startLines": "50,55,64,60,22,26,30,35,40,18,45",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
- "endLines": "53,58,67,62,25,29,33,38,43,21,48",
- "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056"
+ "startLines": "131,72,75,74,73,19,20,21,120,121,130,129,128,26,83,84,82,81,80,96,95,94,86,39,38,64,29,30,87,41,76,122,71,67,77,42,48,53,43,63,62,61,57,56,54,55,58,78,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,103,102,106,118,111,110,112,113,115,114,104,105,109,107,108,101,116,117,127,125,124,126,27,85,93,98,97,99,92,91,90,89,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "8195,3898,4159,4063,3994,827,870,922,7641,7690,8143,8085,8034,1282,4748,4842,4677,4593,4510,5709,5626,5524,5018,2004,1953,3397,1486,1539,5079,2097,4242,7753,3827,3582,4344,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,4422,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6165,6098,6406,7544,6770,6689,6844,6933,7175,7096,6249,6324,6630,6470,6550,6043,7319,7441,7993,7866,7809,7919,1366,4950,5438,5844,5775,5924,5379,5324,5262,5202,974,1084",
+ "endLines": "135,72,75,74,73,19,20,21,120,121,130,129,128,26,83,84,82,81,80,96,95,94,86,39,38,64,29,30,87,41,76,122,71,67,77,42,48,53,43,63,62,61,57,56,54,55,58,78,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,103,102,106,118,111,110,112,113,115,114,104,105,109,107,108,101,116,117,127,125,124,126,27,85,93,98,97,99,92,91,90,89,22,23",
+ "endColumns": "14,95,82,95,68,42,51,51,48,62,51,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,77,57,46,58,56,70,60,56,49,51,52,49,49,56,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+ "endOffsets": "8599,3989,4237,4154,4058,865,917,969,7685,7748,8190,8138,8080,1361,4837,4945,4743,4672,4588,5770,5704,5621,5074,2061,1999,3470,1534,1594,5179,2151,4339,7803,3893,3626,4417,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,4474,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6244,6160,6465,7635,6839,6765,6928,7091,7314,7170,6319,6401,6684,6545,6625,6093,7436,7539,8029,7914,7861,7988,1426,5013,5519,5919,5839,6013,5433,5374,5319,5257,1079,1169"
},
"to": {
- "startLines": "125,129,133,137,140,144,148,152,156,160,164",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051",
- "endLines": "128,132,136,139,143,147,151,155,159,163,167",
- "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247"
+ "startLines": "24,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "985,1338,1434,1517,1613,1682,1725,1777,1829,1878,1941,1993,2051,2102,2186,2280,2388,2459,2543,2626,2692,2775,2877,2938,3000,3051,3129,3182,3242,3347,3406,3508,3563,3634,3683,3761,3819,3866,3925,3982,4053,4114,4171,4221,4273,4326,4376,4426,4483,4543,4596,4662,4724,4787,4834,4889,4977,5035,5097,5147,5192,5235,5295,5362,5417,5472,5525,5572,5625,5681,5729,5784,5837,5921,5988,6052,6148,6222,6303,6392,6555,6699,6778,6853,6935,6994,7074,7154,7209,7331,7434,7475,7528,7585,7659,7724,7792,7878,7958,8027,8121,8180,8235,8297,8357,8467",
+ "endLines": "28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133",
+ "endColumns": "14,95,82,95,68,42,51,51,48,62,51,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,77,57,46,58,56,70,60,56,49,51,52,49,49,56,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+ "endOffsets": "1333,1429,1512,1608,1677,1720,1772,1824,1873,1936,1988,2046,2097,2181,2275,2383,2454,2538,2621,2687,2770,2872,2933,2995,3046,3124,3177,3237,3342,3401,3503,3558,3629,3678,3756,3814,3861,3920,3977,4048,4109,4166,4216,4268,4321,4371,4421,4478,4538,4591,4657,4719,4782,4829,4884,4972,5030,5092,5142,5187,5230,5290,5357,5412,5467,5520,5567,5620,5676,5724,5779,5832,5916,5983,6047,6143,6217,6298,6387,6550,6694,6773,6848,6930,6989,7069,7149,7204,7326,7429,7470,7523,7580,7654,7719,7787,7873,7953,8022,8116,8175,8230,8292,8352,8462,8552"
}
},
{
- "source": "E:\\programingg\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml",
+ "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values\\styles.xml",
"from": {
- "startLines": "18",
- "startColumns": "4",
- "startOffsets": "712",
- "endColumns": "56",
- "endOffsets": "764"
+ "startLines": "64,69,78,74,36,40,44,49,54,32,59,28,25,19,22",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2499,2704,3077,2916,1332,1515,1700,1886,2090,1149,2297,1031,921,713,819",
+ "endLines": "67,72,81,76,39,43,47,52,57,35,62,30,27,21,24",
+ "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12,12,12",
+ "endOffsets": "2698,2910,3283,3071,1510,1695,1880,2084,2291,1327,2493,1143,1026,814,916"
},
"to": {
- "startLines": "12",
- "startColumns": "4",
- "startOffsets": "420",
- "endColumns": "56",
- "endOffsets": "472"
+ "startLines": "134,138,142,146,149,153,157,161,165,169,173,177,180,183,186",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "8557,8761,8972,9182,9342,9525,9710,9895,10098,10304,10487,10688,10805,10915,11021",
+ "endLines": "137,141,145,148,152,156,160,164,168,172,176,179,182,185,188",
+ "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12,12,12",
+ "endOffsets": "8756,8967,9177,9337,9520,9705,9890,10093,10299,10482,10683,10800,10910,11016,11118"
}
},
{
- "source": "E:\\programingg\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml",
+ "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values\\dimens.xml",
"from": {
"startLines": "19,20,21,22,18",
"startColumns": "4,4,4,4,4",
@@ -111,30 +111,47 @@
"endOffsets": "811,864,917,969,759"
},
"to": {
- "startLines": "13,14,15,16,17",
+ "startLines": "19,20,21,22,23",
"startColumns": "4,4,4,4,4",
- "startOffsets": "477,529,582,635,687",
+ "startOffsets": "723,775,828,881,933",
"endColumns": "51,52,52,51,51",
- "endOffsets": "524,577,630,682,734"
+ "endOffsets": "770,823,876,928,980"
}
},
{
- "source": "E:\\programingg\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml",
+ "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values\\arrays.xml",
"from": {
- "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084",
- "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
- "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
- "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169"
+ "startLines": "19,26",
+ "startColumns": "4,4",
+ "startOffsets": "739,1047",
+ "endLines": "24,29",
+ "endColumns": "19,19",
+ "endOffsets": "1041,1162"
+ },
+ "to": {
+ "startLines": "2,8",
+ "startColumns": "4,4",
+ "startOffsets": "105,300",
+ "endLines": "7,11",
+ "endColumns": "19,19",
+ "endOffsets": "295,415"
+ }
+ },
+ {
+ "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values\\colors.xml",
+ "from": {
+ "startLines": "18",
+ "startColumns": "4",
+ "startOffsets": "712",
+ "endColumns": "56",
+ "endOffsets": "764"
},
"to": {
- "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034",
- "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
- "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
- "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119"
+ "startLines": "18",
+ "startColumns": "4",
+ "startOffsets": "666",
+ "endColumns": "56",
+ "endOffsets": "718"
}
}
]
@@ -143,7 +160,7 @@
"outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat",
"map": [
{
- "source": "E:\\programingg\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+ "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
"from": {
"startLines": "18",
"startColumns": "4",
@@ -162,22 +179,22 @@
}
},
{
- "source": "E:\\programingg\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+ "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
"from": {
- "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029",
- "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
- "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090"
+ "startLines": "129,75,74,73,72,19,20,21,118,119,128,127,126,26,81,82,80,79,78,94,93,92,84,40,39,64,29,30,85,41,37,120,71,67,76,42,48,53,43,63,62,61,57,56,54,55,58,77,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "6938,3763,3697,3624,3574,843,883,931,6436,6481,6886,6832,6782,1215,4132,4200,4073,4007,3944,4862,4802,4739,4332,1945,1894,3145,1385,1438,4386,2007,1784,6538,3515,3302,3835,2066,2347,2593,2119,3085,3032,2981,2786,2738,2644,2692,2832,3895,2879,2390,3456,2929,3345,2304,2546,2490,2435,3247,2260,3205,2169,2210,3397,1334,1639,1735,1592,1688,1545,1500,1164,1111,5237,5178,5460,6361,5771,5702,5835,5913,6096,6023,5312,5378,5647,5517,5582,5129,6200,6283,6744,6637,6589,6682,1277,4277,4680,4975,4917,5042,4632,4587,4539,4488,979,1045",
+ "endLines": "131,75,74,73,72,19,20,21,118,119,128,127,126,26,81,82,80,79,78,94,93,92,84,40,39,64,29,30,85,41,37,120,71,67,76,42,48,53,43,63,62,61,57,56,54,55,58,77,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
+ "endColumns": "14,71,65,72,49,39,47,47,44,56,51,53,49,61,67,76,58,65,62,54,59,62,53,61,50,59,52,61,83,58,79,49,58,42,59,52,42,50,49,59,52,50,45,47,47,45,46,48,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,81,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "7110,3830,3758,3692,3619,878,926,974,6476,6533,6933,6881,6827,1272,4195,4272,4127,4068,4002,4912,4857,4797,4381,2002,1940,3200,1433,1495,4465,2061,1859,6583,3569,3340,3890,2114,2385,2639,2164,3140,3080,3027,2827,2781,2687,2733,2874,3939,2924,2430,3510,2976,3392,2342,2588,2541,2485,3297,2299,3242,2205,2255,3451,1380,1683,1779,1634,1730,1587,1540,1210,1159,5307,5232,5512,6430,5830,5766,5908,6018,6195,6091,5373,5455,5697,5577,5642,5173,6278,6356,6777,6677,6632,6739,1329,4327,4734,5037,4970,5099,4675,4627,4582,4534,1040,1106"
},
"to": {
- "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923",
- "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
- "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984"
+ "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,935,989,1039,1101,1169,1246,1305,1371,1434,1489,1549,1612,1666,1728,1779,1839,1892,1954,2038,2097,2177,2227,2286,2329,2389,2442,2485,2536,2586,2646,2699,2750,2796,2844,2892,2938,2985,3034,3084,3129,3188,3240,3292,3335,3382,3438,3493,3548,3592,3634,3675,3725,3784,3835,3884,3933,3980,4027,4074,4119,4170,4223,4298,4357,4414,4488,4552,4621,4699,4809,4913,4986,5052,5134,5189,5254,5319,5368,5451,5529,5567,5612,5660,5722,5779,5834,5893,5960,6018,6080,6128,6173,6221,6272,6338",
+ "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113",
+ "endColumns": "14,71,65,72,49,39,47,47,44,56,51,53,49,61,67,76,58,65,62,54,59,62,53,61,50,59,52,61,83,58,79,49,58,42,59,52,42,50,49,59,52,50,45,47,47,45,46,48,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,81,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "379,451,517,590,640,680,728,776,821,878,930,984,1034,1096,1164,1241,1300,1366,1429,1484,1544,1607,1661,1723,1774,1834,1887,1949,2033,2092,2172,2222,2281,2324,2384,2437,2480,2531,2581,2641,2694,2745,2791,2839,2887,2933,2980,3029,3079,3124,3183,3235,3287,3330,3377,3433,3488,3543,3587,3629,3670,3720,3779,3830,3879,3928,3975,4022,4069,4114,4165,4218,4293,4352,4409,4483,4547,4616,4694,4804,4908,4981,5047,5129,5184,5249,5314,5363,5446,5524,5562,5607,5655,5717,5774,5829,5888,5955,6013,6075,6123,6168,6216,6267,6333,6399"
}
}
]
diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
index 2852241..5494f20 100644
--- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
+++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
@@ -4,7 +4,7 @@
"outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml",
"map": [
{
- "source": "E:\\programingg\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+ "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
"from": {
"startLines": "18",
"startColumns": "4",
@@ -23,22 +23,22 @@
}
},
{
- "source": "E:\\programingg\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+ "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
"from": {
- "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029",
- "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
- "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
+ "startLines": "128,74,73,72,71,19,20,21,118,119,127,126,125,26,82,83,81,80,79,95,94,93,85,39,38,63,29,30,86,40,75,120,70,66,77,41,47,52,42,62,61,60,56,55,53,54,57,78,58,48,69,59,67,46,51,50,49,65,45,64,43,44,68,28,34,36,33,35,32,31,25,24,102,101,105,117,110,109,111,112,114,113,103,104,108,106,107,100,115,116,124,122,121,123,27,84,92,97,96,98,91,90,89,88,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "6947,3667,3601,3528,3478,827,867,915,6446,6491,6895,6841,6791,1199,4142,4210,4083,4018,3955,4873,4813,4750,4342,1849,1798,3049,1369,1422,4396,1911,3740,6548,3419,3206,3846,1970,2251,2497,2023,2989,2936,2885,2690,2642,2548,2596,2736,3906,2783,2294,3360,2833,3249,2208,2450,2394,2339,3151,2164,3109,2073,2114,3301,1318,1623,1719,1576,1672,1529,1484,1148,1095,5248,5189,5471,6372,5782,5713,5846,5924,6107,6034,5323,5389,5658,5528,5593,5140,6211,6294,6753,6646,6598,6691,1261,4287,4691,4986,4928,5053,4643,4598,4550,4499,963,1029",
+ "endLines": "130,74,73,72,71,19,20,21,118,119,127,126,125,26,82,83,81,80,79,95,94,93,85,39,38,63,29,30,86,40,75,120,70,66,77,41,47,52,42,62,61,60,56,55,53,54,57,78,58,48,69,59,67,46,51,50,49,65,45,64,43,44,68,28,34,36,33,35,32,31,25,24,102,101,105,117,110,109,111,112,114,113,103,104,108,106,107,100,115,116,124,122,121,123,27,84,92,97,96,98,91,90,89,88,22,23",
+ "endColumns": "14,72,65,72,49,39,47,47,44,56,51,53,49,61,67,76,58,64,62,54,59,62,53,61,50,59,52,61,84,58,80,49,58,42,59,52,42,50,49,59,52,50,45,47,47,45,46,48,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,81,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "7119,3735,3662,3596,3523,862,910,958,6486,6543,6942,6890,6836,1256,4205,4282,4137,4078,4013,4923,4868,4808,4391,1906,1844,3104,1417,1479,4476,1965,3816,6593,3473,3244,3901,2018,2289,2543,2068,3044,2984,2931,2731,2685,2591,2637,2778,3950,2828,2334,3414,2880,3296,2246,2492,2445,2389,3201,2203,3146,2109,2159,3355,1364,1667,1763,1618,1714,1571,1524,1194,1143,5318,5243,5523,6441,5841,5777,5919,6029,6206,6102,5384,5466,5708,5588,5653,5184,6289,6367,6786,6686,6641,6748,1313,4337,4745,5048,4981,5110,4686,4638,4593,4545,1024,1090"
},
"to": {
- "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925",
- "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
- "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
+ "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,936,990,1040,1102,1170,1247,1306,1371,1434,1489,1549,1612,1666,1728,1779,1839,1892,1954,2039,2098,2179,2229,2288,2331,2391,2444,2487,2538,2588,2648,2701,2752,2798,2846,2894,2940,2987,3036,3086,3131,3190,3242,3294,3337,3384,3440,3495,3550,3594,3636,3677,3727,3786,3837,3886,3935,3982,4029,4076,4121,4172,4225,4300,4359,4416,4490,4554,4623,4701,4811,4915,4988,5054,5136,5191,5256,5321,5370,5453,5531,5569,5614,5662,5724,5781,5836,5895,5962,6020,6082,6130,6175,6223,6274,6340",
+ "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113",
+ "endColumns": "14,72,65,72,49,39,47,47,44,56,51,53,49,61,67,76,58,64,62,54,59,62,53,61,50,59,52,61,84,58,80,49,58,42,59,52,42,50,49,59,52,50,45,47,47,45,46,48,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,81,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "379,452,518,591,641,681,729,777,822,879,931,985,1035,1097,1165,1242,1301,1366,1429,1484,1544,1607,1661,1723,1774,1834,1887,1949,2034,2093,2174,2224,2283,2326,2386,2439,2482,2533,2583,2643,2696,2747,2793,2841,2889,2935,2982,3031,3081,3126,3185,3237,3289,3332,3379,3435,3490,3545,3589,3631,3672,3722,3781,3832,3881,3930,3977,4024,4071,4116,4167,4220,4295,4354,4411,4485,4549,4618,4696,4806,4910,4983,5049,5131,5186,5251,5316,5365,5448,5526,5564,5609,5657,5719,5776,5831,5890,5957,6015,6077,6125,6170,6218,6269,6335,6401"
}
}
]
diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
index dde4b3a..7584261 100644
--- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
+++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
@@ -4,7 +4,7 @@
"outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml",
"map": [
{
- "source": "E:\\programingg\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+ "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
"from": {
"startLines": "18",
"startColumns": "4",
@@ -23,22 +23,22 @@
}
},
{
- "source": "E:\\programingg\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+ "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
"from": {
- "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029",
- "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
- "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090"
+ "startLines": "129,75,74,73,72,19,20,21,118,119,128,127,126,26,81,82,80,79,78,94,93,92,84,40,39,64,29,30,85,41,37,120,71,67,76,42,48,53,43,63,62,61,57,56,54,55,58,77,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "6938,3763,3697,3624,3574,843,883,931,6436,6481,6886,6832,6782,1215,4132,4200,4073,4007,3944,4862,4802,4739,4332,1945,1894,3145,1385,1438,4386,2007,1784,6538,3515,3302,3835,2066,2347,2593,2119,3085,3032,2981,2786,2738,2644,2692,2832,3895,2879,2390,3456,2929,3345,2304,2546,2490,2435,3247,2260,3205,2169,2210,3397,1334,1639,1735,1592,1688,1545,1500,1164,1111,5237,5178,5460,6361,5771,5702,5835,5913,6096,6023,5312,5378,5647,5517,5582,5129,6200,6283,6744,6637,6589,6682,1277,4277,4680,4975,4917,5042,4632,4587,4539,4488,979,1045",
+ "endLines": "131,75,74,73,72,19,20,21,118,119,128,127,126,26,81,82,80,79,78,94,93,92,84,40,39,64,29,30,85,41,37,120,71,67,76,42,48,53,43,63,62,61,57,56,54,55,58,77,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
+ "endColumns": "14,71,65,72,49,39,47,47,44,56,51,53,49,61,67,76,58,65,62,54,59,62,53,61,50,59,52,61,83,58,79,49,58,42,59,52,42,50,49,59,52,50,45,47,47,45,46,48,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,81,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "7110,3830,3758,3692,3619,878,926,974,6476,6533,6933,6881,6827,1272,4195,4272,4127,4068,4002,4912,4857,4797,4381,2002,1940,3200,1433,1495,4465,2061,1859,6583,3569,3340,3890,2114,2385,2639,2164,3140,3080,3027,2827,2781,2687,2733,2874,3939,2924,2430,3510,2976,3392,2342,2588,2541,2485,3297,2299,3242,2205,2255,3451,1380,1683,1779,1634,1730,1587,1540,1210,1159,5307,5232,5512,6430,5830,5766,5908,6018,6195,6091,5373,5455,5697,5577,5642,5173,6278,6356,6777,6677,6632,6739,1329,4327,4734,5037,4970,5099,4675,4627,4582,4534,1040,1106"
},
"to": {
- "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923",
- "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
- "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984"
+ "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,935,989,1039,1101,1169,1246,1305,1371,1434,1489,1549,1612,1666,1728,1779,1839,1892,1954,2038,2097,2177,2227,2286,2329,2389,2442,2485,2536,2586,2646,2699,2750,2796,2844,2892,2938,2985,3034,3084,3129,3188,3240,3292,3335,3382,3438,3493,3548,3592,3634,3675,3725,3784,3835,3884,3933,3980,4027,4074,4119,4170,4223,4298,4357,4414,4488,4552,4621,4699,4809,4913,4986,5052,5134,5189,5254,5319,5368,5451,5529,5567,5612,5660,5722,5779,5834,5893,5960,6018,6080,6128,6173,6221,6272,6338",
+ "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113",
+ "endColumns": "14,71,65,72,49,39,47,47,44,56,51,53,49,61,67,76,58,65,62,54,59,62,53,61,50,59,52,61,83,58,79,49,58,42,59,52,42,50,49,59,52,50,45,47,47,45,46,48,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,81,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "379,451,517,590,640,680,728,776,821,878,930,984,1034,1096,1164,1241,1300,1366,1429,1484,1544,1607,1661,1723,1774,1834,1887,1949,2033,2092,2172,2222,2281,2324,2384,2437,2480,2531,2581,2641,2694,2745,2791,2839,2887,2933,2980,3029,3079,3124,3183,3235,3287,3330,3377,3433,3488,3543,3587,3629,3670,3720,3779,3830,3879,3928,3975,4022,4069,4114,4165,4218,4293,4352,4409,4483,4547,4616,4694,4804,4908,4981,5047,5129,5184,5249,5314,5363,5446,5524,5562,5607,5655,5717,5774,5829,5888,5955,6013,6075,6123,6168,6216,6267,6333,6399"
}
}
]
diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
index ab41cae..90bd93e 100644
--- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
+++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
@@ -4,62 +4,62 @@
"outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml",
"map": [
{
- "source": "E:\\programingg\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml",
+ "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values\\FontColor.xml",
"from": {
- "startLines": "19,26",
- "startColumns": "4,4",
- "startOffsets": "739,1047",
- "endLines": "24,29",
- "endColumns": "19,19",
- "endOffsets": "1041,1162"
+ "startLines": "4,7,6,2,3,5",
+ "startColumns": "4,4,4,4,4,4",
+ "startOffsets": "133,255,213,55,95,172",
+ "endColumns": "38,45,41,39,37,40",
+ "endOffsets": "167,296,250,90,128,208"
},
"to": {
- "startLines": "2,8",
- "startColumns": "4,4",
- "startOffsets": "105,300",
- "endLines": "7,11",
- "endColumns": "19,19",
- "endOffsets": "295,415"
+ "startLines": "12,13,14,15,16,17",
+ "startColumns": "4,4,4,4,4,4",
+ "startOffsets": "420,459,505,547,587,625",
+ "endColumns": "38,45,41,39,37,40",
+ "endOffsets": "454,500,542,582,620,661"
}
},
{
- "source": "E:\\programingg\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml",
+ "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values\\strings.xml",
"from": {
- "startLines": "50,55,64,60,22,26,30,35,40,18,45",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
- "endLines": "53,58,67,62,25,29,33,38,43,21,48",
- "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056"
+ "startLines": "131,72,75,74,73,19,20,21,120,121,130,129,128,26,83,84,82,81,80,96,95,94,86,39,38,64,29,30,87,41,76,122,71,67,77,42,48,53,43,63,62,61,57,56,54,55,58,78,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,103,102,106,118,111,110,112,113,115,114,104,105,109,107,108,101,116,117,127,125,124,126,27,85,93,98,97,99,92,91,90,89,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "8195,3898,4159,4063,3994,827,870,922,7641,7690,8143,8085,8034,1282,4748,4842,4677,4593,4510,5709,5626,5524,5018,2004,1953,3397,1486,1539,5079,2097,4242,7753,3827,3582,4344,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,4422,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6165,6098,6406,7544,6770,6689,6844,6933,7175,7096,6249,6324,6630,6470,6550,6043,7319,7441,7993,7866,7809,7919,1366,4950,5438,5844,5775,5924,5379,5324,5262,5202,974,1084",
+ "endLines": "135,72,75,74,73,19,20,21,120,121,130,129,128,26,83,84,82,81,80,96,95,94,86,39,38,64,29,30,87,41,76,122,71,67,77,42,48,53,43,63,62,61,57,56,54,55,58,78,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,103,102,106,118,111,110,112,113,115,114,104,105,109,107,108,101,116,117,127,125,124,126,27,85,93,98,97,99,92,91,90,89,22,23",
+ "endColumns": "14,95,82,95,68,42,51,51,48,62,51,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,77,57,46,58,56,70,60,56,49,51,52,49,49,56,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+ "endOffsets": "8599,3989,4237,4154,4058,865,917,969,7685,7748,8190,8138,8080,1361,4837,4945,4743,4672,4588,5770,5704,5621,5074,2061,1999,3470,1534,1594,5179,2151,4339,7803,3893,3626,4417,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,4474,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6244,6160,6465,7635,6839,6765,6928,7091,7314,7170,6319,6401,6684,6545,6625,6093,7436,7539,8029,7914,7861,7988,1426,5013,5519,5919,5839,6013,5433,5374,5319,5257,1079,1169"
},
"to": {
- "startLines": "125,129,133,137,140,144,148,152,156,160,164",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051",
- "endLines": "128,132,136,139,143,147,151,155,159,163,167",
- "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247"
+ "startLines": "24,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "985,1338,1434,1517,1613,1682,1725,1777,1829,1878,1941,1993,2051,2102,2186,2280,2388,2459,2543,2626,2692,2775,2877,2938,3000,3051,3129,3182,3242,3347,3406,3508,3563,3634,3683,3761,3819,3866,3925,3982,4053,4114,4171,4221,4273,4326,4376,4426,4483,4543,4596,4662,4724,4787,4834,4889,4977,5035,5097,5147,5192,5235,5295,5362,5417,5472,5525,5572,5625,5681,5729,5784,5837,5921,5988,6052,6148,6222,6303,6392,6555,6699,6778,6853,6935,6994,7074,7154,7209,7331,7434,7475,7528,7585,7659,7724,7792,7878,7958,8027,8121,8180,8235,8297,8357,8467",
+ "endLines": "28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133",
+ "endColumns": "14,95,82,95,68,42,51,51,48,62,51,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,77,57,46,58,56,70,60,56,49,51,52,49,49,56,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+ "endOffsets": "1333,1429,1512,1608,1677,1720,1772,1824,1873,1936,1988,2046,2097,2181,2275,2383,2454,2538,2621,2687,2770,2872,2933,2995,3046,3124,3177,3237,3342,3401,3503,3558,3629,3678,3756,3814,3861,3920,3977,4048,4109,4166,4216,4268,4321,4371,4421,4478,4538,4591,4657,4719,4782,4829,4884,4972,5030,5092,5142,5187,5230,5290,5357,5412,5467,5520,5567,5620,5676,5724,5779,5832,5916,5983,6047,6143,6217,6298,6387,6550,6694,6773,6848,6930,6989,7069,7149,7204,7326,7429,7470,7523,7580,7654,7719,7787,7873,7953,8022,8116,8175,8230,8292,8352,8462,8552"
}
},
{
- "source": "E:\\programingg\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml",
+ "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values\\styles.xml",
"from": {
- "startLines": "18",
- "startColumns": "4",
- "startOffsets": "712",
- "endColumns": "56",
- "endOffsets": "764"
+ "startLines": "64,69,78,74,36,40,44,49,54,32,59,28,25,19,22",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2499,2704,3077,2916,1332,1515,1700,1886,2090,1149,2297,1031,921,713,819",
+ "endLines": "67,72,81,76,39,43,47,52,57,35,62,30,27,21,24",
+ "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12,12,12",
+ "endOffsets": "2698,2910,3283,3071,1510,1695,1880,2084,2291,1327,2493,1143,1026,814,916"
},
"to": {
- "startLines": "12",
- "startColumns": "4",
- "startOffsets": "420",
- "endColumns": "56",
- "endOffsets": "472"
+ "startLines": "134,138,142,146,149,153,157,161,165,169,173,177,180,183,186",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "8557,8761,8972,9182,9342,9525,9710,9895,10098,10304,10487,10688,10805,10915,11021",
+ "endLines": "137,141,145,148,152,156,160,164,168,172,176,179,182,185,188",
+ "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12,12,12",
+ "endOffsets": "8756,8967,9177,9337,9520,9705,9890,10093,10299,10482,10683,10800,10910,11016,11118"
}
},
{
- "source": "E:\\programingg\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml",
+ "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values\\dimens.xml",
"from": {
"startLines": "19,20,21,22,18",
"startColumns": "4,4,4,4,4",
@@ -68,30 +68,47 @@
"endOffsets": "811,864,917,969,759"
},
"to": {
- "startLines": "13,14,15,16,17",
+ "startLines": "19,20,21,22,23",
"startColumns": "4,4,4,4,4",
- "startOffsets": "477,529,582,635,687",
+ "startOffsets": "723,775,828,881,933",
"endColumns": "51,52,52,51,51",
- "endOffsets": "524,577,630,682,734"
+ "endOffsets": "770,823,876,928,980"
}
},
{
- "source": "E:\\programingg\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml",
+ "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values\\arrays.xml",
"from": {
- "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084",
- "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
- "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
- "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169"
+ "startLines": "19,26",
+ "startColumns": "4,4",
+ "startOffsets": "739,1047",
+ "endLines": "24,29",
+ "endColumns": "19,19",
+ "endOffsets": "1041,1162"
+ },
+ "to": {
+ "startLines": "2,8",
+ "startColumns": "4,4",
+ "startOffsets": "105,300",
+ "endLines": "7,11",
+ "endColumns": "19,19",
+ "endOffsets": "295,415"
+ }
+ },
+ {
+ "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values\\colors.xml",
+ "from": {
+ "startLines": "18",
+ "startColumns": "4",
+ "startOffsets": "712",
+ "endColumns": "56",
+ "endOffsets": "764"
},
"to": {
- "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034",
- "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
- "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
- "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119"
+ "startLines": "18",
+ "startColumns": "4",
+ "startOffsets": "666",
+ "endColumns": "56",
+ "endOffsets": "718"
}
}
]
diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
index 2a106a9..450a98d 100644
--- a/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
+++ b/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
@@ -3,26 +3,18 @@
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_middle.9.png.flat",
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_middle.9.png"
},
- {
- "merged": "net.micode.notes.app-merged_res-5:/layout_note_list_dropdown_menu.xml.flat",
- "source": "net.micode.notes.app-main-7:/layout/note_list_dropdown_menu.xml"
- },
{
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_bar_bg.9.png.flat",
"source": "net.micode.notes.app-main-7:/drawable-hdpi/title_bar_bg.9.png"
},
{
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_folder.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_folder.9.png"
+ "merged": "net.micode.notes.app-merged_res-5:/layout_note_list_dropdown_menu.xml.flat",
+ "source": "net.micode.notes.app-main-7:/layout/note_list_dropdown_menu.xml"
},
{
"merged": "net.micode.notes.app-merged_res-5:/layout_folder_list_item.xml.flat",
"source": "net.micode.notes.app-main-7:/layout/folder_list_item.xml"
},
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_single.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_single.9.png"
- },
{
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_selected.png.flat",
"source": "net.micode.notes.app-main-7:/drawable-hdpi/selected.png"
@@ -31,26 +23,6 @@
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_yellow.9.png.flat",
"source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_yellow.9.png"
},
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_notification.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/notification.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_down.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_down.9.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_new_note_pressed.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/new_note_pressed.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_white.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_white.9.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/layout_note_item.xml.flat",
- "source": "net.micode.notes.app-main-7:/layout/note_item.xml"
- },
{
"merged": "net.micode.notes.app-merged_res-5:/menu_sub_folder.xml.flat",
"source": "net.micode.notes.app-main-7:/menu/sub_folder.xml"
@@ -60,61 +32,29 @@
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_footer_bg.9.png"
},
{
- "merged": "net.micode.notes.app-merged_res-5:/layout_settings_header.xml.flat",
- "source": "net.micode.notes.app-main-7:/layout/settings_header.xml"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_note_edit_color_selector_panel.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/note_edit_color_selector_panel.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_alert.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/title_alert.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_red.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_red.png"
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_color_green.png.flat",
+ "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_color_green.png"
},
{
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_clock.png.flat",
"source": "net.micode.notes.app-main-7:/drawable-hdpi/clock.png"
},
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_yellow.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_yellow.png"
- },
{
"merged": "net.micode.notes.app-merged_res-5:/raw_introduction.flat",
"source": "net.micode.notes.app-main-7:/raw/introduction"
},
{
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_large.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_large.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_middle.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_middle.9.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_blue.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_blue.png"
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_yellow.png.flat",
+ "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_yellow.png"
},
{
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_up.9.png.flat",
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_up.9.png"
},
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_up.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_up.9.png"
- },
{
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_blue.png.flat",
"source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_blue.png"
},
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_white.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_white.png"
- },
{
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_green.png.flat",
"source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_green.png"
@@ -127,10 +67,6 @@
"merged": "net.micode.notes.app-merged_res-5:/layout_widget_2x.xml.flat",
"source": "net.micode.notes.app-main-7:/layout/widget_2x.xml"
},
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_up.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_up.9.png"
- },
{
"merged": "net.micode.notes.app-merged_res-5:/xml_widget_2x_info.xml.flat",
"source": "net.micode.notes.app-main-7:/xml/widget_2x_info.xml"
@@ -139,10 +75,6 @@
"merged": "net.micode.notes.app-merged_res-5:/menu_call_record_folder.xml.flat",
"source": "net.micode.notes.app-main-7:/menu/call_record_folder.xml"
},
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_white.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_white.png"
- },
{
"merged": "net.micode.notes.app-merged_res-5:/xml_preferences.xml.flat",
"source": "net.micode.notes.app-main-7:/xml/preferences.xml"
@@ -151,30 +83,14 @@
"merged": "net.micode.notes.app-merged_res-5:/layout_dialog_edit_text.xml.flat",
"source": "net.micode.notes.app-main-7:/layout/dialog_edit_text.xml"
},
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_white.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_white.9.png"
- },
{
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_blue.9.png.flat",
"source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_blue.9.png"
},
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_down.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_down.9.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/raw-zh-rCN_introduction.flat",
- "source": "net.micode.notes.app-main-7:/raw-zh-rCN/introduction"
- },
{
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_single.9.png.flat",
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_single.9.png"
},
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_background.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_background.png"
- },
{
"merged": "net.micode.notes.app-merged_res-5:/color_secondary_text_dark.xml.flat",
"source": "net.micode.notes.app-main-7:/color/secondary_text_dark.xml"
@@ -199,18 +115,10 @@
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_yellow.9.png.flat",
"source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_yellow.9.png"
},
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_search_result.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/search_result.png"
- },
{
"merged": "net.micode.notes.app-merged_res-5:/layout_note_edit.xml.flat",
"source": "net.micode.notes.app-main-7:/layout/note_edit.xml"
},
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_green.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_green.png"
- },
{
"merged": "net.micode.notes.app-merged_res-5:/layout_widget_4x.xml.flat",
"source": "net.micode.notes.app-main-7:/layout/widget_4x.xml"
@@ -219,18 +127,6 @@
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_green.9.png.flat",
"source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_green.9.png"
},
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_red.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_red.9.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/xml_searchable.xml.flat",
- "source": "net.micode.notes.app-main-7:/xml/searchable.xml"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_middle.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_middle.9.png"
- },
{
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_menu_delete.png.flat",
"source": "net.micode.notes.app-main-7:/drawable-hdpi/menu_delete.png"
@@ -243,14 +139,6 @@
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_down.9.png.flat",
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_down.9.png"
},
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_normal.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_normal.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_middle.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_middle.9.png"
- },
{
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_icon_app.png.flat",
"source": "net.micode.notes.app-main-7:/drawable-hdpi/icon_app.png"
@@ -263,22 +151,10 @@
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_bg_btn_set_color.png.flat",
"source": "net.micode.notes.app-main-7:/drawable-hdpi/bg_btn_set_color.png"
},
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_new_note_normal.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/new_note_normal.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/menu_note_list_dropdown.xml.flat",
- "source": "net.micode.notes.app-main-7:/menu/note_list_dropdown.xml"
- },
{
"merged": "net.micode.notes.app-merged_res-5:/menu_note_list.xml.flat",
"source": "net.micode.notes.app-main-7:/menu/note_list.xml"
},
- {
- "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit_list_item.xml.flat",
- "source": "net.micode.notes.app-main-7:/layout/note_edit_list_item.xml"
- },
{
"merged": "net.micode.notes.app-merged_res-5:/layout_note_list_footer.xml.flat",
"source": "net.micode.notes.app-main-7:/layout/note_list_footer.xml"
@@ -291,18 +167,10 @@
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_bg_color_btn_mask.png.flat",
"source": "net.micode.notes.app-main-7:/drawable-hdpi/bg_color_btn_mask.png"
},
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_down.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_down.9.png"
- },
{
"merged": "net.micode.notes.app-merged_res-5:/layout_add_account_text.xml.flat",
"source": "net.micode.notes.app-main-7:/layout/add_account_text.xml"
},
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_size_selector_bg.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_size_selector_bg.9.png"
- },
{
"merged": "net.micode.notes.app-merged_res-5:/layout_datetime_picker.xml.flat",
"source": "net.micode.notes.app-main-7:/layout/datetime_picker.xml"
@@ -311,6 +179,174 @@
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_super.png.flat",
"source": "net.micode.notes.app-main-7:/drawable-hdpi/font_super.png"
},
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_single.9.png.flat",
+ "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_single.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_yellow.png.flat",
+ "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_yellow.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_delete.png.flat",
+ "source": "net.micode.notes.app-main-7:/drawable-hdpi/delete.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_green.9.png.flat",
+ "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_green.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/menu_note_edit.xml.flat",
+ "source": "net.micode.notes.app-main-7:/menu/note_edit.xml"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/layout_account_dialog_title.xml.flat",
+ "source": "net.micode.notes.app-main-7:/layout/account_dialog_title.xml"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_call_record.png.flat",
+ "source": "net.micode.notes.app-main-7:/drawable-hdpi/call_record.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_up.9.png.flat",
+ "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_up.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_folder.9.png.flat",
+ "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_folder.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_single.9.png.flat",
+ "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_single.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_notification.png.flat",
+ "source": "net.micode.notes.app-main-7:/drawable-hdpi/notification.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_down.9.png.flat",
+ "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_down.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_new_note_pressed.png.flat",
+ "source": "net.micode.notes.app-main-7:/drawable-hdpi/new_note_pressed.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_white.9.png.flat",
+ "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_white.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/layout_note_item.xml.flat",
+ "source": "net.micode.notes.app-main-7:/layout/note_item.xml"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/layout_settings_header.xml.flat",
+ "source": "net.micode.notes.app-main-7:/layout/settings_header.xml"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_note_edit_color_selector_panel.png.flat",
+ "source": "net.micode.notes.app-main-7:/drawable-hdpi/note_edit_color_selector_panel.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_alert.png.flat",
+ "source": "net.micode.notes.app-main-7:/drawable-hdpi/title_alert.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_red.png.flat",
+ "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_red.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_large.png.flat",
+ "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_large.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_middle.9.png.flat",
+ "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_middle.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_blue.png.flat",
+ "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_blue.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_up.9.png.flat",
+ "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_up.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_white.png.flat",
+ "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_white.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_up.9.png.flat",
+ "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_up.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_white.png.flat",
+ "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_white.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_white.9.png.flat",
+ "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_white.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_down.9.png.flat",
+ "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_down.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/raw-zh-rCN_introduction.flat",
+ "source": "net.micode.notes.app-main-7:/raw-zh-rCN/introduction"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_background.png.flat",
+ "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_background.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_search_result.png.flat",
+ "source": "net.micode.notes.app-main-7:/drawable-hdpi/search_result.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_green.png.flat",
+ "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_green.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_red.9.png.flat",
+ "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_red.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/xml_searchable.xml.flat",
+ "source": "net.micode.notes.app-main-7:/xml/searchable.xml"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_middle.9.png.flat",
+ "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_middle.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_normal.png.flat",
+ "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_normal.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_middle.9.png.flat",
+ "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_middle.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/menu_note_list_dropdown.xml.flat",
+ "source": "net.micode.notes.app-main-7:/menu/note_list_dropdown.xml"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_new_note_normal.png.flat",
+ "source": "net.micode.notes.app-main-7:/drawable-hdpi/new_note_normal.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit_list_item.xml.flat",
+ "source": "net.micode.notes.app-main-7:/layout/note_edit_list_item.xml"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_down.9.png.flat",
+ "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_down.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_size_selector_bg.9.png.flat",
+ "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_size_selector_bg.9.png"
+ },
{
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_red.9.png.flat",
"source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_red.9.png"
@@ -323,10 +359,6 @@
"merged": "net.micode.notes.app-merged_res-5:/menu_note_list_options.xml.flat",
"source": "net.micode.notes.app-main-7:/menu/note_list_options.xml"
},
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_single.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_single.9.png"
- },
{
"merged": "net.micode.notes.app-merged_res-5:/menu_call_note_edit.xml.flat",
"source": "net.micode.notes.app-main-7:/menu/call_note_edit.xml"
@@ -335,48 +367,20 @@
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_single.9.png.flat",
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_single.9.png"
},
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_yellow.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_yellow.png"
- },
{
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_red.png.flat",
"source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_red.png"
},
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_delete.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/delete.png"
- },
{
"merged": "net.micode.notes.app-merged_res-5:/color_primary_text_dark.xml.flat",
"source": "net.micode.notes.app-main-7:/color/primary_text_dark.xml"
},
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_green.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_green.9.png"
- },
{
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_down.9.png.flat",
"source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_down.9.png"
},
- {
- "merged": "net.micode.notes.app-merged_res-5:/menu_note_edit.xml.flat",
- "source": "net.micode.notes.app-main-7:/menu/note_edit.xml"
- },
{
"merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_small.png.flat",
"source": "net.micode.notes.app-main-7:/drawable-hdpi/font_small.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/layout_account_dialog_title.xml.flat",
- "source": "net.micode.notes.app-main-7:/layout/account_dialog_title.xml"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_call_record.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/call_record.png"
- },
- {
- "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_up.9.png.flat",
- "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_up.9.png"
}
]
\ No newline at end of file
diff --git a/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
index cec6ad0..7135a18 100644
Binary files a/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_5.jar b/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_5.jar
deleted file mode 100644
index 90fedfb..0000000
Binary files a/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_5.jar and /dev/null differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex
index 3ec8694..4a21e88 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex
index 77fc13f..2ef7405 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex
index 0fb39f7..a961bc4 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex
index 2b0d946..1c0dee7 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex
index 8333ba1..720f42c 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex
index 81c3fc2..3e6ef4e 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex
index 9484774..37e4878 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex
index d6f9990..1baae91 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex
index 6b4a469..00400e4 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex
index dfdb6b3..d9a2ab4 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex
index 06719b1..4729c21 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex
index 8f17e71..745df43 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex
index e2055dc..6bd3c6c 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex
index f51d63b..ae9c160 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex
index 2aba33b..b139a21 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex
index 67e31de..137bd02 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex
index 60b9e39..82a15e2 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex
index 7009519..ce86fe4 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex
index e2dff47..e07d5b4 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex
index 4855d0e..dce0337 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex
index 64d96b3..9db738a 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex
index 0799d30..dd43cb4 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex
index 29cbbbf..9af01f3 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex
index c4b7db6..3167a05 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex
index 01d237b..e1e0d98 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex
index 5f25c0f..f06038a 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex
index b8db69c..3432b84 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex
index ec0402c..10dc925 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex
index 5fd517e..4cc87c9 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex
index dc8c600..171c306 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex
index 51d4bec..31a0c14 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex
index 48f993c..7aadaca 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex
index 91d53df..c11ddc8 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/FontColorParser$TextAppearanceResources.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/FontColorParser$TextAppearanceResources.dex
new file mode 100644
index 0000000..63ffdc9
Binary files /dev/null and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/FontColorParser$TextAppearanceResources.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/FontColorParser.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/FontColorParser.dex
new file mode 100644
index 0000000..2f237eb
Binary files /dev/null and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/FontColorParser.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex
index 0215fa6..fc4e994 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex
index e9217ca..f187bd2 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex
index eac1844..7f59274 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex
index 254d2ca..0bfd54b 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex
index 4b699f3..5f75934 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex
index dfce0f1..61a84ce 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex
index 3d37b7c..bcfa6e9 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex
index 04d5c91..f079529 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex
index 64cbaab..ad3c500 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex
index b1a976d..cdc243e 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex
index 97a7ce4..8d30492 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex
index 5ff69b8..e43411c 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex
index 08f79c9..0dc26c4 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex
index e26f40f..0df2655 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex
index c00e5b5..bcdbefa 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex
index 379d253..30c37a7 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex
index b8ecb0a..d9419a5 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex
index 2e21e00..c183d73 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex
index a355446..cccb68c 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex
index 7f1ee6d..8980125 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex
index f75d453..c213131 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex
index a1fad89..f93288a 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex
index 84a4592..24727dc 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex
index 5651cb4..c6aa311 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex
index a52b249..5d30cee 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex
index a2bbe0e..3c00a32 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex
index 3136635..1af261e 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex
index 1a6e15e..fcdad97 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex
index ff32b28..1323e64 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex
index f01ae95..e7289ce 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex
index 8eba346..35f5f98 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex
index 916c87e..f451fb3 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex
index 2d6c690..95b5c38 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex
index 51eac93..7a56f6d 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex
index 1226c8e..34018b6 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex
index 9df73db..5cbd255 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex
index b0900a0..9016fe9 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex
index 9c884ea..9a5113e 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex
index 8fcb62f..46a48ad 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex
index 68f4b7f..d89c751 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex
index 6b3c811..f769567 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex
index 83194ec..74086ad 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex
index 357ed7c..a19ad22 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex
index a1a5391..379c5ef 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex
index 62dcb26..55d55a1 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex
index a6d8979..fc94e16 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex
index edb0f85..771e84c 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex
index e832510..a90f86d 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex
index b2e4069..30aea0f 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex
index 3456bf5..1e7b5fe 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex
index cab7e8d..32d3200 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex
index b30d3ed..98f2a30 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex
index c665855..9aa74d2 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex
index afc2167..ee6e240 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex
index c75dcff..c0a9113 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex
index 5a37d5a..61ef482 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex
index d79be5e..0ed7474 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex
index 92aba60..a7d983b 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex
index f42000d..627fb01 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex
index 21aa394..a3cdcd0 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex
index c159f55..4f69626 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex
index 0d540b4..332ebea 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex
index 39632c6..6b1441f 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex
index 520e151..1f3550a 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex differ
diff --git a/app/build/intermediates/runtime_symbol_list/debug/R.txt b/app/build/intermediates/runtime_symbol_list/debug/R.txt
index 00d6e91..4f814fb 100644
--- a/app/build/intermediates/runtime_symbol_list/debug/R.txt
+++ b/app/build/intermediates/runtime_symbol_list/debug/R.txt
@@ -1,8 +1,14 @@
int array format_for_exported_note 0x7f010000
int array menu_share_ways 0x7f010001
-int color primary_text_dark 0x7f020000
-int color secondary_text_dark 0x7f020001
-int color user_query_highlight 0x7f020002
+int color Blue 0x7f020000
+int color Bright_Blue 0x7f020001
+int color Default 0x7f020002
+int color Green 0x7f020003
+int color Red 0x7f020004
+int color Yellow 0x7f020005
+int color primary_text_dark 0x7f020006
+int color secondary_text_dark 0x7f020007
+int color user_query_highlight 0x7f020008
int dimen text_font_size_large 0x7f030000
int dimen text_font_size_medium 0x7f030001
int dimen text_font_size_normal 0x7f030002
@@ -24,56 +30,57 @@ int drawable edit_title_white 0x7f04000c
int drawable edit_title_yellow 0x7f04000d
int drawable edit_white 0x7f04000e
int drawable edit_yellow 0x7f04000f
-int drawable font_large 0x7f040010
-int drawable font_normal 0x7f040011
-int drawable font_size_selector_bg 0x7f040012
-int drawable font_small 0x7f040013
-int drawable font_super 0x7f040014
-int drawable icon_app 0x7f040015
-int drawable list_background 0x7f040016
-int drawable list_blue_down 0x7f040017
-int drawable list_blue_middle 0x7f040018
-int drawable list_blue_single 0x7f040019
-int drawable list_blue_up 0x7f04001a
-int drawable list_folder 0x7f04001b
-int drawable list_footer_bg 0x7f04001c
-int drawable list_green_down 0x7f04001d
-int drawable list_green_middle 0x7f04001e
-int drawable list_green_single 0x7f04001f
-int drawable list_green_up 0x7f040020
-int drawable list_red_down 0x7f040021
-int drawable list_red_middle 0x7f040022
-int drawable list_red_single 0x7f040023
-int drawable list_red_up 0x7f040024
-int drawable list_white_down 0x7f040025
-int drawable list_white_middle 0x7f040026
-int drawable list_white_single 0x7f040027
-int drawable list_white_up 0x7f040028
-int drawable list_yellow_down 0x7f040029
-int drawable list_yellow_middle 0x7f04002a
-int drawable list_yellow_single 0x7f04002b
-int drawable list_yellow_up 0x7f04002c
-int drawable menu_delete 0x7f04002d
-int drawable menu_move 0x7f04002e
-int drawable new_note 0x7f04002f
-int drawable new_note_normal 0x7f040030
-int drawable new_note_pressed 0x7f040031
-int drawable note_edit_color_selector_panel 0x7f040032
-int drawable notification 0x7f040033
-int drawable search_result 0x7f040034
-int drawable selected 0x7f040035
-int drawable title_alert 0x7f040036
-int drawable title_bar_bg 0x7f040037
-int drawable widget_2x_blue 0x7f040038
-int drawable widget_2x_green 0x7f040039
-int drawable widget_2x_red 0x7f04003a
-int drawable widget_2x_white 0x7f04003b
-int drawable widget_2x_yellow 0x7f04003c
-int drawable widget_4x_blue 0x7f04003d
-int drawable widget_4x_green 0x7f04003e
-int drawable widget_4x_red 0x7f04003f
-int drawable widget_4x_white 0x7f040040
-int drawable widget_4x_yellow 0x7f040041
+int drawable font_color_green 0x7f040010
+int drawable font_large 0x7f040011
+int drawable font_normal 0x7f040012
+int drawable font_size_selector_bg 0x7f040013
+int drawable font_small 0x7f040014
+int drawable font_super 0x7f040015
+int drawable icon_app 0x7f040016
+int drawable list_background 0x7f040017
+int drawable list_blue_down 0x7f040018
+int drawable list_blue_middle 0x7f040019
+int drawable list_blue_single 0x7f04001a
+int drawable list_blue_up 0x7f04001b
+int drawable list_folder 0x7f04001c
+int drawable list_footer_bg 0x7f04001d
+int drawable list_green_down 0x7f04001e
+int drawable list_green_middle 0x7f04001f
+int drawable list_green_single 0x7f040020
+int drawable list_green_up 0x7f040021
+int drawable list_red_down 0x7f040022
+int drawable list_red_middle 0x7f040023
+int drawable list_red_single 0x7f040024
+int drawable list_red_up 0x7f040025
+int drawable list_white_down 0x7f040026
+int drawable list_white_middle 0x7f040027
+int drawable list_white_single 0x7f040028
+int drawable list_white_up 0x7f040029
+int drawable list_yellow_down 0x7f04002a
+int drawable list_yellow_middle 0x7f04002b
+int drawable list_yellow_single 0x7f04002c
+int drawable list_yellow_up 0x7f04002d
+int drawable menu_delete 0x7f04002e
+int drawable menu_move 0x7f04002f
+int drawable new_note 0x7f040030
+int drawable new_note_normal 0x7f040031
+int drawable new_note_pressed 0x7f040032
+int drawable note_edit_color_selector_panel 0x7f040033
+int drawable notification 0x7f040034
+int drawable search_result 0x7f040035
+int drawable selected 0x7f040036
+int drawable title_alert 0x7f040037
+int drawable title_bar_bg 0x7f040038
+int drawable widget_2x_blue 0x7f040039
+int drawable widget_2x_green 0x7f04003a
+int drawable widget_2x_red 0x7f04003b
+int drawable widget_2x_white 0x7f04003c
+int drawable widget_2x_yellow 0x7f04003d
+int drawable widget_4x_blue 0x7f04003e
+int drawable widget_4x_green 0x7f04003f
+int drawable widget_4x_red 0x7f040040
+int drawable widget_4x_white 0x7f040041
+int drawable widget_4x_yellow 0x7f040042
int id account_dialog_subtitle 0x7f050000
int id account_dialog_title 0x7f050001
int id action_select_all 0x7f050002
@@ -87,60 +94,71 @@ int id et_edit_text 0x7f050009
int id et_foler_name 0x7f05000a
int id font_size_selector 0x7f05000b
int id hour 0x7f05000c
-int id iv_alert_icon 0x7f05000d
-int id iv_bg_blue 0x7f05000e
-int id iv_bg_blue_select 0x7f05000f
-int id iv_bg_green 0x7f050010
-int id iv_bg_green_select 0x7f050011
-int id iv_bg_red 0x7f050012
-int id iv_bg_red_select 0x7f050013
-int id iv_bg_white 0x7f050014
-int id iv_bg_white_select 0x7f050015
-int id iv_bg_yellow 0x7f050016
-int id iv_bg_yellow_select 0x7f050017
-int id iv_large_select 0x7f050018
-int id iv_medium_select 0x7f050019
-int id iv_small_select 0x7f05001a
-int id iv_super_select 0x7f05001b
-int id ll_font_large 0x7f05001c
-int id ll_font_normal 0x7f05001d
-int id ll_font_small 0x7f05001e
-int id ll_font_super 0x7f05001f
-int id menu_alert 0x7f050020
-int id menu_delete 0x7f050021
-int id menu_delete_remind 0x7f050022
-int id menu_export_text 0x7f050023
-int id menu_font_size 0x7f050024
-int id menu_list_mode 0x7f050025
-int id menu_new_folder 0x7f050026
-int id menu_new_note 0x7f050027
-int id menu_search 0x7f050028
-int id menu_send_to_desktop 0x7f050029
-int id menu_setting 0x7f05002a
-int id menu_share 0x7f05002b
-int id menu_sync 0x7f05002c
-int id minute 0x7f05002d
-int id move 0x7f05002e
-int id navigation_bar 0x7f05002f
-int id note_bg_color_selector 0x7f050030
-int id note_edit_list 0x7f050031
-int id note_edit_view 0x7f050032
-int id note_item 0x7f050033
-int id note_title 0x7f050034
-int id notes_list 0x7f050035
-int id prefenerece_sync_status_textview 0x7f050036
-int id preference_sync_button 0x7f050037
-int id selection_menu 0x7f050038
-int id sv_note_edit 0x7f050039
-int id tv_alert_date 0x7f05003a
-int id tv_folder_name 0x7f05003b
-int id tv_modified_date 0x7f05003c
-int id tv_name 0x7f05003d
-int id tv_time 0x7f05003e
-int id tv_title 0x7f05003f
-int id tv_title_bar 0x7f050040
-int id widget_bg_image 0x7f050041
-int id widget_text 0x7f050042
+int id iv_Bright_blue_select 0x7f05000d
+int id iv_alert_icon 0x7f05000e
+int id iv_bg_blue 0x7f05000f
+int id iv_bg_blue_select 0x7f050010
+int id iv_bg_green 0x7f050011
+int id iv_bg_green_select 0x7f050012
+int id iv_bg_red 0x7f050013
+int id iv_bg_red_select 0x7f050014
+int id iv_bg_white 0x7f050015
+int id iv_bg_white_select 0x7f050016
+int id iv_bg_yellow 0x7f050017
+int id iv_bg_yellow_select 0x7f050018
+int id iv_default_select 0x7f050019
+int id iv_green_select 0x7f05001a
+int id iv_large_select 0x7f05001b
+int id iv_medium_select 0x7f05001c
+int id iv_red_select 0x7f05001d
+int id iv_small_select 0x7f05001e
+int id iv_super_select 0x7f05001f
+int id ll_font_Bright_blue 0x7f050020
+int id ll_font_color_selector 0x7f050021
+int id ll_font_default 0x7f050022
+int id ll_font_green 0x7f050023
+int id ll_font_large 0x7f050024
+int id ll_font_normal 0x7f050025
+int id ll_font_red 0x7f050026
+int id ll_font_small 0x7f050027
+int id ll_font_super 0x7f050028
+int id menu_alert 0x7f050029
+int id menu_change_font_color 0x7f05002a
+int id menu_delete 0x7f05002b
+int id menu_delete_remind 0x7f05002c
+int id menu_export_text 0x7f05002d
+int id menu_font_size 0x7f05002e
+int id menu_insert_img 0x7f05002f
+int id menu_list_mode 0x7f050030
+int id menu_new_folder 0x7f050031
+int id menu_new_note 0x7f050032
+int id menu_search 0x7f050033
+int id menu_send_to_desktop 0x7f050034
+int id menu_setting 0x7f050035
+int id menu_share 0x7f050036
+int id menu_sync 0x7f050037
+int id minute 0x7f050038
+int id move 0x7f050039
+int id navigation_bar 0x7f05003a
+int id note_bg_color_selector 0x7f05003b
+int id note_edit_list 0x7f05003c
+int id note_edit_view 0x7f05003d
+int id note_item 0x7f05003e
+int id note_title 0x7f05003f
+int id notes_list 0x7f050040
+int id prefenerece_sync_status_textview 0x7f050041
+int id preference_sync_button 0x7f050042
+int id selection_menu 0x7f050043
+int id sv_note_edit 0x7f050044
+int id tv_alert_date 0x7f050045
+int id tv_folder_name 0x7f050046
+int id tv_modified_date 0x7f050047
+int id tv_name 0x7f050048
+int id tv_time 0x7f050049
+int id tv_title 0x7f05004a
+int id tv_title_bar 0x7f05004b
+int id widget_bg_image 0x7f05004c
+int id widget_text 0x7f05004d
int layout account_dialog_title 0x7f060000
int layout add_account_text 0x7f060001
int layout datetime_picker 0x7f060002
@@ -173,99 +191,102 @@ int string app_widget2x2 0x7f0a0005
int string app_widget4x4 0x7f0a0006
int string button_delete 0x7f0a0007
int string call_record_folder_name 0x7f0a0008
-int string datetime_dialog_cancel 0x7f0a0009
-int string datetime_dialog_ok 0x7f0a000a
-int string delete_remind_time_message 0x7f0a000b
-int string error_note_empty_for_clock 0x7f0a000c
-int string error_note_empty_for_send_to_desktop 0x7f0a000d
-int string error_note_not_exist 0x7f0a000e
-int string error_sdcard_export 0x7f0a000f
-int string error_sdcard_unmounted 0x7f0a0010
-int string error_sync_cancelled 0x7f0a0011
-int string error_sync_internal 0x7f0a0012
-int string error_sync_network 0x7f0a0013
-int string failed_sdcard_export 0x7f0a0014
-int string file_name_txt_format 0x7f0a0015
-int string file_path 0x7f0a0016
-int string folder_exist 0x7f0a0017
-int string format_date_ymd 0x7f0a0018
-int string format_datetime_mdhm 0x7f0a0019
-int string format_exported_file_location 0x7f0a001a
-int string format_folder_files_count 0x7f0a001b
-int string format_move_notes_to_folder 0x7f0a001c
-int string hint_foler_name 0x7f0a001d
-int string info_note_enter_desktop 0x7f0a001e
-int string menu_alert 0x7f0a001f
-int string menu_create_folder 0x7f0a0020
-int string menu_delete 0x7f0a0021
-int string menu_deselect_all 0x7f0a0022
-int string menu_export_text 0x7f0a0023
-int string menu_folder_change_name 0x7f0a0024
-int string menu_folder_delete 0x7f0a0025
-int string menu_folder_view 0x7f0a0026
-int string menu_font_large 0x7f0a0027
-int string menu_font_normal 0x7f0a0028
-int string menu_font_size 0x7f0a0029
-int string menu_font_small 0x7f0a002a
-int string menu_font_super 0x7f0a002b
-int string menu_list_mode 0x7f0a002c
-int string menu_move 0x7f0a002d
-int string menu_move_parent_folder 0x7f0a002e
-int string menu_normal_mode 0x7f0a002f
-int string menu_remove_remind 0x7f0a0030
-int string menu_search 0x7f0a0031
-int string menu_select_all 0x7f0a0032
-int string menu_select_none 0x7f0a0033
-int string menu_select_title 0x7f0a0034
-int string menu_send_to_desktop 0x7f0a0035
-int string menu_setting 0x7f0a0036
-int string menu_share 0x7f0a0037
-int string menu_sync 0x7f0a0038
-int string menu_sync_cancel 0x7f0a0039
-int string menu_title_select_folder 0x7f0a003a
-int string note_alert_expired 0x7f0a003b
-int string note_link_email 0x7f0a003c
-int string note_link_other 0x7f0a003d
-int string note_link_tel 0x7f0a003e
-int string note_link_web 0x7f0a003f
-int string notealert_enter 0x7f0a0040
-int string notealert_ok 0x7f0a0041
-int string notelist_menu_new 0x7f0a0042
-int string notelist_string_info 0x7f0a0043
-int string preferences_account_summary 0x7f0a0044
-int string preferences_account_title 0x7f0a0045
-int string preferences_add_account 0x7f0a0046
-int string preferences_bg_random_appear_title 0x7f0a0047
-int string preferences_button_sync_cancel 0x7f0a0048
-int string preferences_button_sync_immediately 0x7f0a0049
-int string preferences_dialog_change_account_title 0x7f0a004a
-int string preferences_dialog_change_account_warn_msg 0x7f0a004b
-int string preferences_dialog_select_account_tips 0x7f0a004c
-int string preferences_dialog_select_account_title 0x7f0a004d
-int string preferences_last_sync_time 0x7f0a004e
-int string preferences_last_sync_time_format 0x7f0a004f
-int string preferences_menu_cancel 0x7f0a0050
-int string preferences_menu_change_account 0x7f0a0051
-int string preferences_menu_remove_account 0x7f0a0052
-int string preferences_title 0x7f0a0053
-int string preferences_toast_cannot_change_account 0x7f0a0054
-int string preferences_toast_success_set_accout 0x7f0a0055
-int string search 0x7f0a0056
-int string search_hint 0x7f0a0057
-int string search_label 0x7f0a0058
-int string search_setting_description 0x7f0a0059
-int string set_remind_time_message 0x7f0a005a
-int string success_sdcard_export 0x7f0a005b
-int string success_sync_account 0x7f0a005c
-int string sync_progress_init_list 0x7f0a005d
-int string sync_progress_login 0x7f0a005e
-int string sync_progress_syncing 0x7f0a005f
-int string ticker_cancel 0x7f0a0060
-int string ticker_fail 0x7f0a0061
-int string ticker_success 0x7f0a0062
-int string ticker_syncing 0x7f0a0063
-int string widget_havenot_content 0x7f0a0064
-int string widget_under_visit_mode 0x7f0a0065
+int string change_txt_color 0x7f0a0009
+int string datetime_dialog_cancel 0x7f0a000a
+int string datetime_dialog_ok 0x7f0a000b
+int string delete_remind_time_message 0x7f0a000c
+int string error_note_empty_for_clock 0x7f0a000d
+int string error_note_empty_for_send_to_desktop 0x7f0a000e
+int string error_note_not_exist 0x7f0a000f
+int string error_sdcard_export 0x7f0a0010
+int string error_sdcard_unmounted 0x7f0a0011
+int string error_sync_cancelled 0x7f0a0012
+int string error_sync_internal 0x7f0a0013
+int string error_sync_network 0x7f0a0014
+int string failed_sdcard_export 0x7f0a0015
+int string file_name_txt_format 0x7f0a0016
+int string file_path 0x7f0a0017
+int string folder_exist 0x7f0a0018
+int string format_date_ymd 0x7f0a0019
+int string format_datetime_mdhm 0x7f0a001a
+int string format_exported_file_location 0x7f0a001b
+int string format_folder_files_count 0x7f0a001c
+int string format_move_notes_to_folder 0x7f0a001d
+int string hint_foler_name 0x7f0a001e
+int string info_note_enter_desktop 0x7f0a001f
+int string menu_alert 0x7f0a0020
+int string menu_change_font_color 0x7f0a0021
+int string menu_create_folder 0x7f0a0022
+int string menu_delete 0x7f0a0023
+int string menu_deselect_all 0x7f0a0024
+int string menu_export_text 0x7f0a0025
+int string menu_folder_change_name 0x7f0a0026
+int string menu_folder_delete 0x7f0a0027
+int string menu_folder_view 0x7f0a0028
+int string menu_font_large 0x7f0a0029
+int string menu_font_normal 0x7f0a002a
+int string menu_font_size 0x7f0a002b
+int string menu_font_small 0x7f0a002c
+int string menu_font_super 0x7f0a002d
+int string menu_insert_img 0x7f0a002e
+int string menu_list_mode 0x7f0a002f
+int string menu_move 0x7f0a0030
+int string menu_move_parent_folder 0x7f0a0031
+int string menu_normal_mode 0x7f0a0032
+int string menu_remove_remind 0x7f0a0033
+int string menu_search 0x7f0a0034
+int string menu_select_all 0x7f0a0035
+int string menu_select_none 0x7f0a0036
+int string menu_select_title 0x7f0a0037
+int string menu_send_to_desktop 0x7f0a0038
+int string menu_setting 0x7f0a0039
+int string menu_share 0x7f0a003a
+int string menu_sync 0x7f0a003b
+int string menu_sync_cancel 0x7f0a003c
+int string menu_title_select_folder 0x7f0a003d
+int string note_alert_expired 0x7f0a003e
+int string note_link_email 0x7f0a003f
+int string note_link_other 0x7f0a0040
+int string note_link_tel 0x7f0a0041
+int string note_link_web 0x7f0a0042
+int string notealert_enter 0x7f0a0043
+int string notealert_ok 0x7f0a0044
+int string notelist_menu_new 0x7f0a0045
+int string notelist_string_info 0x7f0a0046
+int string preferences_account_summary 0x7f0a0047
+int string preferences_account_title 0x7f0a0048
+int string preferences_add_account 0x7f0a0049
+int string preferences_bg_random_appear_title 0x7f0a004a
+int string preferences_button_sync_cancel 0x7f0a004b
+int string preferences_button_sync_immediately 0x7f0a004c
+int string preferences_dialog_change_account_title 0x7f0a004d
+int string preferences_dialog_change_account_warn_msg 0x7f0a004e
+int string preferences_dialog_select_account_tips 0x7f0a004f
+int string preferences_dialog_select_account_title 0x7f0a0050
+int string preferences_last_sync_time 0x7f0a0051
+int string preferences_last_sync_time_format 0x7f0a0052
+int string preferences_menu_cancel 0x7f0a0053
+int string preferences_menu_change_account 0x7f0a0054
+int string preferences_menu_remove_account 0x7f0a0055
+int string preferences_title 0x7f0a0056
+int string preferences_toast_cannot_change_account 0x7f0a0057
+int string preferences_toast_success_set_accout 0x7f0a0058
+int string search 0x7f0a0059
+int string search_hint 0x7f0a005a
+int string search_label 0x7f0a005b
+int string search_setting_description 0x7f0a005c
+int string set_remind_time_message 0x7f0a005d
+int string success_sdcard_export 0x7f0a005e
+int string success_sync_account 0x7f0a005f
+int string sync_progress_init_list 0x7f0a0060
+int string sync_progress_login 0x7f0a0061
+int string sync_progress_syncing 0x7f0a0062
+int string ticker_cancel 0x7f0a0063
+int string ticker_fail 0x7f0a0064
+int string ticker_success 0x7f0a0065
+int string ticker_syncing 0x7f0a0066
+int string widget_havenot_content 0x7f0a0067
+int string widget_under_visit_mode 0x7f0a0068
int style HighlightTextAppearancePrimary 0x7f0b0000
int style HighlightTextAppearanceSecondary 0x7f0b0001
int style NoteActionBarStyle 0x7f0b0002
@@ -277,6 +298,10 @@ int style TextAppearancePrimaryItem 0x7f0b0007
int style TextAppearanceSecondaryItem 0x7f0b0008
int style TextAppearanceSuper 0x7f0b0009
int style TextAppearanceUnderMenuIcon 0x7f0b000a
+int style TextColorBrightBlue 0x7f0b000b
+int style TextColorDefault 0x7f0b000c
+int style TextColorGreen 0x7f0b000d
+int style TextColorRed 0x7f0b000e
int xml preferences 0x7f0c0000
int xml searchable 0x7f0c0001
int xml widget_2x_info 0x7f0c0002
diff --git a/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json b/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json
index 1920ca8..51f6368 100644
--- a/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json
+++ b/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json
@@ -1 +1 @@
-{"enableV1Signing":true,"enableV2Signing":false,"enableV3Signing":false,"enableV4Signing":false}
\ No newline at end of file
+{"enableV1Signing":false,"enableV2Signing":true,"enableV3Signing":false,"enableV4Signing":false}
\ No newline at end of file
diff --git a/app/build/intermediates/source_set_path_map/debug/file-map.txt b/app/build/intermediates/source_set_path_map/debug/file-map.txt
index 02ab1a1..c73f3d0 100644
--- a/app/build/intermediates/source_set_path_map/debug/file-map.txt
+++ b/app/build/intermediates/source_set_path_map/debug/file-map.txt
@@ -1,8 +1,8 @@
-net.micode.notes.app-pngs-0 E:\programingg\Notes-master1\app\build\generated\res\pngs\debug
-net.micode.notes.app-resValues-1 E:\programingg\Notes-master1\app\build\generated\res\resValues\debug
-net.micode.notes.app-rs-2 E:\programingg\Notes-master1\app\build\generated\res\rs\debug
-net.micode.notes.app-mergeDebugResources-3 E:\programingg\Notes-master1\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir
-net.micode.notes.app-mergeDebugResources-4 E:\programingg\Notes-master1\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir
-net.micode.notes.app-merged_res-5 E:\programingg\Notes-master1\app\build\intermediates\merged_res\debug
-net.micode.notes.app-debug-6 E:\programingg\Notes-master1\app\src\debug\res
-net.micode.notes.app-main-7 E:\programingg\Notes-master1\app\src\main\res
+net.micode.notes.app-pngs-0 D:\Work-java\MINOTES\minotes\app\build\generated\res\pngs\debug
+net.micode.notes.app-resValues-1 D:\Work-java\MINOTES\minotes\app\build\generated\res\resValues\debug
+net.micode.notes.app-rs-2 D:\Work-java\MINOTES\minotes\app\build\generated\res\rs\debug
+net.micode.notes.app-mergeDebugResources-3 D:\Work-java\MINOTES\minotes\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir
+net.micode.notes.app-mergeDebugResources-4 D:\Work-java\MINOTES\minotes\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir
+net.micode.notes.app-merged_res-5 D:\Work-java\MINOTES\minotes\app\build\intermediates\merged_res\debug
+net.micode.notes.app-debug-6 D:\Work-java\MINOTES\minotes\app\src\debug\res
+net.micode.notes.app-main-7 D:\Work-java\MINOTES\minotes\app\src\main\res
diff --git a/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
index 4461006..0085047 100644
--- a/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
+++ b/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
@@ -1,283 +1,308 @@
net.micode.notes:xml/widget_4x_info = 0x7f0c0003
net.micode.notes:xml/preferences = 0x7f0c0000
+net.micode.notes:style/TextColorGreen = 0x7f0b000d
+net.micode.notes:style/TextColorDefault = 0x7f0b000c
net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008
net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006
net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004
net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000
-net.micode.notes:string/widget_havenot_content = 0x7f0a0064
-net.micode.notes:string/ticker_syncing = 0x7f0a0063
-net.micode.notes:string/ticker_success = 0x7f0a0062
+net.micode.notes:string/widget_havenot_content = 0x7f0a0067
+net.micode.notes:string/ticker_syncing = 0x7f0a0066
+net.micode.notes:string/ticker_success = 0x7f0a0065
net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001
-net.micode.notes:string/ticker_cancel = 0x7f0a0060
-net.micode.notes:string/sync_progress_syncing = 0x7f0a005f
-net.micode.notes:string/sync_progress_init_list = 0x7f0a005d
-net.micode.notes:string/search_label = 0x7f0a0058
-net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0055
-net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0054
-net.micode.notes:string/preferences_title = 0x7f0a0053
-net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0052
+net.micode.notes:string/ticker_cancel = 0x7f0a0063
+net.micode.notes:string/sync_progress_syncing = 0x7f0a0062
+net.micode.notes:string/sync_progress_init_list = 0x7f0a0060
+net.micode.notes:string/search_label = 0x7f0a005b
+net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0058
+net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0057
+net.micode.notes:string/preferences_title = 0x7f0a0056
+net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0055
net.micode.notes:style/NoteActionBarStyle = 0x7f0b0002
-net.micode.notes:string/preferences_menu_change_account = 0x7f0a0051
-net.micode.notes:string/preferences_menu_cancel = 0x7f0a0050
-net.micode.notes:string/preferences_last_sync_time = 0x7f0a004e
-net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a004d
-net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004b
-net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a0049
-net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a0048
-net.micode.notes:string/preferences_account_summary = 0x7f0a0044
-net.micode.notes:string/success_sdcard_export = 0x7f0a005b
-net.micode.notes:string/notelist_string_info = 0x7f0a0043
-net.micode.notes:string/notelist_menu_new = 0x7f0a0042
-net.micode.notes:string/notealert_ok = 0x7f0a0041
-net.micode.notes:string/notealert_enter = 0x7f0a0040
-net.micode.notes:string/note_link_web = 0x7f0a003f
-net.micode.notes:string/note_link_tel = 0x7f0a003e
-net.micode.notes:string/note_link_other = 0x7f0a003d
-net.micode.notes:string/note_link_email = 0x7f0a003c
-net.micode.notes:string/note_alert_expired = 0x7f0a003b
-net.micode.notes:string/menu_sync_cancel = 0x7f0a0039
-net.micode.notes:string/menu_sync = 0x7f0a0038
-net.micode.notes:string/menu_share = 0x7f0a0037
-net.micode.notes:string/menu_select_title = 0x7f0a0034
+net.micode.notes:string/preferences_menu_change_account = 0x7f0a0054
+net.micode.notes:string/preferences_menu_cancel = 0x7f0a0053
+net.micode.notes:string/preferences_last_sync_time = 0x7f0a0051
+net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a0050
+net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004e
+net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a004c
+net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a004b
+net.micode.notes:string/preferences_account_summary = 0x7f0a0047
+net.micode.notes:string/success_sdcard_export = 0x7f0a005e
+net.micode.notes:string/notelist_string_info = 0x7f0a0046
+net.micode.notes:string/notelist_menu_new = 0x7f0a0045
+net.micode.notes:string/notealert_ok = 0x7f0a0044
+net.micode.notes:string/notealert_enter = 0x7f0a0043
+net.micode.notes:string/note_link_web = 0x7f0a0042
+net.micode.notes:string/note_link_tel = 0x7f0a0041
+net.micode.notes:string/note_link_other = 0x7f0a0040
+net.micode.notes:string/note_link_email = 0x7f0a003f
+net.micode.notes:string/note_alert_expired = 0x7f0a003e
+net.micode.notes:string/menu_sync_cancel = 0x7f0a003c
+net.micode.notes:string/menu_sync = 0x7f0a003b
+net.micode.notes:string/menu_share = 0x7f0a003a
+net.micode.notes:string/menu_select_title = 0x7f0a0037
net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005
-net.micode.notes:string/menu_select_none = 0x7f0a0033
-net.micode.notes:string/menu_title_select_folder = 0x7f0a003a
-net.micode.notes:string/menu_select_all = 0x7f0a0032
-net.micode.notes:string/menu_search = 0x7f0a0031
-net.micode.notes:string/menu_remove_remind = 0x7f0a0030
-net.micode.notes:string/menu_normal_mode = 0x7f0a002f
-net.micode.notes:string/menu_move_parent_folder = 0x7f0a002e
-net.micode.notes:string/menu_move = 0x7f0a002d
-net.micode.notes:string/menu_list_mode = 0x7f0a002c
-net.micode.notes:string/menu_font_super = 0x7f0a002b
-net.micode.notes:string/menu_font_small = 0x7f0a002a
-net.micode.notes:string/menu_folder_change_name = 0x7f0a0024
-net.micode.notes:string/menu_export_text = 0x7f0a0023
-net.micode.notes:string/menu_deselect_all = 0x7f0a0022
-net.micode.notes:string/menu_create_folder = 0x7f0a0020
+net.micode.notes:string/menu_select_none = 0x7f0a0036
+net.micode.notes:string/menu_title_select_folder = 0x7f0a003d
+net.micode.notes:string/menu_select_all = 0x7f0a0035
+net.micode.notes:string/menu_search = 0x7f0a0034
+net.micode.notes:string/menu_remove_remind = 0x7f0a0033
+net.micode.notes:string/menu_normal_mode = 0x7f0a0032
+net.micode.notes:string/menu_move_parent_folder = 0x7f0a0031
+net.micode.notes:string/menu_move = 0x7f0a0030
+net.micode.notes:string/menu_list_mode = 0x7f0a002f
+net.micode.notes:string/menu_insert_img = 0x7f0a002e
+net.micode.notes:string/menu_font_super = 0x7f0a002d
+net.micode.notes:string/menu_font_small = 0x7f0a002c
+net.micode.notes:string/menu_export_text = 0x7f0a0025
+net.micode.notes:string/menu_deselect_all = 0x7f0a0024
+net.micode.notes:string/menu_create_folder = 0x7f0a0022
+net.micode.notes:string/info_note_enter_desktop = 0x7f0a001f
+net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001d
+net.micode.notes:string/format_folder_files_count = 0x7f0a001c
+net.micode.notes:string/format_date_ymd = 0x7f0a0019
net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007
-net.micode.notes:string/folder_exist = 0x7f0a0017
-net.micode.notes:string/hint_foler_name = 0x7f0a001d
-net.micode.notes:string/format_date_ymd = 0x7f0a0018
-net.micode.notes:string/file_path = 0x7f0a0016
-net.micode.notes:string/set_remind_time_message = 0x7f0a005a
-net.micode.notes:string/error_sync_network = 0x7f0a0013
-net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010
-net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a
-net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009
-net.micode.notes:drawable/list_green_up = 0x7f040020
+net.micode.notes:string/hint_foler_name = 0x7f0a001e
+net.micode.notes:string/folder_exist = 0x7f0a0018
+net.micode.notes:string/file_path = 0x7f0a0017
+net.micode.notes:string/ticker_fail = 0x7f0a0064
+net.micode.notes:string/file_name_txt_format = 0x7f0a0016
+net.micode.notes:string/failed_sdcard_export = 0x7f0a0015
+net.micode.notes:string/set_remind_time_message = 0x7f0a005d
+net.micode.notes:string/error_sync_network = 0x7f0a0014
+net.micode.notes:string/error_note_not_exist = 0x7f0a000f
+net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000e
+net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000d
+net.micode.notes:style/TextColorBrightBlue = 0x7f0b000b
+net.micode.notes:string/datetime_dialog_ok = 0x7f0a000b
+net.micode.notes:string/datetime_dialog_cancel = 0x7f0a000a
+net.micode.notes:string/menu_folder_view = 0x7f0a0028
+net.micode.notes:id/menu_delete = 0x7f05002b
+net.micode.notes:string/change_txt_color = 0x7f0a0009
+net.micode.notes:drawable/list_green_up = 0x7f040021
net.micode.notes:string/call_record_folder_name = 0x7f0a0008
-net.micode.notes:drawable/new_note_normal = 0x7f040030
+net.micode.notes:drawable/new_note_normal = 0x7f040031
net.micode.notes:string/button_delete = 0x7f0a0007
net.micode.notes:string/app_widget2x2 = 0x7f0a0005
-net.micode.notes:string/menu_font_normal = 0x7f0a0028
-net.micode.notes:string/format_exported_file_location = 0x7f0a001a
+net.micode.notes:string/menu_font_normal = 0x7f0a002a
+net.micode.notes:string/format_exported_file_location = 0x7f0a001b
net.micode.notes:raw/introduction = 0x7f090000
-net.micode.notes:string/delete_remind_time_message = 0x7f0a000b
+net.micode.notes:string/delete_remind_time_message = 0x7f0a000c
net.micode.notes:dimen/text_font_size_super = 0x7f030004
-net.micode.notes:drawable/selected = 0x7f040035
+net.micode.notes:drawable/selected = 0x7f040036
net.micode.notes:plurals/search_results_title = 0x7f080000
net.micode.notes:menu/sub_folder = 0x7f070006
net.micode.notes:menu/note_edit = 0x7f070002
-net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009
-net.micode.notes:color/secondary_text_dark = 0x7f020001
-net.micode.notes:id/move = 0x7f05002e
-net.micode.notes:id/iv_bg_yellow_select = 0x7f050017
-net.micode.notes:menu/call_note_edit = 0x7f070000
-net.micode.notes:drawable/new_note_pressed = 0x7f040031
-net.micode.notes:id/iv_bg_blue = 0x7f05000e
-net.micode.notes:layout/settings_header = 0x7f06000b
net.micode.notes:layout/note_list = 0x7f060008
-net.micode.notes:drawable/list_white_single = 0x7f040027
+net.micode.notes:drawable/list_white_single = 0x7f040028
net.micode.notes:layout/note_item = 0x7f060007
net.micode.notes:xml/widget_2x_info = 0x7f0c0002
net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000
net.micode.notes:layout/datetime_picker = 0x7f060002
net.micode.notes:id/btn_new_note = 0x7f050004
+net.micode.notes:id/ll_font_Bright_blue = 0x7f050020
net.micode.notes:layout/note_list_footer = 0x7f06000a
-net.micode.notes:id/widget_text = 0x7f050042
-net.micode.notes:id/tv_title_bar = 0x7f050040
-net.micode.notes:drawable/widget_2x_blue = 0x7f040038
-net.micode.notes:id/tv_time = 0x7f05003e
-net.micode.notes:id/tv_name = 0x7f05003d
-net.micode.notes:drawable/new_note = 0x7f04002f
-net.micode.notes:id/sv_note_edit = 0x7f050039
-net.micode.notes:id/selection_menu = 0x7f050038
-net.micode.notes:string/error_sdcard_export = 0x7f0a000f
-net.micode.notes:id/preference_sync_button = 0x7f050037
-net.micode.notes:layout/note_edit = 0x7f060005
-net.micode.notes:id/notes_list = 0x7f050035
+net.micode.notes:id/widget_text = 0x7f05004d
+net.micode.notes:id/tv_title_bar = 0x7f05004b
+net.micode.notes:drawable/widget_2x_blue = 0x7f040039
+net.micode.notes:id/tv_time = 0x7f050049
+net.micode.notes:color/Red = 0x7f020004
+net.micode.notes:id/tv_name = 0x7f050048
+net.micode.notes:id/selection_menu = 0x7f050043
+net.micode.notes:string/error_sdcard_export = 0x7f0a0010
+net.micode.notes:id/preference_sync_button = 0x7f050042
net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002
-net.micode.notes:drawable/title_alert = 0x7f040036
-net.micode.notes:id/note_title = 0x7f050034
-net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f
-net.micode.notes:id/note_edit_view = 0x7f050032
-net.micode.notes:id/navigation_bar = 0x7f05002f
+net.micode.notes:drawable/title_alert = 0x7f040037
+net.micode.notes:id/note_title = 0x7f05003f
+net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a0052
+net.micode.notes:id/note_edit_view = 0x7f05003d
+net.micode.notes:id/navigation_bar = 0x7f05003a
net.micode.notes:string/app_widget4x4 = 0x7f0a0006
-net.micode.notes:drawable/font_normal = 0x7f040011
-net.micode.notes:id/minute = 0x7f05002d
-net.micode.notes:drawable/font_super = 0x7f040014
-net.micode.notes:id/menu_sync = 0x7f05002c
-net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e
-net.micode.notes:id/menu_share = 0x7f05002b
-net.micode.notes:id/menu_setting = 0x7f05002a
-net.micode.notes:string/widget_under_visit_mode = 0x7f0a0065
-net.micode.notes:id/menu_send_to_desktop = 0x7f050029
-net.micode.notes:id/menu_search = 0x7f050028
-net.micode.notes:drawable/list_green_down = 0x7f04001d
-net.micode.notes:id/menu_new_note = 0x7f050027
-net.micode.notes:string/error_note_not_exist = 0x7f0a000e
-net.micode.notes:id/menu_new_folder = 0x7f050026
-net.micode.notes:id/menu_list_mode = 0x7f050025
-net.micode.notes:id/iv_medium_select = 0x7f050019
-net.micode.notes:id/menu_export_text = 0x7f050023
-net.micode.notes:string/menu_folder_view = 0x7f0a0026
-net.micode.notes:id/menu_delete = 0x7f050021
-net.micode.notes:string/ticker_fail = 0x7f0a0061
-net.micode.notes:string/file_name_txt_format = 0x7f0a0015
+net.micode.notes:drawable/font_normal = 0x7f040012
+net.micode.notes:id/minute = 0x7f050038
+net.micode.notes:drawable/font_super = 0x7f040015
+net.micode.notes:id/menu_sync = 0x7f050037
+net.micode.notes:id/menu_share = 0x7f050036
+net.micode.notes:id/menu_setting = 0x7f050035
+net.micode.notes:string/widget_under_visit_mode = 0x7f0a0068
+net.micode.notes:id/menu_send_to_desktop = 0x7f050034
+net.micode.notes:id/menu_search = 0x7f050033
+net.micode.notes:drawable/list_green_down = 0x7f04001e
+net.micode.notes:id/menu_new_note = 0x7f050032
+net.micode.notes:id/menu_new_folder = 0x7f050031
+net.micode.notes:id/menu_list_mode = 0x7f050030
+net.micode.notes:id/iv_medium_select = 0x7f05001c
+net.micode.notes:id/menu_export_text = 0x7f05002d
net.micode.notes:drawable/edit_blue = 0x7f040006
-net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050036
-net.micode.notes:string/menu_font_size = 0x7f0a0029
-net.micode.notes:string/menu_alert = 0x7f0a001f
+net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050041
+net.micode.notes:string/menu_font_size = 0x7f0a002b
+net.micode.notes:string/menu_change_font_color = 0x7f0a0021
+net.micode.notes:string/menu_alert = 0x7f0a0020
net.micode.notes:drawable/edit_title_yellow = 0x7f04000d
-net.micode.notes:id/menu_alert = 0x7f050020
-net.micode.notes:string/success_sync_account = 0x7f0a005c
-net.micode.notes:id/ll_font_super = 0x7f05001f
-net.micode.notes:id/ll_font_small = 0x7f05001e
+net.micode.notes:id/ll_font_color_selector = 0x7f050021
+net.micode.notes:id/menu_alert = 0x7f050029
+net.micode.notes:string/success_sync_account = 0x7f0a005f
+net.micode.notes:id/ll_font_super = 0x7f050028
+net.micode.notes:id/ll_font_small = 0x7f050027
net.micode.notes:menu/call_record_folder = 0x7f070001
-net.micode.notes:id/ll_font_normal = 0x7f05001d
-net.micode.notes:id/ll_font_large = 0x7f05001c
-net.micode.notes:id/note_bg_color_selector = 0x7f050030
-net.micode.notes:drawable/search_result = 0x7f040034
-net.micode.notes:id/iv_super_select = 0x7f05001b
-net.micode.notes:id/iv_bg_yellow = 0x7f050016
-net.micode.notes:string/error_sync_cancelled = 0x7f0a0011
-net.micode.notes:id/iv_bg_white_select = 0x7f050015
-net.micode.notes:id/tv_alert_date = 0x7f05003a
-net.micode.notes:dimen/text_font_size_large = 0x7f030000
-net.micode.notes:drawable/notification = 0x7f040033
-net.micode.notes:id/iv_bg_red = 0x7f050012
-net.micode.notes:string/menu_font_large = 0x7f0a0027
-net.micode.notes:drawable/widget_4x_blue = 0x7f04003d
-net.micode.notes:id/iv_large_select = 0x7f050018
-net.micode.notes:id/widget_bg_image = 0x7f050041
-net.micode.notes:id/iv_bg_green_select = 0x7f050011
-net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c
-net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004a
-net.micode.notes:drawable/menu_move = 0x7f04002e
-net.micode.notes:drawable/widget_4x_white = 0x7f040040
-net.micode.notes:id/iv_bg_blue_select = 0x7f05000f
-net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004c
-net.micode.notes:id/font_size_selector = 0x7f05000b
+net.micode.notes:id/ll_font_normal = 0x7f050025
+net.micode.notes:id/ll_font_large = 0x7f050024
+net.micode.notes:id/note_bg_color_selector = 0x7f05003b
+net.micode.notes:drawable/search_result = 0x7f040035
+net.micode.notes:id/iv_super_select = 0x7f05001f
+net.micode.notes:layout/note_edit = 0x7f060005
+net.micode.notes:id/notes_list = 0x7f050040
+net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0011
+net.micode.notes:drawable/font_color_green = 0x7f040010
+net.micode.notes:id/iv_red_select = 0x7f05001d
+net.micode.notes:drawable/new_note = 0x7f040030
+net.micode.notes:id/sv_note_edit = 0x7f050044
+net.micode.notes:id/iv_green_select = 0x7f05001a
+net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009
+net.micode.notes:color/secondary_text_dark = 0x7f020007
+net.micode.notes:id/move = 0x7f050039
+net.micode.notes:id/iv_bg_yellow_select = 0x7f050018
+net.micode.notes:menu/call_note_edit = 0x7f070000
+net.micode.notes:drawable/new_note_pressed = 0x7f040032
+net.micode.notes:id/iv_bg_blue = 0x7f05000f
+net.micode.notes:layout/settings_header = 0x7f06000b
+net.micode.notes:id/iv_default_select = 0x7f050019
+net.micode.notes:id/iv_bg_yellow = 0x7f050017
+net.micode.notes:string/error_sync_cancelled = 0x7f0a0012
+net.micode.notes:id/iv_bg_white_select = 0x7f050016
+net.micode.notes:id/iv_bg_white = 0x7f050015
+net.micode.notes:string/menu_font_large = 0x7f0a0029
+net.micode.notes:drawable/widget_4x_blue = 0x7f04003e
+net.micode.notes:id/iv_large_select = 0x7f05001b
+net.micode.notes:id/widget_bg_image = 0x7f05004c
+net.micode.notes:id/iv_bg_green_select = 0x7f050012
+net.micode.notes:id/amPm = 0x7f050003
+net.micode.notes:id/iv_bg_green = 0x7f050011
net.micode.notes:id/et_edit_text = 0x7f050009
net.micode.notes:id/et_foler_name = 0x7f05000a
net.micode.notes:drawable/edit_green = 0x7f040007
net.micode.notes:layout/widget_4x = 0x7f06000d
-net.micode.notes:string/search = 0x7f0a0056
+net.micode.notes:string/search = 0x7f0a0059
net.micode.notes:id/cb_edit_item = 0x7f050006
net.micode.notes:id/btn_set_bg_color = 0x7f050005
net.micode.notes:id/account_dialog_subtitle = 0x7f050000
+net.micode.notes:id/iv_bg_blue_select = 0x7f050010
+net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004d
+net.micode.notes:drawable/menu_move = 0x7f04002f
+net.micode.notes:drawable/widget_4x_white = 0x7f040041
net.micode.notes:menu/note_list = 0x7f070003
net.micode.notes:id/account_dialog_title = 0x7f050001
-net.micode.notes:id/iv_bg_green = 0x7f050010
-net.micode.notes:id/amPm = 0x7f050003
-net.micode.notes:drawable/widget_4x_green = 0x7f04003e
+net.micode.notes:drawable/widget_4x_green = 0x7f04003f
net.micode.notes:style/NoteTheme = 0x7f0b0003
net.micode.notes:id/hour = 0x7f05000c
-net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040032
-net.micode.notes:drawable/widget_2x_yellow = 0x7f04003c
-net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c
-net.micode.notes:drawable/widget_2x_red = 0x7f04003a
+net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040033
+net.micode.notes:drawable/widget_2x_yellow = 0x7f04003d
+net.micode.notes:dimen/text_font_size_large = 0x7f030000
+net.micode.notes:id/tv_alert_date = 0x7f050045
+net.micode.notes:drawable/widget_2x_red = 0x7f04003b
net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a
net.micode.notes:id/delete = 0x7f050008
-net.micode.notes:drawable/widget_2x_green = 0x7f040039
-net.micode.notes:drawable/title_bar_bg = 0x7f040037
-net.micode.notes:drawable/menu_delete = 0x7f04002d
-net.micode.notes:string/error_sync_internal = 0x7f0a0012
-net.micode.notes:drawable/list_green_single = 0x7f04001f
+net.micode.notes:drawable/widget_2x_green = 0x7f04003a
+net.micode.notes:drawable/title_bar_bg = 0x7f040038
+net.micode.notes:id/iv_bg_red = 0x7f050013
+net.micode.notes:drawable/notification = 0x7f040034
+net.micode.notes:drawable/list_green_single = 0x7f040020
net.micode.notes:string/alert_message_delete_note = 0x7f0a0001
-net.micode.notes:id/tv_modified_date = 0x7f05003c
-net.micode.notes:drawable/list_blue_middle = 0x7f040018
-net.micode.notes:id/iv_small_select = 0x7f05001a
+net.micode.notes:id/tv_modified_date = 0x7f050047
+net.micode.notes:drawable/list_blue_middle = 0x7f040019
+net.micode.notes:id/iv_small_select = 0x7f05001e
net.micode.notes:menu/note_list_options = 0x7f070005
net.micode.notes:xml/searchable = 0x7f0c0001
-net.micode.notes:string/menu_folder_delete = 0x7f0a0025
+net.micode.notes:string/menu_folder_delete = 0x7f0a0027
+net.micode.notes:id/ll_font_green = 0x7f050023
net.micode.notes:drawable/dropdown_icon = 0x7f040005
net.micode.notes:id/date = 0x7f050007
-net.micode.notes:drawable/list_yellow_single = 0x7f04002b
-net.micode.notes:drawable/list_red_up = 0x7f040024
-net.micode.notes:drawable/widget_4x_yellow = 0x7f040041
-net.micode.notes:drawable/list_yellow_middle = 0x7f04002a
-net.micode.notes:id/tv_folder_name = 0x7f05003b
-net.micode.notes:drawable/list_yellow_down = 0x7f040029
-net.micode.notes:string/format_folder_files_count = 0x7f0a001b
+net.micode.notes:color/Bright_Blue = 0x7f020001
+net.micode.notes:color/Yellow = 0x7f020005
+net.micode.notes:drawable/list_yellow_single = 0x7f04002c
+net.micode.notes:drawable/list_red_up = 0x7f040025
+net.micode.notes:drawable/widget_4x_yellow = 0x7f040042
+net.micode.notes:drawable/list_yellow_middle = 0x7f04002b
+net.micode.notes:id/tv_folder_name = 0x7f050046
+net.micode.notes:drawable/list_yellow_down = 0x7f04002a
net.micode.notes:drawable/clock = 0x7f040003
-net.micode.notes:drawable/list_white_up = 0x7f040028
-net.micode.notes:drawable/edit_title_blue = 0x7f040009
-net.micode.notes:drawable/edit_red = 0x7f040008
-net.micode.notes:id/iv_alert_icon = 0x7f05000d
+net.micode.notes:drawable/list_white_up = 0x7f040029
net.micode.notes:layout/dialog_edit_text = 0x7f060003
-net.micode.notes:string/preferences_account_title = 0x7f0a0045
+net.micode.notes:string/preferences_account_title = 0x7f0a0048
net.micode.notes:drawable/edit_white = 0x7f04000e
-net.micode.notes:drawable/list_white_middle = 0x7f040026
-net.micode.notes:color/user_query_highlight = 0x7f020002
-net.micode.notes:drawable/list_white_down = 0x7f040025
-net.micode.notes:string/preferences_add_account = 0x7f0a0046
+net.micode.notes:drawable/list_white_middle = 0x7f040027
+net.micode.notes:id/menu_change_font_color = 0x7f05002a
+net.micode.notes:color/user_query_highlight = 0x7f020008
+net.micode.notes:id/iv_Bright_blue_select = 0x7f05000d
+net.micode.notes:drawable/list_white_down = 0x7f040026
+net.micode.notes:layout/folder_list_item = 0x7f060004
+net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009
+net.micode.notes:drawable/list_blue_down = 0x7f040018
+net.micode.notes:drawable/list_red_middle = 0x7f040023
+net.micode.notes:drawable/list_red_down = 0x7f040022
+net.micode.notes:id/action_select_all = 0x7f050002
+net.micode.notes:drawable/list_green_middle = 0x7f04001f
+net.micode.notes:string/menu_send_to_desktop = 0x7f0a0038
+net.micode.notes:drawable/list_red_single = 0x7f040024
+net.micode.notes:string/preferences_add_account = 0x7f0a0049
net.micode.notes:drawable/bg_btn_set_color = 0x7f040000
-net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a0047
+net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a004a
net.micode.notes:layout/widget_2x = 0x7f06000c
-net.micode.notes:drawable/list_footer_bg = 0x7f04001c
+net.micode.notes:drawable/list_footer_bg = 0x7f04001d
net.micode.notes:string/alert_title_delete = 0x7f0a0003
net.micode.notes:drawable/edit_title_green = 0x7f04000a
-net.micode.notes:drawable/icon_app = 0x7f040015
-net.micode.notes:string/menu_send_to_desktop = 0x7f0a0035
-net.micode.notes:drawable/list_red_single = 0x7f040023
-net.micode.notes:string/failed_sdcard_export = 0x7f0a0014
-net.micode.notes:drawable/widget_4x_red = 0x7f04003f
-net.micode.notes:id/menu_delete_remind = 0x7f050022
-net.micode.notes:drawable/list_red_down = 0x7f040021
-net.micode.notes:drawable/list_red_middle = 0x7f040022
-net.micode.notes:id/iv_bg_white = 0x7f050014
-net.micode.notes:id/iv_bg_red_select = 0x7f050013
-net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000d
-net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009
-net.micode.notes:drawable/list_blue_down = 0x7f040017
-net.micode.notes:id/action_select_all = 0x7f050002
-net.micode.notes:string/format_datetime_mdhm = 0x7f0a0019
-net.micode.notes:drawable/font_small = 0x7f040013
-net.micode.notes:string/sync_progress_login = 0x7f0a005e
+net.micode.notes:drawable/icon_app = 0x7f040016
+net.micode.notes:drawable/font_small = 0x7f040014
+net.micode.notes:string/sync_progress_login = 0x7f0a0061
net.micode.notes:array/menu_share_ways = 0x7f010001
-net.micode.notes:drawable/widget_2x_white = 0x7f04003b
-net.micode.notes:layout/folder_list_item = 0x7f060004
+net.micode.notes:drawable/widget_2x_white = 0x7f04003c
net.micode.notes:layout/add_account_text = 0x7f060001
-net.micode.notes:id/tv_title = 0x7f05003f
-net.micode.notes:color/primary_text_dark = 0x7f020000
-net.micode.notes:drawable/font_size_selector_bg = 0x7f040012
-net.micode.notes:drawable/list_blue_up = 0x7f04001a
-net.micode.notes:string/search_setting_description = 0x7f0a0059
-net.micode.notes:drawable/list_blue_single = 0x7f040019
-net.micode.notes:drawable/font_large = 0x7f040010
+net.micode.notes:style/TextColorRed = 0x7f0b000e
+net.micode.notes:id/tv_title = 0x7f05004a
+net.micode.notes:color/primary_text_dark = 0x7f020006
+net.micode.notes:drawable/font_size_selector_bg = 0x7f040013
+net.micode.notes:drawable/list_blue_up = 0x7f04001b
+net.micode.notes:drawable/widget_4x_red = 0x7f040040
+net.micode.notes:string/search_setting_description = 0x7f0a005c
+net.micode.notes:drawable/list_blue_single = 0x7f04001a
+net.micode.notes:drawable/font_large = 0x7f040011
net.micode.notes:drawable/delete = 0x7f040004
net.micode.notes:drawable/edit_yellow = 0x7f04000f
-net.micode.notes:id/note_item = 0x7f050033
+net.micode.notes:id/note_item = 0x7f05003e
+net.micode.notes:id/ll_font_default = 0x7f050022
+net.micode.notes:color/Blue = 0x7f020000
net.micode.notes:drawable/edit_title_white = 0x7f04000c
-net.micode.notes:id/note_edit_list = 0x7f050031
+net.micode.notes:id/note_edit_list = 0x7f05003c
+net.micode.notes:id/iv_alert_icon = 0x7f05000e
+net.micode.notes:drawable/edit_red = 0x7f040008
net.micode.notes:drawable/edit_title_red = 0x7f04000b
-net.micode.notes:string/menu_delete = 0x7f0a0021
-net.micode.notes:drawable/list_folder = 0x7f04001b
+net.micode.notes:string/menu_delete = 0x7f0a0023
+net.micode.notes:drawable/list_folder = 0x7f04001c
net.micode.notes:drawable/call_record = 0x7f040002
-net.micode.notes:string/search_hint = 0x7f0a0057
-net.micode.notes:id/menu_font_size = 0x7f050024
+net.micode.notes:drawable/edit_title_blue = 0x7f040009
+net.micode.notes:id/iv_bg_red_select = 0x7f050014
+net.micode.notes:string/error_sync_internal = 0x7f0a0013
+net.micode.notes:drawable/menu_delete = 0x7f04002e
+net.micode.notes:string/menu_folder_change_name = 0x7f0a0026
+net.micode.notes:color/Default = 0x7f020002
+net.micode.notes:string/search_hint = 0x7f0a005a
+net.micode.notes:id/menu_font_size = 0x7f05002e
net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001
-net.micode.notes:drawable/list_yellow_up = 0x7f04002c
net.micode.notes:dimen/text_font_size_small = 0x7f030003
net.micode.notes:dimen/text_font_size_normal = 0x7f030002
-net.micode.notes:drawable/list_green_middle = 0x7f04001e
-net.micode.notes:drawable/list_background = 0x7f040016
+net.micode.notes:drawable/list_background = 0x7f040017
net.micode.notes:string/app_name = 0x7f0a0004
net.micode.notes:menu/note_list_dropdown = 0x7f070004
-net.micode.notes:string/menu_setting = 0x7f0a0036
+net.micode.notes:string/menu_setting = 0x7f0a0039
net.micode.notes:dimen/text_font_size_medium = 0x7f030001
+net.micode.notes:string/format_datetime_mdhm = 0x7f0a001a
+net.micode.notes:color/Green = 0x7f020003
+net.micode.notes:drawable/list_yellow_up = 0x7f04002d
+net.micode.notes:id/menu_insert_img = 0x7f05002f
+net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004f
+net.micode.notes:id/font_size_selector = 0x7f05000b
net.micode.notes:layout/note_edit_list_item = 0x7f060006
net.micode.notes:layout/account_dialog_title = 0x7f060000
+net.micode.notes:id/ll_font_red = 0x7f050026
net.micode.notes:array/format_for_exported_note = 0x7f010000
+net.micode.notes:id/menu_delete_remind = 0x7f05002c
diff --git a/app/build/outputs/logs/manifest-merger-debug-report.txt b/app/build/outputs/logs/manifest-merger-debug-report.txt
index 23a31e9..2b20b1f 100644
--- a/app/build/outputs/logs/manifest-merger-debug-report.txt
+++ b/app/build/outputs/logs/manifest-merger-debug-report.txt
@@ -1,235 +1,235 @@
-- Merging decision tree log ---
manifest
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12
-INJECTED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12
-INJECTED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12
-INJECTED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12
-INJECTED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12
-INJECTED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12
-INJECTED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:18:1-150:12
package
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:19:5-31
- INJECTED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml
- INJECTED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:19:5-31
+ INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml
+ INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml
android:versionName
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:21:5-30
- INJECTED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml
- INJECTED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:21:5-30
+ INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml
+ INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml
xmlns:android
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:18:11-69
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:18:11-69
android:versionCode
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:20:5-28
- INJECTED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml
- INJECTED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:20:5-28
+ INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml
+ INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml
uses-sdk
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
-INJECTED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
-INJECTED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
-INJECTED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
-INJECTED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:23:5-44
+INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:23:5-44
+INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:23:5-44
+INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:23:5-44
+INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:23:5-44
android:targetSdkVersion
- INJECTED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
- INJECTED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml
+ INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:23:5-44
+ INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml
android:minSdkVersion
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:23:15-41
- INJECTED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml
- INJECTED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:23:15-41
+ INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml
+ INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml
uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:25:5-81
android:name
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:25:22-78
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:25:22-78
uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:26:5-88
android:name
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:26:22-85
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:26:22-85
uses-permission#android.permission.INTERNET
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:27:5-67
android:name
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:27:22-64
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:27:22-64
uses-permission#android.permission.READ_CONTACTS
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:28:5-72
android:name
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:28:22-69
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:28:22-69
uses-permission#android.permission.MANAGE_ACCOUNTS
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:29:5-74
android:name
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:29:22-71
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:29:22-71
uses-permission#android.permission.AUTHENTICATE_ACCOUNTS
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:30:5-80
android:name
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:30:22-77
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:30:22-77
uses-permission#android.permission.GET_ACCOUNTS
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:31:5-71
android:name
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:31:22-68
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:31:22-68
uses-permission#android.permission.USE_CREDENTIALS
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:32:5-74
android:name
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:32:22-71
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:32:22-71
uses-permission#android.permission.RECEIVE_BOOT_COMPLETED
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:33:5-81
android:name
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:33:22-78
application
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:35:5-149:19
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:35:5-149:19
android:label
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:37:9-41
android:icon
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:36:9-42
activity#net.micode.notes.ui.NotesListActivity
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:38:9-51:20
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:38:9-51:20
android:label
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:41:13-45
android:launchMode
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:42:13-43
android:windowSoftInputMode
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:45:13-52
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:45:13-52
android:uiOptions
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:44:13-57
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:44:13-57
android:configChanges
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:40:13-74
android:theme
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:43:13-45
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:43:13-45
android:name
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:39:13-49
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:39:13-49
intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:47:13-50:29
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:47:13-50:29
action#android.intent.action.MAIN
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:48:17-69
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:48:17-69
android:name
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:48:25-66
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:48:25-66
category#android.intent.category.LAUNCHER
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:49:17-77
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:49:17-77
android:name
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:49:27-74
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:49:27-74
activity#net.micode.notes.ui.NoteEditActivity
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:53:9-81:20
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:53:9-81:20
android:launchMode
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:56:13-43
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:56:13-43
android:configChanges
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:55:13-74
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:55:13-74
android:theme
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:57:13-45
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:57:13-45
android:name
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:54:13-48
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:54:13-48
intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:59:13-64:29
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:59:13-64:29
action#android.intent.action.VIEW
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:60:17-69
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:60:17-69
android:name
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:60:25-66
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:60:25-66
category#android.intent.category.DEFAULT
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:61:17-76
android:name
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:61:27-73
data
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:62:17-78
android:mimeType
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:62:23-75
intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:66:13-71:29
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:66:13-71:29
action#android.intent.action.INSERT_OR_EDIT
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:67:17-79
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:67:17-79
android:name
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:67:25-76
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:67:25-76
intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:73:13-76:29
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:73:13-76:29
action#android.intent.action.SEARCH
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:74:17-71
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:74:17-71
android:name
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:74:25-68
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:74:25-68
meta-data#android.app.searchable
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:78:13-80:54
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:78:13-80:54
android:resource
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:80:17-51
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:80:17-51
android:name
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:79:17-54
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:79:17-54
provider#net.micode.notes.data.NotesProvider
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:83:9-86:43
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:83:9-86:43
android:authorities
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:85:13-47
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:85:13-47
android:multiprocess
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:86:13-40
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:86:13-40
android:name
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:84:13-63
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:84:13-63
receiver#net.micode.notes.widget.NoteWidgetProvider_2x
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:88:9-100:20
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:88:9-100:20
android:label
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:90:13-50
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:90:13-50
android:name
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:89:13-57
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:89:13-57
intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:91:13-95:29
action#android.appwidget.action.APPWIDGET_UPDATE
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:92:17-84
android:name
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:92:25-81
action#android.appwidget.action.APPWIDGET_DELETED
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:93:17-85
android:name
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:93:25-82
action#android.intent.action.PRIVACY_MODE_CHANGED
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:94:17-85
android:name
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:94:25-82
meta-data#android.appwidget.provider
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:97:13-99:58
android:resource
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:99:17-55
android:name
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:98:17-58
receiver#net.micode.notes.widget.NoteWidgetProvider_4x
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:101:9-114:20
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:101:9-114:20
android:label
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:103:13-50
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:103:13-50
android:name
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:102:13-57
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:102:13-57
receiver#net.micode.notes.ui.AlarmInitReceiver
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:116:9-120:20
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:116:9-120:20
android:name
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:116:19-55
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:116:19-55
intent-filter#action:name:android.intent.action.BOOT_COMPLETED
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:117:13-119:29
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:117:13-119:29
action#android.intent.action.BOOT_COMPLETED
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:118:17-79
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:118:17-79
android:name
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:118:25-76
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:118:25-76
receiver#net.micode.notes.ui.AlarmReceiver
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:122:9-125:20
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:122:9-125:20
android:process
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:124:13-38
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:124:13-38
android:name
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:123:13-61
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:123:13-61
activity#net.micode.notes.ui.AlarmAlertActivity
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:127:9-132:20
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:127:9-132:20
android:label
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:129:13-45
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:129:13-45
android:launchMode
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:130:13-48
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:130:13-48
android:theme
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:131:13-75
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:131:13-75
android:name
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:128:13-50
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:128:13-50
activity#net.micode.notes.ui.NotesPreferenceActivity
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:134:9-139:20
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:134:9-139:20
android:label
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:136:13-54
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:136:13-54
android:launchMode
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:137:13-43
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:137:13-43
android:theme
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:138:13-60
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:138:13-60
android:name
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:135:13-71
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:135:13-71
service#net.micode.notes.gtask.remote.GTaskSyncService
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:141:9-144:19
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:141:9-144:19
android:exported
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:143:13-37
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:143:13-37
android:name
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:142:13-74
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:142:13-74
meta-data#android.app.default_searchable
-ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:146:9-148:52
+ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:146:9-148:52
android:value
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:148:13-49
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:148:13-49
android:name
- ADDED from E:\programingg\Notes-master1\app\src\main\AndroidManifest.xml:147:13-58
+ ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:147:13-58
diff --git a/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
index 4f9583d..cd844ab 100644
Binary files a/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ
diff --git a/app/src/main/java/net/micode/notes/gtask/data/MetaData.java b/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
index 3a2050b..c4683e4 100644
--- a/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
+++ b/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
@@ -24,31 +24,33 @@ import net.micode.notes.tool.GTaskStringUtils;
import org.json.JSONException;
import org.json.JSONObject;
-
public class MetaData extends Task {
- private final static String TAG = MetaData.class.getSimpleName();
+ // 通过getSimpleName()获得类的gid并存入字符串中
+ private final static String TAG = MetaData.class.getSimpleName();
private String mRelatedGid = null;
-
+ // 设置元数据，生成元数据库
public void setMeta(String gid, JSONObject metaInfo) {
try {
+ // 注释方法块
metaInfo.put(GTaskStringUtils.META_HEAD_GTASK_ID, gid);
} catch (JSONException e) {
+ // 生成无法创建关联gid的日志
Log.e(TAG, "failed to put related gid");
}
setNotes(metaInfo.toString());
setName(GTaskStringUtils.META_NOTE_NAME);
}
-
+ // 获取关联的gid
public String getRelatedGid() {
return mRelatedGid;
}
-
+ // 判断数据是否为空是否值得保存
@Override
public boolean isWorthSaving() {
return getNotes() != null;
}
-
+ // 使用远程json设置元数据内容
@Override
public void setContentByRemoteJSON(JSONObject js) {
super.setContentByRemoteJSON(js);
@@ -62,18 +64,18 @@ public class MetaData extends Task {
}
}
}
-
+ // 使用本地json对象设置数据内容，该方法不应该被调用，若调用则抛出异常
@Override
public void setContentByLocalJSON(JSONObject js) {
// this function should not be called
throw new IllegalAccessError("MetaData:setContentByLocalJSON should not be called");
}
-
+ // 从元数据中获取本地json对象，该方法不应该被调用，若调用则抛出异常
@Override
public JSONObject getLocalJSONFromContent() {
throw new IllegalAccessError("MetaData:getLocalJSONFromContent should not be called");
}
-
+ // 获取同步动作状态，该方法不应该被调用，若调用则抛出异常
@Override
public int getSyncAction(Cursor c) {
throw new IllegalAccessError("MetaData:getSyncAction should not be called");
diff --git a/app/src/main/java/net/micode/notes/gtask/data/Node.java b/app/src/main/java/net/micode/notes/gtask/data/Node.java
index 63950e0..1484c14 100644
--- a/app/src/main/java/net/micode/notes/gtask/data/Node.java
+++ b/app/src/main/java/net/micode/notes/gtask/data/Node.java
@@ -19,32 +19,33 @@ package net.micode.notes.gtask.data;
import android.database.Cursor;
import org.json.JSONObject;
-
+// 对同步操作的基本节点进行一个定义
public abstract class Node {
+ // 本地和云端内容一致
public static final int SYNC_ACTION_NONE = 0;
-
+ // 需要在远程云端增加内容
public static final int SYNC_ACTION_ADD_REMOTE = 1;
-
+ // 需要在本地增加内容
public static final int SYNC_ACTION_ADD_LOCAL = 2;
-
+ // 需要在远程云端和删除内容
public static final int SYNC_ACTION_DEL_REMOTE = 3;
-
+ // 需要在本地删除内容
public static final int SYNC_ACTION_DEL_LOCAL = 4;
-
+ // 需要将本地内容更新至云端
public static final int SYNC_ACTION_UPDATE_REMOTE = 5;
-
+ // 需要将云端内容更新至本地
public static final int SYNC_ACTION_UPDATE_LOCAL = 6;
-
+ // 同步冲突
public static final int SYNC_ACTION_UPDATE_CONFLICT = 7;
-
+ // 同步错误
public static final int SYNC_ACTION_ERROR = 8;
private String mGid;
private String mName;
-
+ // 记录最后一次修改的时间
private long mLastModified;
-
+ // 表征是否被删除
private boolean mDeleted;
public Node() {
diff --git a/app/src/main/java/net/micode/notes/gtask/data/SqlData.java b/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
index d3ec3be..72ba013 100644
--- a/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
+++ b/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
@@ -13,7 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+// Description：用于支持小米便签最底层的数据库相关操作，和sqlnote的关系上是子集关系，即data是note的子集（节点）。
+// SqlData其实就是也就是所谓数据中的数据
package net.micode.notes.gtask.data;
import android.content.ContentResolver;
@@ -34,17 +35,17 @@ import net.micode.notes.gtask.exception.ActionFailureException;
import org.json.JSONException;
import org.json.JSONObject;
-
public class SqlData {
+ // 将得到的内容写入字符串tag中
private static final String TAG = SqlData.class.getSimpleName();
-
+ // 设置无效id为-99999
private static final int INVALID_ID = -99999;
-
+ // 集合interface DataColumns中所有sf常量
public static final String[] PROJECTION_DATA = new String[] {
DataColumns.ID, DataColumns.MIME_TYPE, DataColumns.CONTENT, DataColumns.DATA1,
DataColumns.DATA3
};
-
+ // 为sql表编号
public static final int DATA_ID_COLUMN = 0;
public static final int DATA_MIME_TYPE_COLUMN = 1;
@@ -56,7 +57,7 @@ public class SqlData {
public static final int DATA_CONTENT_DATA_3_COLUMN = 4;
private ContentResolver mContentResolver;
-
+ // 判断是否用content生成，真为true，假为false
private boolean mIsCreate;
private long mDataId;
@@ -70,7 +71,7 @@ public class SqlData {
private String mDataContentData3;
private ContentValues mDiffDataValues;
-
+ // 初始化数据库的构造函数
public SqlData(Context context) {
mContentResolver = context.getContentResolver();
mIsCreate = true;
@@ -81,14 +82,14 @@ public class SqlData {
mDataContentData3 = "";
mDiffDataValues = new ContentValues();
}
-
+ // 初始化数据库的构造函数
public SqlData(Context context, Cursor c) {
mContentResolver = context.getContentResolver();
mIsCreate = false;
loadFromCursor(c);
mDiffDataValues = new ContentValues();
}
-
+ // 从游标处加载数据
private void loadFromCursor(Cursor c) {
mDataId = c.getLong(DATA_ID_COLUMN);
mDataMimeType = c.getString(DATA_MIME_TYPE_COLUMN);
@@ -96,7 +97,7 @@ public class SqlData {
mDataContentData1 = c.getLong(DATA_CONTENT_DATA_1_COLUMN);
mDataContentData3 = c.getString(DATA_CONTENT_DATA_3_COLUMN);
}
-
+ // 设置用于共享的数据
public void setContent(JSONObject js) throws JSONException {
long dataId = js.has(DataColumns.ID) ? js.getLong(DataColumns.ID) : INVALID_ID;
if (mIsCreate || mDataId != dataId) {
@@ -129,7 +130,7 @@ public class SqlData {
}
mDataContentData3 = dataContentData3;
}
-
+ // 获取共享数据的内容
public JSONObject getContent() throws JSONException {
if (mIsCreate) {
Log.e(TAG, "it seems that we haven't created this in database yet");
@@ -143,7 +144,7 @@ public class SqlData {
js.put(DataColumns.DATA3, mDataContentData3);
return js;
}
-
+ // 提交更改至数据库
public void commit(long noteId, boolean validateVersion, long version) {
if (mIsCreate) {
@@ -182,7 +183,7 @@ public class SqlData {
mDiffDataValues.clear();
mIsCreate = false;
}
-
+ // 获取当前id
public long getId() {
return mDataId;
}
diff --git a/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java b/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
index 79a4095..be42a61 100644
--- a/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
+++ b/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
@@ -37,12 +37,15 @@ import org.json.JSONObject;
import java.util.ArrayList;
+// 用于支持小米便签最底层的数据库相关操作，和sqldata的关系上是父集关系，即note是data的子父集
+// 和SqlData相比SqlNote算是真正意义上的数据
public class SqlNote {
+ // 得到的类名写入tag中
private static final String TAG = SqlNote.class.getSimpleName();
private static final int INVALID_ID = -99999;
-
+ // 集合了interface NoteColumns中所有SF常量
public static final String[] PROJECTION_NOTE = new String[] {
NoteColumns.ID, NoteColumns.ALERTED_DATE, NoteColumns.BG_COLOR_ID,
NoteColumns.CREATED_DATE, NoteColumns.HAS_ATTACHMENT, NoteColumns.MODIFIED_DATE,
@@ -121,7 +124,7 @@ public class SqlNote {
private ContentValues mDiffNoteValues;
private ArrayList<SqlData> mDataList;
-
+ // 构造函数，初始化context参数
public SqlNote(Context context) {
mContext = context;
mContentResolver = context.getContentResolver();
@@ -142,7 +145,7 @@ public class SqlNote {
mDiffNoteValues = new ContentValues();
mDataList = new ArrayList<SqlData>();
}
-
+ // 通过游标初始化context
public SqlNote(Context context, Cursor c) {
mContext = context;
mContentResolver = context.getContentResolver();
@@ -165,7 +168,7 @@ public class SqlNote {
mDiffNoteValues = new ContentValues();
}
-
+ // 从游标加载数据
private void loadFromCursor(long id) {
Cursor c = null;
try {
@@ -184,7 +187,7 @@ public class SqlNote {
c.close();
}
}
-
+ // 从游标加载数据
private void loadFromCursor(Cursor c) {
mId = c.getLong(ID_COLUMN);
mAlertDate = c.getLong(ALERTED_DATE_COLUMN);
@@ -199,7 +202,7 @@ public class SqlNote {
mWidgetType = c.getInt(WIDGET_TYPE_COLUMN);
mVersion = c.getLong(VERSION_COLUMN);
}
-
+ // 获取共享数据并加载到数据库当前游标处
private void loadDataContent() {
Cursor c = null;
mDataList.clear();
@@ -225,7 +228,7 @@ public class SqlNote {
c.close();
}
}
-
+ // 设置通过content机制用于共享的数据信息
public boolean setContent(JSONObject js) {
try {
JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
@@ -358,7 +361,7 @@ public class SqlNote {
}
return true;
}
-
+ // 获取content机制提供的数据并加载到note中
public JSONObject getContent() {
try {
JSONObject js = new JSONObject();
@@ -406,40 +409,40 @@ public class SqlNote {
}
return null;
}
-
+ //给当前id设置父id
public void setParentId(long id) {
mParentId = id;
mDiffNoteValues.put(NoteColumns.PARENT_ID, id);
}
-
+ // 给当前id设置Gtaskid
public void setGtaskId(String gid) {
mDiffNoteValues.put(NoteColumns.GTASK_ID, gid);
}
-
+ // 给当前id设置同步id
public void setSyncId(long syncId) {
mDiffNoteValues.put(NoteColumns.SYNC_ID, syncId);
}
-
+ // 初始化本地修改，即撤销
public void resetLocalModified() {
mDiffNoteValues.put(NoteColumns.LOCAL_MODIFIED, 0);
}
-
+ // 获得当前id
public long getId() {
return mId;
}
-
+ // 获得id的父id
public long getParentId() {
return mParentId;
}
-
+ // 获取小部分内容以显示部分便签内容
public String getSnippet() {
return mSnippet;
}
-
+ // 判断是否为便签类型
public boolean isNoteType() {
return mType == Notes.TYPE_NOTE;
}
-
+ // 提交更改到数据库
public void commit(boolean validateVersion) {
if (mIsCreate) {
if (mId == INVALID_ID && mDiffNoteValues.containsKey(NoteColumns.ID)) {
diff --git a/app/src/main/java/net/micode/notes/gtask/data/Task.java b/app/src/main/java/net/micode/notes/gtask/data/Task.java
index 6a19454..58097db 100644
--- a/app/src/main/java/net/micode/notes/gtask/data/Task.java
+++ b/app/src/main/java/net/micode/notes/gtask/data/Task.java
@@ -34,17 +34,17 @@ import org.json.JSONObject;
public class Task extends Node {
private static final String TAG = Task.class.getSimpleName();
-
+ // 完成判断
private boolean mCompleted;
private String mNotes;
-
+ // 实例化存储的数据类型
private JSONObject mMetaInfo;
-
+ // 兄弟任务的指针
private Task mPriorSibling;
-
+ // 父类指针
private TaskList mParent;
-
+ // 初始化构造方法
public Task() {
super();
mCompleted = false;
@@ -53,7 +53,7 @@ public class Task extends Node {
mParent = null;
mMetaInfo = null;
}
-
+ // 用于创建jsonobject对象，获取创建新行为的操作
public JSONObject getCreateAction(int actionId) {
JSONObject js = new JSONObject();
@@ -102,7 +102,7 @@ public class Task extends Node {
return js;
}
-
+ // 用于创建jsonobject对象，实现创建更新行为的操作
public JSONObject getUpdateAction(int actionId) {
JSONObject js = new JSONObject();
@@ -134,7 +134,7 @@ public class Task extends Node {
return js;
}
-
+ // 用于从远端目录创建
public void setContentByRemoteJSON(JSONObject js) {
if (js != null) {
try {
@@ -174,7 +174,7 @@ public class Task extends Node {
}
}
}
-
+ // 本地创建
public void setContentByLocalJSON(JSONObject js) {
if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE)
|| !js.has(GTaskStringUtils.META_HEAD_DATA)) {
@@ -203,7 +203,7 @@ public class Task extends Node {
e.printStackTrace();
}
}
-
+ // 从目录获取本地json
public JSONObject getLocalJSONFromContent() {
String name = getName();
try {
@@ -246,7 +246,7 @@ public class Task extends Node {
return null;
}
}
-
+ // 设置meta信息
public void setMetaInfo(MetaData metaData) {
if (metaData != null && metaData.getNotes() != null) {
try {
@@ -257,7 +257,7 @@ public class Task extends Node {
}
}
}
-
+ // 获取同步行为
public int getSyncAction(Cursor c) {
try {
JSONObject noteInfo = null;
diff --git a/app/src/main/java/net/micode/notes/gtask/data/TaskList.java b/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
index 4ea21c5..5f48d1d 100644
--- a/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
+++ b/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
@@ -32,9 +32,9 @@ import java.util.ArrayList;
public class TaskList extends Node {
private static final String TAG = TaskList.class.getSimpleName();
-
+ // 当前TaskList的指针
private int mIndex;
-
+ // 类中主要的保存数据的单元，用来实现一个以Task为元素的ArrayList
private ArrayList<Task> mChildren;
public TaskList() {
@@ -42,7 +42,7 @@ public class TaskList extends Node {
mChildren = new ArrayList<Task>();
mIndex = 1;
}
-
+ // 生成并返回一个包含了一定数据的JSONObject实体
public JSONObject getCreateAction(int actionId) {
JSONObject js = new JSONObject();
@@ -73,7 +73,7 @@ public class TaskList extends Node {
return js;
}
-
+ // 更新一个包含了一定数据的JSONObject实体
public JSONObject getUpdateAction(int actionId) {
JSONObject js = new JSONObject();
@@ -215,11 +215,11 @@ public class TaskList extends Node {
return SYNC_ACTION_ERROR;
}
-
+ // 获得TaskList的大小
public int getChildTaskCount() {
return mChildren.size();
}
-
+ // 在当前任务表末尾添加新的任务
public boolean addChildTask(Task task) {
boolean ret = false;
if (task != null && !mChildren.contains(task)) {
@@ -233,7 +233,7 @@ public class TaskList extends Node {
}
return ret;
}
-
+ // 在当前任务表的指定位置添加新的任务
public boolean addChildTask(Task task, int index) {
if (index < 0 || index > mChildren.size()) {
Log.e(TAG, "add child task: invalid index");
@@ -259,7 +259,7 @@ public class TaskList extends Node {
return true;
}
-
+ // 删除TaskList中的一个Task
public boolean removeChildTask(Task task) {
boolean ret = false;
int index = mChildren.indexOf(task);
@@ -280,7 +280,7 @@ public class TaskList extends Node {
}
return ret;
}
-
+ // 移动TaskList中的一个Task
public boolean moveChildTask(Task task, int index) {
if (index < 0 || index >= mChildren.size()) {
@@ -298,7 +298,7 @@ public class TaskList extends Node {
return true;
return (removeChildTask(task) && addChildTask(task, index));
}
-
+ // 按gid寻找Task
public Task findChildTaskByGid(String gid) {
for (int i = 0; i < mChildren.size(); i++) {
Task t = mChildren.get(i);
@@ -308,11 +308,11 @@ public class TaskList extends Node {
}
return null;
}
-
+ // 返回指定Task的index
public int getChildTaskIndex(Task task) {
return mChildren.indexOf(task);
}
-
+ // 返回指定index的Task
public Task getChildTaskByIndex(int index) {
if (index < 0 || index >= mChildren.size()) {
Log.e(TAG, "getTaskByIndex: invalid index");
@@ -320,7 +320,7 @@ public class TaskList extends Node {
}
return mChildren.get(index);
}
-
+ // 返回指定gid的task
public Task getChilTaskByGid(String gid) {
for (Task task : mChildren) {
if (task.getGid().equals(gid))
diff --git a/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java b/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
index 15504be..7787d25 100644
--- a/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
+++ b/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
@@ -14,15 +14,17 @@
* limitations under the License.
*/
+// 小米便签运行过程中的运行异常处理
package net.micode.notes.gtask.exception;
public class ActionFailureException extends RuntimeException {
+ // 版本控制用，反序列化版本升级时仍保持对象唯一性
private static final long serialVersionUID = 4425249765923293627L;
+ // 通过super()来引用父类成分
public ActionFailureException() {
super();
}
-
public ActionFailureException(String paramString) {
super(paramString);
}
diff --git a/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java b/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
index b08cfb1..6f67afe 100644
--- a/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
+++ b/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
@@ -14,11 +14,14 @@
* limitations under the License.
*/
+// 运行过程中的网络异常处理
package net.micode.notes.gtask.exception;
public class NetworkFailureException extends Exception {
+ // 版本控制用，反序列化版本升级时仍保持对象唯一性
private static final long serialVersionUID = 2107610287180234136L;
+ // 通过super()来引用父类成分
public NetworkFailureException() {
super();
}
diff --git a/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java b/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
index b3b61e7..7981605 100644
--- a/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
+++ b/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
@@ -15,6 +15,14 @@
* limitations under the License.
*/
+/*
+ *异步操作类，实现Gtask异步操作过程
+ *主要方法：
+ *private void showNotification(int tickerId, String content) 用于为用户同步当前事件状态
+ *protected Integer doInBackground(Void... unused) 后台线程执行，完成任务主要工作
+ *protected void onProgressUpdate(String... progress) 主线程运行，以进度条显示用户工作完成状态
+ *protected void onPostExecute(Integer result) 更新UI
+ */
package net.micode.notes.gtask.remote;
import android.app.Notification;
@@ -44,7 +52,7 @@ public class GTaskASyncTask extends AsyncTask<Void, String, Integer> {
private GTaskManager mTaskManager;
private OnCompleteListener mOnCompleteListener;
-
+ // GTask的一个同步进程类，包含上下文信息，事件完成进度监听方法，通知管理方法，和进程管理方法
public GTaskASyncTask(Context context, OnCompleteListener listener) {
mContext = context;
mOnCompleteListener = listener;
@@ -52,56 +60,70 @@ public class GTaskASyncTask extends AsyncTask<Void, String, Integer> {
.getSystemService(Context.NOTIFICATION_SERVICE);
mTaskManager = GTaskManager.getInstance();
}
-
+ //取消同步
public void cancelSync() {
mTaskManager.cancelSync();
}
-
+ // 发布并更新事件处理进程
public void publishProgess(String message) {
publishProgress(new String[] {
message
});
}
+ // 该方法用于为用户同步当前事件状态
private void showNotification(int tickerId, String content) {
Notification notification = new Notification(R.drawable.notification, mContext
.getString(tickerId), System.currentTimeMillis());
+ // 调用系统灯光
notification.defaults = Notification.DEFAULT_LIGHTS;
+ // 操作后清除通知栏信息
notification.flags = Notification.FLAG_AUTO_CANCEL;
+ // 事件挂起意向
PendingIntent pendingIntent;
+ // 同步失败挂起活动信息
if (tickerId != R.string.ticker_success) {
pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
NotesPreferenceActivity.class), 0);
-
+ // 同步成功显示活动信息列表
} else {
+
pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
NotesListActivity.class), 0);
}
- notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content,
- pendingIntent);
+ // 该方法疑似为设置显示最新事件信息，但运行时编译器报错，暂时注释以规避报错选项
+ /*notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content,
+ pendingIntent);*/
+ //
mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification);
}
@Override
protected Integer doInBackground(Void... unused) {
+ //利用getString将NotesPreferenceActivity.getSyncAccountName(mContext)的字符串内容
+ //传进sync_progress_login中
publishProgess(mContext.getString(R.string.sync_progress_login, NotesPreferenceActivity
.getSyncAccountName(mContext)));
+ //返回后台同步的具体操作
return mTaskManager.sync(mContext, this);
}
@Override
protected void onProgressUpdate(String... progress) {
showNotification(R.string.ticker_syncing, progress[0]);
+ //判断mContext是否为GTaskSyncService的实例
if (mContext instanceof GTaskSyncService) {
((GTaskSyncService) mContext).sendBroadcast(progress[0]);
}
}
@Override
+ //后台运行完后更新ui，显示更新后结果
protected void onPostExecute(Integer result) {
if (result == GTaskManager.STATE_SUCCESS) {
showNotification(R.string.ticker_success, mContext.getString(
R.string.success_sync_account, mTaskManager.getSyncAccount()));
+ //更新修改时间
NotesPreferenceActivity.setLastSyncTime(mContext, System.currentTimeMillis());
} else if (result == GTaskManager.STATE_NETWORK_ERROR) {
showNotification(R.string.ticker_fail, mContext.getString(R.string.error_sync_network));
@@ -111,9 +133,11 @@ public class GTaskASyncTask extends AsyncTask<Void, String, Integer> {
showNotification(R.string.ticker_cancel, mContext
.getString(R.string.error_sync_cancelled));
}
+ //不同状态下的结果显示
if (mOnCompleteListener != null) {
+ //新增可运行线程
new Thread(new Runnable() {
-
+ //线程运行，初始化操作
public void run() {
mOnCompleteListener.onComplete();
}
diff --git a/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java b/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
index c67dfdf..fee4803 100644
--- a/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
+++ b/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
@@ -60,10 +60,13 @@ import java.util.zip.GZIPInputStream;
import java.util.zip.Inflater;
import java.util.zip.InflaterInputStream;
-
+/*
+ *实现GTask登录操作，创建GTask任务，与谷歌服务联网获取任务和任务列表
+ *主要用类：accountManager JSONObject HttpParams authToken Gid
+ */
public class GTaskClient {
private static final String TAG = GTaskClient.class.getSimpleName();
-
+ //指定登录URL地址
private static final String GTASK_URL = "https://mail.google.com/tasks/";
private static final String GTASK_GET_URL = "https://mail.google.com/tasks/ig";
@@ -89,7 +92,7 @@ public class GTaskClient {
private Account mAccount;
private JSONArray mUpdateArray;
-
+ // 创建GTask构造方法
private GTaskClient() {
mHttpClient = null;
mGetUrl = GTASK_GET_URL;
@@ -101,35 +104,38 @@ public class GTaskClient {
mAccount = null;
mUpdateArray = null;
}
-
+ // 实例化并锁定GTaskClient，使用getInstance()返回mInstance
public static synchronized GTaskClient getInstance() {
if (mInstance == null) {
mInstance = new GTaskClient();
}
return mInstance;
}
-
+ // 用于实现登录操作的布尔方法,提供了账号URL密码登录和谷歌官方邮箱URL登录两种登陆方法
public boolean login(Activity activity) {
// we suppose that the cookie would expire after 5 minutes
// then we need to re-login
+ // 五分钟后需要重新登录
final long interval = 1000 * 60 * 5;
if (mLastLoginTime + interval < System.currentTimeMillis()) {
mLoggedin = false;
}
// need to re-login after account switch
+ // 切换账号后需要重新登录
if (mLoggedin
&& !TextUtils.equals(getSyncAccount().name, NotesPreferenceActivity
.getSyncAccountName(activity))) {
mLoggedin = false;
}
-
+ // 检测登录状态
if (mLoggedin) {
Log.d(TAG, "already logged in");
return true;
}
-
+ // 获取上一次登陆时间
mLastLoginTime = System.currentTimeMillis();
+ // 返回的Token为空则登陆失败
String authToken = loginGoogleAccount(activity, false);
if (authToken == null) {
Log.e(TAG, "login google account failed");
@@ -137,6 +143,7 @@ public class GTaskClient {
}
// login with custom domain if necessary
+ // 必要时使用本地输入谷歌邮箱登录
if (!(mAccount.name.toLowerCase().endsWith("gmail.com") || mAccount.name.toLowerCase()
.endsWith("googlemail.com"))) {
StringBuilder url = new StringBuilder(GTASK_URL).append("a/");
@@ -152,6 +159,7 @@ public class GTaskClient {
}
// try to login with google official url
+ // 调取谷歌邮箱官方URL登录
if (!mLoggedin) {
mGetUrl = GTASK_GET_URL;
mPostUrl = GTASK_POST_URL;
@@ -163,25 +171,30 @@ public class GTaskClient {
mLoggedin = true;
return true;
}
-
+ // 实现谷歌登录的方法，以AccountManager管理账号，Token登录
private String loginGoogleAccount(Activity activity, boolean invalidateToken) {
+ // 登录Token
String authToken;
+ // 账号管理，提供账号注册接口
AccountManager accountManager = AccountManager.get(activity);
+ // 获取以com.google结尾的账号列表
Account[] accounts = accountManager.getAccountsByType("com.google");
-
+ // 如果账号长度为空则返回无可用账号
if (accounts.length == 0) {
Log.e(TAG, "there is no available google account");
return null;
}
-
+ // 获取账户名称
String accountName = NotesPreferenceActivity.getSyncAccountName(activity);
Account account = null;
+ // 遍历返回的账户信息，寻找记录的账户信息
for (Account a : accounts) {
if (a.name.equals(accountName)) {
account = a;
break;
}
}
+
if (account != null) {
mAccount = account;
} else {
@@ -190,11 +203,13 @@ public class GTaskClient {
}
// get the token now
+ // 取得登录Token
AccountManagerFuture<Bundle> accountManagerFuture = accountManager.getAuthToken(account,
"goanna_mobile", null, activity, null, null);
try {
Bundle authTokenBundle = accountManagerFuture.getResult();
authToken = authTokenBundle.getString(AccountManager.KEY_AUTHTOKEN);
+ // 若Token无效，则通过invalidateAuthToken方法废除该Token
if (invalidateToken) {
accountManager.invalidateAuthToken("com.google", authToken);
loginGoogleAccount(activity, false);
@@ -206,11 +221,12 @@ public class GTaskClient {
return authToken;
}
-
+ // 尝试登录的布尔方法需要预先判断Token是否有效
private boolean tryToLoginGtask(Activity activity, String authToken) {
if (!loginGtask(authToken)) {
// maybe the auth token is out of date, now let's invalidate the
// token and try again
+ // 若Token则废弃Token且重试
authToken = loginGoogleAccount(activity, true);
if (authToken == null) {
Log.e(TAG, "login google account failed");
@@ -224,26 +240,35 @@ public class GTaskClient {
}
return true;
}
-
+ // 登录GTask具体操作
private boolean loginGtask(String authToken) {
int timeoutConnection = 10000;
+ // socket为一种通信数据交换的端口
int timeoutSocket = 15000;
+ // 实现一个新的HTTP参数类
HttpParams httpParameters = new BasicHttpParams();
+ // 设置链接超时时间
HttpConnectionParams.setConnectionTimeout(httpParameters, timeoutConnection);
+ // 设置设置端口超时时间
HttpConnectionParams.setSoTimeout(httpParameters, timeoutSocket);
mHttpClient = new DefaultHttpClient(httpParameters);
+ // 存储新的本地cookie
BasicCookieStore localBasicCookieStore = new BasicCookieStore();
mHttpClient.setCookieStore(localBasicCookieStore);
HttpProtocolParams.setUseExpectContinue(mHttpClient.getParams(), false);
// login gtask
+ // 登录GTask具体操作
try {
+ // 设置登录URL
String loginUrl = mGetUrl + "?auth=" + authToken;
+ // 通过已实例化URL网页中的资源查找
HttpGet httpGet = new HttpGet(loginUrl);
HttpResponse response = null;
response = mHttpClient.execute(httpGet);
// get the cookie now
+ // 遍历已存储的cookie以验证是否与登录cookie相符，若相符则匹配
List<Cookie> cookies = mHttpClient.getCookieStore().getCookies();
boolean hasAuthCookie = false;
for (Cookie cookie : cookies) {
@@ -256,6 +281,7 @@ public class GTaskClient {
}
// get the client version
+ // 以脚本获取返回的Content中GTask_Url的内容
String resString = getResponseContent(response.getEntity());
String jsBegin = "_setup(";
String jsEnd = ")}</script>";
@@ -273,40 +299,47 @@ public class GTaskClient {
return false;
} catch (Exception e) {
// simply catch all exceptions
+ // 仅捕获到异常则返回捕获失败
Log.e(TAG, "httpget gtask_url failed");
return false;
}
return true;
}
-
+ // 获取行为ID
private int getActionId() {
return mActionId++;
}
+ // 实例化创建用于网络传输的对向，使用HTTPpost类来创建并返回一个空的的对向
private HttpPost createHttpPost() {
HttpPost httpPost = new HttpPost(mPostUrl);
httpPost.setHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8");
httpPost.setHeader("AT", "1");
return httpPost;
}
-
+ // 获取响应的资源目录
private String getResponseContent(HttpEntity entity) throws IOException {
String contentEncoding = null;
+ // 荣国URL获得HttpEntity对象，若返回值不为空，则创建数据流获取返回对象
if (entity.getContentEncoding() != null) {
contentEncoding = entity.getContentEncoding().getValue();
Log.d(TAG, "encoding: " + contentEncoding);
}
InputStream input = entity.getContent();
+ // Gzip为使用DEFLATE压缩数据的另一个压缩库
if (contentEncoding != null && contentEncoding.equalsIgnoreCase("gzip")) {
input = new GZIPInputStream(entity.getContent());
- } else if (contentEncoding != null && contentEncoding.equalsIgnoreCase("deflate")) {
+ }
+ // Deflate为一个无专利的无损数据压缩算法
+ else if (contentEncoding != null && contentEncoding.equalsIgnoreCase("deflate")) {
Inflater inflater = new Inflater(true);
input = new InflaterInputStream(entity.getContent(), inflater);
}
try {
+ // 包装类，用于提高读取的运行效率
InputStreamReader isr = new InputStreamReader(input);
BufferedReader br = new BufferedReader(isr);
StringBuilder sb = new StringBuilder();
@@ -322,7 +355,10 @@ public class GTaskClient {
input.close();
}
}
-
+ /*
+ * 以json发送请求，请求的内容在json中的实例化对象传入，利用json获取task中内容
+ * 并创捷对应jspost，利用postrequest得到返回的任务信息并用task_setGid设置task的新id
+ */
private JSONObject postRequest(JSONObject js) throws NetworkFailureException {
if (!mLoggedin) {
Log.e(TAG, "please login first");
@@ -360,6 +396,8 @@ public class GTaskClient {
}
}
+ // 创建单个任务，传入task类的对象、使用json获取task中的内容，并创建相应的jspost，利用postRequest获得任务返回信
+ // 息并且使用task.setGid设置task的new_id
public void createTask(Task task) throws NetworkFailureException {
commitUpdate();
try {
@@ -385,7 +423,7 @@ public class GTaskClient {
throw new ActionFailureException("create task: handing jsonobject failed");
}
}
-
+ // 创建任务列表，设置tasklist_Gid
public void createTaskList(TaskList tasklist) throws NetworkFailureException {
commitUpdate();
try {
@@ -411,7 +449,8 @@ public class GTaskClient {
throw new ActionFailureException("create tasklist: handing jsonobject failed");
}
}
-
+ // 提交更新，使用JSONobject进行存储，使用jsPost.put，Put的信息包括UpdateArray和ClientVersion，使用
+ // postRequest发送这个jspost,进行处理
public void commitUpdate() throws NetworkFailureException {
if (mUpdateArray != null) {
try {
@@ -432,7 +471,7 @@ public class GTaskClient {
}
}
}
-
+ // 添加更新事项，通过调用 commitUpdate()实现
public void addUpdateNode(Node node) throws NetworkFailureException {
if (node != null) {
// too many update items may result in an error
@@ -446,7 +485,9 @@ public class GTaskClient {
mUpdateArray.put(node.getUpdateAction(getActionId()));
}
}
-
+ // 移动task至不同的任务列表中去，通过getgid获取所属不同任务列表的gid，通过
+ // JSONObject.put(String name, Object value)函数设置移动后的task的相关属性值，从而达到移动的目的
+ // 最后通过postRequest进行更新后的任务列表的发送
public void moveTask(Task task, TaskList preParent, TaskList curParent)
throws NetworkFailureException {
commitUpdate();
@@ -463,6 +504,7 @@ public class GTaskClient {
if (preParent == curParent && task.getPriorSibling() != null) {
// put prioring_sibing_id only if moving within the tasklist and
// it is not the first one
+ //设置优先级ID，只有当移动是发生在文件中
action.put(GTaskStringUtils.GTASK_JSON_PRIOR_SIBLING_ID, task.getPriorSibling());
}
action.put(GTaskStringUtils.GTASK_JSON_SOURCE_LIST, preParent.getGid());
@@ -472,6 +514,7 @@ public class GTaskClient {
action.put(GTaskStringUtils.GTASK_JSON_DEST_LIST, curParent.getGid());
}
actionList.put(action);
+ //最后将ACTION_LIST加入到jsPost中
jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList);
// client_version
@@ -486,6 +529,7 @@ public class GTaskClient {
}
}
+ //删除操作节点，利用JSON，删除后使用postRequest发送删除后的结果
public void deleteNode(Node node) throws NetworkFailureException {
commitUpdate();
try {
@@ -494,6 +538,7 @@ public class GTaskClient {
// action_list
node.setDeleted(true);
+ // 这里会获取到删除操作的ID，加入到actionLiast中
actionList.put(node.getUpdateAction(getActionId()));
jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList);
@@ -508,7 +553,8 @@ public class GTaskClient {
throw new ActionFailureException("delete node: handing jsonobject failed");
}
}
-
+ //获取任务列表，首先通过GetURL使用getResponseContent联网获取数据，然后筛选出"_setup("到)}</script>的部分，
+ // 并且从中获取GTASK_JSON_LISTS的内容返回
public JSONArray getTaskLists() throws NetworkFailureException {
if (!mLoggedin) {
Log.e(TAG, "please login first");
@@ -521,6 +567,7 @@ public class GTaskClient {
response = mHttpClient.execute(httpGet);
// get the task list
+ // 获取任务列表并存储进jsString中
String resString = getResponseContent(response.getEntity());
String jsBegin = "_setup(";
String jsEnd = ")}</script>";
@@ -547,6 +594,7 @@ public class GTaskClient {
}
}
+ // 通过传入的TASKList的gid,从网络上获取相应属于这个任务列表的任务
public JSONArray getTaskList(String listGid) throws NetworkFailureException {
commitUpdate();
try {
@@ -558,6 +606,7 @@ public class GTaskClient {
action.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
GTaskStringUtils.GTASK_JSON_ACTION_TYPE_GETALL);
action.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, getActionId());
+ // 设置为传入的listGid
action.put(GTaskStringUtils.GTASK_JSON_LIST_ID, listGid);
action.put(GTaskStringUtils.GTASK_JSON_GET_DELETED, false);
actionList.put(action);
@@ -578,7 +627,7 @@ public class GTaskClient {
public Account getSyncAccount() {
return mAccount;
}
-
+ // 重装更新后的内容
public void resetUpdateArray() {
mUpdateArray = null;
}
diff --git a/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java b/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
index d2b4082..d514ada 100644
--- a/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
+++ b/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
@@ -86,33 +86,44 @@ public class GTaskManager {
private HashMap<String, Long> mGidToNid;
private HashMap<Long, String> mNidToGid;
-
+ // 初始化Google任务管理器的函数
private GTaskManager() {
+ // 初始化同步状态为未执行
mSyncing = false;
+ // 全局状态标识为可执行
mCancelled = false;
+ // java泛型类，用于创建一个用类作为参数的类
mGTaskListHashMap = new HashMap<String, TaskList>();
mGTaskHashMap = new HashMap<String, Node>();
mMetaHashMap = new HashMap<String, MetaData>();
mMetaList = null;
mLocalDeleteIdMap = new HashSet<Long>();
+ // 将Gid转换为Noteid通过哈希表建立映射
mGidToNid = new HashMap<String, Long>();
+ // 将Noteid转换为Gid通过哈希表建立映射
mNidToGid = new HashMap<Long, String>();
}
-
+ // synchronizedy语言级同步，用于表述该方法可能运行于多线程环境之下
+ // 该方法用于初始化mInstance
+ // @return GTaskManager
public static synchronized GTaskManager getInstance() {
if (mInstance == null) {
mInstance = new GTaskManager();
}
return mInstance;
}
-
+ // synchronizedy语言级同步，用于表述该方法可能运行于多线程环境之下
public synchronized void setActivityContext(Activity activity) {
// used for getting authtoken
mActivity = activity;
}
-
+ // 用于本地化和远端同步的方法
+ // @param context-----获取上下文
+ // @param assyncTask-----用于同步的异步操作类
+ // @return int
public int sync(Context context, GTaskASyncTask asyncTask) {
if (mSyncing) {
+ // 创建同步的日志文件
Log.d(TAG, "Sync is in progress");
return STATE_SYNC_IN_PROGRESS;
}
@@ -128,11 +139,14 @@ public class GTaskManager {
mNidToGid.clear();
try {
+ // 创建用户机实例
GTaskClient client = GTaskClient.getInstance();
+ // JSON类型，用于置空NULL
client.resetUpdateArray();
// login google task
if (!mCancelled) {
+ // 谷歌登录操作，若非则抛出登陆失败异常
if (!client.login(mActivity)) {
throw new NetworkFailureException("login google task failed");
}
@@ -140,14 +154,17 @@ public class GTaskManager {
// get the task list from google
asyncTask.publishProgess(mContext.getString(R.string.sync_progress_init_list));
+ // 将谷歌上获取的JSONTasklist转换为本地Tasklist
initGTaskList();
// do content sync work
asyncTask.publishProgess(mContext.getString(R.string.sync_progress_syncing));
syncContent();
+ // 抓取网络异常并创建调试日志抛出error
} catch (NetworkFailureException e) {
Log.e(TAG, e.toString());
return STATE_NETWORK_ERROR;
+ // 抓取操作异常并创建调试日志抛出error
} catch (ActionFailureException e) {
Log.e(TAG, e.toString());
return STATE_INTERNAL_ERROR;
@@ -167,32 +184,44 @@ public class GTaskManager {
return mCancelled ? STATE_SYNC_CANCELLED : STATE_SUCCESS;
}
-
+ // 初始化GTaskList，获取Google上JSONTaskList并转换为本地TaskList
+ // 将获取的数据储存在mMetaList，mGTaskListHashMap，MGTaskHashmap中
+ // @exception NetworkFailureException
+ // @return void
private void initGTaskList() throws NetworkFailureException {
if (mCancelled)
return;
GTaskClient client = GTaskClient.getInstance();
try {
+ // Json对象是子元素的无序集合，相当于创建一个Map对象，
+ // bantouyan-json库对Json对象的抽象概念，提供操纵json对象的各种方法，
+ // 其格式为("key1": value1,"key2": value2...)key为字符串
+ // ajax请求不刷新页面，因此配合js可实现局部刷新，所以json常用作异步请求返回对象使用
JSONArray jsTaskLists = client.getTaskLists();
// init meta list first
+ // TaskList类型
mMetaList = null;
for (int i = 0; i < jsTaskLists.length(); i++) {
+ // JSONObject与JSONArray一个为对象，一个为数组。此处取出单个JSONObject
JSONObject object = jsTaskLists.getJSONObject(i);
String gid = object.getString(GTaskStringUtils.GTASK_JSON_ID);
String name = object.getString(GTaskStringUtils.GTASK_JSON_NAME);
- if (name
- .equals(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_META)) {
+ if (name.equals(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_META)) {
+ // MetaList为元表，此处为初始化TaskList
mMetaList = new TaskList();
+ // 由远端JSON获取对象信息
mMetaList.setContentByRemoteJSON(object);
// load meta data
+ // 获取用户端的TaskList的gid
JSONArray jsMetas = client.getTaskList(gid);
for (int j = 0; j < jsMetas.length(); j++) {
object = (JSONObject) jsMetas.getJSONObject(j);
MetaData metaData = new MetaData();
metaData.setContentByRemoteJSON(object);
+ // 判断值是否值得存储，为否则不加入mMetaList
if (metaData.isWorthSaving()) {
mMetaList.addChildTask(metaData);
if (metaData.getGid() != null) {
@@ -214,18 +243,21 @@ public class GTaskManager {
// init task list
for (int i = 0; i < jsTaskLists.length(); i++) {
JSONObject object = jsTaskLists.getJSONObject(i);
+ // 通过GetString传入本地某标志数据的名称，获取其在远端的名称
String gid = object.getString(GTaskStringUtils.GTASK_JSON_ID);
String name = object.getString(GTaskStringUtils.GTASK_JSON_NAME);
if (name.startsWith(GTaskStringUtils.MIUI_FOLDER_PREFFIX)
&& !name.equals(GTaskStringUtils.MIUI_FOLDER_PREFFIX
+ GTaskStringUtils.FOLDER_META)) {
+ // 由本地tasklist获取内容用于和远端同步
TaskList tasklist = new TaskList();
tasklist.setContentByRemoteJSON(object);
mGTaskListHashMap.put(gid, tasklist);
mGTaskHashMap.put(gid, tasklist);
// load tasks
+ // 加载tasks
JSONArray jsTasks = client.getTaskList(gid);
for (int j = 0; j < jsTasks.length(); j++) {
object = (JSONObject) jsTasks.getJSONObject(j);
@@ -246,7 +278,8 @@ public class GTaskManager {
throw new ActionFailureException("initGTaskList: handing JSONObject failed");
}
}
-
+ // 本地内容同步操作
+ // @throw NetWorkFailureException
private void syncContent() throws NetworkFailureException {
int syncType;
Cursor c = null;
@@ -300,6 +333,7 @@ public class GTaskManager {
gid = c.getString(SqlNote.GTASK_ID_COLUMN);
node = mGTaskHashMap.get(gid);
if (node != null) {
+ // 通过哈希表获取gid
mGTaskHashMap.remove(gid);
mGidToNid.put(gid, c.getLong(SqlNote.ID_COLUMN));
mNidToGid.put(c.getLong(SqlNote.ID_COLUMN), gid);
@@ -350,7 +384,7 @@ public class GTaskManager {
}
}
-
+ // 同步文件夹
private void syncFolder() throws NetworkFailureException {
Cursor c = null;
String gid;
@@ -475,7 +509,7 @@ public class GTaskManager {
if (!mCancelled)
GTaskClient.getInstance().commitUpdate();
}
-
+ // 为同步类型分类
private void doContentSync(int syncType, Node node, Cursor c) throws NetworkFailureException {
if (mCancelled) {
return;
@@ -521,7 +555,7 @@ public class GTaskManager {
throw new ActionFailureException("unkown sync action type");
}
}
-
+ // 本地增加新的Node
private void addLocalNode(Node node) throws NetworkFailureException {
if (mCancelled) {
return;
@@ -595,7 +629,7 @@ public class GTaskManager {
// update meta
updateRemoteMeta(node.getGid(), sqlNote);
}
-
+ // 更新本地Node
private void updateLocalNode(Node node, Cursor c) throws NetworkFailureException {
if (mCancelled) {
return;
@@ -618,12 +652,12 @@ public class GTaskManager {
// update meta info
updateRemoteMeta(node.getGid(), sqlNote);
}
-
+ // 添加远端node
private void addRemoteNode(Node node, Cursor c) throws NetworkFailureException {
if (mCancelled) {
return;
}
-
+ // 从本地数据库中获取内容
SqlNote sqlNote = new SqlNote(mContext, c);
Node n;
@@ -637,8 +671,9 @@ public class GTaskManager {
Log.e(TAG, "cannot find task's parent tasklist");
throw new ActionFailureException("cannot add remote task");
}
+ // 在本地生成的GTaskList中添加子节点
mGTaskListHashMap.get(parentGid).addChildTask(task);
-
+ // 登录远端服务器创建task
GTaskClient.getInstance().createTask(task);
n = (Node) task;
@@ -655,7 +690,7 @@ public class GTaskManager {
folderName += GTaskStringUtils.FOLDER_CALL_NOTE;
else
folderName += sqlNote.getSnippet();
-
+ // 迭代器，通过统一接口迭代所有map元素
Iterator<Map.Entry<String, TaskList>> iter = mGTaskListHashMap.entrySet().iterator();
while (iter.hasNext()) {
Map.Entry<String, TaskList> entry = iter.next();
@@ -691,7 +726,7 @@ public class GTaskManager {
mGidToNid.put(n.getGid(), sqlNote.getId());
mNidToGid.put(sqlNote.getId(), n.getGid());
}
-
+ // 更新远端node
private void updateRemoteNode(Node node, Cursor c) throws NetworkFailureException {
if (mCancelled) {
return;
@@ -709,15 +744,17 @@ public class GTaskManager {
// move task if necessary
if (sqlNote.isNoteType()) {
Task task = (Task) node;
+ // preParentList通过node获取的父节点列表
TaskList preParentList = task.getParent();
-
+ // curParentGid为通过光标在数据库中找到sqlNote的mParentId，再通过mNidToGid由long类型转为String类型的Gid
String curParentGid = mNidToGid.get(sqlNote.getParentId());
if (curParentGid == null) {
Log.e(TAG, "cannot find task's parent tasklist");
throw new ActionFailureException("cannot update remote task");
}
+ // 通过HashMap找到对应Gid的TaskList
TaskList curParentList = mGTaskListHashMap.get(curParentGid);
-
+ // 判断父上一个节点是否与本节点相符，用于更新操作
if (preParentList != curParentList) {
preParentList.removeChildTask(task);
curParentList.addChildTask(task);
@@ -729,7 +766,7 @@ public class GTaskManager {
sqlNote.resetLocalModified();
sqlNote.commit(true);
}
-
+ // 升级远程meta
private void updateRemoteMeta(String gid, SqlNote sqlNote) throws NetworkFailureException {
if (sqlNote != null && sqlNote.isNoteType()) {
MetaData metaData = mMetaHashMap.get(gid);
@@ -745,7 +782,7 @@ public class GTaskManager {
}
}
}
-
+ // 刷新本地syncid以对应更改后的对象
private void refreshLocalSyncId() throws NetworkFailureException {
if (mCancelled) {
return;
@@ -769,8 +806,10 @@ public class GTaskManager {
Node node = mGTaskHashMap.get(gid);
if (node != null) {
mGTaskHashMap.remove(gid);
+ // 在ContentValues中创建键值对。准备通过contentResolver写入数据
ContentValues values = new ContentValues();
values.put(NoteColumns.SYNC_ID, node.getLastModified());
+ // 进行批量更改，选择参数为NULL，应该可以用insert替换，参数分别为表名和需要更新的value对象。
mContentResolver.update(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI,
c.getLong(SqlNote.ID_COLUMN)), values, null, null);
} else {
diff --git a/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java b/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
index cca36f7..a23452b 100644
--- a/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
+++ b/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
@@ -16,6 +16,23 @@
package net.micode.notes.gtask.remote;
+/*
+ * Service是在一段不定的时间运行在后台，不和用户交互的应用组件
+ * 主要方法：
+ * private void startSync() 启动一个同步工作
+ * private void cancelSync() 取消同步
+ * public void onCreate()
+ * public int onStartCommand(Intent intent, int flags, int startId) service生命周期的组成部分，相当于重启service（比如在被暂停之后），而不是创建一个新的service
+ * public void onLowMemory() 在没有内存的情况下如果存在service则结束掉这的service
+ * public IBinder onBind()
+ * public void sendBroadcast(String msg) 发送同步的相关通知
+ * public static void startSync(Activity activity)
+ * public static void cancelSync(Context context)
+ * public static boolean isSyncing() 判读是否在进行同步
+ * public static String getProgressString() 获取当前进度的信息
+ */
+
+
import android.app.Activity;
import android.app.Service;
import android.content.Context;
@@ -41,7 +58,7 @@ public class GTaskSyncService extends Service {
private static GTaskASyncTask mSyncTask = null;
private static String mSyncProgress = "";
-
+ // 开始进行一个同的步
private void startSync() {
if (mSyncTask == null) {
mSyncTask = new GTaskASyncTask(this, new GTaskASyncTask.OnCompleteListener() {
@@ -52,6 +69,7 @@ public class GTaskSyncService extends Service {
}
});
sendBroadcast("");
+ // 该函数主打的是一个让任务以单线程队列或者线程池队列方式运行
mSyncTask.execute();
}
}
@@ -63,6 +81,7 @@ public class GTaskSyncService extends Service {
}
@Override
+ // 对Service进行一个初始化
public void onCreate() {
mSyncTask = null;
}
@@ -71,6 +90,7 @@ public class GTaskSyncService extends Service {
public int onStartCommand(Intent intent, int flags, int startId) {
Bundle bundle = intent.getExtras();
if (bundle != null && bundle.containsKey(ACTION_STRING_NAME)) {
+ // 对于开始同步和取消同步分情况表示
switch (bundle.getInt(ACTION_STRING_NAME, ACTION_INVALID)) {
case ACTION_START_SYNC:
startSync();
@@ -92,26 +112,28 @@ public class GTaskSyncService extends Service {
mSyncTask.cancelSync();
}
}
-
+ // 重制客户端的服务绑定
public IBinder onBind(Intent intent) {
return null;
}
public void sendBroadcast(String msg) {
mSyncProgress = msg;
+ // 创建新的新意图
Intent intent = new Intent(GTASK_SERVICE_BROADCAST_NAME);
intent.putExtra(GTASK_SERVICE_BROADCAST_IS_SYNCING, mSyncTask != null);
intent.putExtra(GTASK_SERVICE_BROADCAST_PROGRESS_MSG, msg);
sendBroadcast(intent);
}
-
+ // 对同步进行一个开始
public static void startSync(Activity activity) {
GTaskManager.getInstance().setActivityContext(activity);
Intent intent = new Intent(activity, GTaskSyncService.class);
intent.putExtra(GTaskSyncService.ACTION_STRING_NAME, GTaskSyncService.ACTION_START_SYNC);
+ // 发送通知
activity.startService(intent);
}
-
+ // 对同步进行一个取消
public static void cancelSync(Context context) {
Intent intent = new Intent(context, GTaskSyncService.class);
intent.putExtra(GTaskSyncService.ACTION_STRING_NAME, GTaskSyncService.ACTION_CANCEL_SYNC);
@@ -125,4 +147,4 @@ public class GTaskSyncService extends Service {
public static String getProgressString() {
return mSyncProgress;
}
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/net/micode/notes/model/Note.java b/app/src/main/java/net/micode/notes/model/Note.java
index 6706cf6..4072cf5 100644
--- a/app/src/main/java/net/micode/notes/model/Note.java
+++ b/app/src/main/java/net/micode/notes/model/Note.java
@@ -15,6 +15,7 @@
*/
package net.micode.notes.model;
+
import android.content.ContentProviderOperation;
import android.content.ContentProviderResult;
import android.content.ContentUris;
@@ -33,88 +34,90 @@ import net.micode.notes.data.Notes.TextNote;
import java.util.ArrayList;
+public class Note {// 便签类
+ private ContentValues mNoteDiffValues; // 用于保存便签修改值
+ private NoteData mNoteData; // 保存便签的数据
+ private static final String TAG = "Note"; // 设置TAG为Note
-public class Note {
- private ContentValues mNoteDiffValues;
- private NoteData mNoteData;
- private static final String TAG = "Note";
/**
* Create a new note id for adding a new note to databases
*/
- public static synchronized long getNewNoteId(Context context, long folderId) {
+ public static synchronized long getNewNoteId(Context context, long folderId) { // 为一个新的便签创建id返回数据库
// Create a new note in the database
- ContentValues values = new ContentValues();
- long createdTime = System.currentTimeMillis();
+ ContentValues values = new ContentValues(); // 用于保存创建日期等字段的值
+ long createdTime = System.currentTimeMillis(); // 获取创建时间
values.put(NoteColumns.CREATED_DATE, createdTime);
values.put(NoteColumns.MODIFIED_DATE, createdTime);
values.put(NoteColumns.TYPE, Notes.TYPE_NOTE);
values.put(NoteColumns.LOCAL_MODIFIED, 1);
values.put(NoteColumns.PARENT_ID, folderId);
- Uri uri = context.getContentResolver().insert(Notes.CONTENT_NOTE_URI, values);
+ Uri uri = context.getContentResolver().insert(Notes.CONTENT_NOTE_URI, values); // 将values插入数据库中，并返回uri
long noteId = 0;
try {
- noteId = Long.valueOf(uri.getPathSegments().get(1));
+ noteId = Long.valueOf(uri.getPathSegments().get(1)); // 解析uri获取新笔记id
} catch (NumberFormatException e) {
- Log.e(TAG, "Get note id error :" + e.toString());
+ Log.e(TAG, "Get note id error :" + e.toString()); // 解析失败日志
noteId = 0;
}
if (noteId == -1) {
- throw new IllegalStateException("Wrong note id:" + noteId);
+ throw new IllegalStateException("Wrong note id:" + noteId); // 获取id出错，抛出异常
}
return noteId;
}
public Note() {
- mNoteDiffValues = new ContentValues();
- mNoteData = new NoteData();
+ mNoteDiffValues = new ContentValues(); // 创建新对象
+ mNoteData = new NoteData(); // 创建新对象
}
- public void setNoteValue(String key, String value) {
- mNoteDiffValues.put(key, value);
- mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);
- mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());
+ public void setNoteValue(String key, String value) { // 设置便签的值
+ mNoteDiffValues.put(key, value); // key为属性，values为新值
+ mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1); // 本地修改标识为1，标识被修改
+ mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis()); // 表示修改时间，用于服务器时间比较
}
public void setTextData(String key, String value) {
- mNoteData.setTextData(key, value);
- }
+ mNoteData.setTextData(key, value); // 添加键值对
+ } // 设置文本数据
public void setTextDataId(long id) {
mNoteData.setTextDataId(id);
- }
+ } // 设置文本数据id
public long getTextDataId() {
return mNoteData.mTextDataId;
- }
+ } // 获取文本数据id
public void setCallDataId(long id) {
mNoteData.setCallDataId(id);
- }
+ } // 设置通讯数据id
public void setCallData(String key, String value) {
mNoteData.setCallData(key, value);
- }
+ } // 设置通讯数据，添加键值对
public boolean isLocalModified() {
return mNoteDiffValues.size() > 0 || mNoteData.isLocalModified();
- }
+ } // 检查是否被修改
- public boolean syncNote(Context context, long noteId) {
+ public boolean syncNote(Context context, long noteId) { // 用于同步到数据库中
if (noteId <= 0) {
- throw new IllegalArgumentException("Wrong note id:" + noteId);
+ throw new IllegalArgumentException("Wrong note id:" + noteId); // 抛出异常
}
- if (!isLocalModified()) {
- return true;
+ if (!isLocalModified()) { // 判断是否修改过
+ return true; // 没修改则不需要同步
}
/**
- * In theory, once data changed, the note should be updated on {@link NoteColumns#LOCAL_MODIFIED} and
- * {@link NoteColumns#MODIFIED_DATE}. For data safety, though update note fails, we also update the
+ * In theory, once data changed, the note should be updated on
+ * {@link NoteColumns#LOCAL_MODIFIED} and
+ * {@link NoteColumns#MODIFIED_DATE}. For data safety, though update note fails,
+ * we also update the
* note data info
*/
- if (context.getContentResolver().update(
+ if (context.getContentResolver().update( // 打包并同步
ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), mNoteDiffValues, null,
null) == 0) {
Log.e(TAG, "Update note error, should not happen");
@@ -124,13 +127,13 @@ public class Note {
if (mNoteData.isLocalModified()
&& (mNoteData.pushIntoContentResolver(context, noteId) == null)) {
- return false;
+ return false; // 表示同步失败
}
return true;
}
- private class NoteData {
+ private class NoteData { // 私有内部类，用于便签数据管理
private long mTextDataId;
private ContentValues mTextDataValues;
@@ -141,77 +144,76 @@ public class Note {
private static final String TAG = "NoteData";
- public NoteData() {
- mTextDataValues = new ContentValues();
- mCallDataValues = new ContentValues();
+ public NoteData() { // 构造函数
+ mTextDataValues = new ContentValues(); // 保存便签文本
+ mCallDataValues = new ContentValues(); // 保存便签通讯记录
mTextDataId = 0;
mCallDataId = 0;
}
boolean isLocalModified() {
return mTextDataValues.size() > 0 || mCallDataValues.size() > 0;
- }
+ } // 检查便签是否再本地修改
void setTextDataId(long id) {
- if(id <= 0) {
+ if (id <= 0) {
throw new IllegalArgumentException("Text data id should larger than 0");
}
mTextDataId = id;
- }
+ } // 设置便签文本标识符
void setCallDataId(long id) {
if (id <= 0) {
throw new IllegalArgumentException("Call data id should larger than 0");
}
mCallDataId = id;
- }
+ } // 设置便签通讯标识符
void setCallData(String key, String value) {
mCallDataValues.put(key, value);
- mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);
- mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());
- }
+ mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1); // 更新修改状态
+ mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis()); // 更新修改日期
+ } // 设置文本数据
- void setTextData(String key, String value) {
+ void setTextData(String key, String value) { // 设置通讯数据
mTextDataValues.put(key, value);
mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);
mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());
}
- Uri pushIntoContentResolver(Context context, long noteId) {
+ Uri pushIntoContentResolver(Context context, long noteId) { // 将文本数据与通讯数据添加到context
/**
* Check for safety
*/
if (noteId <= 0) {
- throw new IllegalArgumentException("Wrong note id:" + noteId);
+ throw new IllegalArgumentException("Wrong note id:" + noteId); // 抛出异常
}
ArrayList<ContentProviderOperation> operationList = new ArrayList<ContentProviderOperation>();
ContentProviderOperation.Builder builder = null;
- if(mTextDataValues.size() > 0) {
- mTextDataValues.put(DataColumns.NOTE_ID, noteId);
+ if (mTextDataValues.size() > 0) { // 检查文本数据
+ mTextDataValues.put(DataColumns.NOTE_ID, noteId); // 将便签id与数据值相关联
if (mTextDataId == 0) {
- mTextDataValues.put(DataColumns.MIME_TYPE, TextNote.CONTENT_ITEM_TYPE);
+ mTextDataValues.put(DataColumns.MIME_TYPE, TextNote.CONTENT_ITEM_TYPE); // 并将键值对添加到mTextDataValues中
Uri uri = context.getContentResolver().insert(Notes.CONTENT_DATA_URI,
- mTextDataValues);
+ mTextDataValues); // 插入新的数据行，保存返回的uri
try {
setTextDataId(Long.valueOf(uri.getPathSegments().get(1)));
} catch (NumberFormatException e) {
- Log.e(TAG, "Insert new text data fail with noteId" + noteId);
+ Log.e(TAG, "Insert new text data fail with noteId" + noteId); // 异常日志
mTextDataValues.clear();
return null;
}
- } else {
+ } else { // 表示需要更新现有数据行
builder = ContentProviderOperation.newUpdate(ContentUris.withAppendedId(
Notes.CONTENT_DATA_URI, mTextDataId));
builder.withValues(mTextDataValues);
operationList.add(builder.build());
}
- mTextDataValues.clear();
+ mTextDataValues.clear(); // 清空mTextDataValues
}
-
- if(mCallDataValues.size() > 0) {
+ if (mCallDataValues.size() > 0) { // 检查通讯数据，代码内容功能同上
mCallDataValues.put(DataColumns.NOTE_ID, noteId);
if (mCallDataId == 0) {
mCallDataValues.put(DataColumns.MIME_TYPE, CallNote.CONTENT_ITEM_TYPE);
@@ -233,7 +235,7 @@ public class Note {
mCallDataValues.clear();
}
- if (operationList.size() > 0) {
+ if (operationList.size() > 0) { // 检查operationList，对载入的操作进行批量提交
try {
ContentProviderResult[] results = context.getContentResolver().applyBatch(
Notes.AUTHORITY, operationList);
diff --git a/app/src/main/java/net/micode/notes/model/WorkingNote.java b/app/src/main/java/net/micode/notes/model/WorkingNote.java
index be081e4..dc18c52 100644
--- a/app/src/main/java/net/micode/notes/model/WorkingNote.java
+++ b/app/src/main/java/net/micode/notes/model/WorkingNote.java
@@ -31,38 +31,39 @@ import net.micode.notes.data.Notes.NoteColumns;
import net.micode.notes.data.Notes.TextNote;
import net.micode.notes.tool.ResourceParser.NoteBgResources;
-
-public class WorkingNote {
+public class WorkingNote {// 表示工作便签
// Note for the working note
- private Note mNote;
+ private Note mNote; // 表示工作便签
// Note Id
- private long mNoteId;
+ private long mNoteId; // 便签id
// Note content
- private String mContent;
+ public String mContent; // 便签内容
// Note mode
- private int mMode;
+ private int mMode; // 便签模式
+
+ private long mAlertDate; // 提醒日期
- private long mAlertDate;
+ private long mModifiedDate; // 最近修改日期
- private long mModifiedDate;
+ private int mBgColorId; // 背景颜色id
- private int mBgColorId;
+ private int mTxtColorId; // 文本颜色id
- private int mWidgetId;
+ private int mWidgetId; // 小部件id
- private int mWidgetType;
+ private int mWidgetType; // 小部件类型
- private long mFolderId;
+ private long mFolderId; // 所在文件夹id
- private Context mContext;
+ private Context mContext; // 表示上下文
- private static final String TAG = "WorkingNote";
+ private static final String TAG = "WorkingNote"; // 设置TAG
- private boolean mIsDeleted;
+ private boolean mIsDeleted; // 表示是否被删除
- private NoteSettingChangedListener mNoteSettingStatusListener;
+ private NoteSettingChangedListener mNoteSettingStatusListener; // 表示便签设置状态
- public static final String[] DATA_PROJECTION = new String[] {
+ public static final String[] DATA_PROJECTION = new String[] { // 用于指定需要从数据库查询的数据列
DataColumns.ID,
DataColumns.CONTENT,
DataColumns.MIME_TYPE,
@@ -81,28 +82,29 @@ public class WorkingNote {
NoteColumns.MODIFIED_DATE
};
- private static final int DATA_ID_COLUMN = 0;
+ private static final int DATA_ID_COLUMN = 0; // 表示查询数据的id列
+
+ private static final int DATA_CONTENT_COLUMN = 1; // 表示查询数据的内容列
- private static final int DATA_CONTENT_COLUMN = 1;
+ private static final int DATA_MIME_TYPE_COLUMN = 2; // 表示查询数据的MIME类型列
- private static final int DATA_MIME_TYPE_COLUMN = 2;
+ private static final int DATA_MODE_COLUMN = 3; // 表示查询数据的模式列
- private static final int DATA_MODE_COLUMN = 3;
+ private static final int NOTE_PARENT_ID_COLUMN = 0; // 表示查询便签的父文件夹id列
- private static final int NOTE_PARENT_ID_COLUMN = 0;
+ private static final int NOTE_ALERTED_DATE_COLUMN = 1; // 表示便签的提醒日期列
- private static final int NOTE_ALERTED_DATE_COLUMN = 1;
+ private static final int NOTE_BG_COLOR_ID_COLUMN = 2; // 表示便签的背景颜色id列
- private static final int NOTE_BG_COLOR_ID_COLUMN = 2;
+ private static final int NOTE_WIDGET_ID_COLUMN = 3; // 表示便签小组件id列
- private static final int NOTE_WIDGET_ID_COLUMN = 3;
+ private static final int NOTE_WIDGET_TYPE_COLUMN = 4; // 表示便签小组件类型列
- private static final int NOTE_WIDGET_TYPE_COLUMN = 4;
+ private static final int NOTE_MODIFIED_DATE_COLUMN = 5; // 表示便签最后修改日期列
- private static final int NOTE_MODIFIED_DATE_COLUMN = 5;
// New note construct
- private WorkingNote(Context context, long folderId) {
+ private WorkingNote(Context context, long folderId) { // 新建便签的结构
mContext = context;
mAlertDate = 0;
mModifiedDate = System.currentTimeMillis();
@@ -115,7 +117,7 @@ public class WorkingNote {
}
// Existing note construct
- private WorkingNote(Context context, long noteId, long folderId) {
+ private WorkingNote(Context context, long noteId, long folderId) { // 存在的的便签结构
mContext = context;
mNoteId = noteId;
mFolderId = folderId;
@@ -124,13 +126,13 @@ public class WorkingNote {
loadNote();
}
- private void loadNote() {
+ private void loadNote() { // 查询并加载当前便签的详细信息
Cursor cursor = mContext.getContentResolver().query(
ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mNoteId), NOTE_PROJECTION, null,
- null, null);
+ null, null); // 返回一个Cursor对象
if (cursor != null) {
- if (cursor.moveToFirst()) {
+ if (cursor.moveToFirst()) { // 将查询结构的列值返回当前便签
mFolderId = cursor.getLong(NOTE_PARENT_ID_COLUMN);
mBgColorId = cursor.getInt(NOTE_BG_COLOR_ID_COLUMN);
mWidgetId = cursor.getInt(NOTE_WIDGET_ID_COLUMN);
@@ -141,70 +143,70 @@ public class WorkingNote {
cursor.close();
} else {
Log.e(TAG, "No note with id:" + mNoteId);
- throw new IllegalArgumentException("Unable to find note with id " + mNoteId);
+ throw new IllegalArgumentException("Unable to find note with id " + mNoteId); // 抛出异常，表示未找到指定id的便签
}
- loadNoteData();
+ loadNoteData(); // 加载便签内容和其他数据
}
- private void loadNoteData() {
+ private void loadNoteData() { // 加载便签内容数据
Cursor cursor = mContext.getContentResolver().query(Notes.CONTENT_DATA_URI, DATA_PROJECTION,
- DataColumns.NOTE_ID + "=?", new String[] {
- String.valueOf(mNoteId)
- }, null);
+ DataColumns.NOTE_ID + "=?", new String[] { // 获取与便签id相对应的所有数据
+ String.valueOf(mNoteId)
+ }, null); // 遍历Cursor对象所有数据
if (cursor != null) {
if (cursor.moveToFirst()) {
do {
String type = cursor.getString(DATA_MIME_TYPE_COLUMN);
- if (DataConstants.NOTE.equals(type)) {
+ if (DataConstants.NOTE.equals(type)) { // 类型相对应则设置WorkingNote对象成员变量
mContent = cursor.getString(DATA_CONTENT_COLUMN);
mMode = cursor.getInt(DATA_MODE_COLUMN);
mNote.setTextDataId(cursor.getLong(DATA_ID_COLUMN));
} else if (DataConstants.CALL_NOTE.equals(type)) {
- mNote.setCallDataId(cursor.getLong(DATA_ID_COLUMN));
+ mNote.setCallDataId(cursor.getLong(DATA_ID_COLUMN)); // 设置为Notes对象的成员变量
} else {
- Log.d(TAG, "Wrong note type with type:" + type);
+ Log.d(TAG, "Wrong note type with type:" + type); // 抛出异常，错误的数据类型
}
} while (cursor.moveToNext());
}
cursor.close();
} else {
Log.e(TAG, "No data with id:" + mNoteId);
- throw new IllegalArgumentException("Unable to find note's data with id " + mNoteId);
+ throw new IllegalArgumentException("Unable to find note's data with id " + mNoteId); // 抛出异常，无查询结果
}
}
- public static WorkingNote createEmptyNote(Context context, long folderId, int widgetId,
- int widgetType, int defaultBgColorId) {
- WorkingNote note = new WorkingNote(context, folderId);
+ public static WorkingNote createEmptyNote(Context context, long folderId, int widgetId, // 上下文对象、文件夹id、组件id、组件类型、默认背景颜色id
+ int widgetType, int defaultBgColorId) { // 创建空白便签
+ WorkingNote note = new WorkingNote(context, folderId); // 用上下文对象、父文件夹id创建WorkingNote
note.setBgColorId(defaultBgColorId);
note.setWidgetId(widgetId);
note.setWidgetType(widgetType);
- return note;
+ return note; // 设置变量并返回
}
- public static WorkingNote load(Context context, long id) {
+ public static WorkingNote load(Context context, long id) { // 用上下文对象和id创建新的WorkingNote对象
return new WorkingNote(context, id, 0);
}
- public synchronized boolean saveNote() {
- if (isWorthSaving()) {
- if (!existInDatabase()) {
- if ((mNoteId = Note.getNewNoteId(mContext, mFolderId)) == 0) {
- Log.e(TAG, "Create new note fail with id:" + mNoteId);
+ public synchronized boolean saveNote() { // 保存便签
+ if (isWorthSaving()) { // 判断是否保存
+ if (!existInDatabase()) { // 是否存在与数据库
+ if ((mNoteId = Note.getNewNoteId(mContext, mFolderId)) == 0) { // 不存在则获取id
+ Log.e(TAG, "Create new note fail with id:" + mNoteId); // 日志记录
return false;
}
}
- mNote.syncNote(mContext, mNoteId);
+ mNote.syncNote(mContext, mNoteId); // 同步到数据库中
/**
* Update widget content if there exist any widget of this note
*/
- if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID
+ if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID // 诺该便签与组件关联
&& mWidgetType != Notes.TYPE_WIDGET_INVALIDE
&& mNoteSettingStatusListener != null) {
- mNoteSettingStatusListener.onWidgetChanged();
+ mNoteSettingStatusListener.onWidgetChanged(); // 更新组件
}
return true;
} else {
@@ -214,155 +216,161 @@ public class WorkingNote {
public boolean existInDatabase() {
return mNoteId > 0;
- }
+ } // 判断便签是否存在数据库
private boolean isWorthSaving() {
- if (mIsDeleted || (!existInDatabase() && TextUtils.isEmpty(mContent))
+ if (mIsDeleted || (!existInDatabase() && TextUtils.isEmpty(mContent)) // 不存在于数据库且为空，或者没本地修改
|| (existInDatabase() && !mNote.isLocalModified())) {
return false;
} else {
return true;
}
- }
+ } // 判断是否值得保存
public void setOnSettingStatusChangedListener(NoteSettingChangedListener l) {
mNoteSettingStatusListener = l;
- }
+ } // 设置便签状态监视器
- public void setAlertDate(long date, boolean set) {
- if (date != mAlertDate) {
- mAlertDate = date;
- mNote.setNoteValue(NoteColumns.ALERTED_DATE, String.valueOf(mAlertDate));
+ public void setAlertDate(long date, boolean set) { // 设置提醒
+ if (date != mAlertDate) { // 判断传入是否相同
+ mAlertDate = date; // 更新
+ mNote.setNoteValue(NoteColumns.ALERTED_DATE, String.valueOf(mAlertDate)); // 更新数据库
}
if (mNoteSettingStatusListener != null) {
- mNoteSettingStatusListener.onClockAlertChanged(date, set);
+ mNoteSettingStatusListener.onClockAlertChanged(date, set); // 调用监听器
}
}
- public void markDeleted(boolean mark) {
+ public void markDeleted(boolean mark) { // 标记删除标志
mIsDeleted = mark;
if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID
&& mWidgetType != Notes.TYPE_WIDGET_INVALIDE && mNoteSettingStatusListener != null) {
- mNoteSettingStatusListener.onWidgetChanged();
+ mNoteSettingStatusListener.onWidgetChanged(); // 已删除则更新组件
}
}
- public void setBgColorId(int id) {
- if (id != mBgColorId) {
- mBgColorId = id;
+ public void setBgColorId(int id) { // 设置背景颜色
+ if (id != mBgColorId) { // 检查
+ mBgColorId = id; // 更新设置
if (mNoteSettingStatusListener != null) {
- mNoteSettingStatusListener.onBackgroundColorChanged();
+ mNoteSettingStatusListener.onBackgroundColorChanged(); // 通知监听器
}
- mNote.setNoteValue(NoteColumns.BG_COLOR_ID, String.valueOf(id));
+ mNote.setNoteValue(NoteColumns.BG_COLOR_ID, String.valueOf(id)); // 更新数据库
}
}
-
- public void setCheckListMode(int mode) {
- if (mMode != mode) {
+ public void setTxtColorId(int id){ // 设置选中文本的颜色
+ if (id != mTxtColorId) {
+ mTxtColorId = id;
+ }
+ }
+ public void setCheckListMode(int mode) { // 设置便签的检查清单模式
+ if (mMode != mode) { // 检查
if (mNoteSettingStatusListener != null) {
- mNoteSettingStatusListener.onCheckListModeChanged(mMode, mode);
+ mNoteSettingStatusListener.onCheckListModeChanged(mMode, mode); // 通知
}
mMode = mode;
- mNote.setTextData(TextNote.MODE, String.valueOf(mMode));
+ mNote.setTextData(TextNote.MODE, String.valueOf(mMode)); // 更新数据库
}
}
- public void setWidgetType(int type) {
+ public void setWidgetType(int type) { // 设置组件类型
if (type != mWidgetType) {
mWidgetType = type;
- mNote.setNoteValue(NoteColumns.WIDGET_TYPE, String.valueOf(mWidgetType));
+ mNote.setNoteValue(NoteColumns.WIDGET_TYPE, String.valueOf(mWidgetType)); // 更新数据库
}
}
- public void setWidgetId(int id) {
+ public void setWidgetId(int id) { // 设置组件id
if (id != mWidgetId) {
mWidgetId = id;
- mNote.setNoteValue(NoteColumns.WIDGET_ID, String.valueOf(mWidgetId));
+ mNote.setNoteValue(NoteColumns.WIDGET_ID, String.valueOf(mWidgetId)); // 更新数据库
}
}
- public void setWorkingText(String text) {
+ public void setWorkingText(String text) { // 设置文本
if (!TextUtils.equals(mContent, text)) {
mContent = text;
- mNote.setTextData(DataColumns.CONTENT, mContent);
+ mNote.setTextData(DataColumns.CONTENT, mContent); // 更新
}
}
- public void convertToCallNote(String phoneNumber, long callDate) {
+ public void convertToCallNote(String phoneNumber, long callDate) { // 转换为呼叫类型便签
mNote.setCallData(CallNote.CALL_DATE, String.valueOf(callDate));
mNote.setCallData(CallNote.PHONE_NUMBER, phoneNumber);
- mNote.setNoteValue(NoteColumns.PARENT_ID, String.valueOf(Notes.ID_CALL_RECORD_FOLDER));
+ mNote.setNoteValue(NoteColumns.PARENT_ID, String.valueOf(Notes.ID_CALL_RECORD_FOLDER)); // 修改父文件夹id为呼叫记录id
}
public boolean hasClockAlert() {
return (mAlertDate > 0 ? true : false);
- }
+ } // 是否设置提醒数据
public String getContent() {
return mContent;
- }
+ } // 获取内容
public long getAlertDate() {
return mAlertDate;
- }
+ } // 获取提醒时间
public long getModifiedDate() {
return mModifiedDate;
- }
+ } // 获取最后修改时间
public int getBgColorResId() {
return NoteBgResources.getNoteBgResource(mBgColorId);
+ } // 获取背景资源id
+ public int getmTxtColorId() {
+ return mTxtColorId;
}
-
public int getBgColorId() {
return mBgColorId;
- }
-
+ } // 获取背景颜色id
public int getTitleBgResId() {
return NoteBgResources.getNoteTitleBgResource(mBgColorId);
- }
+ } // 获取标题栏背景颜色资源id
public int getCheckListMode() {
return mMode;
- }
+ } // 获取检查清单模式
public long getNoteId() {
return mNoteId;
- }
+ } // 获取便签id
public long getFolderId() {
return mFolderId;
- }
+ } // 获取父文件夹id
public int getWidgetId() {
return mWidgetId;
- }
+ } // 获取组件id
public int getWidgetType() {
return mWidgetType;
- }
+ } // 获取组件类型
- public interface NoteSettingChangedListener {
+ public interface NoteSettingChangedListener { // 接口
/**
* Called when the background color of current note has just changed
*/
- void onBackgroundColorChanged();
+ void onBackgroundColorChanged(); // 便签背景颜色变化时启动
/**
* Called when user set clock
*/
- void onClockAlertChanged(long date, boolean set);
+ void onClockAlertChanged(long date, boolean set); // 设置提醒时间时启动
/**
* Call when user create note from widget
*/
- void onWidgetChanged();
+ void onWidgetChanged(); // 创建组件时启动
/**
* Call when switch between check list mode and normal mode
+ *
* @param oldMode is previous mode before change
* @param newMode is new mode
*/
- void onCheckListModeChanged(int oldMode, int newMode);
+ void onCheckListModeChanged(int oldMode, int newMode); // 清单模式转为笔记模式时启动
}
}
diff --git a/app/src/main/java/net/micode/notes/tool/BackupUtils.java b/app/src/main/java/net/micode/notes/tool/BackupUtils.java
index 39f6ec4..93ae8c8 100644
--- a/app/src/main/java/net/micode/notes/tool/BackupUtils.java
+++ b/app/src/main/java/net/micode/notes/tool/BackupUtils.java
@@ -33,8 +33,8 @@ import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.PrintStream;
-
+import java.io.PrintStream;//////
+//添加包。类。对象等
public class BackupUtils {
private static final String TAG = "BackupUtils";
@@ -42,9 +42,9 @@ public class BackupUtils {
private static BackupUtils sInstance;
public static synchronized BackupUtils getInstance(Context context) {
- if (sInstance == null) {
+ if (sInstance == null) {//如果实例为空则创建新实例
sInstance = new BackupUtils(context);
- }
+ }//返回实例
return sInstance;
}
@@ -72,19 +72,19 @@ public class BackupUtils {
private static boolean externalStorageAvailable() {
return Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState());
}
-
+//将笔记·导出文本，返回导出时的状态码
public int exportToText() {
return mTextExport.exportToText();
}
-
+//获取导出文本文件名
public String getExportedTextFileName() {
return mTextExport.mFileName;
}
-
+//获得到处文本文件目录
public String getExportedTextFileDir() {
return mTextExport.mFileDirectory;
}
-
+//负责将笔记导出为文本
private static class TextExport {
private static final String[] NOTE_PROJECTION = {
NoteColumns.ID,
@@ -93,11 +93,11 @@ public class BackupUtils {
NoteColumns.TYPE
};
- private static final int NOTE_COLUMN_ID = 0;
+ private static final int NOTE_COLUMN_ID = 0;//查询结果中笔记id所在列的索引
- private static final int NOTE_COLUMN_MODIFIED_DATE = 1;
+ private static final int NOTE_COLUMN_MODIFIED_DATE = 1;//查询结果中笔记上次修改时间所在的索引
- private static final int NOTE_COLUMN_SNIPPET = 2;
+ private static final int NOTE_COLUMN_SNIPPET = 2;//查询摘要所在索引
private static final String[] DATA_PROJECTION = {
DataColumns.CONTENT,
@@ -106,7 +106,7 @@ public class BackupUtils {
DataColumns.DATA2,
DataColumns.DATA3,
DataColumns.DATA4,
- };
+ };//定义静态不可变数据列
private static final int DATA_COLUMN_CONTENT = 0;
@@ -114,24 +114,24 @@ public class BackupUtils {
private static final int DATA_COLUMN_CALL_DATE = 2;
- private static final int DATA_COLUMN_PHONE_NUMBER = 4;
+ private static final int DATA_COLUMN_PHONE_NUMBER = 4;//定义以上数据列MIME类，呼叫日期，号码的索引初始值
- private final String [] TEXT_FORMAT;
- private static final int FORMAT_FOLDER_NAME = 0;
+ private final String [] TEXT_FORMAT;//定义带有3个元素字符串数组TEXT_FORMAT
+ private static final int FORMAT_FOLDER_NAME = 0;//格式化后目录名称FORMAT_FOLDER_NAME= 0
private static final int FORMAT_NOTE_DATE = 1;
- private static final int FORMAT_NOTE_CONTENT = 2;
+ private static final int FORMAT_NOTE_CONTENT = 2;//格式化后的笔记内容索引为2
- private Context mContext;
- private String mFileName;
- private String mFileDirectory;
+ private Context mContext;//声名Context类型和字符串类型
+ private String mFileName;//文件名称
+ private String mFileDirectory;//文件目录路径
public TextExport(Context context) {
- TEXT_FORMAT = context.getResources().getStringArray(R.array.format_for_exported_note);
+ TEXT_FORMAT = context.getResources().getStringArray(R.array.format_for_exported_note);//初始化文件名称变量为控字符串
mContext = context;
mFileName = "";
mFileDirectory = "";
- }
-
+ }//初始化文件路径mFileDirectory = ""为空
+//创建TextExport对象
private String getFormat(int id) {
return TEXT_FORMAT[id];
}
@@ -166,39 +166,39 @@ public class BackupUtils {
* Export note identified by id to a print stream
*/
private void exportNoteToText(String noteId, PrintStream ps) {
- Cursor dataCursor = mContext.getContentResolver().query(Notes.CONTENT_DATA_URI,
+ Cursor dataCursor = mContext.getContentResolver().query(Notes.CONTENT_DATA_URI,//查询CONTENT_DATA_URI对应的数据表
DATA_PROJECTION, DataColumns.NOTE_ID + "=?", new String[] {
noteId
}, null);
-
- if (dataCursor != null) {
- if (dataCursor.moveToFirst()) {
+//使用DataColumns.NOTE_ID是否为？限制查询条件，并查询noted对应的数据行
+ if (dataCursor != null) {//若查询不为空，则执行以下代码：
+ if (dataCursor.moveToFirst()) {//移动游标为第一条记录并循环记录
do {
- String mimeType = dataCursor.getString(DATA_COLUMN_MIME_TYPE);
+ String mimeType = dataCursor.getString(DATA_COLUMN_MIME_TYPE);//获取MIME_TYPE的值
if (DataConstants.CALL_NOTE.equals(mimeType)) {
// Print phone number
String phoneNumber = dataCursor.getString(DATA_COLUMN_PHONE_NUMBER);
long callDate = dataCursor.getLong(DATA_COLUMN_CALL_DATE);
- String location = dataCursor.getString(DATA_COLUMN_CONTENT);
+ String location = dataCursor.getString(DATA_COLUMN_CONTENT);//从记录中获取phonenumber和calldate的值并输出号码
- if (!TextUtils.isEmpty(phoneNumber)) {
+ if (!TextUtils.isEmpty(phoneNumber)) {//若电话号码不为空
ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT),
- phoneNumber));
+ phoneNumber));//输出电话号码输出到PrintStream实例PS中
}
// Print call date
ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT), DateFormat
.format(mContext.getString(R.string.format_datetime_mdhm),
- callDate)));
+ callDate)));//输出通话日期信息到PrintStream中
// Print call attachment location
- if (!TextUtils.isEmpty(location)) {
+ if (!TextUtils.isEmpty(location)) {//若位置信息不为空
ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT),
location));
- }
- } else if (DataConstants.NOTE.equals(mimeType)) {
- String content = dataCursor.getString(DATA_COLUMN_CONTENT);
+ }//输出位置信息到PrintStream实例PS中
+ } else if (DataConstants.NOTE.equals(mimeType)) {//若数据类型为Note，则执行以下语句
+ String content = dataCursor.getString(DATA_COLUMN_CONTENT);//从Cursor中获取信息
if (!TextUtils.isEmpty(content)) {
ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT),
- content));
+ content));//将内容信息格式化输出rintStream实例PS中
}
}
} while (dataCursor.moveToNext());
@@ -210,74 +210,74 @@ public class BackupUtils {
ps.write(new byte[] {
Character.LINE_SEPARATOR, Character.LETTER_NUMBER
});
- } catch (IOException e) {
+ } catch (IOException e) {//若出现IO异常，则廖永Log类的e（）方法将异常信息输出日志中
Log.e(TAG, e.toString());
}
}
-
+//使用rintStream实例PS的write（）方法写入字节数组到输出流中，包括换行和字母数字
/**
* Note will be exported as text which is user readable
*/
- public int exportToText() {
+ public int exportToText() {//定义exportToText()，返回值类型为整型
if (!externalStorageAvailable()) {
Log.d(TAG, "Media was not mounted");
return STATE_SD_CARD_UNMOUONTED;
}
-
- PrintStream ps = getExportToTextPrintStream();
+//若外部存储不可用，输出日记信息，返回表示Media was not mounted
+ PrintStream ps = getExportToTextPrintStream();//获取打印输出
if (ps == null) {
Log.e(TAG, "get print stream error");
return STATE_SYSTEM_ERROR;
- }
+ }//若获取不到打印输出，输出get print stream error"，并返回错误
// First export folder and its notes
- Cursor folderCursor = mContext.getContentResolver().query(
+ Cursor folderCursor = mContext.getContentResolver().query(//声名Cursor类的变量folder，存储调查结果
Notes.CONTENT_NOTE_URI,
- NOTE_PROJECTION,
+ NOTE_PROJECTION,//调用getContentResolver()，查询目标为Note表中数据和NOTE_PROJECTION指定列
"(" + NoteColumns.TYPE + "=" + Notes.TYPE_FOLDER + " AND "
+ NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER + ") OR "
+ NoteColumns.ID + "=" + Notes.ID_CALL_RECORD_FOLDER, null, null);
-
- if (folderCursor != null) {
+//限定查询条件为文件夹且父类文件夹不是回收站
+ if (folderCursor != null) {//判断folder是否为空
if (folderCursor.moveToFirst()) {
do {
// Print folder's name
- String folderName = "";
+ String folderName = "";//遍历查询文件夹中所有文件夹记录
if(folderCursor.getLong(NOTE_COLUMN_ID) == Notes.ID_CALL_RECORD_FOLDER) {
- folderName = mContext.getString(R.string.call_record_folder_name);
- } else {
+ folderName = mContext.getString(R.string.call_record_folder_name);//若记录对应通话记录文件夹，给folder赋值Notes.ID_CALL_RECORD_FOLDER
+ } else {//否则folder赋值为记录的摘要字段值
folderName = folderCursor.getString(NOTE_COLUMN_SNIPPET);
}
if (!TextUtils.isEmpty(folderName)) {
ps.println(String.format(getFormat(FORMAT_FOLDER_NAME), folderName));
}
- String folderId = folderCursor.getString(NOTE_COLUMN_ID);
+ String folderId = folderCursor.getString(NOTE_COLUMN_ID);//获取当前记录对应文件夹id并赋值给folder
exportFolderToText(folderId, ps);
- } while (folderCursor.moveToNext());
+ } while (folderCursor.moveToNext());//将当前记录文件夹导出为文本形式，结果写入PS中
}
folderCursor.close();
}
// Export notes in root's folder
- Cursor noteCursor = mContext.getContentResolver().query(
- Notes.CONTENT_NOTE_URI,
- NOTE_PROJECTION,
+ Cursor noteCursor = mContext.getContentResolver().query(//通过getContentResolver()获取resolver对象，并调用querty方法查询
+ Notes.CONTENT_NOTE_URI,//查询URI
+ NOTE_PROJECTION,//查询列
NoteColumns.TYPE + "=" + +Notes.TYPE_NOTE + " AND " + NoteColumns.PARENT_ID
- + "=0", null, null);
+ + "=0", null, null);//限制查询类型为Notes.TYPE_NOTE，且父id为0的note记录
if (noteCursor != null) {
- if (noteCursor.moveToFirst()) {
+ if (noteCursor.moveToFirst()) {//将游标移到查询结果的第一条记录
do {
ps.println(String.format(getFormat(FORMAT_NOTE_DATE), DateFormat.format(
mContext.getString(R.string.format_datetime_mdhm),
- noteCursor.getLong(NOTE_COLUMN_MODIFIED_DATE))));
+ noteCursor.getLong(NOTE_COLUMN_MODIFIED_DATE))));//根据时间格式化字符串的时间戳，将时间转换成字符串格式
// Query data belong to this note
String noteId = noteCursor.getString(NOTE_COLUMN_ID);
exportNoteToText(noteId, ps);
} while (noteCursor.moveToNext());
- }
+ }//或i去当前Note记录的id，吧id对应数据写入输出流中
noteCursor.close();
}
- ps.close();
+ ps.close();//关闭游标
return STATE_SUCCESS;
}
@@ -286,21 +286,21 @@ public class BackupUtils {
* Get a print stream pointed to the file {@generateExportedTextFile}
*/
private PrintStream getExportToTextPrintStream() {
- File file = generateFileMountedOnSDcard(mContext, R.string.file_path,
+ File file = generateFileMountedOnSDcard(mContext, R.string.file_path,//使用getExportToTextPrintStream()再sd卡上生成指定名称和路径的文本文件
R.string.file_name_txt_format);
if (file == null) {
Log.e(TAG, "create file to exported failed");
- return null;
+ return null;//若生成文件失败，返回null，再logcat输出错误信息
}
mFileName = file.getName();
- mFileDirectory = mContext.getString(R.string.file_path);
+ mFileDirectory = mContext.getString(R.string.file_path);//将成功创建文件保存为FoleNAMe，路径柏村委mFileDiectory
PrintStream ps = null;
try {
FileOutputStream fos = new FileOutputStream(file);
- ps = new PrintStream(fos);
- } catch (FileNotFoundException e) {
+ ps = new PrintStream(fos);//创建对象fos，用于写入文件
+ } catch (FileNotFoundException e) {//使用fos创建PrintStream对象PS，一边向文件夹写入数据
e.printStackTrace();
- return null;
+ return null;//若无法找到写入目标文件，再logcat输出错误信息，并返回null
} catch (NullPointerException e) {
e.printStackTrace();
return null;
@@ -314,28 +314,28 @@ public class BackupUtils {
*/
private static File generateFileMountedOnSDcard(Context context, int filePathResId, int fileNameFormatResId) {
StringBuilder sb = new StringBuilder();
- sb.append(Environment.getExternalStorageDirectory());
+ sb.append(Environment.getExternalStorageDirectory());//再strtingbuilder中添加SD卡根目录路径
sb.append(context.getString(filePathResId));
- File filedir = new File(sb.toString());
+ File filedir = new File(sb.toString());//添加文件路径字符串资源id，并返回file对象表示该目录
sb.append(context.getString(
fileNameFormatResId,
DateFormat.format(context.getString(R.string.format_date_ymd),
- System.currentTimeMillis())));
+ System.currentTimeMillis())));//再StringBuilder添加文件名格式字符串资源id，并使用dateFormat替换为当前日期格式化字符串
File file = new File(sb.toString());
-
+//返回表示最终创建的文件夹对象
try {
if (!filedir.exists()) {
filedir.mkdir();
- }
+ }//判断指定目录是否存在，若不存在创建
if (!file.exists()) {
file.createNewFile();
- }
- return file;
+ }//判断指定目录是否存在，若不存在创建
+ return file;//返回创建对象
} catch (SecurityException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
- }
+ }//如果不能在指定目录下创建新的文件，则抛出IOException异常
return null;
}
diff --git a/app/src/main/java/net/micode/notes/tool/DataUtils.java b/app/src/main/java/net/micode/notes/tool/DataUtils.java
index 2a14982..665e0a2 100644
--- a/app/src/main/java/net/micode/notes/tool/DataUtils.java
+++ b/app/src/main/java/net/micode/notes/tool/DataUtils.java
@@ -25,18 +25,18 @@ import android.content.OperationApplicationException;
import android.database.Cursor;
import android.os.RemoteException;
import android.util.Log;
-
+//导入android 包content、database等
import net.micode.notes.data.Notes;
import net.micode.notes.data.Notes.CallNote;
import net.micode.notes.data.Notes.NoteColumns;
import net.micode.notes.ui.NotesListAdapter.AppWidgetAttribute;
-
+//导入net-micode包下数据
import java.util.ArrayList;
import java.util.HashSet;
+//导入JAVA ArrayList和HashSet类
-
-public class DataUtils {
- public static final String TAG = "DataUtils";
+public class DataUtils {//对DataUtils类进行定义
+ public static final String TAG = "DataUtils";//定义静态不可变字TAG符串常量"DataUtils"
public static boolean batchDeleteNotes(ContentResolver resolver, HashSet<Long> ids) {
if (ids == null) {
Log.d(TAG, "the ids is null");
@@ -46,69 +46,71 @@ public class DataUtils {
Log.d(TAG, "no id is in the hashset");
return true;
}
-
+ //定义批量删除笔记。若ids参数为null，输出"the ids is null"并返回true；若ids参数为0，输出"no id is in the hashset"并返回true
ArrayList<ContentProviderOperation> operationList = new ArrayList<ContentProviderOperation>();
- for (long id : ids) {
+ //定义操作列表，存储ContentProviderOperation对象
+ for (long id : ids) {//遍历id列表
if(id == Notes.ID_ROOT_FOLDER) {
Log.e(TAG, "Don't delete system folder root");
continue;
- }
+ }//如果id为系统根目录，打印"不要删除系统根目录"并进行下一次循环
ContentProviderOperation.Builder builder = ContentProviderOperation
.newDelete(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id));
- operationList.add(builder.build());
+ operationList.add(builder.build());//创造builder对象，删除指定id的ContentProviderOperation
}
- try {
+ try {//调用applybatch
ContentProviderResult[] results = resolver.applyBatch(Notes.AUTHORITY, operationList);
if (results == null || results.length == 0 || results[0] == null) {
Log.d(TAG, "delete notes failed, ids:" + ids.toString());
return false;
}
- return true;
+ return true;//若返回为空或第一个结果为null，输出删除失败返回false，否则返回true
} catch (RemoteException e) {
Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
} catch (OperationApplicationException e) {
Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
- }
+ }//若remoteexeption或operationapplicationexception异常，返回false
return false;
}
public static void moveNoteToFoler(ContentResolver resolver, long id, long srcFolderId, long desFolderId) {
- ContentValues values = new ContentValues();
- values.put(NoteColumns.PARENT_ID, desFolderId);
- values.put(NoteColumns.ORIGIN_PARENT_ID, srcFolderId);
+ ContentValues values = new ContentValues();//创建contentValues对象
+ values.put(NoteColumns.PARENT_ID, desFolderId);//移动笔记至目标文件夹
+ values.put(NoteColumns.ORIGIN_PARENT_ID, srcFolderId);//更新笔记的原始父类文件夹id
values.put(NoteColumns.LOCAL_MODIFIED, 1);
resolver.update(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id), values, null, null);
+ //更新笔记
}
public static boolean batchMoveToFolder(ContentResolver resolver, HashSet<Long> ids,
- long folderId) {
+ long folderId) {//若ids为空，打印log并返回true
if (ids == null) {
Log.d(TAG, "the ids is null");
return true;
}
ArrayList<ContentProviderOperation> operationList = new ArrayList<ContentProviderOperation>();
- for (long id : ids) {
+ for (long id : ids) {//遍历笔记id集合
ContentProviderOperation.Builder builder = ContentProviderOperation
.newUpdate(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id));
- builder.withValue(NoteColumns.PARENT_ID, folderId);
- builder.withValue(NoteColumns.LOCAL_MODIFIED, 1);
- operationList.add(builder.build());
+ builder.withValue(NoteColumns.PARENT_ID, folderId);//移动笔记至目标文件夹
+ builder.withValue(NoteColumns.LOCAL_MODIFIED, 1);//添加键值对，表示本地有效
+ operationList.add(builder.build());//添加操作至操作列表
}
try {
- ContentProviderResult[] results = resolver.applyBatch(Notes.AUTHORITY, operationList);
- if (results == null || results.length == 0 || results[0] == null) {
+ ContentProviderResult[] results = resolver.applyBatch(Notes.AUTHORITY, operationList);//应用操作列表
+ if (results == null || results.length == 0 || results[0] == null) {//如果结果为空或者第一个结果为空，打印log并返回false
Log.d(TAG, "delete notes failed, ids:" + ids.toString());
return false;
}
- return true;
- } catch (RemoteException e) {
+ return true;//true表示操作成功
+ } catch (RemoteException e) {//捕获远程异常
Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
- } catch (OperationApplicationException e) {
+ } catch (OperationApplicationException e) {//捕获操作异常
Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
}
- return false;
+ return false;//false表示操作失败
}
/**
@@ -134,7 +136,7 @@ public class DataUtils {
}
}
return count;
- }
+ }//检查笔记是否在数据库中可见，若不可见输出"get folder count failed:"
public static boolean visibleInNoteDatabase(ContentResolver resolver, long noteId, int type) {
Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId),
@@ -152,7 +154,7 @@ public class DataUtils {
}
return exist;
}
-
+//检查数据是否在数据库中存在
public static boolean existInNoteDatabase(ContentResolver resolver, long noteId) {
Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId),
null, null, null, null);
@@ -166,7 +168,7 @@ public class DataUtils {
}
return exist;
}
-
+//检查文件名称是否可见
public static boolean existInDataDatabase(ContentResolver resolver, long dataId) {
Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_DATA_URI, dataId),
null, null, null, null);
@@ -198,6 +200,7 @@ public class DataUtils {
}
public static HashSet<AppWidgetAttribute> getFolderNoteWidget(ContentResolver resolver, long folderId) {
+ //查询文件夹中所有小部件id和类型
Cursor c = resolver.query(Notes.CONTENT_NOTE_URI,
new String[] { NoteColumns.WIDGET_ID, NoteColumns.WIDGET_TYPE },
NoteColumns.PARENT_ID + "=?",
@@ -208,6 +211,7 @@ public class DataUtils {
if (c != null) {
if (c.moveToFirst()) {
set = new HashSet<AppWidgetAttribute>();
+ //遍历查询结果，将小部件id和类型存入hashSET中
do {
try {
AppWidgetAttribute widget = new AppWidgetAttribute();
@@ -220,11 +224,11 @@ public class DataUtils {
} while (c.moveToNext());
}
c.close();
- }
+ }//返回文件夹中所有小部件HashSet集合
return set;
}
- public static String getCallNumberByNoteId(ContentResolver resolver, long noteId) {
+ public static String getCallNumberByNoteId(ContentResolver resolver, long noteId) {//获取一段笔记的getCallNumberByNoteId
Cursor cursor = resolver.query(Notes.CONTENT_DATA_URI,
new String [] { CallNote.PHONE_NUMBER },
CallNote.NOTE_ID + "=? AND " + CallNote.MIME_TYPE + "=?",
@@ -234,20 +238,21 @@ public class DataUtils {
if (cursor != null && cursor.moveToFirst()) {
try {
return cursor.getString(0);
- } catch (IndexOutOfBoundsException e) {
- Log.e(TAG, "Get call number fails " + e.toString());
+ } catch (IndexOutOfBoundsException e) {//如果查询结果不为空且有数据，则返回该行的电话号码
+ Log.e(TAG, "Get call number fails " + e.toString());//如果获取电话号码失败，则打印错误日志
} finally {
cursor.close();
- }
+ } //关闭游标，释放资源
}
- return "";
+ return "";//如果没有查询结果，则返回空串
}
public static long getNoteIdByPhoneNumberAndCallDate(ContentResolver resolver, String phoneNumber, long callDate) {
- Cursor cursor = resolver.query(Notes.CONTENT_DATA_URI,
- new String [] { CallNote.NOTE_ID },
+ //使用ContentResover对象来查询数据，并返回Cursor对象
+ Cursor cursor = resolver.query(Notes.CONTENT_DATA_URI,//查询Note id字段
+ new String [] { CallNote.NOTE_ID },//通过童话日期，电话号码扽给查询
CallNote.CALL_DATE + "=? AND " + CallNote.MIME_TYPE + "=? AND PHONE_NUMBERS_EQUAL("
- + CallNote.PHONE_NUMBER + ",?)",
+ + CallNote.PHONE_NUMBER + ",?)",//传入查询参数
new String [] { String.valueOf(callDate), CallNote.CONTENT_ITEM_TYPE, phoneNumber },
null);
@@ -264,8 +269,8 @@ public class DataUtils {
return 0;
}
- public static String getSnippetById(ContentResolver resolver, long noteId) {
- Cursor cursor = resolver.query(Notes.CONTENT_NOTE_URI,
+ public static String getSnippetById(ContentResolver resolver, long noteId) {//使用ContentResovler对象查询数据，返回Cursor对象
+ Cursor cursor = resolver.query(Notes.CONTENT_NOTE_URI,//查询snippet字段
new String [] { NoteColumns.SNIPPET },
NoteColumns.ID + "=?",
new String [] { String.valueOf(noteId)},
@@ -273,14 +278,14 @@ public class DataUtils {
if (cursor != null) {
String snippet = "";
- if (cursor.moveToFirst()) {
+ if (cursor.moveToFirst()) {//获取查询结果中第0列的值，即snippet字段值
snippet = cursor.getString(0);
}
cursor.close();
return snippet;
}
throw new IllegalArgumentException("Note is not found with id: " + noteId);
- }
+ }//通过noteld获取信息，返回字符串
public static String getFormattedSnippet(String snippet) {
if (snippet != null) {
diff --git a/app/src/main/java/net/micode/notes/tool/FontColorParser.java b/app/src/main/java/net/micode/notes/tool/FontColorParser.java
new file mode 100644
index 0000000..9954a99
--- /dev/null
+++ b/app/src/main/java/net/micode/notes/tool/FontColorParser.java
@@ -0,0 +1,41 @@
+package net.micode.notes.tool;
+
+import android.content.Context;
+import android.preference.PreferenceManager;
+
+import net.micode.notes.R;
+import net.micode.notes.ui.NotesPreferenceActivity;
+
+//字体颜色列举
+public class FontColorParser {
+ public static final int Default = 0;
+ public static final int Bright_blue = 1;
+ public static final int red = 2;
+ public static final int green =3;
+ public static final int Font_color_default = Default;
+
+ public static class TextAppearanceResources {
+ private final static int[] TEXTAPPEARANCE_RESOURCES = new int[]{
+ R.style.TextColorDefault,
+ R.style.TextColorBrightBlue,
+ R.style.TextColorRed,
+ R.style.TextColorGreen
+
+ };
+ //返回默认字体颜色id
+ public static int getTexAppearanceResource(int id) {
+ if (id >= TEXTAPPEARANCE_RESOURCES.length) {
+ return Font_color_default;
+ }
+ return TEXTAPPEARANCE_RESOURCES[id];
+ }
+ //获取所需id
+ public static int getResourceSize()
+ {
+ return TEXTAPPEARANCE_RESOURCES.length;
+ }
+ }
+ public static int getDefaultTxtId(Context context) {
+ return Font_color_default;
+ }
+}
diff --git a/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java b/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
index 666b729..d5dabb0 100644
--- a/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
+++ b/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
@@ -18,96 +18,96 @@ package net.micode.notes.tool;
public class GTaskStringUtils {
- public final static String GTASK_JSON_ACTION_ID = "action_id";
+ public final static String GTASK_JSON_ACTION_ID = "action_id";//定义字符串常量，在类的外部直接访问，表示"action_id"的字符串键名
- public final static String GTASK_JSON_ACTION_LIST = "action_list";
+ public final static String GTASK_JSON_ACTION_LIST = "action_list";//定义字符串常量，在类的外部直接访问，表示"action_list的字符串键名
- public final static String GTASK_JSON_ACTION_TYPE = "action_type";
+ public final static String GTASK_JSON_ACTION_TYPE = "action_type";//定义字符串常量，在类的外部直接访问，表示action_type的字符串键名
- public final static String GTASK_JSON_ACTION_TYPE_CREATE = "create";
+ public final static String GTASK_JSON_ACTION_TYPE_CREATE = "create";//定义字符串常量，在类的外部直接访问，表示create的字符串键名
- public final static String GTASK_JSON_ACTION_TYPE_GETALL = "get_all";
+ public final static String GTASK_JSON_ACTION_TYPE_GETALL = "get_all";//定义字符串常量，在类的外部直接访问，表示get_all的字符串键名
- public final static String GTASK_JSON_ACTION_TYPE_MOVE = "move";
+ public final static String GTASK_JSON_ACTION_TYPE_MOVE = "move";//定义字符串常量，在类的外部直接访问，表示"move的字符串键名
- public final static String GTASK_JSON_ACTION_TYPE_UPDATE = "update";
+ public final static String GTASK_JSON_ACTION_TYPE_UPDATE = "update";//定义字符串常量，在类的外部直接访问，表示update的字符串键名
- public final static String GTASK_JSON_CREATOR_ID = "creator_id";
+ public final static String GTASK_JSON_CREATOR_ID = "creator_id";//定义字符串常量，在类的外部直接访问，表示creator_id的字符串键名
- public final static String GTASK_JSON_CHILD_ENTITY = "child_entity";
+ public final static String GTASK_JSON_CHILD_ENTITY = "child_entity";//定义字符串常量，在类的外部直接访问，表示child_entity的字符串键名
- public final static String GTASK_JSON_CLIENT_VERSION = "client_version";
+ public final static String GTASK_JSON_CLIENT_VERSION = "client_version";//定义字符串常量，在类的外部直接访问，表示client_version的字符串键名
- public final static String GTASK_JSON_COMPLETED = "completed";
+ public final static String GTASK_JSON_COMPLETED = "completed";//定义字符串常量，在类的外部直接访问，表示completed的字符串键名
public final static String GTASK_JSON_CURRENT_LIST_ID = "current_list_id";
+ //定义字符串常量，在类的外部直接访问，表示current_list_id的字符串键名
+ public final static String GTASK_JSON_DEFAULT_LIST_ID = "default_list_id";//定义字符串常量，在类的外部直接访问，表示default_list_id的字符串键名
- public final static String GTASK_JSON_DEFAULT_LIST_ID = "default_list_id";
+ public final static String GTASK_JSON_DELETED = "deleted";//定义字符串常量，在类的外部直接访问，表示deleted的字符串键名
- public final static String GTASK_JSON_DELETED = "deleted";
+ public final static String GTASK_JSON_DEST_LIST = "dest_list";//定义字符串常量，在类的外部直接访问，表示dest_list的字符串键名
- public final static String GTASK_JSON_DEST_LIST = "dest_list";
+ public final static String GTASK_JSON_DEST_PARENT = "dest_parent";//定义字符串常量，在类的外部直接访问，表示dest_parent的字符串键名
- public final static String GTASK_JSON_DEST_PARENT = "dest_parent";
+ public final static String GTASK_JSON_DEST_PARENT_TYPE = "dest_parent_type";//定义字符串常量，在类的外部直接访问，表示dest_parent_type的字符串键名
- public final static String GTASK_JSON_DEST_PARENT_TYPE = "dest_parent_type";
+ public final static String GTASK_JSON_ENTITY_DELTA = "entity_delta";//定义字符串常量，在类的外部直接访问，表示entity_delta的字符串键名
- public final static String GTASK_JSON_ENTITY_DELTA = "entity_delta";
-
- public final static String GTASK_JSON_ENTITY_TYPE = "entity_type";
+ public final static String GTASK_JSON_ENTITY_TYPE = "entity_type";//定义字符串常量，在类的外部直接访问，表示entity_type的字符串键名
public final static String GTASK_JSON_GET_DELETED = "get_deleted";
+ //定义字符串常量，在类的外部直接访问，表示get_deleted的字符串键名
+ public final static String GTASK_JSON_ID = "id";//定义字符串常量，在类的外部直接访问，表示id的字符串键名
- public final static String GTASK_JSON_ID = "id";
-
- public final static String GTASK_JSON_INDEX = "index";
+ public final static String GTASK_JSON_INDEX = "index";//定义字符串常量，在类的外部直接访问，表示index的字符串键名
- public final static String GTASK_JSON_LAST_MODIFIED = "last_modified";
+ public final static String GTASK_JSON_LAST_MODIFIED = "last_modified";//定义字符串常量，在类的外部直接访问，表示last_modified的字符串键名
- public final static String GTASK_JSON_LATEST_SYNC_POINT = "latest_sync_point";
+ public final static String GTASK_JSON_LATEST_SYNC_POINT = "latest_sync_point";//定义字符串常量，在类的外部直接访问，表示latest_sync_point的字符串键名
- public final static String GTASK_JSON_LIST_ID = "list_id";
+ public final static String GTASK_JSON_LIST_ID = "list_id";//定义字符串常量，在类的外部直接访问，表示list_id的字符串键名
- public final static String GTASK_JSON_LISTS = "lists";
+ public final static String GTASK_JSON_LISTS = "lists";//定义字符串常量，在类的外部直接访问，表示lists的字符串键名
- public final static String GTASK_JSON_NAME = "name";
+ public final static String GTASK_JSON_NAME = "name";//定义字符串常量，在类的外部直接访问，表示name的字符串键名
public final static String GTASK_JSON_NEW_ID = "new_id";
+ //定义字符串常量，在类的外部直接访问，表示new_id的字符串键名
+ public final static String GTASK_JSON_NOTES = "notes";//定义字符串常量，在类的外部直接访问，表示notes的字符串键名
- public final static String GTASK_JSON_NOTES = "notes";
-
- public final static String GTASK_JSON_PARENT_ID = "parent_id";
+ public final static String GTASK_JSON_PARENT_ID = "parent_id";//定义字符串常量，在类的外部直接访问，表示parent_id的字符串键名
- public final static String GTASK_JSON_PRIOR_SIBLING_ID = "prior_sibling_id";
+ public final static String GTASK_JSON_PRIOR_SIBLING_ID = "prior_sibling_id";//定义字符串常量，在类的外部直接访问，表示prior_sibling_id的字符串键名
- public final static String GTASK_JSON_RESULTS = "results";
+ public final static String GTASK_JSON_RESULTS = "results";//定义字符串常量，在类的外部直接访问，表示results的字符串键名
public final static String GTASK_JSON_SOURCE_LIST = "source_list";
- public final static String GTASK_JSON_TASKS = "tasks";
+ public final static String GTASK_JSON_TASKS = "tasks";//定义字符串常量，在类的外部直接访问，表示tasks的字符串键名
- public final static String GTASK_JSON_TYPE = "type";
+ public final static String GTASK_JSON_TYPE = "type";//定义字符串常量，在类的外部直接访问，表示type的字符串键名
- public final static String GTASK_JSON_TYPE_GROUP = "GROUP";
+ public final static String GTASK_JSON_TYPE_GROUP = "GROUP";//定义字符串常量，在类的外部直接访问，表示GROUP的字符串键名
- public final static String GTASK_JSON_TYPE_TASK = "TASK";
+ public final static String GTASK_JSON_TYPE_TASK = "TASK";//定义字符串常量，在类的外部直接访问，表示TASK的字符串键名
- public final static String GTASK_JSON_USER = "user";
+ public final static String GTASK_JSON_USER = "user";//定义字符串常量，在类的外部直接访问，表示user的字符串键名
- public final static String MIUI_FOLDER_PREFFIX = "[MIUI_Notes]";
+ public final static String MIUI_FOLDER_PREFFIX = "[MIUI_Notes]";//定义字符串常量，在类的外部直接访问，表示MIUI_Notes的字符串键名
- public final static String FOLDER_DEFAULT = "Default";
+ public final static String FOLDER_DEFAULT = "Default";//定义字符串常量，在类的外部直接访问，表示Default的字符串键名
- public final static String FOLDER_CALL_NOTE = "Call_Note";
+ public final static String FOLDER_CALL_NOTE = "Call_Note";//定义字符串常量，在类的外部直接访问，表示Call_Note的字符串键名
- public final static String FOLDER_META = "METADATA";
+ public final static String FOLDER_META = "METADATA";//定义字符串常量，在类的外部直接访问，表示METADATA的字符串键名
- public final static String META_HEAD_GTASK_ID = "meta_gid";
+ public final static String META_HEAD_GTASK_ID = "meta_gid";//定义字符串常量，在类的外部直接访问，表示meta_gid的字符串键名
- public final static String META_HEAD_NOTE = "meta_note";
+ public final static String META_HEAD_NOTE = "meta_note";//定义字符串常量，在类的外部直接访问，表示meta_note的字符串键名
- public final static String META_HEAD_DATA = "meta_data";
+ public final static String META_HEAD_DATA = "meta_data";//定义字符串常量，在类的外部直接访问，表示meta_data的字符串键名
- public final static String META_NOTE_NAME = "[META INFO] DON'T UPDATE AND DELETE";
+ public final static String META_NOTE_NAME = "[META INFO] DON'T UPDATE AND DELETE";//定义字符串常量，在类的外部直接访问，表示[META INFO] DON'T UPDATE AND DELETE的字符串键名
}
diff --git a/app/src/main/java/net/micode/notes/tool/ResourceParser.java b/app/src/main/java/net/micode/notes/tool/ResourceParser.java
index 1ad3ad6..86fab8f 100644
--- a/app/src/main/java/net/micode/notes/tool/ResourceParser.java
+++ b/app/src/main/java/net/micode/notes/tool/ResourceParser.java
@@ -22,22 +22,22 @@ import android.preference.PreferenceManager;
import net.micode.notes.R;
import net.micode.notes.ui.NotesPreferenceActivity;
-public class ResourceParser {
-
- public static final int YELLOW = 0;
- public static final int BLUE = 1;
- public static final int WHITE = 2;
+public class ResourceParser {
+//定义常量，用于表示颜色和字体大小
+ public static final int YELLOW = 0;//黄色
+ public static final int BLUE = 1;//蓝
+ public static final int WHITE = 2;//bai
public static final int GREEN = 3;
public static final int RED = 4;
- public static final int BG_DEFAULT_COLOR = YELLOW;
+ public static final int BG_DEFAULT_COLOR = YELLOW;//默认背景颜色为黄色
- public static final int TEXT_SMALL = 0;
- public static final int TEXT_MEDIUM = 1;
- public static final int TEXT_LARGE = 2;
- public static final int TEXT_SUPER = 3;
+ public static final int TEXT_SMALL = 0;//字体小号
+ public static final int TEXT_MEDIUM = 1;//中
+ public static final int TEXT_LARGE = 2;//da
+ public static final int TEXT_SUPER = 3;//chaoda
- public static final int BG_DEFAULT_FONT_SIZE = TEXT_MEDIUM;
+ public static final int BG_DEFAULT_FONT_SIZE = TEXT_MEDIUM;//默认大小为中
public static class NoteBgResources {
private final static int [] BG_EDIT_RESOURCES = new int [] {
@@ -46,7 +46,7 @@ public class ResourceParser {
R.drawable.edit_white,
R.drawable.edit_green,
R.drawable.edit_red
- };
+ };//定义私有静态常量G_EDIT_RESOURCES ，用于储存图片资源id
private final static int [] BG_EDIT_TITLE_RESOURCES = new int [] {
R.drawable.edit_title_yellow,
@@ -54,7 +54,7 @@ public class ResourceParser {
R.drawable.edit_title_white,
R.drawable.edit_title_green,
R.drawable.edit_title_red
- };
+ };//定义另一个私有静态常量，用于储存笔记编辑页面标题背景资源id
public static int getNoteBgResource(int id) {
return BG_EDIT_RESOURCES[id];
@@ -63,40 +63,40 @@ public class ResourceParser {
public static int getNoteTitleBgResource(int id) {
return BG_EDIT_TITLE_RESOURCES[id];
}
- }
+ }//初始化编辑页面标题背景资源id
- public static int getDefaultBgId(Context context) {
+ public static int getDefaultBgId(Context context) {//获取应用配置信息，判断用户是否自定义背景颜色
if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean(
NotesPreferenceActivity.PREFERENCE_SET_BG_COLOR_KEY, false)) {
return (int) (Math.random() * NoteBgResources.BG_EDIT_RESOURCES.length);
} else {
- return BG_DEFAULT_COLOR;
+ return BG_DEFAULT_COLOR;//若没有定义，返回默认颜色白色
}
}
public static class NoteItemBgResources {
- private final static int [] BG_FIRST_RESOURCES = new int [] {
- R.drawable.list_yellow_up,
- R.drawable.list_blue_up,
- R.drawable.list_white_up,
- R.drawable.list_green_up,
- R.drawable.list_red_up
+ private final static int [] BG_FIRST_RESOURCES = new int [] {//定义final整型数组 BG_FIRST_RESOURCES
+ R.drawable.list_yellow_up,//黄色背景上边框图案id
+ R.drawable.list_blue_up,//蓝色背景上边框图案id
+ R.drawable.list_white_up,//白色背景边框图案id
+ R.drawable.list_green_up,//绿色背景边框图案id
+ R.drawable.list_red_up//红色背景边框图案id
};
private final static int [] BG_NORMAL_RESOURCES = new int [] {
- R.drawable.list_yellow_middle,
- R.drawable.list_blue_middle,
- R.drawable.list_white_middle,
- R.drawable.list_green_middle,
- R.drawable.list_red_middle
+ R.drawable.list_yellow_middle,//黄色背景中间边框图案id
+ R.drawable.list_blue_middle,//蓝色背景中间边框图案id
+ R.drawable.list_white_middle,//白色背景中间边框图案id
+ R.drawable.list_green_middle,//绿色背景中间边框图案id
+ R.drawable.list_red_middle//红色背景中间边框图案id
};
private final static int [] BG_LAST_RESOURCES = new int [] {
- R.drawable.list_yellow_down,
- R.drawable.list_blue_down,
- R.drawable.list_white_down,
- R.drawable.list_green_down,
- R.drawable.list_red_down,
+ R.drawable.list_yellow_down,//黄色背景中下间边框图案id
+ R.drawable.list_blue_down,//蓝色背景中下间边框图案id
+ R.drawable.list_white_down,//白色背景中下间边框图案id
+ R.drawable.list_green_down,//绿色背景中下间边框图案id
+ R.drawable.list_red_down,//红色背景中下间边框图案id
};
private final static int [] BG_SINGLE_RESOURCES = new int [] {
@@ -110,33 +110,30 @@ public class ResourceParser {
public static int getNoteBgFirstRes(int id) {
return BG_FIRST_RESOURCES[id];
}
-
+//定义getNoteBgFirstRes方法，用于返回G_FIRST_RESOURCES[id]
public static int getNoteBgLastRes(int id) {
return BG_LAST_RESOURCES[id];
}
-
+//定义getNoteBgLastRes方法，用于返回 BG_LAST_RESOURCES[id]
public static int getNoteBgSingleRes(int id) {
return BG_SINGLE_RESOURCES[id];
}
-
+ //定义getNoteBgSingleRes方法，用于返回BG_SINGLE_RESOURCES[id]
public static int getNoteBgNormalRes(int id) {
return BG_NORMAL_RESOURCES[id];
}
-
- public static int getFolderBgRes() {
- return R.drawable.list_folder;
- }
+ //定义etNoteBgNormalRes方法，用于返回BG_NORMAL_RESOURCES[id]
+ public static int getFolderBgRes() {return R.drawable.list_folder;}//定义getFolderBgRes方法，用于返回 R.drawable.list_folder
}
- public static class WidgetBgResources {
+ public static class WidgetBgResources {//定义静态内部类WidgetBgResources
private final static int [] BG_2X_RESOURCES = new int [] {
R.drawable.widget_2x_yellow,
R.drawable.widget_2x_blue,
R.drawable.widget_2x_white,
R.drawable.widget_2x_green,
R.drawable.widget_2x_red,
- };
-
+ };// 管理小部件2x2格式不同颜色资源图片
public static int getWidget2xBgResource(int id) {
return BG_2X_RESOURCES[id];
}
@@ -147,20 +144,20 @@ public class ResourceParser {
R.drawable.widget_4x_white,
R.drawable.widget_4x_green,
R.drawable.widget_4x_red
- };
+ };// 管理小部件4x4格式不同颜色资源图片
public static int getWidget4xBgResource(int id) {
return BG_4X_RESOURCES[id];
}
}
- public static class TextAppearanceResources {
+ public static class TextAppearanceResources {//定义TextAppearanceResources 静态内部类
private final static int [] TEXTAPPEARANCE_RESOURCES = new int [] {
R.style.TextAppearanceNormal,
R.style.TextAppearanceMedium,
R.style.TextAppearanceLarge,
R.style.TextAppearanceSuper
- };
+ };//分别对应中等，大号，超大的文本外观样式
public static int getTexAppearanceResource(int id) {
/**
diff --git a/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java b/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
index 85723be..75de484 100644
--- a/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
+++ b/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
@@ -41,30 +41,42 @@ import java.io.IOException;
public class AlarmAlertActivity extends Activity implements OnClickListener, OnDismissListener {
- private long mNoteId;
- private String mSnippet;
- private static final int SNIPPET_PREW_MAX_LEN = 60;
+ private long mNoteId; //用于存储笔记Id
+ private String mSnippet; //用于存储笔记内容摘要
+ private static final int SNIPPET_PREW_MAX_LEN = 60;//限制笔记长度
MediaPlayer mPlayer;
+
+ //onCreate() 函数在 Activity 初始化时调用，用于初始化
+ //savedInstanceState 该参数用于恢复 Activity 状态。
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+
+ //界面显示：无标题
requestWindowFeature(Window.FEATURE_NO_TITLE);
+ //获取 Window 对象，添加 FLAG_SHOW_WHEN_LOCKED 标记
final Window win = getWindow();
win.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
+ //如果屏幕没亮，添加一系列 屏幕唤醒标记
if (!isScreenOn()) {
- win.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
- | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
- | WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON
+ win.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON //保持窗口常亮
+ | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON //点亮窗口
+ | WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON //允许在窗口点亮时锁屏
| WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR);
}
+ //获取Intent对象
Intent intent = getIntent();
+ //从Intent对象中获取笔记的 Id 和内容
try {
mNoteId = Long.valueOf(intent.getData().getPathSegments().get(1));
+
+ //根据便签Id从数据库中获取便签内容
+ //getContentResolver() 实现数据共享，实例存储
mSnippet = DataUtils.getSnippetById(this.getContentResolver(), mNoteId);
mSnippet = mSnippet.length() > SNIPPET_PREW_MAX_LEN ? mSnippet.substring(0,
SNIPPET_PREW_MAX_LEN) + getResources().getString(R.string.notelist_string_info)
@@ -74,6 +86,7 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
return;
}
+ //创建 MediaPlayer 对象，根据笔记是否存在数据库中来展示操作对话框或者直接退出
mPlayer = new MediaPlayer();
if (DataUtils.visibleInNoteDatabase(getContentResolver(), mNoteId, Notes.TYPE_NOTE)) {
showActionDialog();
@@ -83,29 +96,38 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
}
}
+ //用于判断屏幕是否被唤醒（亮着）
private boolean isScreenOn() {
PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
return pm.isScreenOn();
}
+ //用于实现报警铃声的播放
private void playAlarmSound() {
+ //获取系统默认的铃声
Uri url = RingtoneManager.getActualDefaultRingtoneUri(this, RingtoneManager.TYPE_ALARM);
+ //获取静音模式下允许响铃的类型
int silentModeStreams = Settings.System.getInt(getContentResolver(),
Settings.System.MODE_RINGER_STREAMS_AFFECTED, 0);
+ //判断闹钟铃声是否被静音模式影响
+ //若被影响则设置播放音频类型为允许响铃的类型
+ //若违背影响则设置音频为默认类型
if ((silentModeStreams & (1 << AudioManager.STREAM_ALARM)) != 0) {
mPlayer.setAudioStreamType(silentModeStreams);
} else {
mPlayer.setAudioStreamType(AudioManager.STREAM_ALARM);
}
try {
- mPlayer.setDataSource(this, url);
- mPlayer.prepare();
- mPlayer.setLooping(true);
- mPlayer.start();
+ mPlayer.setDataSource(this, url); //设置报警铃声
+ mPlayer.prepare(); //准备同步
+ mPlayer.setLooping(true); //设置循环播放
+ mPlayer.start(); //开始播放
} catch (IllegalArgumentException e) {
// TODO Auto-generated catch block
+
+ //以下的 e.printStackTrace() 函数功能是抛出异常，还将显示出更深的调用信息
e.printStackTrace();
} catch (SecurityException e) {
// TODO Auto-generated catch block
@@ -119,32 +141,52 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
}
}
+
+ //创建一个对话框，标题为app的名字，内容为mSnippet，确定按钮为notealert_ok，
+ // 当屏幕开启时，取消按钮为notealert_enter，点击弹出框外部可以隐藏弹出框
private void showActionDialog() {
AlertDialog.Builder dialog = new AlertDialog.Builder(this);
+ //为对话框设置标题
dialog.setTitle(R.string.app_name);
+ //为对话框设置内容
dialog.setMessage(mSnippet);
+ //给对话框添加“OK”按钮
dialog.setPositiveButton(R.string.notealert_ok, this);
+
if (isScreenOn()) {
+ //给对话框添加“CANCEL”按钮
dialog.setNegativeButton(R.string.notealert_enter, this);
}
+ //给对话框设置监听器
dialog.show().setOnDismissListener(this);
}
+ //当对话框界面内某个按钮被点击时调用以下方法
+ // 接收 对话框界面 和 点击的按钮位置which 为参数
public void onClick(DialogInterface dialog, int which) {
+ //switch语句，根据按钮位置的不同，执行不同的操作
switch (which) {
+ //当点击点击的是返回按键
case DialogInterface.BUTTON_NEGATIVE:
+ //将编辑的便签内容传输到特定类中
Intent intent = new Intent(this, NoteEditActivity.class);
+ //设置操作属性
intent.setAction(Intent.ACTION_VIEW);
+ //创建一个特定的Note Id传输给便签
intent.putExtra(Intent.EXTRA_UID, mNoteId);
+ //开始操作
startActivity(intent);
break;
+ //如果是其他按钮被点击则不执行任何操作
default:
break;
}
}
public void onDismiss(DialogInterface dialog) {
+ //终止报警声音
stopAlarmSound();
+ //完成动作
finish();
}
@@ -152,6 +194,7 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
if (mPlayer != null) {
mPlayer.stop();
mPlayer.release();
+ //释放 MediaPlayer(媒体播放器)对象
mPlayer = null;
}
}
diff --git a/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java b/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
index f221202..edd2b85 100644
--- a/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
+++ b/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
@@ -28,8 +28,10 @@ import net.micode.notes.data.Notes;
import net.micode.notes.data.Notes.NoteColumns;
+//定时向用户推送闹钟提醒
public class AlarmInitReceiver extends BroadcastReceiver {
+ //对数据库的操作，调用笔记Id和时钟时间
private static final String [] PROJECTION = new String [] {
NoteColumns.ID,
NoteColumns.ALERTED_DATE
@@ -38,16 +40,23 @@ public class AlarmInitReceiver extends BroadcastReceiver {
private static final int COLUMN_ID = 0;
private static final int COLUMN_ALERTED_DATE = 1;
+ //重写 BroadcastReceiver 的 onReceive 方法
@Override
public void onReceive(Context context, Intent intent) {
+
+ //获取当前系统时间
long currentDate = System.currentTimeMillis();
+
+ //查询数据库，找出大于当前系统时间、类型相等的笔记的记录
Cursor c = context.getContentResolver().query(Notes.CONTENT_NOTE_URI,
PROJECTION,
NoteColumns.ALERTED_DATE + ">? AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE,
new String[] { String.valueOf(currentDate) },
null);
+ //当查询结果不为空时
if (c != null) {
+ // 如果有符合要求的记录，就遍历每一条记录
if (c.moveToFirst()) {
do {
long alertDate = c.getLong(COLUMN_ALERTED_DATE);
diff --git a/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java b/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
index 54e503b..1b4d096 100644
--- a/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
+++ b/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
@@ -24,6 +24,8 @@ public class AlarmReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
intent.setClass(context, AlarmAlertActivity.class);
+
+ //为intent对象添加一个标志，表示它将启动一个新的任务栈
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
context.startActivity(intent);
}
diff --git a/app/src/main/java/net/micode/notes/ui/DateTimePicker.java b/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
index 496b0cd..ab88e69 100644
--- a/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
+++ b/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
@@ -30,6 +30,7 @@ import android.widget.NumberPicker;
public class DateTimePicker extends FrameLayout {
+ //初始化控件
private static final boolean DEFAULT_ENABLE_STATE = true;
private static final int HOURS_IN_HALF_DAY = 12;
@@ -46,11 +47,12 @@ public class DateTimePicker extends FrameLayout {
private static final int AMPM_SPINNER_MIN_VAL = 0;
private static final int AMPM_SPINNER_MAX_VAL = 1;
+ //设置闹钟的变量
private final NumberPicker mDateSpinner;
private final NumberPicker mHourSpinner;
private final NumberPicker mMinuteSpinner;
private final NumberPicker mAmPmSpinner;
- private Calendar mDate;
+ private Calendar mDate; //用于操作时间
private String[] mDateDisplayValues = new String[DAYS_IN_ALL_WEEK];
@@ -64,7 +66,20 @@ public class DateTimePicker extends FrameLayout {
private OnDateTimeChangedListener mOnDateTimeChangedListener;
+ /*
+ 设置时间选择器的监听器，
+ 包括了日期选择器的监听器 mOnDateChangedListener，
+ 小时选择器的监听器 mOnHourChangedListener，
+ 分钟选择器的监听器mOnMinuteChangedListener，
+ 上午和下午选择器的监听器 mOnAmPmChangedListener
+
+ */
+
+
+ //日期选择器的监听器
private NumberPicker.OnValueChangeListener mOnDateChangedListener = new NumberPicker.OnValueChangeListener() {
+
+ //将目前的日期传给 mDate，updateDateControl是同步操作
@Override
public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
mDate.add(Calendar.DAY_OF_YEAR, newVal - oldVal);
@@ -73,39 +88,58 @@ public class DateTimePicker extends FrameLayout {
}
};
+ //选择器的监听器
private NumberPicker.OnValueChangeListener mOnHourChangedListener = new NumberPicker.OnValueChangeListener() {
+
@Override
public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
boolean isDateChanged = false;
Calendar cal = Calendar.getInstance();
if (!mIs24HourView) {
+
+ //这里是对于12小时制时，晚上11点和12点交替时对日期的更改
if (!mIsAm && oldVal == HOURS_IN_HALF_DAY - 1 && newVal == HOURS_IN_HALF_DAY) {
cal.setTimeInMillis(mDate.getTimeInMillis());
cal.add(Calendar.DAY_OF_YEAR, 1);
isDateChanged = true;
- } else if (mIsAm && oldVal == HOURS_IN_HALF_DAY && newVal == HOURS_IN_HALF_DAY - 1) {
+ }
+
+ //这里是对于12小时制时，凌晨11点和12点交替时对日期的更改
+ else if (mIsAm && oldVal == HOURS_IN_HALF_DAY && newVal == HOURS_IN_HALF_DAY - 1) {
cal.setTimeInMillis(mDate.getTimeInMillis());
cal.add(Calendar.DAY_OF_YEAR, -1);
isDateChanged = true;
}
+
+ //这里是对于12小时制时，中午11点和12点交替时对AM和PM的更改
if (oldVal == HOURS_IN_HALF_DAY - 1 && newVal == HOURS_IN_HALF_DAY ||
oldVal == HOURS_IN_HALF_DAY && newVal == HOURS_IN_HALF_DAY - 1) {
mIsAm = !mIsAm;
updateAmPmControl();
}
} else {
+
+ //这里是对于24小时制时，晚上11点和12点交替时对日期的更改
if (oldVal == HOURS_IN_ALL_DAY - 1 && newVal == 0) {
cal.setTimeInMillis(mDate.getTimeInMillis());
cal.add(Calendar.DAY_OF_YEAR, 1);
isDateChanged = true;
- } else if (oldVal == 0 && newVal == HOURS_IN_ALL_DAY - 1) {
+ }
+
+ //这里是对于24小时制时，凌晨11点和12点交替时对日期的更改
+ else if (oldVal == 0 && newVal == HOURS_IN_ALL_DAY - 1) {
cal.setTimeInMillis(mDate.getTimeInMillis());
cal.add(Calendar.DAY_OF_YEAR, -1);
isDateChanged = true;
}
}
+
+ //用数字选择器给 newHour 赋值
int newHour = mHourSpinner.getValue() % HOURS_IN_HALF_DAY + (mIsAm ? 0 : HOURS_IN_HALF_DAY);
+
+ //将新的Hour值传给mDate
mDate.set(Calendar.HOUR_OF_DAY, newHour);
+
onDateTimeChanged();
if (isDateChanged) {
setCurrentYear(cal.get(Calendar.YEAR));
@@ -115,12 +149,13 @@ public class DateTimePicker extends FrameLayout {
}
};
+ //分钟选择器的监听器
private NumberPicker.OnValueChangeListener mOnMinuteChangedListener = new NumberPicker.OnValueChangeListener() {
@Override
public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
int minValue = mMinuteSpinner.getMinValue();
int maxValue = mMinuteSpinner.getMaxValue();
- int offset = 0;
+ int offset = 0; //设置一个小时改变的记录数据
if (oldVal == maxValue && newVal == minValue) {
offset += 1;
} else if (oldVal == minValue && newVal == maxValue) {
@@ -144,6 +179,7 @@ public class DateTimePicker extends FrameLayout {
}
};
+ // 上午和下午选择器的监听器
private NumberPicker.OnValueChangeListener mOnAmPmChangedListener = new NumberPicker.OnValueChangeListener() {
@Override
public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
@@ -163,34 +199,43 @@ public class DateTimePicker extends FrameLayout {
int dayOfMonth, int hourOfDay, int minute);
}
+ // 通过对数据库的访问，获取当前系统时间
public DateTimePicker(Context context) {
this(context, System.currentTimeMillis());
}
+ // 获得一个天文数字（1970年至今的秒数），需要DateFormat将其变得有意义
public DateTimePicker(Context context, long date) {
this(context, date, DateFormat.is24HourFormat(context));
}
public DateTimePicker(Context context, long date, boolean is24HourView) {
- super(context);
+ super(context);//获取系统时间
mDate = Calendar.getInstance();
mInitialising = true;
mIsAm = getCurrentHourOfDay() >= HOURS_IN_HALF_DAY;
+
+ //在控件中填充R.layout.datetime_picker布局
inflate(context, R.layout.datetime_picker, this);
+ //获取年月日Spinner，设置最小值和最大值，设置值改变监听
mDateSpinner = (NumberPicker) findViewById(R.id.date);
mDateSpinner.setMinValue(DATE_SPINNER_MIN_VAL);
mDateSpinner.setMaxValue(DATE_SPINNER_MAX_VAL);
mDateSpinner.setOnValueChangedListener(mOnDateChangedListener);
+ // 获取时Spinner，设置值改变监听
mHourSpinner = (NumberPicker) findViewById(R.id.hour);
mHourSpinner.setOnValueChangedListener(mOnHourChangedListener);
+
+ // 获取分Spinner，设置最小值、最大值、长按更新间隔和值改变监听
mMinuteSpinner = (NumberPicker) findViewById(R.id.minute);
mMinuteSpinner.setMinValue(MINUT_SPINNER_MIN_VAL);
mMinuteSpinner.setMaxValue(MINUT_SPINNER_MAX_VAL);
mMinuteSpinner.setOnLongPressUpdateInterval(100);
mMinuteSpinner.setOnValueChangedListener(mOnMinuteChangedListener);
+ // 获取上午/下午Spinner，设置最小值、最大值、显示值和值改变监听
String[] stringsForAmPm = new DateFormatSymbols().getAmPmStrings();
mAmPmSpinner = (NumberPicker) findViewById(R.id.amPm);
mAmPmSpinner.setMinValue(AMPM_SPINNER_MIN_VAL);
@@ -214,8 +259,12 @@ public class DateTimePicker extends FrameLayout {
mInitialising = false;
}
+ // 设置控件及其子控件的可用状态
@Override
public void setEnabled(boolean enabled) {
+
+ // 如果mIsEnabled变量与传入的enabled相同，则不进行操作，
+ // 否则将控件及其子控件的可用状态更新为enabled并更新mIsEnabled变量。
if (mIsEnabled == enabled) {
return;
}
@@ -434,6 +483,7 @@ public class DateTimePicker extends FrameLayout {
updateAmPmControl();
}
+ // 更新日期控件，根据当前日期更新展示的日期列表
private void updateDateControl() {
Calendar cal = Calendar.getInstance();
cal.setTimeInMillis(mDate.getTimeInMillis());
@@ -448,6 +498,8 @@ public class DateTimePicker extends FrameLayout {
mDateSpinner.invalidate();
}
+ // 更新上午/下午控件，如果是24小时制，则隐藏此控件；
+ // 否则根据当前选择的时间更新展示的上午/下午选项
private void updateAmPmControl() {
if (mIs24HourView) {
mAmPmSpinner.setVisibility(View.GONE);
@@ -458,6 +510,7 @@ public class DateTimePicker extends FrameLayout {
}
}
+ // 更新小时控件，根据当前选择的时间更新展示的小时选项
private void updateHourControl() {
if (mIs24HourView) {
mHourSpinner.setMinValue(HOUR_SPINNER_MIN_VAL_24_HOUR_VIEW);
diff --git a/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java b/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
index 2c47ba4..be8d4ae 100644
--- a/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
+++ b/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
@@ -31,37 +31,52 @@ import android.text.format.DateUtils;
public class DateTimePickerDialog extends AlertDialog implements OnClickListener {
- private Calendar mDate = Calendar.getInstance();
+ private Calendar mDate = Calendar.getInstance();//便于时间操作
private boolean mIs24HourView;
- private OnDateTimeSetListener mOnDateTimeSetListener;
- private DateTimePicker mDateTimePicker;
+ private OnDateTimeSetListener mOnDateTimeSetListener;//时间日期滚动控件
+ private DateTimePicker mDateTimePicker;//用于设置或获取日期和时间
public interface OnDateTimeSetListener {
+
+ //在选择日期后返回结果
void OnDateTimeSet(AlertDialog dialog, long date);
}
public DateTimePickerDialog(Context context, long date) {
super(context);
mDateTimePicker = new DateTimePicker(context);
- setView(mDateTimePicker);
+ setView(mDateTimePicker); //设置一个子视图
+
+ //设置一个监听器
mDateTimePicker.setOnDateTimeChangedListener(new OnDateTimeChangedListener() {
public void onDateTimeChanged(DateTimePicker view, int year, int month,
int dayOfMonth, int hourOfDay, int minute) {
+
+ //设置日期时间为用户选择的日期和时间
mDate.set(Calendar.YEAR, year);
mDate.set(Calendar.MONTH, month);
mDate.set(Calendar.DAY_OF_MONTH, dayOfMonth);
mDate.set(Calendar.HOUR_OF_DAY, hourOfDay);
mDate.set(Calendar.MINUTE, minute);
+
+ // 更新标题为选择的日期和时间
updateTitle(mDate.getTimeInMillis());
}
});
- mDate.setTimeInMillis(date);
- mDate.set(Calendar.SECOND, 0);
+
+ mDate.setTimeInMillis(date);// 初始化mDate对象
+ mDate.set(Calendar.SECOND, 0);// 将秒数设为0
mDateTimePicker.setCurrentDate(mDate.getTimeInMillis());
+
+ // 为对话框设置一个确定按钮
setButton(context.getString(R.string.datetime_dialog_ok), this);
+
+ // 为对话框设置一个取消按钮，传入null为点击事件处理器
setButton2(context.getString(R.string.datetime_dialog_cancel), (OnClickListener)null);
+
+ //根据当前的时间的时间格式设置是否使用24小时制显示时间
set24HourView(DateFormat.is24HourFormat(this.getContext()));
- updateTitle(mDate.getTimeInMillis());
+ updateTitle(mDate.getTimeInMillis());// 更新对话框的标题为初始日期和时间
}
public void set24HourView(boolean is24HourView) {
@@ -73,15 +88,24 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener
}
private void updateTitle(long date) {
+
+ // 定义一个标识变量，用于根据给定的日期时间更新标题栏的显示
int flag =
DateUtils.FORMAT_SHOW_YEAR |
DateUtils.FORMAT_SHOW_DATE |
DateUtils.FORMAT_SHOW_TIME;
+
+ // 根据用户选择的，决定是否使用24小时制
flag |= mIs24HourView ? DateUtils.FORMAT_24HOUR : DateUtils.FORMAT_24HOUR;
+
+ // 将日期转化为字符串，并设置标题
setTitle(DateUtils.formatDateTime(this.getContext(), date, flag));
}
+ // 用于处理对话框的点击事件
public void onClick(DialogInterface arg0, int arg1) {
+
+ // 如果有日期时间设置监听器，则传递当前日期时间
if (mOnDateTimeSetListener != null) {
mOnDateTimeSetListener.OnDateTimeSet(this, mDate.getTimeInMillis());
}
diff --git a/app/src/main/java/net/micode/notes/ui/DropdownMenu.java b/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
index 613dc74..0cdbfbc 100644
--- a/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
+++ b/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
@@ -28,16 +28,23 @@ import android.widget.PopupMenu.OnMenuItemClickListener;
import net.micode.notes.R;
public class DropdownMenu {
+ // 定义一个按钮，用于显示和触发下拉菜单
private Button mButton;
+ // 定义一个弹出菜单，用于显示菜单项
private PopupMenu mPopupMenu;
+ // 定义一个菜单类，用于存储菜单项
private Menu mMenu;
public DropdownMenu(Context context, Button button, int menuId) {
mButton = button;
+ // 设置背景为下拉图标
mButton.setBackgroundResource(R.drawable.dropdown_icon);
+ // 初始化弹出菜单，并绑定按钮对象
mPopupMenu = new PopupMenu(context, mButton);
+ // 获取菜单对象，加载菜单资源
mMenu = mPopupMenu.getMenu();
mPopupMenu.getMenuInflater().inflate(menuId, mMenu);
+ // 设置点击监听器，点击时弹出菜单
mButton.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
mPopupMenu.show();
@@ -45,16 +52,20 @@ public class DropdownMenu {
});
}
+ // 用于设置下拉菜单点击监听器
public void setOnDropdownMenuItemClickListener(OnMenuItemClickListener listener) {
+ // 如果弹出菜单不为空则为其设置监听器
if (mPopupMenu != null) {
mPopupMenu.setOnMenuItemClickListener(listener);
}
}
+ // 可根据id查找菜单项
public MenuItem findItem(int id) {
return mMenu.findItem(id);
}
+ // 用于设置按钮标题
public void setTitle(CharSequence title) {
mButton.setText(title);
}
diff --git a/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java b/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
index 96b77da..930f65d 100644
--- a/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
+++ b/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
@@ -29,27 +29,35 @@ import net.micode.notes.data.Notes;
import net.micode.notes.data.Notes.NoteColumns;
+// 指定每个列表项的布局模板，指定Cursor中的每个字段应该绑定到那些视图上
+// 以文件夹的形式展现给用户
public class FoldersListAdapter extends CursorAdapter {
+ // 指定查询时返回的列，NoteColumns是一个接口
public static final String [] PROJECTION = {
NoteColumns.ID,
NoteColumns.SNIPPET
};
+ // 定义查询文件夹表是返回的列的索引
public static final int ID_COLUMN = 0;
public static final int NAME_COLUMN = 1;
+ // 在列表视图中显示文件夹数据
public FoldersListAdapter(Context context, Cursor c) {
super(context, c);
// TODO Auto-generated constructor stub
}
+ // 创建一个新视图，并初始化子标签
@Override
public View newView(Context context, Cursor cursor, ViewGroup parent) {
return new FolderListItem(context);
}
+ // 用于绑定视图和数据
@Override
public void bindView(View view, Context context, Cursor cursor) {
+ // 判断视图对象是否为 FolderListItem 的实例
if (view instanceof FolderListItem) {
String folderName = (cursor.getLong(ID_COLUMN) == Notes.ID_ROOT_FOLDER) ? context
.getString(R.string.menu_move_parent_folder) : cursor.getString(NAME_COLUMN);
@@ -57,21 +65,27 @@ public class FoldersListAdapter extends CursorAdapter {
}
}
+ // 获取对应文件夹名称
public String getFolderName(Context context, int position) {
Cursor cursor = (Cursor) getItem(position);
+ // 根据文件夹id获取文件夹的名称
return (cursor.getLong(ID_COLUMN) == Notes.ID_ROOT_FOLDER) ? context
.getString(R.string.menu_move_parent_folder) : cursor.getString(NAME_COLUMN);
}
+ // 用于显示文件夹名称
private class FolderListItem extends LinearLayout {
private TextView mName;
public FolderListItem(Context context) {
super(context);
+ // 将布局文件加载到当前视图
inflate(context, R.layout.folder_list_item, this);
+ // 将获取到的TextView对象赋值给mName
mName = (TextView) findViewById(R.id.tv_folder_name);
}
+ // 将给定的名称设置到mName中
public void bind(String name) {
mName.setText(name);
}
diff --git a/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
index 96a9ff8..0a2a4de 100644
--- a/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
+++ b/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
@@ -22,19 +22,31 @@ import android.app.AlertDialog;
import android.app.PendingIntent;
import android.app.SearchManager;
import android.appwidget.AppWidgetManager;
+import android.content.ContentResolver;
import android.content.ContentUris;
+import android.content.ContentValues;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
+import android.database.Cursor;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
import android.graphics.Paint;
+import android.net.Uri;
+import android.nfc.Tag;
+import android.os.Build;
import android.os.Bundle;
+import android.provider.DocumentsContract;
import android.preference.PreferenceManager;
+import android.provider.MediaStore;
+import android.text.Editable;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.TextUtils;
import android.text.format.DateUtils;
import android.text.style.BackgroundColorSpan;
+import android.text.style.ImageSpan;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
@@ -58,6 +70,7 @@ import net.micode.notes.data.Notes.TextNote;
import net.micode.notes.model.WorkingNote;
import net.micode.notes.model.WorkingNote.NoteSettingChangedListener;
import net.micode.notes.tool.DataUtils;
+import net.micode.notes.tool.FontColorParser;
import net.micode.notes.tool.ResourceParser;
import net.micode.notes.tool.ResourceParser.TextAppearanceResources;
import net.micode.notes.ui.DateTimePickerDialog.OnDateTimeSetListener;
@@ -65,6 +78,10 @@ import net.micode.notes.ui.NoteEditText.OnTextViewChangeListener;
import net.micode.notes.widget.NoteWidgetProvider_2x;
import net.micode.notes.widget.NoteWidgetProvider_4x;
+import org.w3c.dom.Document;
+
+import java.io.File;
+import java.io.FileNotFoundException;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -74,16 +91,19 @@ import java.util.regex.Pattern;
public class NoteEditActivity extends Activity implements OnClickListener,
NoteSettingChangedListener, OnTextViewChangeListener {
+ // 头部视图空间
private class HeadViewHolder {
+ // 文本视图，显示修改的日期
public TextView tvModified;
-
+ // 图像视图，显示警告图标
public ImageView ivAlertIcon;
-
+ // 文本视图，显示警告日期
public TextView tvAlertDate;
-
+ // 图像按钮，用于设置背景颜色
public ImageView ibSetBgColor;
}
+ // 用于存储不同背景选择按钮的id和对应颜色
private static final Map<Integer, Integer> sBgSelectorBtnsMap = new HashMap<Integer, Integer>();
static {
sBgSelectorBtnsMap.put(R.id.iv_bg_yellow, ResourceParser.YELLOW);
@@ -93,6 +113,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
sBgSelectorBtnsMap.put(R.id.iv_bg_white, ResourceParser.WHITE);
}
+ // 用于存储不同颜色值和对应的背景选择器的id
private static final Map<Integer, Integer> sBgSelectorSelectionMap = new HashMap<Integer, Integer>();
static {
sBgSelectorSelectionMap.put(ResourceParser.YELLOW, R.id.iv_bg_yellow_select);
@@ -102,6 +123,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
sBgSelectorSelectionMap.put(ResourceParser.WHITE, R.id.iv_bg_white_select);
}
+ // 用于存储不同字体大小按钮id和对应的字体大小
private static final Map<Integer, Integer> sFontSizeBtnsMap = new HashMap<Integer, Integer>();
static {
sFontSizeBtnsMap.put(R.id.ll_font_large, ResourceParser.TEXT_LARGE);
@@ -110,6 +132,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
sFontSizeBtnsMap.put(R.id.ll_font_super, ResourceParser.TEXT_SUPER);
}
+ // 用于存储不同字体大小和对应的字体选择器的id
private static final Map<Integer, Integer> sFontSelectorSelectionMap = new HashMap<Integer, Integer>();
static {
sFontSelectorSelectionMap.put(ResourceParser.TEXT_LARGE, R.id.iv_large_select);
@@ -117,47 +140,73 @@ public class NoteEditActivity extends Activity implements OnClickListener,
sFontSelectorSelectionMap.put(ResourceParser.TEXT_MEDIUM, R.id.iv_medium_select);
sFontSelectorSelectionMap.put(ResourceParser.TEXT_SUPER, R.id.iv_super_select);
}
-
+ // 用于存储不同文本颜色的按钮id和对应文本颜色
+ private static final Map<Integer, Integer> sTxtColorBtnsMaps = new HashMap<Integer, Integer>();
+ static {
+ sTxtColorBtnsMaps.put(R.id.ll_font_default, FontColorParser.Default);
+ sTxtColorBtnsMaps.put(R.id.ll_font_green, FontColorParser.green);
+ sTxtColorBtnsMaps.put(R.id.ll_font_red, FontColorParser.red);
+ sTxtColorBtnsMaps.put(R.id.ll_font_Bright_blue, FontColorParser.Bright_blue);
+ }
+ // 用于存储不同文本颜色和其对应选择器id
+ private static final Map<Integer, Integer> sTxtColorSelectorSelectionMap = new HashMap<Integer, Integer>();
+ static {
+ sTxtColorSelectorSelectionMap.put(FontColorParser.Default ,R.id.iv_default_select);
+ sTxtColorSelectorSelectionMap.put(FontColorParser.red ,R.id.iv_red_select);
+ sTxtColorSelectorSelectionMap.put(FontColorParser.Bright_blue ,R.id.iv_Bright_blue_select);
+ sTxtColorSelectorSelectionMap.put(FontColorParser.green ,R.id.iv_green_select);
+ }
private static final String TAG = "NoteEditActivity";
-
+ // 存储笔记的头部视图
private HeadViewHolder mNoteHeaderHolder;
-
+ // 存储头部视图图面板
private View mHeadViewPanel;
private View mNoteBgColorSelector;
-
+ private View mTxtColorSelector;
private View mFontSizeSelector;
-
+ // 用于存储笔记编辑器
private EditText mNoteEditor;
-
+ // 用于存储笔记编辑面板
private View mNoteEditorPanel;
-
+ // 用于存储正在编辑的笔记
private WorkingNote mWorkingNote;
-
+ // 用于存储用户的偏好设置
private SharedPreferences mSharedPrefs;
+ private int mTxtColorId;
private int mFontSizeId;
-
+ // 用于表示字体大小偏好设置键
+ private static final String PREFERENCE_TXT_COLOR = "pref_font_color";
private static final String PREFERENCE_FONT_SIZE = "pref_font_size";
-
+ // 用于限制快捷方式图标标题的最大长度
private static final int SHORTCUT_ICON_TITLE_MAX_LEN = 10;
-
+ // 表示已被选中的标签符号
public static final String TAG_CHECKED = String.valueOf('\u221A');
+ // 表示未被选中的标签符号
public static final String TAG_UNCHECKED = String.valueOf('\u25A1');
-
+ // 用于唤出相册操作
+ public final int OPEN_GALLERY = 1;
+ // 用于存储文本编辑列表
private LinearLayout mEditTextList;
+ // 用于存储用户的输入内容
private String mUserQuery;
+
private Pattern mPattern;
+ // 在活动创建时进行一些初始化操作
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
this.setContentView(R.layout.note_edit);
+ // 如果传入的参数为空，且调用initActivityState方法传入getIntent方法返回的Intent对象返回false，
+ // 表示活动状态初始化失败，结束活动
if (savedInstanceState == null && !initActivityState(getIntent())) {
finish();
return;
}
+ // 初始化一些资源
initResources();
}
@@ -165,20 +214,27 @@ public class NoteEditActivity extends Activity implements OnClickListener,
* Current activity may be killed when the memory is low. Once it is killed, for another time
* user load this activity, we should restore the former state
*/
+ // 为防止内存不足时程序的终止，在这里有一个保存现场的函数
+ // 用于在活动恢复时执行一些操作
@Override
protected void onRestoreInstanceState(Bundle savedInstanceState) {
super.onRestoreInstanceState(savedInstanceState);
if (savedInstanceState != null && savedInstanceState.containsKey(Intent.EXTRA_UID)) {
+ // 创建一个新的Intent对象，设置其动作为Intent.ACTION_VIEW
Intent intent = new Intent(Intent.ACTION_VIEW);
+ // 将Intent.EXTRA_UID作为额外数据放入intent对象中
intent.putExtra(Intent.EXTRA_UID, savedInstanceState.getLong(Intent.EXTRA_UID));
+ // 如果初始化活动失败则结束活动
if (!initActivityState(intent)) {
finish();
return;
}
+ // 打印一条调试信息，表示从被杀死的活动中恢复
Log.d(TAG, "Restoring from killed activity");
}
}
+ // 用于返回活动初始化状态
private boolean initActivityState(Intent intent) {
/**
* If the user specified the {@link Intent#ACTION_VIEW} but not provided with id,
@@ -192,25 +248,30 @@ public class NoteEditActivity extends Activity implements OnClickListener,
/**
* Starting from the searched result
*/
+ // 根据键值查找ID
if (intent.hasExtra(SearchManager.EXTRA_DATA_KEY)) {
noteId = Long.parseLong(intent.getStringExtra(SearchManager.EXTRA_DATA_KEY));
mUserQuery = intent.getStringExtra(SearchManager.USER_QUERY);
}
-
+ // 如果在内容提供者中，noteId对应的笔记不可见或者不是笔记类型
if (!DataUtils.visibleInNoteDatabase(getContentResolver(), noteId, Notes.TYPE_NOTE)) {
Intent jump = new Intent(this, NotesListActivity.class);
+ //程序将跳转到上面声明的intent——jump
startActivity(jump);
showToast(R.string.error_note_not_exist);
finish();
return false;
} else {
+ // 否则向 load函数 传入当前活动和noteId作为参数，返回一个WorkingNote对象
mWorkingNote = WorkingNote.load(this, noteId);
+ // 如果正在编辑的笔记为空
if (mWorkingNote == null) {
Log.e(TAG, "load note failed with note id" + noteId);
finish();
return false;
}
}
+ // 获取当前活动的窗口对象，设置软输入状态为隐藏状态并调整大小
getWindow().setSoftInputMode(
WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN
| WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
@@ -243,6 +304,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
} else {
mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId,
widgetType, bgResId);
+ // 将空笔记转换为通话笔记
mWorkingNote.convertToCallNote(phoneNumber, callDate);
}
} else {
@@ -258,6 +320,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
finish();
return false;
}
+ // 设置其设置状态为改变监听器
mWorkingNote.setOnSettingStatusChangedListener(this);
return true;
}
@@ -268,9 +331,12 @@ public class NoteEditActivity extends Activity implements OnClickListener,
initNoteScreen();
}
+ // 用于初始化笔记的界面和功能
private void initNoteScreen() {
+ // 设置笔记编辑器的文字外观，根据字体大小的id选择合适的资源
mNoteEditor.setTextAppearance(this, TextAppearanceResources
.getTexAppearanceResource(mFontSizeId));
+ // 设置外观
if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
switchToListMode(mWorkingNote.getContent());
} else {
@@ -295,18 +361,23 @@ public class NoteEditActivity extends Activity implements OnClickListener,
showAlertHeader();
}
+ // 设置闹钟显示
private void showAlertHeader() {
+ // 判断当前笔记是否有闹钟提醒
if (mWorkingNote.hasClockAlert()) {
long time = System.currentTimeMillis();
+ // 如果系统时间大于闹钟设置的时间，则闹钟时间设置为在系统时间的基础上加一个时间跨度
if (time > mWorkingNote.getAlertDate()) {
mNoteHeaderHolder.tvAlertDate.setText(R.string.note_alert_expired);
} else {
mNoteHeaderHolder.tvAlertDate.setText(DateUtils.getRelativeTimeSpanString(
mWorkingNote.getAlertDate(), time, DateUtils.MINUTE_IN_MILLIS));
}
+ // 显示闹钟的开始图标
mNoteHeaderHolder.tvAlertDate.setVisibility(View.VISIBLE);
mNoteHeaderHolder.ivAlertIcon.setVisibility(View.VISIBLE);
} else {
+ // 如果当前的笔记没有闹钟提醒，就将警告日期文本和警告图标设置为不可见
mNoteHeaderHolder.tvAlertDate.setVisibility(View.GONE);
mNoteHeaderHolder.ivAlertIcon.setVisibility(View.GONE);
};
@@ -326,6 +397,8 @@ public class NoteEditActivity extends Activity implements OnClickListener,
* generate a id. If the editing note is not worth saving, there
* is no id which is equivalent to create new note
*/
+ //在创建一个新的标签时，先在数据库中匹配
+ //如果不存在，那么先在数据库中存储
if (!mWorkingNote.existInDatabase()) {
saveNote();
}
@@ -333,27 +406,32 @@ public class NoteEditActivity extends Activity implements OnClickListener,
Log.d(TAG, "Save working note id: " + mWorkingNote.getNoteId() + " onSaveInstanceState");
}
+ //用于分发触摸事件到合适的视图中
@Override
public boolean dispatchTouchEvent(MotionEvent ev) {
+ // 判断当前笔记的颜色选择器在屏幕上是否可见，且在可触控范围内
if (mNoteBgColorSelector.getVisibility() == View.VISIBLE
&& !inRangeOfView(mNoteBgColorSelector, ev)) {
mNoteBgColorSelector.setVisibility(View.GONE);
return true;
}
-
+ // 判断当前笔记的字体大小选择器是否可见，且在触控范围内
if (mFontSizeSelector.getVisibility() == View.VISIBLE
&& !inRangeOfView(mFontSizeSelector, ev)) {
mFontSizeSelector.setVisibility(View.GONE);
return true;
}
+ // 如果两个选择器在屏幕都不可见，则重新分配触发事件
return super.dispatchTouchEvent(ev);
}
+ // 对屏幕触控的坐标进行操作
private boolean inRangeOfView(View view, MotionEvent ev) {
int []location = new int[2];
view.getLocationOnScreen(location);
int x = location[0];
int y = location[1];
+ // 如果触控的位置超出了给定的范围
if (ev.getX() < x
|| ev.getX() > (x + view.getWidth())
|| ev.getY() < y
@@ -363,6 +441,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
return true;
}
+ //对标签各项属性内容的初始化
private void initResources() {
mHeadViewPanel = findViewById(R.id.note_title);
mNoteHeaderHolder = new HeadViewHolder();
@@ -379,13 +458,22 @@ public class NoteEditActivity extends Activity implements OnClickListener,
iv.setOnClickListener(this);
}
+ //对字体大小的选择
mFontSizeSelector = findViewById(R.id.font_size_selector);
for (int id : sFontSizeBtnsMap.keySet()) {
View view = findViewById(id);
view.setOnClickListener(this);
- };
+ }
+
+ mTxtColorSelector = findViewById(R.id.ll_font_color_selector);
+ for (int id : sTxtColorBtnsMaps.keySet()) {
+ View view = findViewById(id);
+ view.setOnClickListener(this);
+ }
+
mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
mFontSizeId = mSharedPrefs.getInt(PREFERENCE_FONT_SIZE, ResourceParser.BG_DEFAULT_FONT_SIZE);
+ mTxtColorId = mSharedPrefs.getInt(PREFERENCE_TXT_COLOR, FontColorParser.Font_color_default);
/**
* HACKME: Fix bug of store the resource id in shared preference.
* The id may larger than the length of resources, in this case,
@@ -394,18 +482,24 @@ public class NoteEditActivity extends Activity implements OnClickListener,
if(mFontSizeId >= TextAppearanceResources.getResourcesSize()) {
mFontSizeId = ResourceParser.BG_DEFAULT_FONT_SIZE;
}
+ if(mTxtColorId >= FontColorParser.TextAppearanceResources.getResourceSize()) {
+ mTxtColorId = FontColorParser.Font_color_default;
+ }
mEditTextList = (LinearLayout) findViewById(R.id.note_edit_list);
}
@Override
protected void onPause() {
super.onPause();
+ // 尝试保存当前笔记数据，并判断是否保持成功
if(saveNote()) {
Log.d(TAG, "Note data was saved with length:" + mWorkingNote.getContent().length());
}
+ // 清除一些设置状态
clearSettingState();
}
+ // 与桌面小部件的内容和外观同步
private void updateWidget() {
Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_2X) {
@@ -425,12 +519,15 @@ public class NoteEditActivity extends Activity implements OnClickListener,
setResult(RESULT_OK, intent);
}
+ // 在一个视图被点击时调用
public void onClick(View v) {
+ // 获取被点击的视图的id
int id = v.getId();
+ // 如果是背景颜色的按钮，则将背景颜色选择器和当前笔记背景颜色对应的视图设为可见
if (id == R.id.btn_set_bg_color) {
mNoteBgColorSelector.setVisibility(View.VISIBLE);
findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
- - View.VISIBLE);
+ View.VISIBLE);
} else if (sBgSelectorBtnsMap.containsKey(id)) {
findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
View.GONE);
@@ -449,9 +546,25 @@ public class NoteEditActivity extends Activity implements OnClickListener,
TextAppearanceResources.getTexAppearanceResource(mFontSizeId));
}
mFontSizeSelector.setVisibility(View.GONE);
+ } else if (sTxtColorBtnsMaps.containsKey(id)) {
+ findViewById(sTxtColorSelectorSelectionMap.get(mTxtColorId)).setVisibility(View.GONE);
+ mTxtColorId = sTxtColorBtnsMaps.get(id);
+ mSharedPrefs.edit().putInt(PREFERENCE_TXT_COLOR, mTxtColorId).commit();
+ findViewById(sTxtColorSelectorSelectionMap.get(mTxtColorId)).setVisibility(View.VISIBLE);
+ if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
+ getWorkingText();
+ switchToListMode(mWorkingNote.getContent());
+ } else {
+ mNoteEditor.setTextAppearance(this,
+ FontColorParser.TextAppearanceResources.getTexAppearanceResource(mTxtColorId));
+ }
+ mTxtColorSelector.setVisibility(View.GONE);
+ } else if (id == R.id.menu_insert_img) {
+ openGallery();
}
}
+ // 当按下返回键时执行操作
@Override
public void onBackPressed() {
if(clearSettingState()) {
@@ -462,6 +575,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
super.onBackPressed();
}
+ // 用于清除一些设置状态
private boolean clearSettingState() {
if (mNoteBgColorSelector.getVisibility() == View.VISIBLE) {
mNoteBgColorSelector.setVisibility(View.GONE);
@@ -473,6 +587,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
return false;
}
+ // 在改变背景颜色时执行的操作
public void onBackgroundColorChanged() {
findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
View.VISIBLE);
@@ -480,38 +595,56 @@ public class NoteEditActivity extends Activity implements OnClickListener,
mHeadViewPanel.setBackgroundResource(mWorkingNote.getTitleBgResId());
}
+ // 在准备选择菜单执行的操作
@Override
public boolean onPrepareOptionsMenu(Menu menu) {
+ // 判断Activity是否正在结束
if (isFinishing()) {
return true;
}
clearSettingState();
+ // 清空菜单所有项目
menu.clear();
+ // 判断当前笔记的文件夹id是否是通话记录文件夹的id
if (mWorkingNote.getFolderId() == Notes.ID_CALL_RECORD_FOLDER) {
+ // 加载通话记录编辑菜单的资源
getMenuInflater().inflate(R.menu.call_note_edit, menu);
} else {
+ // 加载普通笔记编辑菜单的资源
getMenuInflater().inflate(R.menu.note_edit, menu);
}
+ // 笔记是否处于清单模式
if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
+ // 将菜单中的列表模式项目的标题设置为普通模式
menu.findItem(R.id.menu_list_mode).setTitle(R.string.menu_normal_mode);
} else {
+ // 将菜单中的列表模式项目的标题设置为列表模式
menu.findItem(R.id.menu_list_mode).setTitle(R.string.menu_list_mode);
}
+ // 判断当前笔记是否有闹钟提醒
if (mWorkingNote.hasClockAlert()) {
+ // 将菜单中的提醒项目设置为不可见
menu.findItem(R.id.menu_alert).setVisible(false);
} else {
+ // 将菜单中的删除提醒项目设置为不可见
menu.findItem(R.id.menu_delete_remind).setVisible(false);
}
return true;
}
+ // 当选择菜单中的某个项目被点击调用时的操作
@Override
public boolean onOptionsItemSelected(MenuItem item) {
+ // 根据被点击项目的id，进行不同的处理
switch (item.getItemId()) {
+ case R.id.menu_insert_img:
+ openGallery();
+ break;
case R.id.menu_new_note:
createNewNote();
break;
case R.id.menu_delete:
+ // 创建对话框，询问用户是否删除
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(getString(R.string.alert_title_delete));
builder.setIcon(android.R.drawable.ic_dialog_alert);
@@ -527,24 +660,34 @@ public class NoteEditActivity extends Activity implements OnClickListener,
builder.show();
break;
case R.id.menu_font_size:
+ // 将字体大小选择器和当前字体大小对应的视图设置为可见
mFontSizeSelector.setVisibility(View.VISIBLE);
findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE);
break;
+ case R.id.menu_change_font_color:
+ mTxtColorSelector.setVisibility(View.VISIBLE);
+ findViewById(sTxtColorSelectorSelectionMap.get(mTxtColorId)).setVisibility(View.VISIBLE);
+ break;
case R.id.menu_list_mode:
+ // 根据当前笔记是否是清单模式，切换到相反的模式，并更新笔记的清单模式属性
mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ?
TextNote.MODE_CHECK_LIST : 0);
break;
case R.id.menu_share:
getWorkingText();
+ // 将文本发送给其他应用
sendTo(this, mWorkingNote.getContent());
break;
case R.id.menu_send_to_desktop:
+ // 将当前笔记作为一个快捷方式发送到桌面
sendToDesktop();
break;
case R.id.menu_alert:
+ // 设置一个闹钟提醒
setReminder();
break;
case R.id.menu_delete_remind:
+ // 将当前笔记的提醒日期设置为0，并更新数据库
mWorkingNote.setAlertDate(0, false);
break;
default:
@@ -553,13 +696,17 @@ public class NoteEditActivity extends Activity implements OnClickListener,
return true;
}
+ // 设置闹钟提醒
private void setReminder() {
+ // 用于显示日期时间选择器对话框
DateTimePickerDialog d = new DateTimePickerDialog(this, System.currentTimeMillis());
d.setOnDateTimeSetListener(new OnDateTimeSetListener() {
+ // 根据用户选择的日期时间，设置当前笔记的提醒日期，并更新数据库
public void OnDateTimeSet(AlertDialog dialog, long date) {
mWorkingNote.setAlertDate(date , true);
}
});
+ // 显示对话框，让用户选择一个日期时间
d.show();
}
@@ -567,13 +714,17 @@ public class NoteEditActivity extends Activity implements OnClickListener,
* Share note to apps that support {@link Intent#ACTION_SEND} action
* and {@text/plain} type
*/
+ // 与其他应用共享文本信息
private void sendTo(Context context, String info) {
Intent intent = new Intent(Intent.ACTION_SEND);
+ // 将要共享的文本信息作为额外数据放入意图中
intent.putExtra(Intent.EXTRA_TEXT, info);
intent.setType("text/plain");
+ // 启动一个活动，让用户选择一个可以接收这个意图的应用
context.startActivity(intent);
}
+ // 创建一个新便签
private void createNewNote() {
// Firstly, save current editing notes
saveNote();
@@ -586,15 +737,19 @@ public class NoteEditActivity extends Activity implements OnClickListener,
startActivity(intent);
}
+ // 删除当前便签
private void deleteCurrentNote() {
+ // 如果正在编辑的笔记存有数据
if (mWorkingNote.existInDatabase()) {
HashSet<Long> ids = new HashSet<Long>();
long id = mWorkingNote.getNoteId();
+ // 判断是否为根文件夹id
if (id != Notes.ID_ROOT_FOLDER) {
ids.add(id);
} else {
Log.d(TAG, "Wrong note id, should not happen");
}
+ // 判断当前是否是同步模式
if (!isSyncMode()) {
if (!DataUtils.batchDeleteNotes(getContentResolver(), ids)) {
Log.e(TAG, "Delete Note error");
@@ -608,10 +763,12 @@ public class NoteEditActivity extends Activity implements OnClickListener,
mWorkingNote.markDeleted(true);
}
+ // 判断是否是同步模式
private boolean isSyncMode() {
return NotesPreferenceActivity.getSyncAccountName(this).trim().length() > 0;
}
+ // 笔记闹钟提醒发生变化时调用, set 是是否设置提醒的标志
public void onClockAlertChanged(long date, boolean set) {
/**
* User could set clock to an unsaved note, so before setting the
@@ -620,15 +777,22 @@ public class NoteEditActivity extends Activity implements OnClickListener,
if (!mWorkingNote.existInDatabase()) {
saveNote();
}
+ // 大于0,即保存到了数据库中,否则就是未保存到数据库
if (mWorkingNote.getNoteId() > 0) {
+ // 用于发送一个闹钟接收的广播，将当前笔记的uri作为数据放入意图中
Intent intent = new Intent(this, AlarmReceiver.class);
intent.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mWorkingNote.getNoteId()));
+ // 用于包装上面的意图对象，以便在闹钟触发时发送广播
PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, intent, 0);
+ // 获取一个闹钟管理器对象，用于设置或取消闹钟
AlarmManager alarmManager = ((AlarmManager) getSystemService(ALARM_SERVICE));
showAlertHeader();
+ // 判断是否设置提醒
if(!set) {
+ // 取消之前设置的闹钟
alarmManager.cancel(pendingIntent);
} else {
+ // 设置一个在指定日期时间触发的闹钟，并发送待定意图
alarmManager.set(AlarmManager.RTC_WAKEUP, date, pendingIntent);
}
} else {
@@ -646,6 +810,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
updateWidget();
}
+ // 在用户删除某个文本编辑器时，将被删除的文本内容追加到前面或者后面的文本编辑器中，并更新列表的索引值
public void onEditTextDelete(int index, String text) {
int childCount = mEditTextList.getChildCount();
if (childCount == 1) {
@@ -672,6 +837,10 @@ public class NoteEditActivity extends Activity implements OnClickListener,
edit.setSelection(length);
}
+ /* 在用户在某个文本编辑器中按下回车键时，创建一个新的文本编辑器，
+ * 并将当前的文本内容分割到两个文本编辑器中。
+ * 实现在笔记应用中输入多行文本。
+ */
public void onEditTextEnter(int index, String text) {
/**
* Should not happen, check for debug
@@ -691,6 +860,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
}
+ // 将用户输入的文本转换成多个文本编辑器，以便用户在列表模式下编辑多行文本。
private void switchToListMode(String text) {
mEditTextList.removeAllViews();
String[] items = text.split("\n");
@@ -708,6 +878,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
mEditTextList.setVisibility(View.VISIBLE);
}
+ // 将用户输入的搜索关键词在完整文本中高亮显示，以便用户快速定位到相关内容
private Spannable getHighlightQueryResult(String fullText, String userQuery) {
SpannableString spannable = new SpannableString(fullText == null ? "" : fullText);
if (!TextUtils.isEmpty(userQuery)) {
@@ -725,6 +896,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
return spannable;
}
+ // 根据用户输入的文本内容和搜索关键词创建一个带有复选框和高亮效果的文本编辑器视图
private View getListItem(String item, int index) {
View view = LayoutInflater.from(this).inflate(R.layout.note_edit_list_item, null);
final NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text);
@@ -756,6 +928,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
return view;
}
+ // 根据用户在文本编辑器中输入或删除文本时，动态显示或隐藏复选框。
public void onTextChange(int index, boolean hasText) {
if (index >= mEditTextList.getChildCount()) {
Log.e(TAG, "Wrong index, should not happen");
@@ -768,6 +941,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
}
+ // 根据用户选择的模式，将文本编辑器从普通模式切换到列表模式，或者从列表模式切换到普通模式。
public void onCheckListModeChanged(int oldMode, int newMode) {
if (newMode == TextNote.MODE_CHECK_LIST) {
switchToListMode(mNoteEditor.getText().toString());
@@ -782,6 +956,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
}
+ // 根据笔记的模式，从文本编辑器或者文本编辑器列表中获取文本内容
private boolean getWorkingText() {
boolean hasChecked = false;
if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
@@ -805,6 +980,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
return hasChecked;
}
+ // 用于保存一个笔记应用的文本内容
private boolean saveNote() {
getWorkingText();
boolean saved = mWorkingNote.saveNote();
@@ -821,6 +997,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
return saved;
}
+ // 将笔记内容发送到桌面
private void sendToDesktop() {
/**
* Before send message to home, we should make sure that current
@@ -856,6 +1033,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
}
+ // 用于编辑小图标的标题
private String makeShortcutIconTitle(String content) {
content = content.replace(TAG_CHECKED, "");
content = content.replace(TAG_UNCHECKED, "");
@@ -863,11 +1041,158 @@ public class NoteEditActivity extends Activity implements OnClickListener,
SHORTCUT_ICON_TITLE_MAX_LEN) : content;
}
+ // 显示提示的视图
private void showToast(int resId) {
showToast(resId, Toast.LENGTH_SHORT);
}
+ // 持续显示提示视图
private void showToast(int resId, int duration) {
Toast.makeText(this, resId, duration).show();
}
+ //-----------------------------------------------------------------------------------------//
+ //-----------------------------------施-----工-----区---------------------------------------//
+ //-----------------------------------------------------------------------------------------//
+ //--------------------------------注-----意-----安-----全-----------------------------------//
+ //-----------------------------------------------------------------------------------------//
+ //--------------------------更改请遵循636softwareDevGroup开发共识-----------------------------//
+ //-----------------------------------------------------------------------------------------//
+ //----------------------------Last---Change---2023---04---27-------------------------------//
+ //-----------------------------------------------------------------------------------------//
+ //----------------------------------By-K4sumizawaMiyU--------------------------------------//
+ //-----------------------------------------------------------------------------------------//
+ //--------------------------Miyu--Wa--SeiKai--1st--Kawaii!---------------------------------//
+ // 数据流获取
+ public String getDataColumn(Context context, Uri uri, String selection, String[] selectionArgs) {
+ Cursor cursor = null;
+ final String column = "_data";
+ final String[] projection = {column};
+ try{
+ cursor = context.getContentResolver().query(uri, projection, selection,
+ selectionArgs, null);
+ if (cursor != null && cursor.moveToFirst()) {
+ final int column_index = cursor.getColumnIndexOrThrow(column);
+ return cursor.getString(column_index);
+ }
+ } finally {
+ if (cursor != null)
+ cursor.close();
+ }
+ return null;
+ }
+ // 用于开启多媒体相册
+ public void openGallery() {
+ Intent loadImg = new Intent(Intent.ACTION_GET_CONTENT);
+ loadImg.addCategory(Intent.CATEGORY_OPENABLE);
+ loadImg.setType("image/*");
+ startActivityForResult(loadImg, OPEN_GALLERY);
+ }
+ // 用于取得图片路径
+ public String getPath(final Context context, final Uri uri) {
+ final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
+ if (isKitKat && DocumentsContract.isDocumentUri(context, uri)) {
+ if (isMediaDocument(uri)) {
+ final String docId = DocumentsContract.getDocumentId(uri);
+ final String[] split = docId.split(":");
+ final String type = split[0];
+
+ Uri contentUri = null;
+ if ("image".equals(type)) {
+ contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
+ }
+ final String selection = "_id=?";
+ final String[] selectionArgs = new String[]{split[1]};
+
+ return getDataColumn(context, contentUri, selection, selectionArgs);
+ }
+ } else if ("content".equalsIgnoreCase(uri.getScheme())) {
+ return getDataColumn(context, uri, null, null);
+ } else if ("file".equalsIgnoreCase(uri.getScheme())) {
+ return uri.getPath();
+ }
+ return null;
+ }
+ // 路径地址转换为图片
+ private void convertToImg() {
+ NoteEditText noteEditText = (NoteEditText) findViewById(R.id.note_edit_view);
+ Editable editable = noteEditText.getText();
+ String noteTxt= editable.toString();
+ int length = editable.length();
+ for(int i = 0;i < length;i ++) {
+ for(int j = i;j < length;j ++) {
+ String img_frag = noteTxt.substring(i, j+1);
+ if(img_frag.length() > 15 && img_frag.endsWith("[/local]")&& img_frag.startsWith("[local]")) {
+ int lim = 7;
+ int len = img_frag.length() - 15;
+ String path = img_frag.substring(lim, lim + len);
+ Bitmap bitmap = null;
+ Log.d(TAG,"img from:"+path);
+ try {
+ bitmap = BitmapFactory.decodeFile(path);
+ } catch (Exception err) {
+ err.printStackTrace();
+ } if(bitmap != null) {
+ Log.d(TAG,"img not null");
+ ImageSpan imageSpan = new ImageSpan(NoteEditActivity.this, bitmap);
+ String ss = "[local]" + path + "[/local]";
+ SpannableString spannableString = new SpannableString(ss);
+ spannableString.setSpan(imageSpan, 0, ss.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+ Log.d(TAG,"success!");
+ Editable edit_txt = noteEditText.getEditableText();
+ edit_txt.delete(i, i + len + 15);
+ edit_txt.insert(i, spannableString);
+ }
+ }
+ }
+ }
+ }
+ // 重写onActivityResult处理返回的数据
+ protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
+ super.onActivityResult(requestCode, resultCode, intent);
+ ContentResolver resolver = getContentResolver();
+ switch (requestCode) {
+ case OPEN_GALLERY:
+ Uri originUri = intent.getData();
+ Bitmap bitmap = null;
+ try {
+ bitmap = BitmapFactory.decodeStream(resolver.openInputStream(originUri));
+ } catch (FileNotFoundException err) {
+ Log.d(TAG,"get file_exception");
+ err.printStackTrace();
+ } if(bitmap != null) {
+ Log.d(TAG,"Bitmap is not null");
+ ImageSpan imageSpan = new ImageSpan(NoteEditActivity.this, bitmap);
+ String path = getPath(this, originUri);
+ String img_frag= "[local]" + path + "[/local]";
+ // 创建一个SpannableString对象，以便插入用ImageSpan对象封装的图像
+ SpannableString spannableString = new SpannableString(img_frag);
+ spannableString.setSpan(imageSpan, 0, img_frag.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+ // 将图片插入光标所在位置
+ NoteEditText img = (NoteEditText) findViewById(R.id.note_edit_view);
+ int index = img.getSelectionStart();
+ Log.d(TAG,"Index is:" + index);
+ Editable edit_txt = img.getEditableText();
+ edit_txt.insert(index, spannableString);
+ mWorkingNote.mContent = img.getText().toString();
+ // 将改动提交至数据库
+ ContentResolver contentResolver = getContentResolver();
+ ContentValues contentValues = new ContentValues();
+ final long id = mWorkingNote.getNoteId();
+ contentValues.put("snippet",mWorkingNote.mContent);
+ contentResolver.update(Uri.parse("content://micode_notes/note"), contentValues,"picture=?",new String[]{""+id});
+ ContentValues contentValues1 = new ContentValues();
+ contentValues1.put("content",mWorkingNote.mContent);
+ contentResolver.update(Uri.parse("content://micode_notes/data"), contentValues1,"mime_type=? and note_id=?", new String[]{"vnd.android.cursor.item/text_note",""+id});
+ } else {
+ Toast.makeText(NoteEditActivity.this, "获取图片失败", Toast.LENGTH_SHORT).show();
+ }
+ break;
+ default:
+ break;
+ }
+ }
+ // 判断所选文档是否为多媒体文件
+ public boolean isMediaDocument(Uri uri) {
+ return "com.android.providers.media.documents".equals(uri.getAuthority());
+ }
}
diff --git a/app/src/main/java/net/micode/notes/ui/NoteEditText.java b/app/src/main/java/net/micode/notes/ui/NoteEditText.java
index 2afe2a8..1f7235e 100644
--- a/app/src/main/java/net/micode/notes/ui/NoteEditText.java
+++ b/app/src/main/java/net/micode/notes/ui/NoteEditText.java
@@ -37,6 +37,7 @@ import net.micode.notes.R;
import java.util.HashMap;
import java.util.Map;
+// 继承EditText，设置标签设置文本框
public class NoteEditText extends EditText {
private static final String TAG = "NoteEditText";
private int mIndex;
@@ -46,6 +47,7 @@ public class NoteEditText extends EditText {
private static final String SCHEME_HTTP = "http:" ;
private static final String SCHEME_EMAIL = "mailto:" ;
+ // 建立一个字符和整数的hash表，用于链接电话，网站，还有邮箱
private static final Map<String, Integer> sSchemaActionResMap = new HashMap<String, Integer>();
static {
sSchemaActionResMap.put(SCHEME_TEL, R.string.note_link_tel);
@@ -56,6 +58,7 @@ public class NoteEditText extends EditText {
/**
* Call by the {@link NoteEditActivity} to delete or add edit text
*/
+ //在NoteEditActivity中删除或添加文本的操作，可以看做是一个文本是否被变的标记
public interface OnTextViewChangeListener {
/**
* Delete current edit text when {@link KeyEvent#KEYCODE_DEL} happens
@@ -77,19 +80,22 @@ public class NoteEditText extends EditText {
private OnTextViewChangeListener mOnTextViewChangeListener;
+ // 根据context设置文本
public NoteEditText(Context context) {
super(context, null);
mIndex = 0;
}
-
+ // 设置当前光标
public void setIndex(int index) {
mIndex = index;
}
+ // 初始化文本修改标记
public void setOnTextViewChangeListener(OnTextViewChangeListener listener) {
mOnTextViewChangeListener = listener;
}
+ // 初始化便签
public NoteEditText(Context context, AttributeSet attrs) {
super(context, attrs, android.R.attr.editTextStyle);
}
@@ -99,6 +105,7 @@ public class NoteEditText extends EditText {
// TODO Auto-generated constructor stub
}
+ // 根据用户触摸的位置，获取对应的文本偏移量，并设置为选择状态。
@Override
public boolean onTouchEvent(MotionEvent event) {
switch (event.getAction()) {
@@ -121,6 +128,7 @@ public class NoteEditText extends EditText {
return super.onTouchEvent(event);
}
+ // 处理用户按下一个键盘按键时会触发 的事件
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
switch (keyCode) {
@@ -138,11 +146,14 @@ public class NoteEditText extends EditText {
return super.onKeyDown(keyCode, event);
}
+ // 处理用户松开一个键盘按键时会触发 的事件
@Override
public boolean onKeyUp(int keyCode, KeyEvent event) {
switch(keyCode) {
case KeyEvent.KEYCODE_DEL:
+ // 如果被修改过
if (mOnTextViewChangeListener != null) {
+ // 如果被修改过且文档不为空
if (0 == mSelectionStartBeforeDelete && mIndex != 0) {
mOnTextViewChangeListener.onEditTextDelete(mIndex, getText().toString());
return true;
@@ -167,9 +178,11 @@ public class NoteEditText extends EditText {
return super.onKeyUp(keyCode, event);
}
+ // 当焦点发生变化时，会自动调用该方法来处理焦点改变的事件
@Override
protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) {
if (mOnTextViewChangeListener != null) {
+ // 获取到焦点并且文本不为空
if (!focused && TextUtils.isEmpty(getText())) {
mOnTextViewChangeListener.onTextChange(mIndex, false);
} else {
@@ -179,8 +192,10 @@ public class NoteEditText extends EditText {
super.onFocusChanged(focused, direction, previouslyFocusedRect);
}
+ // 生成上下文菜单
@Override
protected void onCreateContextMenu(ContextMenu menu) {
+ // 如果有文本存在
if (getText() instanceof Spanned) {
int selStart = getSelectionStart();
int selEnd = getSelectionEnd();
@@ -201,7 +216,7 @@ public class NoteEditText extends EditText {
if (defaultResId == 0) {
defaultResId = R.string.note_link_other;
}
-
+ // 建立菜单
menu.add(0, 0, 0, defaultResId).setOnMenuItemClickListener(
new OnMenuItemClickListener() {
public boolean onMenuItemClick(MenuItem item) {
diff --git a/app/src/main/java/net/micode/notes/ui/NoteItemData.java b/app/src/main/java/net/micode/notes/ui/NoteItemData.java
index 0f5a878..fe94192 100644
--- a/app/src/main/java/net/micode/notes/ui/NoteItemData.java
+++ b/app/src/main/java/net/micode/notes/ui/NoteItemData.java
@@ -26,6 +26,9 @@ import net.micode.notes.data.Notes.NoteColumns;
import net.micode.notes.tool.DataUtils;
+/*用于存储和操作一个笔记的id、标题、内容、创建时间、
+修改时间、背景颜色、字体大小、模式、文件夹id等信息。
+ */
public class NoteItemData {
static final String [] PROJECTION = new String [] {
NoteColumns.ID,
@@ -76,6 +79,7 @@ public class NoteItemData {
private boolean mIsOneNoteFollowingFolder;
private boolean mIsMultiNotesFollowingFolder;
+ // 初始化NoteItemData，主要利用光标cursor获取的东西
public NoteItemData(Context context, Cursor cursor) {
mId = cursor.getLong(ID_COLUMN);
mAlertDate = cursor.getLong(ALERTED_DATE_COLUMN);
@@ -109,6 +113,7 @@ public class NoteItemData {
checkPostion(cursor);
}
+ // 根据鼠标的位置设置标记和位置
private void checkPostion(Cursor cursor) {
mIsLastItem = cursor.isLast() ? true : false;
mIsFirstItem = cursor.isFirst() ? true : false;
@@ -214,6 +219,7 @@ public class NoteItemData {
return (mAlertDate > 0);
}
+ // 判断一个笔记是否是一个通话记录
public boolean isCallRecord() {
return (mParentId == Notes.ID_CALL_RECORD_FOLDER && !TextUtils.isEmpty(mPhoneNumber));
}
diff --git a/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
index e843aec..e5ec2e4 100644
--- a/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
+++ b/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
@@ -93,7 +93,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
private enum ListEditState {
NOTE_LIST, SUB_FOLDER, CALL_RECORD_FOLDER
- };
+ }
private ListEditState mState;
@@ -135,9 +135,11 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
private final static int REQUEST_CODE_OPEN_NODE = 102;
private final static int REQUEST_CODE_NEW_NODE = 103;
+ // 在Activity创建时调用
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ // 设置Activity的布局文件为note_list.xml
setContentView(R.layout.note_list);
initResources();
@@ -147,32 +149,45 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
setAppInfoFromRawRes();
}
+ // 在Activity接收到其他Activity返回的结果时调用
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+ // 如果结果是成功的，并且请求码是打开或新建笔记，那么更新笔记列表的游标
if (resultCode == RESULT_OK
&& (requestCode == REQUEST_CODE_OPEN_NODE || requestCode == REQUEST_CODE_NEW_NODE)) {
mNotesListAdapter.changeCursor(null);
} else {
+ // 否则，调用父类的方法处理结果
super.onActivityResult(requestCode, resultCode, data);
}
}
+ // 从raw资源文件中读取应用的介绍信息，并保存为一个笔记
private void setAppInfoFromRawRes() {
+ // 获取SharedPreferences对象，用于存储设置信息
SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
+ // 如果没有添加过介绍信息，那么执行以下操作
if (!sp.getBoolean(PREFERENCE_ADD_INTRODUCTION, false)) {
+ // 用于拼接介绍信息的文本
StringBuilder sb = new StringBuilder();
InputStream in = null;
try {
+ // 从raw资源文件中打开介绍信息的输入流
in = getResources().openRawResource(R.raw.introduction);
if (in != null) {
+ // 用于读取输入流
InputStreamReader isr = new InputStreamReader(in);
+ // 用于缓冲输入流
BufferedReader br = new BufferedReader(isr);
+ // 用于存储读取到的字符
char [] buf = new char[1024];
int len = 0;
+ // 循环读取输入流中的字符，直到结束
while ((len = br.read(buf)) > 0) {
sb.append(buf, 0, len);
}
} else {
+ // 如果输入流为空，那么打印错误日志并返回
Log.e(TAG, "Read introduction file error");
return;
}
@@ -182,6 +197,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
} finally {
if(in != null) {
try {
+ // 关闭输入流
in.close();
} catch (IOException e) {
// TODO Auto-generated catch block
@@ -190,10 +206,13 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
}
+ // 创建一个空的工作笔记对象，设置其所属文件夹，小部件ID，类型和颜色为默认值
WorkingNote note = WorkingNote.createEmptyNote(this, Notes.ID_ROOT_FOLDER,
AppWidgetManager.INVALID_APPWIDGET_ID, Notes.TYPE_WIDGET_INVALIDE,
ResourceParser.RED);
+ // 设置工作笔记的文本为StringBuilder对象中的内容
note.setWorkingText(sb.toString());
+ // 保存工作笔记到数据库中
if (note.saveNote()) {
sp.edit().putBoolean(PREFERENCE_ADD_INTRODUCTION, true).commit();
} else {
@@ -203,43 +222,71 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
}
+ // 在Activity的生命周期中开始时调用
@Override
protected void onStart() {
super.onStart();
+ // 开始异步查询笔记列表
startAsyncNotesListQuery();
}
+ // 用来初始化一些资源
private void initResources() {
+ // 获取内容解析器，用来操作数据库
mContentResolver = this.getContentResolver();
+ // 创建一个后台查询处理器，用来异步查询数据
mBackgroundQueryHandler = new BackgroundQueryHandler(this.getContentResolver());
+ // 设置当前文件夹的ID为根文件夹的ID
mCurrentFolderId = Notes.ID_ROOT_FOLDER;
+ // 获取笔记列表视图，用来显示笔记
mNotesListView = (ListView) findViewById(R.id.notes_list);
+ // 给笔记列表视图添加一个脚部视图，用来显示更多选项
mNotesListView.addFooterView(LayoutInflater.from(this).inflate(R.layout.note_list_footer, null),
null, false);
+ // 给笔记列表视图设置一个点击监听器，用来响应点击事件
mNotesListView.setOnItemClickListener(new OnListItemClickListener());
+ // 给笔记列表视图设置一个长按监听器，用来响应长按事件
mNotesListView.setOnItemLongClickListener(this);
+ // 创建一个笔记列表适配器，用来绑定数据和视图
mNotesListAdapter = new NotesListAdapter(this);
+ // 给笔记列表视图设置适配器
mNotesListView.setAdapter(mNotesListAdapter);
+ // 获取添加新笔记的按钮，用来创建新笔记
mAddNewNote = (Button) findViewById(R.id.btn_new_note);
+ // 给添加新笔记的按钮设置一个点击监听器，用来响应点击事件
mAddNewNote.setOnClickListener(this);
+ // 给添加新笔记的按钮设置一个触摸监听器，用来响应触摸事件
mAddNewNote.setOnTouchListener(new NewNoteOnTouchListener());
+ // 初始化一个标志位，用来判断是否需要分发触摸事件
mDispatch = false;
+ // 用来记录分发触摸事件时的Y坐标
mDispatchY = 0;
+ // 用来记录触摸事件开始时的Y坐标
mOriginY = 0;
+ // 获取标题栏视图，用来显示标题
mTitleBar = (TextView) findViewById(R.id.tv_title_bar);
+ // 设置当前的列表编辑状态为普通状态
mState = ListEditState.NOTE_LIST;
+ // 创建一个模式回调对象，用来处理上下文菜单的操作
mModeCallBack = new ModeCallback();
}
+ // 用户长按列表视图的某一项时，弹出一个上下文菜单，让用户可以对选中的笔记进行一些操作
private class ModeCallback implements ListView.MultiChoiceModeListener, OnMenuItemClickListener {
private DropdownMenu mDropDownMenu;
private ActionMode mActionMode;
private MenuItem mMoveMenu;
-
+ // 用户长按一个笔记时触发的，用于创建一个操作模式(ActionMode)，
+ // 在这个模式下，用户可以对笔记进行一些操作，比如删除或移动
public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+ //从资源文件中加载菜单项
getMenuInflater().inflate(R.menu.note_list_options, menu);
+ //找到删除菜单项，并设置点击监听器
menu.findItem(R.id.delete).setOnMenuItemClickListener(this);
+ //找到移动菜单项，并保存为一个成员变量
mMoveMenu = menu.findItem(R.id.move);
+ //判断当前笔记是否属于通话记录文件夹，或者用户没有创建任何自定义文件夹，
+ //如果是，则隐藏移动菜单项，否则显示移动菜单项，并设置点击监听器
if (mFocusNoteDataItem.getParentId() == Notes.ID_CALL_RECORD_FOLDER
|| DataUtils.getUserFolderCount(mContentResolver) == 0) {
mMoveMenu.setVisible(false);
@@ -247,17 +294,26 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
mMoveMenu.setVisible(true);
mMoveMenu.setOnMenuItemClickListener(this);
}
+ //保存操作模式为一个成员变量
mActionMode = mode;
+ //设置笔记列表适配器的选择模式为true，表示可以多选笔记
mNotesListAdapter.setChoiceMode(true);
+ //设置笔记列表视图的长按可点击属性为false，表示不再响应长按事件
mNotesListView.setLongClickable(false);
+ //隐藏添加新笔记的按钮
mAddNewNote.setVisibility(View.GONE);
+ //从布局文件中加载一个自定义视图，用于显示一个下拉菜单按钮
View customView = LayoutInflater.from(NotesListActivity.this).inflate(
R.layout.note_list_dropdown_menu, null);
+ //将自定义视图设置为操作模式的自定义视图
mode.setCustomView(customView);
+ //创建一个下拉菜单对象，绑定到自定义视图中的按钮，并从资源文件中加载下拉菜单项
mDropDownMenu = new DropdownMenu(NotesListActivity.this,
(Button) customView.findViewById(R.id.selection_menu),
R.menu.note_list_dropdown);
+ //设置下拉菜单的点击监听器，当用户点击下拉菜单项时，
+ // 根据当前的选择状态，全选或取消全选所有笔记，并更新菜单项的状态
mDropDownMenu.setOnDropdownMenuItemClickListener(new PopupMenu.OnMenuItemClickListener(){
public boolean onMenuItemClick(MenuItem item) {
mNotesListAdapter.selectAll(!mNotesListAdapter.isAllSelected());
@@ -266,62 +322,85 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
});
+ //返回true表示创建操作模式成功
return true;
}
+ // 用于更新菜单项的状态和标题，根据当前选择的笔记的数量和是否全选
private void updateMenu() {
+ //获取当前选择的笔记的数量
int selectedCount = mNotesListAdapter.getSelectedCount();
// Update dropdown menu
String format = getResources().getString(R.string.menu_select_title, selectedCount);
mDropDownMenu.setTitle(format);
+ //找到下拉菜单中的全选菜单项
MenuItem item = mDropDownMenu.findItem(R.id.action_select_all);
+ //如果当前已经全选了所有笔记，则设置全选菜单项为选中状态，并修改标题为取消全选
if (item != null) {
if (mNotesListAdapter.isAllSelected()) {
item.setChecked(true);
item.setTitle(R.string.menu_deselect_all);
} else {
+ //否则，设置全选菜单项为未选中状态，并修改标题为全选
item.setChecked(false);
item.setTitle(R.string.menu_select_all);
}
}
}
+ // 在操作模式准备显示之前调用，用于修改菜单项的状态或可见性，
+ // 返回true表示修改了菜单项，返回false表示没有修改
public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
// TODO Auto-generated method stub
return false;
}
+ // 在用户点击操作模式中的菜单项时调用，用于处理相应的逻辑，
+ // 返回true表示处理了点击事件，返回false表示没有处理
public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
// TODO Auto-generated method stub
return false;
}
+ // 在操作模式结束时调用，用于恢复笔记列表的正常状态
public void onDestroyActionMode(ActionMode mode) {
+ //设置笔记列表适配器的选择模式为false，表示不再可以多选笔记
mNotesListAdapter.setChoiceMode(false);
+ //设置笔记列表视图的长按可点击属性为true，表示可以响应长按事件
mNotesListView.setLongClickable(true);
+ //显示添加新笔记的按钮
mAddNewNote.setVisibility(View.VISIBLE);
}
+ // 用于结束操作模式，调用操作模式的finish方法
public void finishActionMode() {
mActionMode.finish();
}
+ // 在用户改变某个笔记的选择状态时调用，用于更新笔记列表适配器和菜单项的状态
public void onItemCheckedStateChanged(ActionMode mode, int position, long id,
boolean checked) {
+ //设置笔记列表适配器中指定位置的笔记的选择状态
mNotesListAdapter.setCheckedItem(position, checked);
+ //更新菜单项的状态和标题
updateMenu();
}
+ // 在用户点击操作模式中的菜单项时调用，用于处理相应的逻辑
public boolean onMenuItemClick(MenuItem item) {
+ //如果当前没有选择任何笔记，则弹出一个提示信息，并返回true表示处理了点击事件
if (mNotesListAdapter.getSelectedCount() == 0) {
Toast.makeText(NotesListActivity.this, getString(R.string.menu_select_none),
Toast.LENGTH_SHORT).show();
return true;
}
+ //根据菜单项的id，执行不同的操作
switch (item.getItemId()) {
case R.id.delete:
+ //创建一个对话框对象，用于提示用户是否确定删除所选笔记
AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this);
+ //设置对话框的标题、图标、消息和按钮
builder.setTitle(getString(R.string.alert_title_delete));
builder.setIcon(android.R.drawable.ic_dialog_alert);
builder.setMessage(getString(R.string.alert_message_delete_notes,
@@ -330,10 +409,12 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog,
int which) {
+ //如果用户点击确定按钮，则调用批量删除的方法
batchDelete();
}
});
builder.setNegativeButton(android.R.string.cancel, null);
+ //显示对话框
builder.show();
break;
case R.id.move:
@@ -346,19 +427,27 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
}
+ // 用于处理添加新笔记按钮的触摸事件
private class NewNoteOnTouchListener implements OnTouchListener {
-
+ // 用于处理触摸事件，参数v是被触摸的视图，参数event是触摸事件对象
public boolean onTouch(View v, MotionEvent event) {
+ //根据触摸事件的类型，执行不同的操作
switch (event.getAction()) {
case MotionEvent.ACTION_DOWN: {
+ //获取屏幕的显示对象
Display display = getWindowManager().getDefaultDisplay();
+ //获取屏幕的高度
int screenHeight = display.getHeight();
+ //获取添加新笔记按钮的高度
int newNoteViewHeight = mAddNewNote.getHeight();
+ //计算添加新笔记按钮的起始位置，即屏幕高度减去按钮高度
int start = screenHeight - newNoteViewHeight;
+ //计算触摸事件的y坐标，即按钮起始位置加上触摸事件相对于按钮的y坐标
int eventY = start + (int) event.getY();
/**
* Minus TitleBar's height
*/
+ //如果当前是子文件夹模式，则需要减去标题栏的高度，因为标题栏会遮挡部分按钮
if (mState == ListEditState.SUB_FOLDER) {
eventY -= mTitleBar.getHeight();
start -= mTitleBar.getHeight();
@@ -372,43 +461,63 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
* Notice that, if the background of the button changes, the formula should
* also change. This is very bad, just for the UI designer's strong requirement.
*/
+ // 如果触摸事件发生在屏幕的左上角
if (event.getY() < (event.getX() * (-0.12) + 94)) {
+ // 获取列表视图中最后一个可见的项目
View view = mNotesListView.getChildAt(mNotesListView.getChildCount() - 1
- mNotesListView.getFooterViewsCount());
+ // 如果项目不为空，并且它的底部在起始位置下方，它的顶部在起始位置加上94的上方
if (view != null && view.getBottom() > start
&& (view.getTop() < (start + 94))) {
+ // 保存触摸事件的原始y坐标
mOriginY = (int) event.getY();
+ // 设置分发y坐标为当前y坐标
mDispatchY = eventY;
+ // 设置触摸事件的位置为分发坐标
event.setLocation(event.getX(), mDispatchY);
+ // 设置一个标志，表示触摸事件应该被分发给列表视图
mDispatch = true;
+ // 将触摸事件分发给列表视图，并返回结果
return mNotesListView.dispatchTouchEvent(event);
}
}
break;
}
+ // 如果触摸事件是一个移动动作
case MotionEvent.ACTION_MOVE: {
+ // 如果标志设置为将触摸事件分发给列表视图
if (mDispatch) {
+ // 更新分发y坐标，加上当前y坐标和原始y坐标的差值
mDispatchY += (int) event.getY() - mOriginY;
+ // 设置触摸事件的位置为分发坐标
event.setLocation(event.getX(), mDispatchY);
+ // 将触摸事件分发给列表视图，并返回结果
return mNotesListView.dispatchTouchEvent(event);
}
break;
}
default: {
+ // 如果标志设置为将触摸事件分发给列表视图
if (mDispatch) {
+ // 设置触摸事件的位置为分发坐标
event.setLocation(event.getX(), mDispatchY);
+ // 重置标志为false
mDispatch = false;
+ // 将触摸事件分发给列表视图，并返回结果
return mNotesListView.dispatchTouchEvent(event);
}
break;
}
}
+ // 如果没有满足以上任何条件，返回false
return false;
}
};
+ // 用来异步查询笔记列表
private void startAsyncNotesListQuery() {
+ // 设置查询条件，如果当前文件夹的id是根文件夹的id，就用根文件夹的选择条件，否则用普通的选择条件
String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION
: NORMAL_SELECTION;
mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null,
@@ -417,21 +526,31 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC");
}
+ // 用来处理异步查询的结果
private final class BackgroundQueryHandler extends AsyncQueryHandler {
public BackgroundQueryHandler(ContentResolver contentResolver) {
+ // 调用父类的构造方法，传入内容解析器
super(contentResolver);
}
+ // 当查询完成时，这个方法会被调用，传入查询标识符，对象和游标
@Override
protected void onQueryComplete(int token, Object cookie, Cursor cursor) {
+ // 根据查询标识符进行不同的处理
switch (token) {
+ // 如果是查询笔记列表的标识符
case FOLDER_NOTE_LIST_QUERY_TOKEN:
+ // 改变笔记列表适配器的游标，更新数据
mNotesListAdapter.changeCursor(cursor);
break;
+ // 如果是查询文件夹列表的标识符
case FOLDER_LIST_QUERY_TOKEN:
+ // 如果游标不为空，并且有数据
if (cursor != null && cursor.getCount() > 0) {
+ // 显示文件夹列表菜单，传入游标
showFolderListMenu(cursor);
} else {
+ // 否则，打印错误日志，表示查询文件夹
Log.e(TAG, "Query folder failed");
}
break;
@@ -441,13 +560,21 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
}
+ // 用来显示文件夹列表菜单
private void showFolderListMenu(Cursor cursor) {
+ // 创建一个对话框构建器，传入当前活动的上下文
AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this);
+ // 设置对话框的标题为选择文件夹
builder.setTitle(R.string.menu_title_select_folder);
+ // 创建一个文件夹列表适配器，传入当前活动和游标
final FoldersListAdapter adapter = new FoldersListAdapter(this, cursor);
+ // 设置对话框的适配器和点击监听器
builder.setAdapter(adapter, new DialogInterface.OnClickListener() {
+ // 当点击某个项目时，这个方法会被调用，传入对话框和项目的位置
public void onClick(DialogInterface dialog, int which) {
+ // 调用数据工具类的方法，批量将选中的笔记移动到点击的文件夹中，
+ // 传入内容解析器，选中的笔记的id和点击的文件夹的id
DataUtils.batchMoveToFolder(mContentResolver,
mNotesListAdapter.getSelectedItemIds(), adapter.getItemId(which));
Toast.makeText(
@@ -455,58 +582,85 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
getString(R.string.format_move_notes_to_folder,
mNotesListAdapter.getSelectedCount(),
adapter.getFolderName(NotesListActivity.this, which)),
+ // 显示一个短暂的提示信息，表示移动了多少个笔记到哪个文件夹
Toast.LENGTH_SHORT).show();
+ // 结束操作模式，取消选择
mModeCallBack.finishActionMode();
}
});
+ // 显示对话框
builder.show();
}
+ // 用来创建一个新的笔记
private void createNewNote() {
+ // 创建一个意图，传入当前活动和笔记编辑活动的类对象
Intent intent = new Intent(this, NoteEditActivity.class);
+ // 设置意图的动作为插入或编辑
intent.setAction(Intent.ACTION_INSERT_OR_EDIT);
+ // 将当前文件夹的id作为额外数据放入意图中
intent.putExtra(Notes.INTENT_EXTRA_FOLDER_ID, mCurrentFolderId);
+ // 启动一个新的活动，并期望返回结果，传入意图和请求码
this.startActivityForResult(intent, REQUEST_CODE_NEW_NODE);
}
+ // 用来批量删除笔记
private void batchDelete() {
+ // 创建一个异步任务，传入空参数，空进度和小部件属性的集合
new AsyncTask<Void, Void, HashSet<AppWidgetAttribute>>() {
+ // 在后台线程执行的方法，传入空参数
protected HashSet<AppWidgetAttribute> doInBackground(Void... unused) {
+ // 获取选中的小部件的属性集合
HashSet<AppWidgetAttribute> widgets = mNotesListAdapter.getSelectedWidget();
+ // 如果不是同步模式
if (!isSyncMode()) {
// if not synced, delete notes directly
+ // 调用数据工具类的方法，直接删除选中的笔记，传入内容解析器和选中的笔记的id
if (DataUtils.batchDeleteNotes(mContentResolver, mNotesListAdapter
.getSelectedItemIds())) {
} else {
+ // 否则，打印错误日志，表示删除笔记出错，不应该发生
Log.e(TAG, "Delete notes error, should not happens");
}
} else {
// in sync mode, we'll move the deleted note into the trash
// folder
+ // 如果是同步模式，调用数据工具类的方法，将选中的笔记移动到回收站文件夹中，
+ // 传入内容解析器，选中的笔记的id和回收站文件夹的id
if (!DataUtils.batchMoveToFolder(mContentResolver, mNotesListAdapter
.getSelectedItemIds(), Notes.ID_TRASH_FOLER)) {
+ // 如果失败，打印错误日志，表示移动笔记到回收站文件夹出错，不应该发生
Log.e(TAG, "Move notes to trash folder error, should not happens");
}
}
+ // 返回小部件属性集合
return widgets;
}
+ // 在主线程执行的方法，传入小部件属性集合
@Override
protected void onPostExecute(HashSet<AppWidgetAttribute> widgets) {
+ // 如果小部件属性集合不为空
if (widgets != null) {
+ // 遍历每个小部件属性
for (AppWidgetAttribute widget : widgets) {
+ // 如果小部件的id和类型都有效
if (widget.widgetId != AppWidgetManager.INVALID_APPWIDGET_ID
&& widget.widgetType != Notes.TYPE_WIDGET_INVALIDE) {
+ // 更新小部件，传入小部件的id和类型
updateWidget(widget.widgetId, widget.widgetType);
}
}
}
+ // 结束操作模式，取消选择
mModeCallBack.finishActionMode();
}
- }.execute();
+ }.execute(); // 执行异步任务
}
+ // 用于删除文件夹
private void deleteFolder(long folderId) {
+ // 如果文件夹id是根文件夹的id，打印错误信息并返回
if (folderId == Notes.ID_ROOT_FOLDER) {
Log.e(TAG, "Wrong folder id, should not happen " + folderId);
return;
@@ -514,6 +668,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
HashSet<Long> ids = new HashSet<Long>();
ids.add(folderId);
+ // 获取文件夹中的笔记小部件
HashSet<AppWidgetAttribute> widgets = DataUtils.getFolderNoteWidget(mContentResolver,
folderId);
if (!isSyncMode()) {
@@ -525,6 +680,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
if (widgets != null) {
for (AppWidgetAttribute widget : widgets) {
+ // 如果小部件id和类型有效，更新小部件
if (widget.widgetId != AppWidgetManager.INVALID_APPWIDGET_ID
&& widget.widgetType != Notes.TYPE_WIDGET_INVALIDE) {
updateWidget(widget.widgetId, widget.widgetType);
@@ -533,32 +689,44 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
}
+ // 打开一个笔记
private void openNode(NoteItemData data) {
Intent intent = new Intent(this, NoteEditActivity.class);
intent.setAction(Intent.ACTION_VIEW);
+ // 传递笔记的id作为额外参数
intent.putExtra(Intent.EXTRA_UID, data.getId());
+ // 启动笔记编辑活动，并期待返回结果
this.startActivityForResult(intent, REQUEST_CODE_OPEN_NODE);
}
+ // 打开一个文件夹，并显示其中的笔记列表
private void openFolder(NoteItemData data) {
+ // 设置当前文件夹的id
mCurrentFolderId = data.getId();
+ // 异步查询笔记列表
startAsyncNotesListQuery();
+ // 判断文件夹的类型，设置状态和视图
if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) {
+ // 如果是通话记录文件夹，设置状态为CALL_RECORD_FOLDER，并隐藏新建笔记按钮
mState = ListEditState.CALL_RECORD_FOLDER;
mAddNewNote.setVisibility(View.GONE);
} else {
+ // 如果是其他文件夹，设置状态为SUB_FOLDER
mState = ListEditState.SUB_FOLDER;
}
+ // 设置标题栏的文本，如果是通话记录文件夹，显示固定的字符串，否则显示文件夹的名称
if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) {
mTitleBar.setText(R.string.call_record_folder_name);
} else {
mTitleBar.setText(data.getSnippet());
}
+ // 显示标题栏
mTitleBar.setVisibility(View.VISIBLE);
}
-
+ // 处理点击事件
public void onClick(View v) {
switch (v.getId()) {
+ // 如果点击的是新建笔记按钮，调用createNewNote方法
case R.id.btn_new_note:
createNewNote();
break;
@@ -567,89 +735,134 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
}
+ // 显示软键盘
private void showSoftInput() {
+ // 获取输入法管理器对象
InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
if (inputMethodManager != null) {
+ // 强制显示软键盘
inputMethodManager.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
}
}
+ // 隐藏软键盘
private void hideSoftInput(View view) {
InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0);
}
+ //定义一个方法，根据参数create来显示创建或修改文件夹的对话框
private void showCreateOrModifyFolderDialog(final boolean create) {
+ //创建一个AlertDialog.Builder对象，用于构建对话框
final AlertDialog.Builder builder = new AlertDialog.Builder(this);
+ // 从布局文件中加载一个View对象，用于显示对话框的内容
View view = LayoutInflater.from(this).inflate(R.layout.dialog_edit_text, null);
+ //从View对象中获取一个EditText对象，用于输入文件夹的名称
final EditText etName = (EditText) view.findViewById(R.id.et_foler_name);
showSoftInput();
+ //判断create参数是否为false，如果是，表示要修改文件夹的名称
if (!create) {
+ //判断mFocusNoteDataItem是否不为空，如果是，表示有选中的文件夹
if (mFocusNoteDataItem != null) {
+ //设置EditText对象的文本为选中文件夹的名称
etName.setText(mFocusNoteDataItem.getSnippet());
+ //设置对话框的标题为“修改文件夹名称”
builder.setTitle(getString(R.string.menu_folder_change_name));
} else {
+ //否则，打印一条错误日志，并返回
Log.e(TAG, "The long click data item is null");
return;
}
} else {
+ //否则，表示要创建文件夹
+ //设置EditText对象的文本为空
etName.setText("");
+ //设置对话框的标题为“新文件夹”
builder.setTitle(this.getString(R.string.menu_create_folder));
}
+ //设置对话框的确定按钮，点击后不做任何操作（需要在后面重写点击事件）
builder.setPositiveButton(android.R.string.ok, null);
+ //设置对话框的取消按钮，点击后调用一个方法，隐藏软键盘，并传入EditText对象作为参数
builder.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
hideSoftInput(etName);
}
});
+ // 设置对话框的视图,并显示
final Dialog dialog = builder.setView(view).show();
+ // 根据ID找到正面按钮，然后将其转换为Button类型
final Button positive = (Button)dialog.findViewById(android.R.id.button1);
+ // 设置positive按钮的点击事件
positive.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
+ // 隐藏软键盘
hideSoftInput(etName);
+ // 获取输入框中的文件夹名
String name = etName.getText().toString();
+ // 检查文件夹名是否已存在
if (DataUtils.checkVisibleFolderName(mContentResolver, name)) {
+ // 如果已存在，弹出提示信息
Toast.makeText(NotesListActivity.this, getString(R.string.folder_exist, name),
Toast.LENGTH_LONG).show();
+ // 选中输入框中的所有文本
etName.setSelection(0, etName.length());
+ // 返回，不执行后续操作
return;
}
+ // 如果不是创建模式，而是修改模式
if (!create) {
+ // 如果输入框中有内容
if (!TextUtils.isEmpty(name)) {
+ // 创建一个ContentValues对象，用于存放更新的数据
ContentValues values = new ContentValues();
+ // 将文件夹名作为便签片段存入values
values.put(NoteColumns.SNIPPET, name);
+ // 将便签类型设为文件夹类型存入values
values.put(NoteColumns.TYPE, Notes.TYPE_FOLDER);
+ // 将本地修改标志设为1存入values
values.put(NoteColumns.LOCAL_MODIFIED, 1);
+ // 根据便签ID更新数据库中的数据
mContentResolver.update(Notes.CONTENT_NOTE_URI, values, NoteColumns.ID
+ "=?", new String[] {
String.valueOf(mFocusNoteDataItem.getId())
});
}
} else if (!TextUtils.isEmpty(name)) {
+ // 如果是创建模式，并且输入框中有内容
+ // 创建一个ContentValues对象，用于存放插入的数据
ContentValues values = new ContentValues();
+ // 将文件夹名作为便签片段存入values
values.put(NoteColumns.SNIPPET, name);
+ // 将便签类型设为文件夹类型存入values
values.put(NoteColumns.TYPE, Notes.TYPE_FOLDER);
+ // 插入一条新的数据到数据库中
mContentResolver.insert(Notes.CONTENT_NOTE_URI, values);
}
+ // 关闭对话框
dialog.dismiss();
}
});
+ // 如果输入框中没有内容，禁用positive按钮
if (TextUtils.isEmpty(etName.getText())) {
positive.setEnabled(false);
}
/**
* When the name edit text is null, disable the positive button
*/
+ // 为输入框添加文本变化的监听器
etName.addTextChangedListener(new TextWatcher() {
+ // 在文本变化之前的回调方法
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
// TODO Auto-generated method stub
}
+ // 在文本变化之前的回调方法
public void onTextChanged(CharSequence s, int start, int before, int count) {
+ // 如果输入框中没有内容，禁用positive按钮
if (TextUtils.isEmpty(etName.getText())) {
positive.setEnabled(false);
} else {
@@ -657,6 +870,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
}
+ // 在文本变化之后的回调方法
public void afterTextChanged(Editable s) {
// TODO Auto-generated method stub
@@ -664,23 +878,32 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
});
}
+ // 当用户按下返回键时执行
@Override
public void onBackPressed() {
switch (mState) {
case SUB_FOLDER:
+ //如果当前状态是子文件夹，那么返回到根文件夹
mCurrentFolderId = Notes.ID_ROOT_FOLDER;
mState = ListEditState.NOTE_LIST;
+ //开始异步查询笔记列表
startAsyncNotesListQuery();
+ //隐藏标题栏
mTitleBar.setVisibility(View.GONE);
break;
case CALL_RECORD_FOLDER:
+ //如果当前状态是通话记录文件夹，那么返回到根文件夹
mCurrentFolderId = Notes.ID_ROOT_FOLDER;
mState = ListEditState.NOTE_LIST;
+ //显示添加新笔记的按钮
mAddNewNote.setVisibility(View.VISIBLE);
+ //隐藏标题栏
mTitleBar.setVisibility(View.GONE);
+ //开始异步查询笔记列表
startAsyncNotesListQuery();
break;
case NOTE_LIST:
+ //如果当前状态是笔记列表，那么直接调用父类的方法
super.onBackPressed();
break;
default:
@@ -688,29 +911,42 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
}
+ // 用来更新小部件
private void updateWidget(int appWidgetId, int appWidgetType) {
+ //创建一个更新小部件的意图
Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
if (appWidgetType == Notes.TYPE_WIDGET_2X) {
+ //如果小部件类型是2x，那么设置意图的类为NoteWidgetProvider_2x
intent.setClass(this, NoteWidgetProvider_2x.class);
} else if (appWidgetType == Notes.TYPE_WIDGET_4X) {
+ //如果小部件类型是4x，那么设置意图的类为NoteWidgetProvider_4x
intent.setClass(this, NoteWidgetProvider_4x.class);
} else {
+ //如果小部件类型不支持，那么打印错误日志并返回
Log.e(TAG, "Unspported widget type");
return;
}
+ //将小部件的id放入意图中
intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[] {
appWidgetId
});
+ //发送广播更新小部件
sendBroadcast(intent);
+ //设置结果为成功，并将意图返回给调用者
setResult(RESULT_OK, intent);
}
+ // 定义一个私有的最终变量，用于创建上下文菜单的监听器
private final OnCreateContextMenuListener mFolderOnCreateContextMenuListener = new OnCreateContextMenuListener() {
+ // 重写onCreateContextMenu方法，用于在长按文件夹时弹出菜单
public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
+ // 如果当前聚焦的笔记数据项不为空
if (mFocusNoteDataItem != null) {
+ // 设置菜单的标题为笔记的摘要
menu.setHeaderTitle(mFocusNoteDataItem.getSnippet());
+ // 添加菜单项，分别为查看文件夹、删除文件夹和修改文件夹名称，指定id和顺序
menu.add(0, MENU_FOLDER_VIEW, 0, R.string.menu_folder_view);
menu.add(0, MENU_FOLDER_DELETE, 0, R.string.menu_folder_delete);
menu.add(0, MENU_FOLDER_CHANGE_NAME, 0, R.string.menu_folder_change_name);
@@ -718,38 +954,53 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
};
+ //当上下文菜单关闭时，执行以下操作
@Override
public void onContextMenuClosed(Menu menu) {
+ //如果笔记列表视图不为空，就取消设置上下文菜单监听器
if (mNotesListView != null) {
mNotesListView.setOnCreateContextMenuListener(null);
}
+ //调用父类的方法
super.onContextMenuClosed(menu);
}
+ //当上下文菜单中的某一项被选择时，执行以下操作
@Override
public boolean onContextItemSelected(MenuItem item) {
+ //如果长按的数据项为空，就打印错误日志并返回false
if (mFocusNoteDataItem == null) {
Log.e(TAG, "The long click data item is null");
return false;
}
+ //根据选择的菜单项的id，执行不同的操作
switch (item.getItemId()) {
+ //如果选择了查看文件夹，就打开对应的文件夹
case MENU_FOLDER_VIEW:
openFolder(mFocusNoteDataItem);
break;
+ //如果选择了删除文件夹，就弹出一个对话框，询问用户是否确定删除
case MENU_FOLDER_DELETE:
AlertDialog.Builder builder = new AlertDialog.Builder(this);
+ //设置对话框的标题
builder.setTitle(getString(R.string.alert_title_delete));
+ //设置对话框的图标
builder.setIcon(android.R.drawable.ic_dialog_alert);
+ //设置对话框的内容
builder.setMessage(getString(R.string.alert_message_delete_folder));
+ //设置对话框的确定按钮和点击事件
builder.setPositiveButton(android.R.string.ok,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
+ //删除文件夹
deleteFolder(mFocusNoteDataItem.getId());
}
});
+ //设置对话框的取消按钮和点击事件
builder.setNegativeButton(android.R.string.cancel, null);
- builder.show();
+ builder.show();//显示对话框
break;
+ //如果选择了修改文件夹名称，就显示一个创建或修改文件夹的对话框
case MENU_FOLDER_CHANGE_NAME:
showCreateOrModifyFolderDialog(false);
break;
@@ -757,103 +1008,158 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
break;
}
+ //返回true表示处理了上下文菜单事件
return true;
}
+ // 重写onPrepareOptionsMenu方法，用于在准备选项菜单时根据不同的状态显示不同的菜单
@Override
public boolean onPrepareOptionsMenu(Menu menu) {
+ // 清空菜单
menu.clear();
+ // 如果当前状态是笔记列表
if (mState == ListEditState.NOTE_LIST) {
+ // 从note_list.xml文件中加载菜单项
getMenuInflater().inflate(R.menu.note_list, menu);
// set sync or sync_cancel
menu.findItem(R.id.menu_sync).setTitle(
GTaskSyncService.isSyncing() ? R.string.menu_sync_cancel : R.string.menu_sync);
} else if (mState == ListEditState.SUB_FOLDER) {
+ // 如果当前状态是子文件夹
+ // 从sub_folder.xml文件中加载菜单项
getMenuInflater().inflate(R.menu.sub_folder, menu);
} else if (mState == ListEditState.CALL_RECORD_FOLDER) {
+ // 如果当前状态是通话记录文件夹
+ // 从call_record_folder.xml文件中加载菜单项
getMenuInflater().inflate(R.menu.call_record_folder, menu);
} else {
+ // 如果当前状态不属于以上任何一种
+ // 打印错误日志，显示错误的状态
Log.e(TAG, "Wrong state:" + mState);
}
+ // 返回true表示显示菜单
return true;
}
+ // 重写onOptionsItemSelected方法，用于处理选项菜单的点击事件
@Override
public boolean onOptionsItemSelected(MenuItem item) {
+ // 根据菜单项的id进行分支判断
switch (item.getItemId()) {
+ // 如果点击了新建文件夹菜单项
case R.id.menu_new_folder: {
+ // 显示创建或修改文件夹的对话框，传入true表示是创建模式
showCreateOrModifyFolderDialog(true);
break;
}
+ // 如果点击了导出文本菜单项
case R.id.menu_export_text: {
+ // 调用导出笔记到文本的方法
exportNoteToText();
break;
}
+ // 如果点击了同步菜单项
case R.id.menu_sync: {
+ // 如果当前是同步模式
if (isSyncMode()) {
+ // 如果菜单项的标题是同步
if (TextUtils.equals(item.getTitle(), getString(R.string.menu_sync))) {
+ // 调用GTaskSyncService的startSync方法，开始同步
GTaskSyncService.startSync(this);
} else {
+ // 如果菜单项的标题是取消同步
+ // 调用GTaskSyncService的cancelSync方法，取消同步
GTaskSyncService.cancelSync(this);
}
} else {
+ // 如果当前不是同步模式
+ // 调用启动偏好设置活动的方法
startPreferenceActivity();
}
break;
}
case R.id.menu_setting: {
+ // 如果点击了设置菜单项
+ // 调用启动偏好设置活动的方法
startPreferenceActivity();
break;
}
case R.id.menu_new_note: {
+ // 如果点击了新建笔记菜单项
+ // 调用创建新笔记的方法
createNewNote();
break;
}
case R.id.menu_search:
+ // 如果点击了搜索菜单项
+ // 调用onSearchRequested方法，启动搜索界面
onSearchRequested();
break;
default:
break;
}
+ // 返回true表示处理了菜单项的点击事件
return true;
}
+ // 用于启动搜索界面
@Override
public boolean onSearchRequested() {
+ // 调用startSearch方法，传入null表示不指定搜索的初始值，
+ // false表示不显示搜索提示，null表示不传递额外的数据，false表示不使用全局搜索
startSearch(null, false, null /* appData */, false);
+ // 返回true表示处理了搜索请求
return true;
}
+ // 用于到处笔记到文本文件
private void exportNoteToText() {
+ // 获取一个BackupUtils的实例，传入当前活动的上下文
final BackupUtils backup = BackupUtils.getInstance(NotesListActivity.this);
+ // 创建一个异步任务，用于在后台线程执行导出操作
new AsyncTask<Void, Void, Integer>() {
+ // 重写doInBackground方法，用于执行导出操作，并返回一个整数表示导出的结果
@Override
protected Integer doInBackground(Void... unused) {
return backup.exportToText();
}
+ // 重写onPostExecute方法，用于在主线程处理导出的结果
@Override
protected void onPostExecute(Integer result) {
+ // 如果导出的结果是SD卡未挂载
if (result == BackupUtils.STATE_SD_CARD_UNMOUONTED) {
+ // 创建一个对话框构造器，传入当前活动的上下文
AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this);
+ // 设置对话框的标题为导出失败
builder.setTitle(NotesListActivity.this
.getString(R.string.failed_sdcard_export));
+ // 设置对话框的内容为SD卡未挂载的错误信息
builder.setMessage(NotesListActivity.this
.getString(R.string.error_sdcard_unmounted));
+ // 设置对话框的确定按钮，不指定点击事件
builder.setPositiveButton(android.R.string.ok, null);
- builder.show();
+ builder.show();// 显示对话框
} else if (result == BackupUtils.STATE_SUCCESS) {
+ // 如果导出的结果是成功
+ // 创建一个对话框构造器，传入当前活动的上下文
AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this);
+ // 设置对话框的标题为导出成功
builder.setTitle(NotesListActivity.this
.getString(R.string.success_sdcard_export));
+ // 设置对话框的内容为导出文件的名称和位置
builder.setMessage(NotesListActivity.this.getString(
R.string.format_exported_file_location, backup
.getExportedTextFileName(), backup.getExportedTextFileDir()));
+ // 设置对话框的确定按钮，不指定点击事件
builder.setPositiveButton(android.R.string.ok, null);
builder.show();
} else if (result == BackupUtils.STATE_SYSTEM_ERROR) {
+ // 如果导出的结果是系统错误
+ // 创建一个对话框构造器，传入当前活动的上下文
AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this);
+ // 设置对话框的标题为导出失败
builder.setTitle(NotesListActivity.this
.getString(R.string.failed_sdcard_export));
builder.setMessage(NotesListActivity.this
@@ -863,49 +1169,79 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
}
- }.execute();
+ }.execute();// 调用execute方法，启动异步任务
}
+ // 用于判断是否是同步模式
private boolean isSyncMode() {
+ // 调用NotesPreferenceActivity的getSyncAccountName方法，获取同步账户的名称，并去除两端的空格，
+ // 如果长度大于0，说明有同步账户，返回true，否则返回false
return NotesPreferenceActivity.getSyncAccountName(this).trim().length() > 0;
}
+ // 用于启动偏好设置活动
private void startPreferenceActivity() {
+ // 获取当前活动的父活动，如果没有父活动，则使用当前活动
Activity from = getParent() != null ? getParent() : this;
+ // 创建一个意图对象，指定从当前活动或父活动跳转到NotesPreferenceActivity
Intent intent = new Intent(from, NotesPreferenceActivity.class);
+ // 传入意图对象和-1表示不指定请求码，如果需要则启动活动
from.startActivityIfNeeded(intent, -1);
}
+ // 用于处理列表项的点击事件
private class OnListItemClickListener implements OnItemClickListener {
+ // 重写onItemClick方法，传入父视图，点击的视图，点击的位置和点击的id
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
if (view instanceof NotesListItem) {
+ // 获取该视图对应的笔记数据项
NoteItemData item = ((NotesListItem) view).getItemData();
+ // 如果笔记列表适配器处于选择模式
if (mNotesListAdapter.isInChoiceMode()) {
+ // 如果笔记数据项的类型是普通笔记
if (item.getType() == Notes.TYPE_NOTE) {
+ // 计算点击的位置，减去列表视图的头部视图数
position = position - mNotesListView.getHeaderViewsCount();
+ // 调用模式回调的onItemCheckedStateChanged方法，
+ // 传入null表示不指定操作模式，传入位置和id，以及取反后的选择状态，
+ // 用于改变列表项的选择状态
mModeCallBack.onItemCheckedStateChanged(null, position, id,
!mNotesListAdapter.isSelectedItem(position));
}
return;
}
+ // 根据当前状态进行分支判断
switch (mState) {
+ // 如果当前状态是笔记列表
case NOTE_LIST:
+ // 如果笔记数据项的类型是文件夹或系统文件夹
if (item.getType() == Notes.TYPE_FOLDER
|| item.getType() == Notes.TYPE_SYSTEM) {
+ // 调用打开文件夹的方法，传入笔记数据项
openFolder(item);
} else if (item.getType() == Notes.TYPE_NOTE) {
+ // 如果笔记数据项的类型是普通笔记
+ // 调用打开笔记的方法，传入笔记数据项
openNode(item);
} else {
+ // 如果笔记数据项的类型不属于以上任何一种
+ // 打印错误日志，显示错误的笔记类型
Log.e(TAG, "Wrong note type in NOTE_LIST");
}
break;
+ // 如果当前状态是子文件夹
case SUB_FOLDER:
+ // 或者当前状态是通话记录文件夹
case CALL_RECORD_FOLDER:
if (item.getType() == Notes.TYPE_NOTE) {
+ // 如果笔记数据项的类型是普通笔记
+ // 调用打开笔记的方法，传入笔记数据项
openNode(item);
} else {
+ // 如果笔记数据项的类型不是普通笔记
+ // 打印错误日志，显示错误的笔记类型
Log.e(TAG, "Wrong note type in SUB_FOLDER");
}
break;
@@ -917,11 +1253,18 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
+ // 用于启动查询目标文件夹的操作
private void startQueryDestinationFolders() {
+ // 用于存储查询条件，表示笔记的类型是文件夹，且父id不是回收站文件夹，且id不是当前文件夹
String selection = NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>? AND " + NoteColumns.ID + "<>?";
+
+ // 如果当前状态是笔记列表，不改变查询条件，
+ // 否则在查询条件的基础上增加一个或条件，表示id等于根文件夹
selection = (mState == ListEditState.NOTE_LIST) ? selection:
"(" + selection + ") OR (" + NoteColumns.ID + "=" + Notes.ID_ROOT_FOLDER + ")";
+ // 调用后台查询处理器的startQuery方法，传入文件夹列表查询标记，
+ // null表示不指定cookie对象，笔记内容的uri，文件夹列表适配器的投影数组，查询条件和参数数组，以及按修改日期降序排序
mBackgroundQueryHandler.startQuery(FOLDER_LIST_QUERY_TOKEN,
null,
Notes.CONTENT_NOTE_URI,
@@ -935,20 +1278,33 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
NoteColumns.MODIFIED_DATE + " DESC");
}
+ // 用于处理列表项的长按事件，传入父视图，长按的视图，长按的位置和长按的id
public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
+ // 如果长按的视图是一个NotesListItem
if (view instanceof NotesListItem) {
+ // 获取该视图对应的笔记数据项，并赋值给mFocusNoteDataItem变量
mFocusNoteDataItem = ((NotesListItem) view).getItemData();
+ // 如果笔记数据项的类型是普通笔记，并且笔记列表适配器不处于选择模式
if (mFocusNoteDataItem.getType() == Notes.TYPE_NOTE && !mNotesListAdapter.isInChoiceMode()) {
+ // 如果调用列表视图的startActionMode方法，并传入模式回调对象，返回不为空
if (mNotesListView.startActionMode(mModeCallBack) != null) {
+ // 传入null表示不指定操作模式，传入位置和id，以及true表示选中该列表项
mModeCallBack.onItemCheckedStateChanged(null, position, id, true);
+ // 传入长按常量，表示触发触觉反馈
mNotesListView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
} else {
+ // 如果调用列表视图的startActionMode方法失败
+ // 打印错误日志，显示启动操作模式失败
Log.e(TAG, "startActionMode fails");
}
} else if (mFocusNoteDataItem.getType() == Notes.TYPE_FOLDER) {
+ // 如果笔记数据项的类型是文件夹
+ // 调用列表视图的setOnCreateContextMenuListener方法，
+ // 并传入文件夹创建上下文菜单监听器对象，表示设置该监听器为创建上下文菜单的监听器
mNotesListView.setOnCreateContextMenuListener(mFolderOnCreateContextMenuListener);
}
}
+ // 返回false表示不消费长按事件
return false;
}
}
diff --git a/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java b/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
index 51c9cb9..af6f2fd 100644
--- a/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
+++ b/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
@@ -31,6 +31,7 @@ import java.util.HashSet;
import java.util.Iterator;
+// 用于创建笔记应用的列表适配器
public class NotesListAdapter extends CursorAdapter {
private static final String TAG = "NotesListAdapter";
private Context mContext;
@@ -55,6 +56,7 @@ public class NotesListAdapter extends CursorAdapter {
return new NotesListItem(context);
}
+ // 用于绑定视图和数据
@Override
public void bindView(View view, Context context, Cursor cursor) {
if (view instanceof NotesListItem) {
@@ -64,20 +66,24 @@ public class NotesListAdapter extends CursorAdapter {
}
}
+ // 设置勾选框，并更新视图
public void setCheckedItem(final int position, final boolean checked) {
mSelectedIndex.put(position, checked);
notifyDataSetChanged();
}
+ // 判断单选按钮是否勾选
public boolean isInChoiceMode() {
return mChoiceMode;
}
+ // 设置单项选项框
public void setChoiceMode(boolean mode) {
mSelectedIndex.clear();
mChoiceMode = mode;
}
+ // 根据参数checked，选择或取消选择所有的便签项
public void selectAll(boolean checked) {
Cursor cursor = getCursor();
for (int i = 0; i < getCount(); i++) {
@@ -89,6 +95,7 @@ public class NotesListAdapter extends CursorAdapter {
}
}
+ // 获取所有选中的项的id
public HashSet<Long> getSelectedItemIds() {
HashSet<Long> itemSet = new HashSet<Long>();
for (Integer position : mSelectedIndex.keySet()) {
@@ -105,6 +112,7 @@ public class NotesListAdapter extends CursorAdapter {
return itemSet;
}
+ // 获取所有选中的项的小部件属性
public HashSet<AppWidgetAttribute> getSelectedWidget() {
HashSet<AppWidgetAttribute> itemSet = new HashSet<AppWidgetAttribute>();
for (Integer position : mSelectedIndex.keySet()) {
@@ -128,6 +136,7 @@ public class NotesListAdapter extends CursorAdapter {
return itemSet;
}
+ // 获取选中的项的数量，并返回一个整数。
public int getSelectedCount() {
Collection<Boolean> values = mSelectedIndex.values();
if (null == values) {
@@ -143,11 +152,13 @@ public class NotesListAdapter extends CursorAdapter {
return count;
}
+ // 判断是否所有项都被选中
public boolean isAllSelected() {
int checkedCount = getSelectedCount();
return (checkedCount != 0 && checkedCount == mNotesCount);
}
+ // 判断是否被选中
public boolean isSelectedItem(final int position) {
if (null == mSelectedIndex.get(position)) {
return false;
@@ -155,18 +166,21 @@ public class NotesListAdapter extends CursorAdapter {
return mSelectedIndex.get(position);
}
+ // 内容发生变化时，重新计算便签数量
@Override
protected void onContentChanged() {
super.onContentChanged();
calcNotesCount();
}
+ // 光标发生变动时，回调该函数计算便签数量
@Override
public void changeCursor(Cursor cursor) {
super.changeCursor(cursor);
calcNotesCount();
}
+ // 计算便签数量
private void calcNotesCount() {
mNotesCount = 0;
for (int i = 0; i < getCount(); i++) {
diff --git a/app/src/main/java/net/micode/notes/ui/NotesListItem.java b/app/src/main/java/net/micode/notes/ui/NotesListItem.java
index 1221e80..dad78e7 100644
--- a/app/src/main/java/net/micode/notes/ui/NotesListItem.java
+++ b/app/src/main/java/net/micode/notes/ui/NotesListItem.java
@@ -30,6 +30,7 @@ import net.micode.notes.tool.DataUtils;
import net.micode.notes.tool.ResourceParser.NoteItemBgResources;
+//创建便签列表项目选项
public class NotesListItem extends LinearLayout {
private ImageView mAlert;
private TextView mTitle;
@@ -38,6 +39,7 @@ public class NotesListItem extends LinearLayout {
private NoteItemData mItemData;
private CheckBox mCheckBox;
+
public NotesListItem(Context context) {
super(context);
inflate(context, R.layout.note_item, this);
@@ -48,15 +50,20 @@ public class NotesListItem extends LinearLayout {
mCheckBox = (CheckBox) findViewById(android.R.id.checkbox);
}
+ // 绑定数据和视图
public void bind(Context context, NoteItemData data, boolean choiceMode, boolean checked) {
+ // 如果是多选模式并且数据是便签类型，就将复选框设置为可见
+ // 让用户可以在多选模式下选择或取消选择便签项
if (choiceMode && data.getType() == Notes.TYPE_NOTE) {
mCheckBox.setVisibility(View.VISIBLE);
+ // 设置是否选中
mCheckBox.setChecked(checked);
} else {
mCheckBox.setVisibility(View.GONE);
}
mItemData = data;
+ // 根据数据的id和父id，设置不同的标题，时间，图标和呼叫名
if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) {
mCallName.setVisibility(View.GONE);
mAlert.setVisibility(View.VISIBLE);
@@ -99,6 +106,7 @@ public class NotesListItem extends LinearLayout {
setBackground(data);
}
+ // 根据传入的数据设置背景颜色
private void setBackground(NoteItemData data) {
int id = data.getBgColorId();
if (data.getType() == Notes.TYPE_NOTE) {
@@ -116,6 +124,7 @@ public class NotesListItem extends LinearLayout {
}
}
+ // 获取视图板顶的数据对象
public NoteItemData getItemData() {
return mItemData;
}
diff --git a/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java b/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
index 07c5f7e..5134c10 100644
--- a/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
+++ b/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
@@ -69,6 +69,7 @@ public class NotesPreferenceActivity extends PreferenceActivity {
private boolean mHasAddedAccount;
+ // 在活动创建时执行一些初始化操作
@Override
protected void onCreate(Bundle icicle) {
super.onCreate(icicle);
@@ -76,6 +77,7 @@ public class NotesPreferenceActivity extends PreferenceActivity {
/* using the app icon for navigation */
getActionBar().setDisplayHomeAsUpEnabled(true);
+ // 从xml文件中加载活动的偏好设置
addPreferencesFromResource(R.xml.preferences);
mAccountCategory = (PreferenceCategory) findPreference(PREFERENCE_SYNC_ACCOUNT_KEY);
mReceiver = new GTaskReceiver();
@@ -84,7 +86,9 @@ public class NotesPreferenceActivity extends PreferenceActivity {
registerReceiver(mReceiver, filter);
mOriAccounts = null;
+ // 从xml文件中加载了一个视图，并赋值给header这个局部变量
View header = LayoutInflater.from(this).inflate(R.layout.settings_header, null);
+ // 将这个视图添加到列表的头部
getListView().addHeaderView(header, null, true);
}
@@ -112,10 +116,11 @@ public class NotesPreferenceActivity extends PreferenceActivity {
}
}
}
-
+ // 刷新用户界面
refreshUI();
}
+ // 在活动销毁时执行一些清理操作
@Override
protected void onDestroy() {
if (mReceiver != null) {
@@ -124,6 +129,7 @@ public class NotesPreferenceActivity extends PreferenceActivity {
super.onDestroy();
}
+ // 加载账户相关的偏好设置
private void loadAccountPreference() {
mAccountCategory.removeAll();
@@ -154,6 +160,7 @@ public class NotesPreferenceActivity extends PreferenceActivity {
mAccountCategory.addPreference(accountPref);
}
+ // 加载同步按钮和同步状态的显示
private void loadSyncButton() {
Button syncButton = (Button) findViewById(R.id.preference_sync_button);
TextView lastSyncTimeView = (TextView) findViewById(R.id.prefenerece_sync_status_textview);
@@ -193,29 +200,35 @@ public class NotesPreferenceActivity extends PreferenceActivity {
}
}
+ // 刷新界面
private void refreshUI() {
loadAccountPreference();
loadSyncButton();
}
+ // 显示账户选择的对话框并进行账户的设置
private void showSelectAccountAlertDialog() {
AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);
+ // 设置标题以及子标题内容
View titleView = LayoutInflater.from(this).inflate(R.layout.account_dialog_title, null);
TextView titleTextView = (TextView) titleView.findViewById(R.id.account_dialog_title);
titleTextView.setText(getString(R.string.preferences_dialog_select_account_title));
TextView subtitleTextView = (TextView) titleView.findViewById(R.id.account_dialog_subtitle);
subtitleTextView.setText(getString(R.string.preferences_dialog_select_account_tips));
+ // 设置对话框的自定义标题
dialogBuilder.setCustomTitle(titleView);
dialogBuilder.setPositiveButton(null, null);
+ // 获取同步账户信息
Account[] accounts = getGoogleAccounts();
String defAccount = getSyncAccountName(this);
mOriAccounts = accounts;
mHasAddedAccount = false;
+ // 如果账户不为空
if (accounts.length > 0) {
CharSequence[] items = new CharSequence[accounts.length];
final CharSequence[] itemMapping = items;
@@ -227,8 +240,10 @@ public class NotesPreferenceActivity extends PreferenceActivity {
}
items[index++] = account.name;
}
+ // 在对话框建立一个单选的复选框
dialogBuilder.setSingleChoiceItems(items, checkedItem,
new DialogInterface.OnClickListener() {
+ //设置点击后执行的事件，包括检录新同步账户和刷新标签界面
public void onClick(DialogInterface dialog, int which) {
setSyncAccount(itemMapping[which].toString());
dialog.dismiss();
@@ -254,15 +269,18 @@ public class NotesPreferenceActivity extends PreferenceActivity {
});
}
+ // 显示一个更改账户的确认对话框
private void showChangeAccountConfirmAlertDialog() {
AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);
+ // 根据同步修改的账户信息设置标题以及子标题的内容
View titleView = LayoutInflater.from(this).inflate(R.layout.account_dialog_title, null);
TextView titleTextView = (TextView) titleView.findViewById(R.id.account_dialog_title);
titleTextView.setText(getString(R.string.preferences_dialog_change_account_title,
getSyncAccountName(this)));
TextView subtitleTextView = (TextView) titleView.findViewById(R.id.account_dialog_subtitle);
subtitleTextView.setText(getString(R.string.preferences_dialog_change_account_warn_msg));
+ // 设置对话框的自定义标题
dialogBuilder.setCustomTitle(titleView);
CharSequence[] menuItemArray = new CharSequence[] {
@@ -283,11 +301,13 @@ public class NotesPreferenceActivity extends PreferenceActivity {
dialogBuilder.show();
}
+ // 获取谷歌账户
private Account[] getGoogleAccounts() {
AccountManager accountManager = AccountManager.get(this);
return accountManager.getAccountsByType("com.google");
}
+ // 设置同步账户
private void setSyncAccount(String account) {
if (!getSyncAccountName(this).equals(account)) {
SharedPreferences settings = getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE);
@@ -318,6 +338,7 @@ public class NotesPreferenceActivity extends PreferenceActivity {
}
}
+ // 删除同步账户
private void removeSyncAccount() {
SharedPreferences settings = getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE);
SharedPreferences.Editor editor = settings.edit();
@@ -340,12 +361,14 @@ public class NotesPreferenceActivity extends PreferenceActivity {
}).start();
}
+ // 获取同步账户名称
public static String getSyncAccountName(Context context) {
SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME,
Context.MODE_PRIVATE);
return settings.getString(PREFERENCE_SYNC_ACCOUNT_NAME, "");
}
+ // 设置最终同步时间
public static void setLastSyncTime(Context context, long time) {
SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME,
Context.MODE_PRIVATE);
@@ -354,12 +377,14 @@ public class NotesPreferenceActivity extends PreferenceActivity {
editor.commit();
}
+ // 获取最终同步时间
public static long getLastSyncTime(Context context) {
SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME,
Context.MODE_PRIVATE);
return settings.getLong(PREFERENCE_LAST_SYNC_TIME, 0);
}
+ // 接收同步状态和信息
private class GTaskReceiver extends BroadcastReceiver {
@Override
@@ -374,6 +399,7 @@ public class NotesPreferenceActivity extends PreferenceActivity {
}
}
+ // 处理菜单选项
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
diff --git a/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java b/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
index ec6f819..4661c89 100644
--- a/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
+++ b/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
@@ -37,33 +37,33 @@ public abstract class NoteWidgetProvider extends AppWidgetProvider {
NoteColumns.ID,
NoteColumns.BG_COLOR_ID,
NoteColumns.SNIPPET
- };
+ };//定义字符串数组PROJECTION，包含IDB G_COLOR_ID SNIPPET三个元素
public static final int COLUMN_ID = 0;
public static final int COLUMN_BG_COLOR_ID = 1;
- public static final int COLUMN_SNIPPET = 2;
+ public static final int COLUMN_SNIPPET = 2;//定义三个元素初始量
private static final String TAG = "NoteWidgetProvider";
@Override
- public void onDeleted(Context context, int[] appWidgetIds) {
+ public void onDeleted(Context context, int[] appWidgetIds) {//创建一个ContentValues对象values存储键值对数据
ContentValues values = new ContentValues();
- values.put(NoteColumns.WIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);
+ values.put(NoteColumns.WIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);//将无效小部件id存储ContentValues中
for (int i = 0; i < appWidgetIds.length; i++) {
context.getContentResolver().update(Notes.CONTENT_NOTE_URI,
values,
NoteColumns.WIDGET_ID + "=?",
- new String[] { String.valueOf(appWidgetIds[i])});
+ new String[] { String.valueOf(appWidgetIds[i])});//通过getcontent函数获取程序contentValues对象，用update方法更新
}
}
private Cursor getNoteWidgetInfo(Context context, int widgetId) {
return context.getContentResolver().query(Notes.CONTENT_NOTE_URI,
- PROJECTION,
+ PROJECTION,//获取ContentResovler对象，并用querty方法查询数据·
NoteColumns.WIDGET_ID + "=? AND " + NoteColumns.PARENT_ID + "<>?",
new String[] { String.valueOf(widgetId), String.valueOf(Notes.ID_TRASH_FOLER) },
null);
- }
+ }//null表示默认排序方式
protected void update(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
update(context, appWidgetManager, appWidgetIds, false);
@@ -71,12 +71,12 @@ public abstract class NoteWidgetProvider extends AppWidgetProvider {
private void update(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds,
boolean privacyMode) {
- for (int i = 0; i < appWidgetIds.length; i++) {
+ for (int i = 0; i < appWidgetIds.length; i++) {//判断当前小部件id是否合法，若合法才可进行操作
if (appWidgetIds[i] != AppWidgetManager.INVALID_APPWIDGET_ID) {
- int bgId = ResourceParser.getDefaultBgId(context);
+ int bgId = ResourceParser.getDefaultBgId(context);//获取默认背景图片id，并将其作为当前部件的背景
String snippet = "";
Intent intent = new Intent(context, NoteEditActivity.class);
- intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+ intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);//创建internet对象，设置flag标志
intent.putExtra(Notes.INTENT_EXTRA_WIDGET_ID, appWidgetIds[i]);
intent.putExtra(Notes.INTENT_EXTRA_WIDGET_TYPE, getWidgetType());
@@ -86,14 +86,14 @@ public abstract class NoteWidgetProvider extends AppWidgetProvider {
Log.e(TAG, "Multiple message with same widget id:" + appWidgetIds[i]);
c.close();
return;
- }
+ }//判断数据库查询结果c是否为空，若查询结果大于1，则记录日志错误并返回
snippet = c.getString(COLUMN_SNIPPET);
bgId = c.getInt(COLUMN_BG_COLOR_ID);
intent.putExtra(Intent.EXTRA_UID, c.getLong(COLUMN_ID));
- intent.setAction(Intent.ACTION_VIEW);
+ intent.setAction(Intent.ACTION_VIEW);//将当前记录id作为extra数据存入启动internet对象中
} else {
snippet = context.getResources().getString(R.string.widget_havenot_content);
- intent.setAction(Intent.ACTION_INSERT_OR_EDIT);
+ intent.setAction(Intent.ACTION_INSERT_OR_EDIT);//// 数据库查询结果为空或者未能成功移动到第一条记录时，将片段内容设置为默认字符串
}
if (c != null) {
@@ -107,16 +107,16 @@ public abstract class NoteWidgetProvider extends AppWidgetProvider {
* Generate the pending intent to start host for the widget
*/
PendingIntent pendingIntent = null;
- if (privacyMode) {
+ if (privacyMode) {// 判断是否处于隐私模式
rv.setTextViewText(R.id.widget_text,
context.getString(R.string.widget_under_visit_mode));
pendingIntent = PendingIntent.getActivity(context, appWidgetIds[i], new Intent(
- context, NotesListActivity.class), PendingIntent.FLAG_UPDATE_CURRENT);
+ context, NotesListActivity.class), PendingIntent.FLAG_UPDATE_CURRENT);// 如果是，将小部件文本设置为“访问模式下”，并创建一个PendingIntent，使点击小部件时跳转至NotesListActivity
} else {
rv.setTextViewText(R.id.widget_text, snippet);
pendingIntent = PendingIntent.getActivity(context, appWidgetIds[i], intent,
PendingIntent.FLAG_UPDATE_CURRENT);
- }
+ }// 如果不是，将小部件文本设置为片段内容，并创建一个PendingIntent，使点击小部件时跳转至NoteEditActivity
rv.setOnClickPendingIntent(R.id.widget_text, pendingIntent);
appWidgetManager.updateAppWidget(appWidgetIds[i], rv);
@@ -128,5 +128,5 @@ public abstract class NoteWidgetProvider extends AppWidgetProvider {
protected abstract int getLayoutId();
- protected abstract int getWidgetType();
+ protected abstract int getWidgetType();//获取背景资源id，布局资源id，小部件类型
}
diff --git a/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java b/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
index adcb2f7..40dd783 100644
--- a/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
+++ b/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
@@ -28,20 +28,21 @@ public class NoteWidgetProvider_2x extends NoteWidgetProvider {
@Override
public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
super.update(context, appWidgetManager, appWidgetIds);
- }
+ }//NoteWidgetProvider_2x是一个继承自NoteWidgetProvider的小部件提供者，用于显示2x大小的便签小部件。
+ //调用父类的update方法，更新小部件UI界面
@Override
protected int getLayoutId() {
return R.layout.widget_2x;
- }
+ }//获取2x大小便签小部件布局资源ID，由子类具体实现
@Override
protected int getBgResourceId(int bgId) {
return ResourceParser.WidgetBgResources.getWidget2xBgResource(bgId);
- }
+ }//获取2x大小便签小部件背景资源ID，由子类具体实现。
@Override
protected int getWidgetType() {
return Notes.TYPE_WIDGET_2X;
- }
+ }//获取小部件类型，由子类具体实现，返回值为Notes.TYPE_WIDGET_2X
}
diff --git a/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java b/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
index c12a02e..6a3b077 100644
--- a/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
+++ b/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
@@ -28,19 +28,20 @@ public class NoteWidgetProvider_4x extends NoteWidgetProvider {
@Override
public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
super.update(context, appWidgetManager, appWidgetIds);
- }
+ }//NoteWidgetProvider_4x是一个继承自NoteWidgetProvider的小部件提供者，用于显示4x大小的便签小部件。
+ //调用父类的update方法，更新小部件UI界面
protected int getLayoutId() {
return R.layout.widget_4x;
- }
+ }//获取4x大小便签小部件布局资源ID，由子类具体实现
@Override
protected int getBgResourceId(int bgId) {
return ResourceParser.WidgetBgResources.getWidget4xBgResource(bgId);
- }
+ }//获取4x大小便签小部件背景资源ID，由子类具体实现。
@Override
protected int getWidgetType() {
return Notes.TYPE_WIDGET_4X;
- }
+ }//获取小部件类型，由子类具体实现，返回值为Notes.TYPE_WIDGET_4X
}
diff --git a/app/src/main/res/color/primary_text_dark.xml b/app/src/main/res/color/primary_text_dark.xml
index 8ad98e3..7c85459 100644
--- a/app/src/main/res/color/primary_text_dark.xml
+++ b/app/src/main/res/color/primary_text_dark.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
diff --git a/app/src/main/res/color/secondary_text_dark.xml b/app/src/main/res/color/secondary_text_dark.xml
index 9cf8a1a..c1c2384 100644
--- a/app/src/main/res/color/secondary_text_dark.xml
+++ b/app/src/main/res/color/secondary_text_dark.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
diff --git a/app/src/main/res/drawable-hdpi/font_color_green.png b/app/src/main/res/drawable-hdpi/font_color_green.png
new file mode 100644
index 0000000..1f3b2fa
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/font_color_green.png differ
diff --git a/app/src/main/res/layout/note_edit.xml b/app/src/main/res/layout/note_edit.xml
index 10b2aa7..a9caac7 100644
--- a/app/src/main/res/layout/note_edit.xml
+++ b/app/src/main/res/layout/note_edit.xml
@@ -397,4 +397,168 @@
android:src="@drawable/selected" />
</FrameLayout>
</LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/ll_font_color_selector"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom"
+ android:background="@drawable/font_size_selector_bg"
+ android:visibility="gone">
+
+ <FrameLayout
+ android:id="@+id/ll_font_default"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1">
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:gravity="center"
+ android:orientation="vertical">
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="5dip"
+ android:src="@color/Default" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="黑色"
+ android:textAppearance="@style/TextAppearanceUnderMenuIcon" />
+
+ </LinearLayout>
+
+ <ImageView
+ android:id="@+id/iv_default_select"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom|right"
+ android:layout_marginRight="6dip"
+ android:layout_marginBottom="-7dip"
+ android:focusable="false"
+ android:src="@drawable/selected"
+ android:visibility="gone" />
+ </FrameLayout>
+
+ <FrameLayout
+ android:id="@+id/ll_font_green"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1">
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:gravity="center"
+ android:orientation="vertical">
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="5dip"
+ android:src="@color/Green" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="绿色"
+ android:textAppearance="@style/TextAppearanceUnderMenuIcon" />
+ </LinearLayout>
+
+ <ImageView
+ android:id="@+id/iv_green_select"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom|right"
+ android:layout_marginRight="6dip"
+ android:layout_marginBottom="-7dip"
+ android:focusable="false"
+ android:src="@drawable/selected"
+ android:visibility="gone" />
+ </FrameLayout>
+
+ <FrameLayout
+ android:id="@+id/ll_font_Bright_blue"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1">
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:gravity="center"
+ android:orientation="vertical">
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="5dip"
+ android:src="@color/Bright_Blue" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="亮蓝色"
+ android:textAppearance="@style/TextAppearanceUnderMenuIcon" />
+ </LinearLayout>
+
+ <ImageView
+ android:id="@+id/iv_Bright_blue_select"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom|right"
+ android:layout_marginRight="6dip"
+ android:layout_marginBottom="-7dip"
+ android:focusable="false"
+ android:src="@drawable/selected"
+ android:visibility="gone" />
+ </FrameLayout>
+
+ <FrameLayout
+ android:id="@+id/ll_font_red"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1">
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:gravity="center"
+ android:orientation="vertical">
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="5dip"
+ android:src="@color/Red" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="红色"
+ android:textAppearance="@style/TextAppearanceUnderMenuIcon" />
+ </LinearLayout>
+
+ <ImageView
+ android:id="@+id/iv_red_select"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom|right"
+ android:layout_marginRight="6dip"
+ android:layout_marginBottom="-7dip"
+ android:focusable="false"
+ android:src="@drawable/selected"
+ android:visibility="gone" />
+ </FrameLayout>
+
+ </LinearLayout>
+
</FrameLayout>
diff --git a/app/src/main/res/menu/note_edit.xml b/app/src/main/res/menu/note_edit.xml
index 35cacd1..a7b1c44 100644
--- a/app/src/main/res/menu/note_edit.xml
+++ b/app/src/main/res/menu/note_edit.xml
@@ -49,4 +49,10 @@
<item
android:id="@+id/menu_delete_remind"
android:title="@string/menu_remove_remind" />
+ <item
+ android:id="@+id/menu_change_font_color"
+ android:title="@string/menu_change_font_color"/>
+ <item
+ android:id="@+id/menu_insert_img"
+ android:title="@string/menu_insert_img"/>
</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 09f75ed..8a79b0f 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -36,6 +36,9 @@
<string name="note_link_web">浏览网页</string>
<string name="note_link_other">打开地图</string>
<!-- note list string -->
+ <string name="file_path">/MIUI/notes/</string>
+ <string name="file_name_txt_format">notes_%s.txt</string>
+ <string name="format_folder_files_count">(%d)</string>
<string name="menu_create_folder">新建文件夹</string>
<string name="menu_export_text">导出文本</string>
<string name="menu_sync">同步</string>
@@ -72,6 +75,8 @@
<string name="alert_message_delete_folder">确认删除文件夹及所包含的便签吗？</string>
<string name="format_move_notes_to_folder">已将所选 %1$d 条便签移到 %2$s 文件夹</string>
<!-- export text -->
+ <string name="menu_change_font_color">更改选中文本颜色</string>
+ <string name="menu_insert_img">插入图片</string>
<string name="error_sdcard_unmounted">SD卡被占用，不能操作</string>
<string name="error_sdcard_export">导出文本时发生错误，请检查SD卡</string>
<string name="error_note_not_exist">要查看的便签不存在</string>
@@ -97,6 +102,7 @@
<string name="preferences_account_title">同步账号</string>
<string name="preferences_account_summary">与google task同步便签记录</string>
<string name="preferences_last_sync_time">上次同步于 %1$s</string>
+ <string name="preferences_last_sync_time_format">yyyy-MM-dd hh:mm:ss</string>
<string name="preferences_add_account">添加账号</string>
<string name="preferences_menu_change_account">更换账号</string>
<string name="preferences_menu_remove_account">删除账号</string>
@@ -119,6 +125,7 @@
<string name="search">便签</string>
<string name="datetime_dialog_ok">设置</string>
<string name="datetime_dialog_cancel">取消</string>
+ <string name="change_txt_color">改变文本颜色</string>
<plurals name="search_results_title">
<item quantity="other"><xliff:g id="NUMBER">%1$s</xliff:g> 条符合“<xliff:g id="SEARCH">%2$s</xliff:g>”的搜索结果</item>
</plurals>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index e29b79b..4287a46 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
@@ -37,6 +37,9 @@
<string name="note_link_other">打開地圖</string>
<string name="format_move_notes_to_folder">已將所選 %1$d 便籤移到 %2$s 文件夾</string>
<!-- note list string -->
+ <string name="file_path">/MIUI/notes/</string>
+ <string name="file_name_txt_format">notes_%s.txt</string>
+ <string name="format_folder_files_count">(%d)</string>
<string name="menu_create_folder">新建文件夾</string>
<string name="menu_export_text">導出文本</string>
<string name="menu_sync">同步</string>
@@ -71,6 +74,8 @@
<string name="alert_message_delete_notes">确认要刪除所選的 %d 條便籤嗎?</string>
<string name="alert_message_delete_note">确认要删除該條便籤嗎?</string>
<string name="alert_message_delete_folder">確認刪除檔夾及所包含的便簽嗎？</string>
+ <string name="menu_change_font_color">更改选中文本颜色</string>
+ <string name="menu_insert_img">插入图像</string>
<string name="error_sdcard_unmounted">SD卡被佔用，不能操作</string>
<string name="error_sdcard_export">導出TXT時發生錯誤，請檢查SD卡</string>
<string name="error_note_not_exist">要查看的便籤不存在</string>
@@ -96,6 +101,7 @@
<string name="preferences_account_title">同步賬號</string>
<string name="preferences_account_summary">与google task同步便簽記錄</string>
<string name="preferences_last_sync_time">上次同步于 %1$s</string>
+ <string name="preferences_last_sync_time_format">yyyy-MM-dd hh:mm:ss</string>
<string name="preferences_add_account">添加賬號</string>
<string name="preferences_menu_change_account">更換賬號</string>
<string name="preferences_menu_remove_account">刪除賬號</string>
@@ -120,6 +126,7 @@
<string name="search">便籤</string>
<string name="datetime_dialog_ok">設置</string>
<string name="datetime_dialog_cancel">取消</string>
+ <string name="change_txt_color">改变文本颜色</string>
<plurals name="search_results_title">
<item quantity="other"><xliff:g id="NUMBER">%1$s</xliff:g> 條符合”<xliff:g id="SEARCH">%2$s</xliff:g>“的搜尋結果</item>
</plurals>
diff --git a/app/src/main/res/values/FontColor.xml b/app/src/main/res/values/FontColor.xml
new file mode 100644
index 0000000..09f31db
--- /dev/null
+++ b/app/src/main/res/values/FontColor.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <color name="Green">#00FF00</color>
+ <color name="Red">#FF0000</color>
+ <color name="Blue">#0000FF</color>
+ <color name="Yellow">#FFFF00</color>
+ <color name="Default">#000000</color>
+ <color name="Bright_Blue">#00FFFF</color>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 55df868..f8ac9bf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -75,6 +75,8 @@
<string name="alert_message_delete_notes">Confirm to delete the selected %d notes?</string>
<string name="alert_message_delete_note">Confirm to delete this note?</string>
<string name="format_move_notes_to_folder">Have moved selected %1$d notes to %2$s folder</string>
+ <string name="menu_change_font_color">Change Selected Text Color</string>
+ <string name="menu_insert_img">Insert Image</string>
<!-- Error information -->
<string name="error_sdcard_unmounted">SD card busy, not available now</string>
<string name="error_sdcard_export">Export failed, please check SD card</string>
@@ -126,6 +128,7 @@
<string name="search">Notes</string>
<string name="datetime_dialog_ok">set</string>
<string name="datetime_dialog_cancel">cancel</string>
+ <string name="change_txt_color">改变文本颜色</string>
<plurals name="search_results_title">
<item quantity="one"><xliff:g id="number" example="1">%1$s</xliff:g> result for \"<xliff:g id="search" example="???">%2$s</xliff:g>\"</item>
<!-- Case of 0 or 2 or more results. -->
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d750e65..247d87c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -16,6 +16,20 @@
-->
<resources>
+
+ <style name="TextColorGreen">
+ <item name="android:textColor">@color/Green</item>
+ </style>
+ <style name="TextColorRed">
+ <item name="android:textColor">@color/Red</item>
+ </style>
+ <style name="TextColorDefault">
+ <item name="android:textColor">@color/Default</item>
+ </style>
+ <style name="TextColorBrightBlue">
+ <item name="android:textColor">@color/Bright_Blue</item>
+ </style>
+
<style name="TextAppearanceSuper">
<item name="android:textSize">@dimen/text_font_size_super</item>
<item name="android:textColorLink">#0000ff</item>
@@ -64,6 +78,6 @@
<style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
<item name="android:displayOptions" />
- <item name="android:visibility">gone</item>
+ <item name="android:visibility">visible</item>
</style>
</resources>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 2a448f5..cdb59e3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,11 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
-
repositories {
google()
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:7.4.1'
+ classpath 'com.android.tools.build:gradle:7.4.2'
}
}
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..2d8d1e4
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1 @@
+android.useAndroidX=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 307ff3d..903c326 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Wed Mar 15 19:05:17 CST 2023
+#Mon Apr 10 21:31:54 CST 2023
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
distributionPath=wrapper/dists
diff --git a/import-summary.txt b/import-summary.txt
index 61d4751..8fea95f 100644
--- a/import-summary.txt
+++ b/import-summary.txt
@@ -10,12 +10,8 @@ so manually move them:
* .gitignore
* .idea\
* .idea\.gitignore
-* .idea\Notes-master.iml
-* .idea\deploymentTargetDropDown.xml
* .idea\misc.xml
* .idea\modules.xml
-* .idea\runConfigurations\
-* .idea\runConfigurations\Unnamed.xml
* .idea\workspace.xml
* NOTICE
* Notes-master.iml
diff --git a/local.properties b/local.properties
index 1401a71..1785fb0 100644
--- a/local.properties
+++ b/local.properties
@@ -2,7 +2,6 @@
# as it contains information specific to your local configuration.
#
# Location of the SDK. This is only used by Gradle.
-# For customization when using a Version Control System, please read the
-# header note.
-#Wed Mar 15 20:20:04 CST 2023
-sdk.dir=D\:\\sdka\\Sdk
+#
+#Mon Apr 10 21:31:54 CST 2023
+sdk.dir=D\:\\Sdk