综合

src/Notes-master3/.idea/deploymentTargetDropDown.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <targetSelectedWithDropDown>
-      <Target>
-        <type value="QUICK_BOOT_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="C:\Users\87334\.android\avd\Pixel_2_API_28.avd" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-10-13T00:16:46.151575400Z" />
-  </component>
-</project>

src/Notes-master3/.idea/gradle.xml

@@ -12,10 +12,7 @@
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
-<<<<<<< HEAD
-=======
             <option value="$PROJECT_DIR$/core" />
->>>>>>> xiaojinchi_branch
           </set>
         </option>
       </GradleProjectSettings>

src/Notes-master3/.idea/misc.xml

@@ -4,18 +4,14 @@
     <option name="filePathToZoomLevelMap">
       <map>
         <entry key="..\:/Notes-master3/app/src/main/res/drawable/butto_read.xml" value="0.1225" />
+        <entry key="..\:/Notes-master3/app/src/main/res/drawable/new_note.xml" value="0.1" />
         <entry key="..\:/Notes-master3/app/src/main/res/layout/account_dialog_title.xml" value="0.17391304347826086" />
         <entry key="..\:/Notes-master3/app/src/main/res/layout/add_account_text.xml" value="0.17391304347826086" />
         <entry key="..\:/Notes-master3/app/src/main/res/layout/datetime_picker.xml" value="0.17391304347826086" />
         <entry key="..\:/Notes-master3/app/src/main/res/layout/dialog_edit_text.xml" value="0.17391304347826086" />
-<<<<<<< HEAD
-        <entry key="..\:/Notes-master3/app/src/main/res/layout/folder_list_item.xml" value="0.17391304347826086" />
-        <entry key="..\:/Notes-master3/app/src/main/res/layout/note_edit.xml" value="0.17391304347826086" />
-=======
         <entry key="..\:/Notes-master3/app/src/main/res/layout/fafas.xml" value="0.2526041666666667" />
         <entry key="..\:/Notes-master3/app/src/main/res/layout/folder_list_item.xml" value="0.17391304347826086" />
-        <entry key="..\:/Notes-master3/app/src/main/res/layout/note_edit.xml" value="0.25" />
->>>>>>> xiaojinchi_branch
+        <entry key="..\:/Notes-master3/app/src/main/res/layout/note_edit.xml" value="0.1" />
         <entry key="..\:/Notes-master3/app/src/main/res/layout/note_edit_list_item.xml" value="0.17391304347826086" />
         <entry key="..\:/Notes-master3/app/src/main/res/layout/note_item.xml" value="0.17391304347826086" />
         <entry key="..\:/Notes-master3/app/src/main/res/layout/note_list.xml" value="0.17391304347826086" />
@@ -25,12 +21,9 @@
         <entry key="..\:/Notes-master3/app/src/main/res/layout/settings_header.xml" value="0.17391304347826086" />
         <entry key="..\:/Notes-master3/app/src/main/res/layout/widget_2x.xml" value="0.17391304347826086" />
         <entry key="..\:/Notes-master3/app/src/main/res/layout/widget_4x.xml" value="0.17391304347826086" />
-        <entry key="..\:/Notes-master3/app/src/main/res/menu/note_edit.xml" value="0.1125" />
-<<<<<<< HEAD
-=======
-        <entry key="..\:/Notes-master3/app/src/main/res/menu/note_list.xml" value="0.1125" />
+        <entry key="..\:/Notes-master3/app/src/main/res/menu/note_edit.xml" value="0.1" />
+        <entry key="..\:/Notes-master3/app/src/main/res/menu/note_list.xml" value="0.1" />
         <entry key="..\:/Notes-master3/app/src/main/res/xml/image.xml" value="0.1" />
->>>>>>> xiaojinchi_branch
       </map>
     </option>
   </component>

src/Notes-master3/.idea/sonarlint/issuestore/0/8/08c35f02f11c35ae9ebf8db0a482054dfa1cf493

@@ -1,15 +1,15 @@
 
 s
-java:S4144Â
"\Update this method so that its implementation is not identical to "getParentId" on line 186.(ø¦¯ÿ
-x
-java:S1450H"VRemove the "mLocked" field and declare it as a local variable in the relevant methods.(˜Ô•Þøÿÿÿÿ
8ÇÆ<EFBFBD>¼0
+java:S4144Æ
"\Update this method so that its implementation is not identical to "getParentId" on line 190.(ø¦¯ÿ
+q
+java:S1450J"VRemove the "mLocked" field and declare it as a local variable in the relevant methods.(˜Ô•Þøÿÿÿÿ

 >
-java:S1125U"(Remove the unnecessary boolean literals.(ú«€É
+java:S1125X"(Remove the unnecessary boolean literals.(ú«€É
 m
-java:S3776q"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(Ñý¨úýÿÿÿÿ

+java:S3776u"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(Ñý¨úýÿÿÿÿ

 C
-java:S1125r"(Remove the unnecessary boolean literals.(¢´—Öÿÿÿÿÿ

+java:S1125v"(Remove the unnecessary boolean literals.(¢´—Öÿÿÿÿÿ

 >
-java:S1125s"(Remove the unnecessary boolean literals.(ãêÛì
+java:S1125w"(Remove the unnecessary boolean literals.(ãêÛì
 F
-java:S1068H"+Remove this unused "mLocked" private field.(˜Ô•Þøÿÿÿÿ

+java:S1068J"+Remove this unused "mLocked" private field.(˜Ô•Þøÿÿÿÿ

src/Notes-master3/.idea/sonarlint/issuestore/1/0/10133dfbf3adffaaf1ccf77ae669b88a4bcddf78

@@ -1,4 +0,0 @@
-
-U
-java:S1118
-":Add a private constructor to hide the implicit public one.(ƒ¢“Ùüÿÿÿÿ

src/Notes-master3/.idea/sonarlint/issuestore/2/f/2fe3432799c272061172eda7b66b7c2169c8db43

@@ -0,0 +1,10 @@
+
+`	java:S112&"FDefine and throw a dedicated exception instead of using a generic one.(王罫<E78E8B><E7BDAB><EFBFBD><EFBFBD>

+7
+java:S1643G"Use a StringBuilder instead.(오<><EC98A4><EFBFBD><EFBFBD><EFBFBD>

+U
+java:S1118":Add a private constructor to hide the implicit public one.(猶蠢<E78CB6><E8A0A2><EFBFBD><EFBFBD>

+O
+java:S2864="4Iterate over the "entrySet" instead of the "keySet".(잁귦<EC9E81><EAB7A6><EFBFBD><EFBFBD><EFBFBD>

+S	java:S106>"9Replace this use of System.out or System.err by a logger.(拳뀱<E68BB3><EB80B1><EFBFBD><EFBFBD><EFBFBD>

+N	java:S106J"9Replace this use of System.out or System.err by a logger.(<28>뇛

src/Notes-master3/.idea/sonarlint/issuestore/3/2/32360bf24febc78f20db52498c7576b3d8650d56

@@ -18,9 +18,9 @@ java:S1319S"`The type of "ids" should be an interface such as "Set" rather than
 ‰

 java:S1319È
"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".(ÛëÈðýÿÿÿÿ

 S
-java:S2589>"8Remove this expression which always evaluates to "false"(ÎŽŽéûÿÿÿÿ

-S
 java:S2589e"8Remove this expression which always evaluates to "false"(ÎŽŽéûÿÿÿÿ

+S
+java:S2589>"8Remove this expression which always evaluates to "false"(ÎŽŽéûÿÿÿÿ

 U
 java:S1118&":Add a private constructor to hide the implicit public one.(³¡¸<C2A1>ÿÿÿÿÿ

 T

src/Notes-master3/.idea/sonarlint/issuestore/3/e/3e688be40dc69cfd1062f41d0fc27fe261a26710

@@ -1,34 +1,5 @@
 
 g
-<<<<<<< HEAD
-java:S1301…
"KReplace this "switch" statement by "if" statements to increase readability.(öÛ«°þÿÿÿÿ

-X
-java:S18747"=Remove this use of "FLAG_SHOW_WHEN_LOCKED"; it is deprecated.(÷±µÁúÿÿÿÿ

-Q
-java:S1874;";Remove this use of "FLAG_TURN_SCREEN_ON"; it is deprecated.(ƒìýè
-U
-java:S1874="?Remove this use of "FLAG_LAYOUT_INSET_DECOR"; it is deprecated.(›·ïß
-H
-java:S1874W"2Remove this use of "isScreenOn"; it is deprecated.(¤® ²

-P
-java:S1874a":Remove this use of "setAudioStreamType"; it is deprecated.(ÃÅÛ­
-P
-java:S1874c":Remove this use of "setAudioStreamType"; it is deprecated.(€ÔÌ¡

-`
-java:S2147m"ECombine this catch with the one at line 106, which has the same body.(ÿëÛßúÿÿÿÿ

-[
-java:S2147p"ECombine this catch with the one at line 106, which has the same body.(‚ùïÄ
-[
-java:S2147s"ECombine this catch with the one at line 106, which has the same body.(ï­£Ä
-M
-java:S1135k"2Complete the task associated to this TODO comment.(ÕÌ<C395>®þÿÿÿÿ

-M
-java:S1135n"2Complete the task associated to this TODO comment.(ÕÌ<C395>®þÿÿÿÿ

-M
-java:S1135q"2Complete the task associated to this TODO comment.(ÕÌ<C395>®þÿÿÿÿ

-M
-java:S1135t"2Complete the task associated to this TODO comment.(ÕÌ<C395>®þÿÿÿÿ

-=======
 java:S1301˜
"KReplace this "switch" statement by "if" statements to increase readability.(öÛ«°þÿÿÿÿ

 X
 java:S1874J"=Remove this use of "FLAG_SHOW_WHEN_LOCKED"; it is deprecated.(÷±µÁúÿÿÿÿ

@@ -55,5 +26,4 @@ java:S1135
 N
 java:S1135‡
"2Complete the task associated to this TODO comment.(ÕÌ<C395>®þÿÿÿÿ

 G
-java:S1068<"*Remove this unused "wakeup" private field.(…©Èå
8ŒèîÓ¿0
->>>>>>> xiaojinchi_branch
+java:S1068<"*Remove this unused "wakeup" private field.(…©Èå
8ŒèîÓ¿0

src/Notes-master3/.idea/sonarlint/issuestore/5/0/503adcf2a0be1ecdb94a15efba4433b6589877b9

@@ -1,14 +0,0 @@
-
-o
-java:S22931"YReplace the type specification in this constructor call with the diamond operator ("<>").(§þ¢¾
-D
-java:S1604Í
"(Make this anonymous inner class a lambda(¯<>Àžÿÿÿÿÿ

-f
-java:S1301h"KReplace this "switch" statement by "if" statements to increase readability.(ãÁð™øÿÿÿÿ

-M
-java:S1135c"2Complete the task associated to this TODO comment.(ƒŠ® úÿÿÿÿ

-<	java:S131h""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".(ΚŸ<C5A1>ûÿÿÿÿ

src/Notes-master3/.idea/sonarlint/issuestore/5/d/5dfe6902d8ec740690f88d644e74362c3be08fad

@@ -1,9 +0,0 @@
-
-m
-java:S37763"RRefactor this method to reduce its Cognitive Complexity from 16 to the 15 allowed.(üßú–ùÿÿÿÿ

-O
-java:S1874?"9Remove this use of "setTextAppearance"; it is deprecated.(¤ñÝ×
-O
-java:S1874F"9Remove this use of "setTextAppearance"; it is deprecated.(Á†<C381>ö
-O
-java:S1874P"9Remove this use of "setTextAppearance"; it is deprecated.(¤ñÝ×

src/Notes-master3/.idea/sonarlint/issuestore/8/7/876016634c6642b35109680ccac740dc8271b236

@@ -1,15 +0,0 @@
-
-F
-java:S1066Ò
"/Merge this if statement with the enclosing one.(â<>®¾
-3
-java:S2386N"Make this member "protected".(”µåÓ
-8
-java:S2386X"Make this member "protected".(Ñ㳎ýÿÿÿÿ

-X
-java:S1126ô
"AReplace this if-then-else statement by a single return statement.(¶ø ˜
-?
-java:S1125Ã"(Remove the unnecessary boolean literals.(ÍÛì•
-?
-java:S1068:")Remove this unused "image" private field.(ÝȽ<C388>
-S
-java:S1068v"8Remove this unused "NOTE_PASSWORD_COLUMN" private field.(’ÖÌÀÿÿÿÿÿ

src/Notes-master3/.idea/sonarlint/issuestore/8/c/8c55c3ccc257e5907959013f99656e4c8ec3903e

@@ -0,0 +1,2 @@
+
+K	xml:S5594<"1Implement permissions on this exported component.(ˆ©…»ùÿÿÿÿ

src/Notes-master3/.idea/sonarlint/issuestore/a/1/a130ec2a8612d749a4ec673c99126daf6e3058c2

@@ -1,19 +0,0 @@
-
-o	java:S115"ZRename this constant name to match the regular expression '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'.(²¾ôê
-t	java:S115"ZRename this constant name to match the regular expression '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'.(ðä€øÿÿÿÿ

-t	java:S115	"ZRename this constant name to match the regular expression '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'.(íõåˆùÿÿÿÿ

-o	java:S115
-"ZRename this constant name to match the regular expression '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'.(óõÖï
-o	java:S115"ZRename this constant name to match the regular expression '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'.(×¹¯€

-t	java:S115"ZRename this constant name to match the regular expression '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'.(ˆäš¸ÿÿÿÿÿ

-—

-java:S1186"€
Add a nested comment explaining why this method is empty, throw an UnsupportedOperationException or complete the implementation.(ǧ¢û
-3
-java:S1118"Hide this public constructor.(ǧ¢û
-m
-java:S3776"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.(Å—«<E28094>ûÿÿÿÿ

-D
-java:S1905")Remove this unnecessary cast to "double".(áà’Àúÿÿÿÿ

-f	java:S128"LEnd this switch case with an unconditional break, return or throw statement.(£Þ¾Ëþÿÿÿÿ

-F
-java:S4524!"+Move this default to the end of the switch.(Ý–Ò˜ÿÿÿÿÿ

src/Notes-master3/.idea/sonarlint/issuestore/a/4/a446c87b1013132f8adaf83656b582028e8809af

@@ -0,0 +1,17 @@
+
+e
+java:S2095«"NUse try-with-resources or close this "FileOutputStream" in a "finally" clause.(ŠÀø¯
+k	java:S116w"VRename this field "TEXT_FORMAT" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(Ñ›–¼
+i
+java:S3776¨
"RRefactor this method to reduce its Cognitive Complexity from 27 to the 15 allowed.(œÃÁí

+h
+java:S3776Ý
"RRefactor this method to reduce its Cognitive Complexity from 23 to the 15 allowed.(ì´ê
+\
+java:S2147°"ECombine this catch with the one at line 301, which has the same body.(ß<>È´
+\
+java:S2147Ð"ECombine this catch with the one at line 334, which has the same body.(ï­£Ä
+]	java:S899Ë"BDo something with the "boolean" value returned by "createNewFile".(Ð<>’Íùÿÿÿÿ

+9
+java:S3398H"#Move this method into "TextExport".(…´‹<C2B4>
+?
+java:S3398»"#Move this method into "TextExport".(¨ä¿ÿýÿÿÿÿ

src/Notes-master3/.idea/sonarlint/issuestore/a/7/a7641cfac724321d508c2a284223a711011a93f5

@@ -1,13 +0,0 @@
-
-f
-java:S11929"KDefine a constant instead of duplicating this literal "content://" 4 times.(š¨ú¯üÿÿÿÿ

-U
-java:S11181":Add a private constructor to hide the implicit public one.(ž’Í“úÿÿÿÿ

-^
-java:S1214@"CMove constants defined in this interfaces to another class or enum.(É⸫úÿÿÿÿ

-Z
-java:S1214°
"CMove constants defined in this interfaces to another class or enum.(ŠÉôŸ
-V
-java:S1118ú
":Add a private constructor to hide the implicit public one.(<28>”‹ˆþÿÿÿÿ

-Q
-java:S1118Š":Add a private constructor to hide the implicit public one.(߀°•

src/Notes-master3/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32

@@ -1,94 +0,0 @@
-
-p
-java:S2293‡"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥ð
->
-java:S1604†"(Make this anonymous inner class a lambda(—̺V
-?
-java:S1604Î"(Make this anonymous inner class a lambda(ά¯”
-?
-java:S1604Ä"(Make this anonymous inner class a lambda(¿Ü´ã
-D
-java:S1604Þ"(Make this anonymous inner class a lambda(ˆÐï<C390>øÿÿÿÿ

-?
-java:S1604æ"(Make this anonymous inner class a lambda(øÄì‡
-?
-java:S1604Ë"(Make this anonymous inner class a lambda(Û±¼ 
-?
-java:S1604ï"(Make this anonymous inner class a lambda(ά¯”
-g
-java:S1301µ"KReplace this "switch" statement by "if" statements to increase readability.(ד¾ñùÿÿÿÿ

-Z
-java:S2583¨
"CChange this condition so that it does not always evaluate to "true"(¢õ§˜
-7
-java:S1116a"Remove this empty statement.(ôŸŽìúÿÿÿÿ

-a
-java:S1124ˆ
"EReorder the modifiers to comply with the Java Language Specification.(¹úæµûÿÿÿÿ

-[
-java:S1124‰
"EReorder the modifiers to comply with the Java Language Specification.(ìѾk
-n
-java:S3776¡
"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.(áé–Þÿÿÿÿÿ

-2
-java:S3626²
"Remove this redundant jump.(ûÁÝ…

-2
-java:S3626¶
"Remove this redundant jump.(ûÁÝ…

-2
-java:S3626Ê
"Remove this redundant jump.(ûÁÝ…

-P
-java:S1874¢
"9Remove this use of "PreferenceManager"; it is deprecated.(­©Ð
-Z
-java:S1874¢
"CRemove this use of "getDefaultSharedPreferences"; it is deprecated.(­©Ð
-N
-java:S1135¼
"2Complete the task associated to this TODO comment.(ÕÌ<C395>®þÿÿÿÿ

-F
-java:S2093¦
"*Change this "try" to a try-with-resources.(¡»¢üùÿÿÿÿ

-o
-java:S1450î
"XRemove the "mMoveMenu" field and declare it as a local variable in the relevant methods.(ž¢—ò

-n
-java:S3252ë
"RUse static access with "android.widget.AbsListView" for "MultiChoiceModeListener".(¦Ûî„úÿÿÿÿ

-N
-java:S1135¤"2Complete the task associated to this TODO comment.(» æžÿÿÿÿÿ

-N
-java:S1135©"2Complete the task associated to this TODO comment.(» æžÿÿÿÿÿ

-U
-java:S1874æ"9Remove this use of "getDefaultDisplay"; it is deprecated.(ĸ¬Ìýÿÿÿÿ

-M
-java:S1874ç"1Remove this use of "getHeight"; it is deprecated.(·¡ªÃýÿÿÿÿ

-8
-java:S1116<18>"Remove this empty statement.(ôŸŽìúÿÿÿÿ

-i
-java:S3776Ü"RRefactor this method to reduce its Cognitive Complexity from 20 to the 15 allowed.(ãìîí

-C
-java:S1874Ý".Remove this use of "<init>"; it is deprecated.(ýî?
-?	java:S108ã")Either remove or fill this block of code.(žûÊ¥
-K
-java:S1874þ"/Remove this use of "execute"; it is deprecated.( å«<C3A5>ûÿÿÿÿ

-S
-java:S1874Â"7Remove this use of "toggleSoftInput"; it is deprecated.(© …áúÿÿÿÿ

-O
-java:S1874Â"3Remove this use of "SHOW_FORCED"; it is deprecated.(© …áúÿÿÿÿ

-h
-java:S3776Ë"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.(ÅôÉ#
-N
-java:S1135<18>"2Complete the task associated to this TODO comment.(» æžÿÿÿÿÿ

-^
-java:S1126’"BReplace this if-then-else statement by a single method invocation.(玒¦ýÿÿÿÿ

-N
-java:S1135š"2Complete the task associated to this TODO comment.(» æžÿÿÿÿÿ

-f
-java:S1874¡"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(œƒƒ©ùÿÿÿÿ

-J
-java:S1874Æ".Remove this use of "<init>"; it is deprecated.(ЧðÛýÿÿÿÿ

-f
-java:S1874Î"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(÷ችûÿÿÿÿ

-K
-java:S1874ë"/Remove this use of "execute"; it is deprecated.( å«<C3A5>ûÿÿÿÿ

-h
-java:S3776û"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(ôŒùb
-K
-java:S3398À"/Move this method into "BackgroundQueryHandler".(—÷õŽüÿÿÿÿ

-<
-java:S3398Ü"%Move this method into "ModeCallback".(ãìîí

-A
-java:S3398¢"%Move this method into "ModeCallback".(“ðÉçýÿÿÿÿ

-G
-java:S3398œ"0Move this method into "OnListItemClickListener".(‘ðð¡

src/Notes-master3/.idea/sonarlint/issuestore/c/4/c42ad3cd6e664963fa1849c760a57d417d500ee7

@@ -0,0 +1,95 @@
+
+P
+java:S1118":Add a private constructor to hide the implicit public one.(ªµ<C2AA><C2B5>
+`
+java:S1124"EReorder the modifiers to comply with the Java Language Specification.(”Úùµþÿÿÿÿ

+[
+java:S1124"EReorder the modifiers to comply with the Java Language Specification.(Ð㘱
+[
+java:S1124"EReorder the modifiers to comply with the Java Language Specification.(å¬å³
+[
+java:S1124"EReorder the modifiers to comply with the Java Language Specification.(¸œÏ<C593>
+`
+java:S1124"EReorder the modifiers to comply with the Java Language Specification.(¶ÎƉýÿÿÿÿ

+[
+java:S1124"EReorder the modifiers to comply with the Java Language Specification.(ùùŸÕ

+`
+java:S1124!"EReorder the modifiers to comply with the Java Language Specification.(íâúÓÿÿÿÿÿ

+[
+java:S1124#"EReorder the modifiers to comply with the Java Language Specification.(â¹âæ
+`
+java:S1124%"EReorder the modifiers to comply with the Java Language Specification.(™¹å†þÿÿÿÿ

+`
+java:S1124'"EReorder the modifiers to comply with the Java Language Specification.(Ëãßìüÿÿÿÿ

+`
+java:S1124)"EReorder the modifiers to comply with the Java Language Specification.(‚šÛ²üÿÿÿÿ

+`
+java:S1124+"EReorder the modifiers to comply with the Java Language Specification.(ºãÌýþÿÿÿÿ

+[
+java:S1124-"EReorder the modifiers to comply with the Java Language Specification.(«è¶ó
+[
+java:S1124/"EReorder the modifiers to comply with the Java Language Specification.(Ó<>•·

+[
+java:S11241"EReorder the modifiers to comply with the Java Language Specification.(ùœª”

+[
+java:S11243"EReorder the modifiers to comply with the Java Language Specification.(ŸÌ¥’
+[
+java:S11245"EReorder the modifiers to comply with the Java Language Specification.(–Æ‘õ
+Z
+java:S11247"EReorder the modifiers to comply with the Java Language Specification.(—ùž 
+`
+java:S11249"EReorder the modifiers to comply with the Java Language Specification.(£úÿÿÿÿ

+Z
+java:S1124;"EReorder the modifiers to comply with the Java Language Specification.(ûÉøK
+`
+java:S1124="EReorder the modifiers to comply with the Java Language Specification.(´ÙøÜøÿÿÿÿ

+[
+java:S1124?"EReorder the modifiers to comply with the Java Language Specification.(Ö«¦î
+Z
+java:S1124A"EReorder the modifiers to comply with the Java Language Specification.(ëí‚$
+[
+java:S1124C"EReorder the modifiers to comply with the Java Language Specification.(±‚Çð
+`
+java:S1124E"EReorder the modifiers to comply with the Java Language Specification.(èÁø°ÿÿÿÿÿ

+[
+java:S1124G"EReorder the modifiers to comply with the Java Language Specification.(¬ôÿ<C3B4>
+[
+java:S1124I"EReorder the modifiers to comply with the Java Language Specification.(ì૵
+`
+java:S1124K"EReorder the modifiers to comply with the Java Language Specification.(âÖ<C3A2>îýÿÿÿÿ

+[
+java:S1124M"EReorder the modifiers to comply with the Java Language Specification.(¡¦¡Æ

+`
+java:S1124O"EReorder the modifiers to comply with the Java Language Specification.(‘™¾Ðüÿÿÿÿ

+`
+java:S1124Q"EReorder the modifiers to comply with the Java Language Specification.(­<>—Òøÿÿÿÿ

+[
+java:S1124S"EReorder the modifiers to comply with the Java Language Specification.(ž×Éô

+[
+java:S1124U"EReorder the modifiers to comply with the Java Language Specification.(ø°Í´
+`
+java:S1124W"EReorder the modifiers to comply with the Java Language Specification.(¼Ô£¹øÿÿÿÿ

+[
+java:S1124Y"EReorder the modifiers to comply with the Java Language Specification.(ŠÉ΢
+`
+java:S1124["EReorder the modifiers to comply with the Java Language Specification.(äöÅŒýÿÿÿÿ

+`
+java:S1124]"EReorder the modifiers to comply with the Java Language Specification.(Á¨È¨úÿÿÿÿ

+[
+java:S1124_"EReorder the modifiers to comply with the Java Language Specification.(—Ú÷Œ
+[
+java:S1124a"EReorder the modifiers to comply with the Java Language Specification.(¼ÕÍ€
+`
+java:S1124c"EReorder the modifiers to comply with the Java Language Specification.(íõâûÿÿÿÿ

+`
+java:S1124e"EReorder the modifiers to comply with the Java Language Specification.(õÑæÞÿÿÿÿÿ

+[
+java:S1124g"EReorder the modifiers to comply with the Java Language Specification.(´Æ’µ

+`
+java:S1124i"EReorder the modifiers to comply with the Java Language Specification.(û³˜µÿÿÿÿÿ

+`
+java:S1124k"EReorder the modifiers to comply with the Java Language Specification.(<28>ìÝÚÿÿÿÿÿ

+Z
+java:S1124m"EReorder the modifiers to comply with the Java Language Specification.(場-
+`
+java:S1124o"EReorder the modifiers to comply with the Java Language Specification.(éÙýâûÿÿÿÿ

src/Notes-master3/.idea/sonarlint/issuestore/d/1/d187f1271655c3d91661a39fe6de395b6a9f290a

@@ -1,5 +1,3 @@
 
-\
-java:S2259¹
"@A "NullPointerException" could be thrown; "js" is nullable here.(±ú”§ýÿÿÿÿ

 i
-java:S3776…"RRefactor this method to reduce its Cognitive Complexity from 16 to the 15 allowed.(´ÇŽª
+java:S3776†"RRefactor this method to reduce its Cognitive Complexity from 16 to the 15 allowed.(´ÇŽª

src/Notes-master3/.idea/sonarlint/issuestore/d/a/da57ce446af85bbd9aefee65e969869f0cff78b0

@@ -1,59 +0,0 @@
-
-?
-java:S1604†
"(Make this anonymous inner class a lambda(ž§¤É
-?
-java:S1604¤
"(Make this anonymous inner class a lambda(ðåܨ
-?
-java:S1604«
"(Make this anonymous inner class a lambda(ðåܨ
-?
-java:S1604ç
"(Make this anonymous inner class a lambda(ά¯”
-?
-java:S1604ô
"(Make this anonymous inner class a lambda(³Ú…Î
-?
-java:S1604‘"(Make this anonymous inner class a lambda(ôéŽÿ

-?
-java:S1604²"(Make this anonymous inner class a lambda(Éãî
-?
-java:S1604Í"(Make this anonymous inner class a lambda(Éãî
-g
-java:S1301ú"KReplace this "switch" statement by "if" statements to increase readability.(øå´¡ÿÿÿÿÿ

-U
-java:S18743":Remove this use of "PreferenceActivity"; it is deprecated.(ç½Úàøÿÿÿÿ

-P
-java:S1874@":Remove this use of "PreferenceCategory"; it is deprecated.(ÜΘÓ

-`
-java:S1874I"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(ÍΘÇ
-K
-java:S1874J"0Remove this use of "onCreate"; it is deprecated.(È¢Õ–úÿÿÿÿ

-P
-java:S1874P":Remove this use of "PreferenceCategory"; it is deprecated.(‰´Òø
-L
-java:S1874P"6Remove this use of "findPreference"; it is deprecated.(‰´Òø
-I
-java:S1874X"3Remove this use of "getListView"; it is deprecated.(ôدé
-h
-java:S3776\"RRefactor this method to reduce its Cognitive Complexity from 20 to the 15 allowed.(Ù«µ§
-`
-java:S1874x"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(ÍÙ÷¢
-G
-java:S1874|"1Remove this use of "onDestroy"; it is deprecated.(ÍÊ·´

-H
-java:S1874€
"1Remove this use of "removeAll"; it is deprecated.(<28>€ûœ

-N
-java:S1874‚
"2Remove this use of "Preference"; it is deprecated.(ƒù¬ ýÿÿÿÿ

-N
-java:S1874‚
"2Remove this use of "Preference"; it is deprecated.(ƒù¬ ýÿÿÿÿ

-G
-java:S1874„
"0Remove this use of "setTitle"; it is deprecated.(<28>ÿœ‚
-N
-java:S1874…
"2Remove this use of "setSummary"; it is deprecated.(÷ÒÙÝûÿÿÿÿ

-[
-java:S1874†
"DRemove this use of "setOnPreferenceClickListener"; it is deprecated.(ž§¤É
-N
-java:S1874‡
"2Remove this use of "Preference"; it is deprecated.(¶®è‰øÿÿÿÿ

-Q
-java:S1874š
"5Remove this use of "addPreference"; it is deprecated.(èÙ†Ýüÿÿÿÿ

-a
-java:S1874ù"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(<28>ñ”Ò
-Q
-java:S1161ù":Add the "@Override" annotation above this method signature(<28>ñ”Ò

src/Notes-master3/.idea/sonarlint/issuestore/d/d/dd970bd8ce083850fca1d4d159647ccd110e57cb

@@ -0,0 +1,15 @@
+
+u
+java:S2293½
"YReplace the type specification in this constructor call with the diamond operator ("<>").(áºÐ»ûÿÿÿÿ

+j
+java:S1192?"ODefine a constant instead of duplicating this literal "Wrong note id:" 3 times.(€¨ƒ¦úÿÿÿÿ

+O
+java:S2589ð
"8Remove this expression which always evaluates to "false"(…Ùâ±
+\
+java:S1126}"AReplace this if-then-else statement by a single return statement.(Æ·¾ôúÿÿÿÿ

+i
+java:S3776µ
"RRefactor this method to reduce its Cognitive Complexity from 23 to the 15 allowed.(<28>¤§²
+U
+java:S1155ì
">Use isEmpty() to check whether the collection is empty or not.(”¥ŠÉ
+\
+java:S2147õ
"ECombine this catch with the one at line 242, which has the same body.(æš©›

src/Notes-master3/.idea/sonarlint/issuestore/e/0/e094aec5c3e1b6f44539adff3114f5a1ad603ddc

@@ -0,0 +1,3 @@
+
+t
+java:S2293*"YReplace the type specification in this constructor call with the diamond operator ("<>").(（<><EFBC88><EFBFBD><EFBFBD><EFBFBD><EFBFBD>

src/Notes-master3/.idea/sonarlint/issuestore/index.pb

@@ -1,53 +1,12 @@
 
 7
 gradlew,5\b\5bbfa66edb4db3c7c33c5181f43510990d3307f9
-g
-7app/src/main/java/net/micode/notes/gtask/data/Task.java,d\1\d187f1271655c3d91661a39fe6de395b6a9f290a
-<<<<<<< HEAD
-X
-(gradle/wrapper/gradle-wrapper.properties,f\b\fbe448ebfc3eb2d4e308f6b8b043666f5b57235e
-d
-4app/src/main/java/net/micode/notes/data/Contact.java,9\a\9a3a19793537958b8b1b03a81985999e22705a2f
-@
-local.properties,0\7\0712df971a99ac4d2fccb8e0fb19f377f3374cca
-l
-<app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java,0\2\0268ec648e2fc0139b30ed13396174b7392c1ae2
-h
-8app/src/main/java/net/micode/notes/ui/AlarmReceiver.java,5\8\5836a695995df8fadacfa6409fe8d21d88946842
-i
-9app/src/main/java/net/micode/notes/ui/DateTimePicker.java,6\c\6cbf8bd9aa98eff862b1dc067330ba66ba4493aa
-r
-Bapp/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java,d\a\da57ce446af85bbd9aefee65e969869f0cff78b0
-k
-;app/src/main/java/net/micode/notes/ui/NotesListAdapter.java,2\8\283f16cc23da56ca65616082bc810304d3511d0a
-m
-=app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java,3\e\3e688be40dc69cfd1062f41d0fc27fe261a26710
-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
-g
-7app/src/main/java/net/micode/notes/ui/NoteEditText.java,5\0\503adcf2a0be1ecdb94a15efba4433b6589877b9
-g
-7app/src/main/java/net/micode/notes/ui/NoteItemData.java,0\8\08c35f02f11c35ae9ebf8db0a482054dfa1cf493
-g
-7app/src/main/java/net/micode/notes/ui/DropdownMenu.java,d\1\d1cc822fa9d783a8d4563bf6e139b7ae10de2fb1
-=======
-f
-6app/src/main/java/net/micode/notes/tool/DataUtils.java,3\2\32360bf24febc78f20db52498c7576b3d8650d56
->>>>>>> xiaojinchi_branch
 p
 @app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java,4\5\4529b3a97b0f3b19b895aa06f23bed63ff38a312
 u
 Eapp/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java,f\0\f087b1ba1b9c91b7293fea0fb071eaed62a42137
 h
 8app/src/main/java/net/micode/notes/tool/ScreenUtils.java,a\d\ad590109436b2eb4769f3f458b66ad7751784d6d
-<<<<<<< HEAD
-<
-build.gradle,f\0\f07866736216be0ee2aba49e392191aeae700a35
-=======
 d
 4app/src/main/java/net/micode/notes/data/Contact.java,9\a\9a3a19793537958b8b1b03a81985999e22705a2f
 X
@@ -58,42 +17,20 @@ L
 gradle.properties.properties,8\c\8ce4a8a05a725a9f27d9278347f33f2603a52493
 ?
 settings.gradle,0\5\05efc8b1657769a27696d478ded1e95f38737233
-@
-local.properties,0\7\0712df971a99ac4d2fccb8e0fb19f377f3374cca
 j
 :app/src/main/java/net/micode/notes/data/NotesProvider.java,6\a\6a65e747031f27aef20597b4181148a9fbf963d5
-b
-2app/src/main/java/net/micode/notes/data/Notes.java,a\7\a7641cfac724321d508c2a284223a711011a93f5
-p
-@app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java,1\e\1eb2363b523dbcae43d3c6e4790c64436af61b13
-<
-build.gradle,f\0\f07866736216be0ee2aba49e392191aeae700a35
 i
 9app/src/main/java/net/micode/notes/ui/ScreenListener.java,a\d\adc88f87585668f7123f43f97cd404c4f4043a2a
 l
-<app/src/main/java/net/micode/notes/ui/NotesListActivity.java,a\d\ad72331a1bed265bb9c0fe838faa74dbf69fce32
-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
-r
-Bapp/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java,d\a\da57ce446af85bbd9aefee65e969869f0cff78b0
-l
 <app/src/main/java/net/micode/notes/ui/SpeechApplication.java,e\c\ec122e94f7dcf5b5821e03c62a12f3f083832263
 m
 =app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java,f\9\f9f49497f95afd327db7a7a512612aa1089003d4
 g
 7app/src/main/java/net/micode/notes/ui/DropdownMenu.java,d\1\d1cc822fa9d783a8d4563bf6e139b7ae10de2fb1
-e
-5app/src/main/java/net/micode/notes/ui/DimenUtils.java,1\0\10133dfbf3adffaaf1ccf77ae669b88a4bcddf78
 i
 9app/src/main/java/net/micode/notes/ui/DateTimePicker.java,6\c\6cbf8bd9aa98eff862b1dc067330ba66ba4493aa
-e
-5app/src/main/java/net/micode/notes/ui/Base64Util.java,a\1\a130ec2a8612d749a4ec673c99126daf6e3058c2
 m
 =app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java,3\e\3e688be40dc69cfd1062f41d0fc27fe261a26710
-i
-9app/src/main/java/net/micode/notes/model/WorkingNote.java,8\7\876016634c6642b35109680ccac740dc8271b236
 o
 ?app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java,2\b\2bfc771e07e87c37d3a76a2c815bc8fb30649798
 l
@@ -101,5 +38,34 @@ l
 h
 8app/src/main/java/net/micode/notes/ui/AlarmReceiver.java,5\8\5836a695995df8fadacfa6409fe8d21d88946842
 g
-7app/src/main/java/net/micode/notes/ui/NoteEditText.java,5\0\503adcf2a0be1ecdb94a15efba4433b6589877b9
->>>>>>> xiaojinchi_branch
+7app/src/main/java/net/micode/notes/ui/NoteItemData.java,0\8\08c35f02f11c35ae9ebf8db0a482054dfa1cf493
+h
+8app/src/main/java/net/micode/notes/tool/BackupUtils.java,a\4\a446c87b1013132f8adaf83656b582028e8809af
+f
+6app/src/main/java/net/micode/notes/tool/DataUtils.java,3\2\32360bf24febc78f20db52498c7576b3d8650d56
+m
+=app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java,c\4\c42ad3cd6e664963fa1849c760a57d417d500ee7
+P
+ app/src/main/AndroidManifest.xml,8\c\8c55c3ccc257e5907959013f99656e4c8ec3903e
+e
+5app/src/main/java/net/micode/notes/tool/HttpUtil.java,2\f\2fe3432799c272061172eda7b66b7c2169c8db43
+g
+7app/src/main/java/net/micode/notes/gtask/data/Task.java,d\1\d187f1271655c3d91661a39fe6de395b6a9f290a
+k
+;app/src/main/java/net/micode/notes/gtask/data/TaskList.java,e\0\e094aec5c3e1b6f44539adff3114f5a1ad603ddc
+@
+app/build.gradle,f\4\f4a01d6a4fcb971362ec00a83903fd3902f52164
+@
+local.properties,0\7\0712df971a99ac4d2fccb8e0fb19f377f3374cca
+<
+build.gradle,f\0\f07866736216be0ee2aba49e392191aeae700a35
+A
+gradle.properties,2\a\2afbb999f001938c88fa43fc2ef52abf0f8213e4
+A
+core/build.gradle,9\1\918ca359602392354123b7d3b63264baf7ea9dde
+p
+@app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java,1\e\1eb2363b523dbcae43d3c6e4790c64436af61b13
+b
+2app/src/main/java/net/micode/notes/model/Note.java,d\d\dd970bd8ce083850fca1d4d159647ccd110e57cb
+k
+;app/src/main/java/net/micode/notes/ui/NotesListAdapter.java,2\8\283f16cc23da56ca65616082bc810304d3511d0a

src/Notes-master3/app/build.gradle

@@ -9,11 +9,7 @@ android {
         applicationId "net.micode.notes"
         useLibrary'org.apache.http.legacy'
         minSdkVersion 21
-<<<<<<< HEAD
-        targetSdkVersion 8
-=======
         targetSdkVersion 23
->>>>>>> xiaojinchi_branch
     }
     lintOptions{ abortOnError false }
 
@@ -23,14 +19,11 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
-<<<<<<< HEAD
-=======
     sourceSets{
         main{
             jniLibs.srcDirs = ['libs']
         }
     }
->>>>>>> xiaojinchi_branch
     packagingOptions {
         exclude 'META-INF/DEPENDENCIES'
         exclude 'META-INF/NOTICE'
@@ -44,13 +37,10 @@ dependencies {
     //implementation files('C:\\Users\\87334\\Desktop\\Notes-master\\httpcomponents-client-4.5.13\\lib\\httpclient-win-4.5.13.jar')
     //implementation files('C:\\Users\\87334\\Desktop\\Notes-master\\httpcomponents-client-4.5.13\\lib\\httpcore-4.4.13.jar')
     implementation 'com.android.support:appcompat-v7:28.0.0'
-<<<<<<< HEAD
-=======
     implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
     //implementation files('libs\\Msc.jar')
     implementation project(path: ':core')
     implementation fileTree(dir: 'libs', include: ['*.jar'])
->>>>>>> xiaojinchi_branch
 }
 sonarqube {
     properties {

src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties

@@ -1,18 +1,4 @@
-<<<<<<< HEAD
-#Thu Oct 13 08:29:24 CST 2022
-net.micode.notes.app-main-10\:/layout/note_edit_list_item.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_green_down.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
-net.micode.notes.app-main-10\:/layout/note_edit.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/selected.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_red.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_white_middle.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
-net.micode.notes.app-main-10\:/xml/preferences.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_red_up.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/font_normal.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/widget_2x_blue.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_white.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
-=======
-#Fri Oct 21 23:33:18 CST 2022
+#Tue Nov 01 08:51:52 CST 2022
 net.micode.notes.app-main-13\:/drawable-hdpi/read.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_read.png.flat
 net.micode.notes.app-main-10\:/layout/note_edit_list_item.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
 net.micode.notes.app-main-13\:/drawable-hdpi/icon_app.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
@@ -25,77 +11,12 @@ net.micode.notes.app-main-13\:/drawable-hdpi/list_blue_single.9.png=D\:\\Notes-m
 net.micode.notes.app-main-13\:/menu/sub_folder.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
 net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_red.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
 net.micode.notes.app-main-10\:/drawable-hdpi/list_red_up.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/font_normal.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
 net.micode.notes.app-main-13\:/drawable-hdpi/edit_red.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
->>>>>>> xiaojinchi_branch
+net.micode.notes.app-main-10\:/drawable-hdpi/font_normal.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
 net.micode.notes.app-main-10\:/drawable-hdpi/edit_red.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
 net.micode.notes.app-main-10\:/drawable-hdpi/title_alert.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
 net.micode.notes.app-main-10\:/drawable-hdpi/font_super.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
 net.micode.notes.app-main-10\:/drawable-hdpi/list_background.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
-<<<<<<< HEAD
-net.micode.notes.app-main-10\:/menu/note_list.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
-net.micode.notes.app-main-10\:/layout/dialog_edit_text.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
-net.micode.notes.app-main-10\:/layout/note_list_dropdown_menu.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/widget_2x_white.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/clock.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
-net.micode.notes.app-main-10\:/layout/widget_2x.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_green_single.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/notification.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_blue_middle.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_red_middle.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_red_single.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_blue_single.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/new_note_normal.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_white_up.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/edit_yellow.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_green_up.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_footer_bg.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/dropdown_icon.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/new_note_pressed.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_green_middle.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/widget_2x_red.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
-net.micode.notes.app-main-10\:/menu/note_list_options.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/menu_move.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
-net.micode.notes.app-main-10\:/layout/settings_header.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/edit_white.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
-net.micode.notes.app-main-10\:/menu/call_note_edit.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/call_record.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
-net.micode.notes.app-main-10\:/color/secondary_text_dark.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_blue_up.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_white_single.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/title_bar_bg.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/edit_title_blue.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
-net.micode.notes.app-main-10\:/layout/widget_4x.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/read.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_read.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/edit_title_green.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_blue_down.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
-net.micode.notes.app-main-10\:/xml/widget_4x_info.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/font_small.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_folder.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
-net.micode.notes.app-main-10\:/menu/sub_folder.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
-net.micode.notes.app-main-10\:/layout/datetime_picker.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
-net.micode.notes.app-main-10\:/drawable/new_note.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_yellow_up.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/edit_green.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
-net.micode.notes.app-main-10\:/color/primary_text_dark.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_yellow_single.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/icon_app.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/edit_blue.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
-net.micode.notes.app-main-10\:/menu/note_list_dropdown.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
-net.micode.notes.app-main-10\:/raw-zh-rCN/introduction=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_red_down.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_white_down.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
-net.micode.notes.app-main-10\:/raw/introduction=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
-net.micode.notes.app-main-10\:/layout/folder_list_item.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
-net.micode.notes.app-main-10\:/layout/add_account_text.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
-net.micode.notes.app-main-10\:/layout/note_list_footer.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/delete.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
-net.micode.notes.app-main-10\:/layout/account_dialog_title.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/edit_title_red.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
-=======
 net.micode.notes.app-main-13\:/drawable-hdpi/widget_2x_green.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
 net.micode.notes.app-main-13\:/xml/widget_4x_info.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
 net.micode.notes.app-main-10\:/layout/note_list_dropdown_menu.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
@@ -115,8 +36,8 @@ net.micode.notes.app-main-13\:/menu/note_list.xml=D\:\\Notes-master3\\app\\build
 net.micode.notes.app-main-10\:/drawable-hdpi/new_note_normal.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
 net.micode.notes.app-main-13\:/drawable-hdpi/list_white_up.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
 net.micode.notes.app-main-10\:/drawable-hdpi/edit_yellow.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_green_up.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
 net.micode.notes.app-main-13\:/xml/widget_2x_info.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_green_up.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
 net.micode.notes.app-main-10\:/drawable-hdpi/list_footer_bg.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
 net.micode.notes.app-main-10\:/drawable-hdpi/new_note_pressed.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
 net.micode.notes.app-main-10\:/drawable-hdpi/list_green_middle.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
@@ -135,8 +56,8 @@ net.micode.notes.app-main-10\:/drawable-hdpi/title_bar_bg.9.png=D\:\\Notes-maste
 net.micode.notes.app-main-10\:/drawable-hdpi/edit_title_blue.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
 net.micode.notes.app-main-10\:/layout/widget_4x.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
 net.micode.notes.app-main-13\:/color/secondary_text_dark.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_blue_down.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
 net.micode.notes.app-main-13\:/menu/note_list_dropdown.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_blue_down.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
 net.micode.notes.app-main-10\:/xml/widget_4x_info.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
 net.micode.notes.app-main-10\:/drawable-hdpi/list_folder.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
 net.micode.notes.app-main-13\:/drawable-hdpi/clock.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
@@ -150,8 +71,8 @@ net.micode.notes.app-main-13\:/drawable-hdpi/font_small.png=D\:\\Notes-master3\\
 net.micode.notes.app-main-10\:/drawable-hdpi/icon_app.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
 net.micode.notes.app-main-10\:/drawable-hdpi/edit_blue.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
 net.micode.notes.app-main-10\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_red_down.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
 net.micode.notes.app-main-10\:/drawable-hdpi/list_white_down.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_red_down.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
 net.micode.notes.app-main-10\:/raw/introduction=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
 net.micode.notes.app-main-13\:/layout/note_list_dropdown_menu.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
 net.micode.notes.app-main-13\:/drawable-hdpi/list_red_down.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
@@ -252,20 +173,11 @@ net.micode.notes.app-main-13\:/drawable/butto_read.xml=D\:\\Notes-master3\\app\\
 net.micode.notes.app-main-10\:/layout/add_account_text.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
 net.micode.notes.app-main-10\:/layout/note_list_footer.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
 net.micode.notes.app-main-13\:/drawable-hdpi/list_footer_bg.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
->>>>>>> xiaojinchi_branch
 net.micode.notes.app-main-10\:/drawable-hdpi/widget_2x_green.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
 net.micode.notes.app-main-10\:/layout/note_item.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
 net.micode.notes.app-main-10\:/menu/call_record_folder.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
 net.micode.notes.app-main-10\:/xml/widget_2x_info.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
 net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_blue.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
-<<<<<<< HEAD
-net.micode.notes.app-main-10\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/font_large.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
-net.micode.notes.app-main-10\:/drawable/butto_read.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable_butto_read.xml.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/bg_btn_set_color.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_yellow_down.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/edit_title_white.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
-=======
 net.micode.notes.app-main-13\:/drawable-hdpi/list_white_middle.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
 net.micode.notes.app-main-13\:/drawable-hdpi/title_alert.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
 net.micode.notes.app-main-13\:/drawable-hdpi/list_white_single.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
@@ -275,19 +187,11 @@ net.micode.notes.app-main-13\:/drawable-hdpi/widget_2x_white.png=D\:\\Notes-mast
 net.micode.notes.app-main-13\:/drawable/new_note.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
 net.micode.notes.app-main-10\:/drawable-hdpi/list_yellow_down.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
 net.micode.notes.app-main-13\:/menu/note_list_options.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
->>>>>>> xiaojinchi_branch
 net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_green.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
 net.micode.notes.app-main-10\:/drawable-hdpi/search_result.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
 net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_yellow.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
 net.micode.notes.app-main-10\:/drawable-hdpi/widget_2x_yellow.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
 net.micode.notes.app-main-10\:/layout/note_list.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
-<<<<<<< HEAD
-net.micode.notes.app-main-10\:/xml/searchable.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/menu_delete.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
-net.micode.notes.app-main-10\:/menu/note_edit.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
-=======
 net.micode.notes.app-main-10\:/drawable-hdpi/menu_delete.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
 net.micode.notes.app-main-10\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
 net.micode.notes.app-main-10\:/menu/note_edit.xml=D\:\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
->>>>>>> xiaojinchi_branch

src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml

@@ -700,7 +700,7 @@
         <item name="isLightTheme">true</item>
     </style>
     <style name="Base.V7.Theme.AppCompat" parent="Platform.AppCompat">
-        <item name="viewInflaterClass">android.support.v7.app.AppCompatViewInflater</item>
+        <item name="viewInflaterClass">androidx.appcompat.app.AppCompatViewInflater</item>
         <item name="windowNoTitle">false</item>
         <item name="windowActionBar">true</item>
         <item name="windowActionBarOverlay">false</item>
@@ -893,7 +893,7 @@
         <item name="android:windowCloseOnTouchOutside">true</item>
     </style>
     <style name="Base.V7.Theme.AppCompat.Light" parent="Platform.AppCompat.Light">
-        <item name="viewInflaterClass">android.support.v7.app.AppCompatViewInflater</item>
+        <item name="viewInflaterClass">androidx.appcompat.app.AppCompatViewInflater</item>
 
         <item name="windowNoTitle">false</item>
         <item name="windowActionBar">true</item>

src/Notes-master3/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties

@@ -1 +1 @@
-#Wed Sep 07 15:54:53 CST 2022
+#Tue Nov 01 08:36:48 CST 2022

src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml

@@ -1,6 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<<<<<<< HEAD
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master3\app\src\main\assets"/><source path="D:\Notes-master3\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master3\app\src\debug\assets"/></dataSet></merger>
-=======
-<merger version="3"><dataSet config=":core" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master3\core\build\intermediates\library_assets\debug\out"><file name="baidu_speech_grammar.bsg" path="D:\Notes-master3\core\build\intermediates\library_assets\debug\out\baidu_speech_grammar.bsg"/><file name="README.txt" path="D:\Notes-master3\core\build\intermediates\library_assets\debug\out\README.txt"/><file name="WakeUp.bin" path="D:\Notes-master3\core\build\intermediates\library_assets\debug\out\WakeUp.bin"/></source></dataSet><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master3\app\src\main\assets"><file name="iflytek/recognize.xml" path="D:\Notes-master3\app\src\main\assets\iflytek\recognize.xml"/><file name="iflytek/voice_bg.9.png" path="D:\Notes-master3\app\src\main\assets\iflytek\voice_bg.9.png"/><file name="iflytek/voice_empty.png" path="D:\Notes-master3\app\src\main\assets\iflytek\voice_empty.png"/><file name="iflytek/voice_full.png" path="D:\Notes-master3\app\src\main\assets\iflytek\voice_full.png"/><file name="iflytek/waiting.png" path="D:\Notes-master3\app\src\main\assets\iflytek\waiting.png"/><file name="iflytek/warning.png" path="D:\Notes-master3\app\src\main\assets\iflytek\warning.png"/><file name="WakeUp.bin" path="D:\Notes-master3\app\src\main\assets\WakeUp.bin"/></source><source path="D:\Notes-master3\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master3\app\src\debug\assets"/></dataSet></merger>
->>>>>>> xiaojinchi_branch
+<merger version="3"><dataSet config=":core" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master3\core\build\intermediates\library_assets\debug\out"><file name="baidu_speech_grammar.bsg" path="D:\Notes-master3\core\build\intermediates\library_assets\debug\out\baidu_speech_grammar.bsg"/><file name="README.txt" path="D:\Notes-master3\core\build\intermediates\library_assets\debug\out\README.txt"/><file name="WakeUp.bin" path="D:\Notes-master3\core\build\intermediates\library_assets\debug\out\WakeUp.bin"/></source></dataSet><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master3\app\src\main\assets"><file name="iflytek/recognize.xml" path="D:\Notes-master3\app\src\main\assets\iflytek\recognize.xml"/><file name="iflytek/voice_bg.9.png" path="D:\Notes-master3\app\src\main\assets\iflytek\voice_bg.9.png"/><file name="iflytek/voice_empty.png" path="D:\Notes-master3\app\src\main\assets\iflytek\voice_empty.png"/><file name="iflytek/voice_full.png" path="D:\Notes-master3\app\src\main\assets\iflytek\voice_full.png"/><file name="iflytek/waiting.png" path="D:\Notes-master3\app\src\main\assets\iflytek\waiting.png"/><file name="iflytek/warning.png" path="D:\Notes-master3\app\src\main\assets\iflytek\warning.png"/><file name="WakeUp.bin" path="D:\Notes-master3\app\src\main\assets\WakeUp.bin"/></source><source path="D:\Notes-master3\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master3\app\src\debug\assets"/></dataSet></merger>

src/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml

@@ -1,6 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<<<<<<< HEAD
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master3\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master3\app\src\debug\jniLibs"/></dataSet></merger>
-=======
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master3\app\libs"><file name="Msc.jar" path="D:\Notes-master3\app\libs\Msc.jar"/><file name="armeabi-v7a/libmsc.so" path="D:\Notes-master3\app\libs\armeabi-v7a\libmsc.so"/><file name="arm64-v8a/libmsc.so" path="D:\Notes-master3\app\libs\arm64-v8a\libmsc.so"/><file name="arm64-v8a/libidcard_quality.1.1.1.so" path="D:\Notes-master3\app\libs\arm64-v8a\libidcard_quality.1.1.1.so"/><file name="armeabi-v7a/libidl_license.so" path="D:\Notes-master3\app\libs\armeabi-v7a\libidl_license.so"/><file name="armeabi/libidl_license.so" path="D:\Notes-master3\app\libs\armeabi\libidl_license.so"/><file name="x86/libidl_license.so" path="D:\Notes-master3\app\libs\x86\libidl_license.so"/><file name="x86/libidcard_quality.1.1.1.so" path="D:\Notes-master3\app\libs\x86\libidcard_quality.1.1.1.so"/><file name="armeabi/libidcard_quality.1.1.1.so" path="D:\Notes-master3\app\libs\armeabi\libidcard_quality.1.1.1.so"/><file name="arm64-v8a/libidl_license.so" path="D:\Notes-master3\app\libs\arm64-v8a\libidl_license.so"/><file name="armeabi-v7a/libidcard_quality.1.1.1.so" path="D:\Notes-master3\app\libs\armeabi-v7a\libidcard_quality.1.1.1.so"/></source></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master3\app\src\debug\jniLibs"/></dataSet></merger>
->>>>>>> xiaojinchi_branch
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master3\app\libs"><file name="Msc.jar" path="D:\Notes-master3\app\libs\Msc.jar"/><file name="armeabi-v7a/libmsc.so" path="D:\Notes-master3\app\libs\armeabi-v7a\libmsc.so"/><file name="arm64-v8a/libmsc.so" path="D:\Notes-master3\app\libs\arm64-v8a\libmsc.so"/><file name="arm64-v8a/libidcard_quality.1.1.1.so" path="D:\Notes-master3\app\libs\arm64-v8a\libidcard_quality.1.1.1.so"/><file name="armeabi-v7a/libidl_license.so" path="D:\Notes-master3\app\libs\armeabi-v7a\libidl_license.so"/><file name="armeabi/libidl_license.so" path="D:\Notes-master3\app\libs\armeabi\libidl_license.so"/><file name="x86/libidl_license.so" path="D:\Notes-master3\app\libs\x86\libidl_license.so"/><file name="x86/libidcard_quality.1.1.1.so" path="D:\Notes-master3\app\libs\x86\libidcard_quality.1.1.1.so"/><file name="armeabi/libidcard_quality.1.1.1.so" path="D:\Notes-master3\app\libs\armeabi\libidcard_quality.1.1.1.so"/><file name="arm64-v8a/libidl_license.so" path="D:\Notes-master3\app\libs\arm64-v8a\libidl_license.so"/><file name="armeabi-v7a/libidcard_quality.1.1.1.so" path="D:\Notes-master3\app\libs\armeabi-v7a\libidcard_quality.1.1.1.so"/></source></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master3\app\src\debug\jniLibs"/></dataSet></merger>

src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt

@@ -1,31 +1,4 @@
-<<<<<<< HEAD
-#Thu Oct 13 08:37:59 CST 2022
-path.4=13/classes.dex
-path.3=12/classes.dex
-path.2=11/classes.dex
-path.1=0/classes.dex
-path.7=5/classes.dex
-path.6=4/classes.dex
-path.5=15/classes.dex
-path.0=classes.dex
-base.4=D\:\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\13\\classes.dex
-base.3=D\:\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\12\\classes.dex
-base.2=D\:\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\11\\classes.dex
-base.1=D\:\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex
-base.0=D\:\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex
-renamed.3=classes4.dex
-renamed.2=classes3.dex
-renamed.1=classes2.dex
-renamed.0=classes.dex
-renamed.7=classes8.dex
-renamed.6=classes7.dex
-base.7=D\:\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\5\\classes.dex
-renamed.5=classes6.dex
-base.6=D\:\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\4\\classes.dex
-renamed.4=classes5.dex
-base.5=D\:\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\15\\classes.dex
-=======
-#Sun Oct 23 00:18:33 CST 2022
+#Tue Nov 01 09:00:57 CST 2022
 path.4=1/classes.dex
 path.3=15/classes.dex
 path.2=13/classes.dex
@@ -71,4 +44,3 @@ base.13=D\:\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeProjectD
 base.12=D\:\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\3\\classes.dex
 base.11=D\:\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\15\\classes.dex
 base.10=D\:\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\13\\classes.dex
->>>>>>> xiaojinchi_branch