src/Notes-master1/.idea/dbnavigator.xml

@@ -25,13 +25,13 @@
     <autoscroll-from-editor value="true" />
     <show-object-properties value="true" />
     <loaded-nodes>
-      <connection connection-id="98fd455f-5028-4c8f-be18-aaecb66cf115">
+      <connection connection-id="559db717-98ce-4bab-9101-a50869bd641a">
-        <schema name="main" object-types="table, view, constraint, index, column, dataset trigger" />
+        <schema name="main" object-types="table, view" />
       </connection>
     </loaded-nodes>
   </component>
   <component name="DBNavigator.Project.DatabaseConsoleManager">
-    <connection id="98fd455f-5028-4c8f-be18-aaecb66cf115">
+    <connection id="559db717-98ce-4bab-9101-a50869bd641a">
       <console name="Connection" type="STANDARD" schema="main" session="Main" />
     </connection>
   </component>
@@ -39,11 +39,11 @@
     <open-files />
   </component>
   <component name="DBNavigator.Project.DatabaseSessionManager">
-    <connection id="98fd455f-5028-4c8f-be18-aaecb66cf115" />
+    <connection id="559db717-98ce-4bab-9101-a50869bd641a" />
   </component>
   <component name="DBNavigator.Project.DatasetFilterManager">
-    <filter-actions connection-id="98fd455f-5028-4c8f-be18-aaecb66cf115" dataset="main.lonote" active-filter-id="9cbbba4f-19d2-434d-a03f-a8810f284856">
+    <filter-actions connection-id="559db717-98ce-4bab-9101-a50869bd641a" dataset="main.note" active-filter-id="c5db275d-f139-44b2-8dd7-6fc9012442ef">
-      <filter id="9cbbba4f-19d2-434d-a03f-a8810f284856" name="Filter 1" temporary="false" custom-name="false" type="basic" join-type="AND" />
+      <filter id="c5db275d-f139-44b2-8dd7-6fc9012442ef" name="Filter 1" temporary="false" custom-name="false" type="basic" join-type="AND" />
     </filter-actions>
   </component>
   <component name="DBNavigator.Project.EditorStateManager">
@@ -72,7 +72,7 @@
   </component>
   <component name="DBNavigator.Project.Settings">
     <connections>
-      <connection id="98fd455f-5028-4c8f-be18-aaecb66cf115" active="true">
+      <connection id="559db717-98ce-4bab-9101-a50869bd641a" active="true">
         <database>
           <name value="Connection" />
           <description value="" />

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

@@ -7,11 +7,11 @@
         <deviceKey>
           <Key>
             <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="E:\SDK\avd\.android\avd\Pixel_2_XL_API_23.avd" />
+            <value value="C:\Users\fanyi\.android\avd\Pixel_XL_API_23_1.avd" />
           </Key>
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2021-11-18T13:59:02.094524100Z" />
+    <timeTargetWasSelectedWithDropDown value="2021-11-08T12:34:39.351298200Z" />
   </component>
 </project>

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

@@ -6,19 +6,15 @@
         <entry key="..\:/Notes-master1/app/src/main/res/layout/account_dialog_title.xml" value="0.1693840579710145" />
         <entry key="..\:/Notes-master1/app/src/main/res/layout/activity_splash.xml" value="0.18206521739130435" />
         <entry key="..\:/Notes-master1/app/src/main/res/layout/add_account_text.xml" value="0.1693840579710145" />
-        <entry key="..\:/Notes-master1/app/src/main/res/layout/app_bar_main.xml" value="0.165" />
         <entry key="..\:/Notes-master1/app/src/main/res/layout/datetime_picker.xml" value="0.1693840579710145" />
         <entry key="..\:/Notes-master1/app/src/main/res/layout/dialog_edit_text.xml" value="0.19895833333333332" />
-        <entry key="..\:/Notes-master1/app/src/main/res/layout/nav_header_main.xml" value="0.1337386018237082" />
         <entry key="..\:/Notes-master1/app/src/main/res/layout/note_edit.xml" value="0.17755825734549138" />
         <entry key="..\:/Notes-master1/app/src/main/res/layout/note_edit_list_item.xml" value="0.1757852077001013" />
         <entry key="..\:/Notes-master1/app/src/main/res/layout/note_item.xml" value="0.1693840579710145" />
-        <entry key="..\:/Notes-master1/app/src/main/res/layout/note_list.xml" value="0.165" />
+        <entry key="..\:/Notes-master1/app/src/main/res/layout/note_list.xml" value="0.14351851851851852" />
         <entry key="..\:/Notes-master1/app/src/main/res/layout/note_list_dropdown_menu.xml" value="0.1693840579710145" />
         <entry key="..\:/Notes-master1/app/src/main/res/layout/note_list_footer.xml" value="0.1693840579710145" />
         <entry key="..\:/Notes-master1/app/src/main/res/layout/settings_header.xml" value="0.1693840579710145" />
-        <entry key="..\:/Notes-master1/app/src/main/res/menu/activity_main_drawer.xml" value="0.275" />
-        <entry key="..\:/Notes-master1/app/src/main/res/menu/background.xml" value="0.275" />
         <entry key="..\:/Notes-master1/app/src/main/res/menu/call_record_folder.xml" value="0.19895833333333332" />
         <entry key="..\:/Notes-master1/app/src/main/res/menu/note_list.xml" value="0.19895833333333332" />
         <entry key="..\:/Notes-master1/app/src/main/res/menu/note_list_options.xml" value="0.14351851851851852" />
@@ -26,23 +22,14 @@
         <entry key="..\:/SDK/platforms/android-30/data/res/layout-xlarge/activity_list.xml" value="0.16" />
         <entry key="..\:/SDK/platforms/android-30/data/res/layout/alert_dialog.xml" value="0.15729166666666666" />
         <entry key="..\:/git/xcr_weihu/src/Notes-master1/app/src/main/res/drawable/new_note.xml" value="0.1734375" />
-        <entry key="..\:/git/xcr_weihu/src/Notes-master1/app/src/main/res/layout/account_dialog_title.xml" value="0.10914855072463768" />
-        <entry key="..\:/git/xcr_weihu/src/Notes-master1/app/src/main/res/layout/add_account_text.xml" value="0.20885416666666667" />
-        <entry key="..\:/git/xcr_weihu/src/Notes-master1/app/src/main/res/layout/app_bar_main.xml" value="0.20885416666666667" />
-        <entry key="..\:/git/xcr_weihu/src/Notes-master1/app/src/main/res/layout/datetime_picker.xml" value="0.20885416666666667" />
         <entry key="..\:/git/xcr_weihu/src/Notes-master1/app/src/main/res/layout/dialog_add_secret.xml" value="0.1" />
         <entry key="..\:/git/xcr_weihu/src/Notes-master1/app/src/main/res/layout/dialog_delete_senote.xml" value="0.20520833333333333" />
         <entry key="..\:/git/xcr_weihu/src/Notes-master1/app/src/main/res/layout/dialog_edit_text.xml" value="0.14356884057971014" />
         <entry key="..\:/git/xcr_weihu/src/Notes-master1/app/src/main/res/layout/dialog_input_passwd.xml" value="0.15729166666666666" />
-        <entry key="..\:/git/xcr_weihu/src/Notes-master1/app/src/main/res/layout/dialog_login.xml" value="0.36614583333333334" />
-        <entry key="..\:/git/xcr_weihu/src/Notes-master1/app/src/main/res/layout/dialog_register.xml" value="0.36614583333333334" />
-        <entry key="..\:/git/xcr_weihu/src/Notes-master1/app/src/main/res/layout/nav_header_main.xml" value="0.20520833333333333" />
         <entry key="..\:/git/xcr_weihu/src/Notes-master1/app/src/main/res/layout/note_edit.xml" value="0.33" />
         <entry key="..\:/git/xcr_weihu/src/Notes-master1/app/src/main/res/layout/note_edit_list_item.xml" value="0.125" />
         <entry key="..\:/git/xcr_weihu/src/Notes-master1/app/src/main/res/layout/note_item.xml" value="0.20520833333333333" />
         <entry key="..\:/git/xcr_weihu/src/Notes-master1/app/src/main/res/layout/note_list.xml" value="0.15729166666666666" />
-        <entry key="..\:/git/xcr_weihu/src/Notes-master1/app/src/main/res/menu/activity_main_drawer.xml" value="0.20520833333333333" />
-        <entry key="..\:/git/xcr_weihu/src/Notes-master1/app/src/main/res/menu/call_note_edit.xml" value="0.1640625" />
         <entry key="..\:/git/xcr_weihu/src/Notes-master1/app/src/main/res/menu/note_list.xml" value="0.20520833333333333" />
         <entry key="..\:/git/xcr_weihu/src/Notes-master1/app/src/main/res/menu/sub_folder.xml" value="0.20520833333333333" />
         <entry key="..\:/git/xcr_weihu/src/Notes-master1/app/src/main/res/xml/file_paths.xml" value="0.17755825734549138" />

src/Notes-master1/.idea/sonarlint/issuestore/1/e/1e8670b74afc171cd1cff4b54f19c5c5e2b275e2

@@ -1,3 +0,0 @@
-
->
-java:S1604)"(Make this anonymous inner class a lambda(€ÖÊ©

src/Notes-master1/.idea/sonarlint/issuestore/3/2/322f2bcce3dd21425ff2a882b59142fb9d0cef8b

@@ -1,13 +0,0 @@
-
-U
-java:S11182":Add a private constructor to hide the implicit public one.(ž’Í“úÿÿÿÿ

-^
-java:S1214I"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.(߀°•

-g
-java:S1192:"LDefine a constant instead of duplicating this literal "content://" 11 times.(š¨ú¯üÿÿÿÿ

src/Notes-master1/.idea/sonarlint/issuestore/5/3/53b98e6d0ece8f8c43934ef63db400be3bbe507c

@@ -1,41 +0,0 @@
-
-7
-java:S1116-"Remove this empty statement.(ôŸŽìúÿÿÿÿ

-K
-java:S18740"5Remove this use of "CursorAdapter"; it is deprecated.(ÌÖçü
-J
-java:S2864_"4Iterate over the "entrySet" instead of the "keySet".(਷â

-B
-java:S1125`"'Remove the unnecessary boolean literal.(ɯÀÐüÿÿÿÿ

-J
-java:S2864o"4Iterate over the "entrySet" instead of the "keySet".(਷â

-B
-java:S1125p"'Remove the unnecessary boolean literal.(ɯÀÐüÿÿÿÿ

-A
-java:S1168~"+Return an empty collection instead of null.(¥¹ï<C2B9>
-C
-java:S1125<18>
"'Remove the unnecessary boolean literal.( „Œ¢ùÿÿÿÿ

-t
-java:S22931"YReplace the type specification in this constructor call with the diamond operator ("<>").(àÉ™âùÿÿÿÿ

-o
-java:S2293^"YReplace the type specification in this constructor call with the diamond operator ("<>").(œ€ÄÑ
-o
-java:S2293n"YReplace the type specification in this constructor call with the diamond operator ("<>").(¾<>Ȫ
-J
-java:S1066V"/Merge this if statement with the enclosing one.(ßÚ§µúÿÿÿÿ

-ˆ

-java:S1319]"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".(“Ÿóßûÿÿÿÿ

-ˆ

-java:S1319m"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".(•Ñòóýÿÿÿÿ

-j
-java:S1104*"TMake widgetId a static final constant or non-public and provide accessors if needed.(åÇŽ<C387>
-q
-java:S1104+"VMake widgetType a static final constant or non-public and provide accessors if needed.(ö漬þÿÿÿÿ

-r
-java:S1104,"\Make widgetHavePasswd a static final constant or non-public and provide accessors if needed.(››õÃ
-E
-java:S5411`"*Use the primitive boolean expression here.(ɯÀÐüÿÿÿÿ

-E
-java:S5411p"*Use the primitive boolean expression here.(ɯÀÐüÿÿÿÿ

-F
-java:S5411<18>
"*Use the primitive boolean expression here.( „Œ¢ùÿÿÿÿ

src/Notes-master1/.idea/sonarlint/issuestore/6/c/6c40630893054a28c13c2eb04ceb5fa51173b0b6

@@ -1,115 +0,0 @@
-
-<EFBFBD>

-java:S1186¯"€
Add a nested comment explaining why this method is empty, throw an UnsupportedOperationException or complete the implementation.(Û›ë´øÿÿÿÿ

-n
-java:S1450²
"WRemove the "editText" field and declare it as a local variable in the relevant methods.(²è‚Æ
-n
-java:S1450°
"WRemove the "mPattern" field and declare it as a local variable in the relevant methods.(©´ÖÛ
-{
-java:S1149¸
"_Replace the synchronized class "StringBuffer" by an unsynchronized one such as "StringBuilder".(ºá¯²ùÿÿÿÿ

-{
-java:S1149Ò"_Replace the synchronized class "StringBuffer" by an unsynchronized one such as "StringBuilder".(ÄÈŒíþÿÿÿÿ

-i	java:S100·
"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(‹‹—ªüÿÿÿÿ

-n
-java:S3776Œ"RRefactor this method to reduce its Cognitive Complexity from 26 to the 15 allowed.(ݨÁ±øÿÿÿÿ

-W
-java:S1874®"@Remove this use of "SOFT_INPUT_ADJUST_RESIZE"; it is deprecated.(ѯ”<C2AF>

-\
-java:S1874Ô"@Remove this use of "SOFT_INPUT_ADJUST_RESIZE"; it is deprecated.(Ò£ú¿ÿÿÿÿÿ

-O
-java:S1874æ"9Remove this use of "setTextAppearance"; it is deprecated.(½õË(
-K
-java:S2864î"4Iterate over the "entrySet" instead of the "keySet".(­Ô‡ï
-N
-java:S1135ú"2Complete the task associated to this TODO comment.(Ùü§“ýÿÿÿÿ

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

-X
-java:S1126Â"AReplace this if-then-else statement by a single return statement.(®ÎÚÉ
-8
-java:S1116â"Remove this empty statement.(ôŸŽìúÿÿÿÿ

-P
-java:S1874ã"9Remove this use of "PreferenceManager"; it is deprecated.(ª¦úÅ
-Z
-java:S1874ã"CRemove this use of "getDefaultSharedPreferences"; it is deprecated.(ª¦úÅ
-U
-java:S1874¢"9Remove this use of "setTextAppearance"; it is deprecated.(ÑëÊäüÿÿÿÿ

-G
-java:S1874¼"0Remove this use of "getColor"; it is deprecated.(è¤ÔÃ
-d
-java:S3252¾"MUse static access with "android.text.Spanned" for "SPAN_INCLUSIVE_EXCLUSIVE".(ŸÍÃó

-U
-java:S1874È"9Remove this use of "setTextAppearance"; it is deprecated.(Ùú˜Êøÿÿÿÿ

-T
-java:S1874´"=Remove this use of "EXTRA_SHORTCUT_INTENT"; it is deprecated.(·Ã°Ÿ
-R
-java:S1874µ";Remove this use of "EXTRA_SHORTCUT_NAME"; it is deprecated.(ÒÀ‘ç
-[
-java:S1874·"DRemove this use of "EXTRA_SHORTCUT_ICON_RESOURCE"; it is deprecated.(§éǾ
-i	java:S100×"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(êúÎêúÿÿÿÿ

-i	java:S100ò"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(‚—Ö°ýÿÿÿÿ

-F
-java:S1197™"*Move the array designators [] to the type.(¨ÅŠÂûÿÿÿÿ

-A
-java:S1197¦"*Move the array designators [] to the type.(Ô„¡å
-—

-java:S1186Ü"€
Add a nested comment explaining why this method is empty, throw an UnsupportedOperationException or complete the implementation.(¢êÄ\
-{
-java:S1149Ò"_Replace the synchronized class "StringBuffer" by an unsynchronized one such as "StringBuilder".(ÄÈŒíþÿÿÿÿ

-O
-java:S1854Ï"8Remove this useless assignment to local variable "edit".(îß›¸
-O	java:S106Ã"9Replace this use of System.out or System.err by a logger.(¹ô•ƒ
-O	java:S106Æ"9Replace this use of System.out or System.err by a logger.(<28>õì—
-@
-java:S1481Ï")Remove this unused "edit" local variable.(îß›¸
-P
-java:S2864Ó"4Iterate over the "entrySet" instead of the "keySet".(<28>†—ýøÿÿÿÿ

-—

-java:S1186„	"€
Add a nested comment explaining why this method is empty, throw an UnsupportedOperationException or complete the implementation.(Ô¿Ñ4
-O	java:S106ï"9Replace this use of System.out or System.err by a logger.(×äÚà
-C
-java:S1068²
",Remove this unused "editText" private field.(²è‚Æ
-H
-java:S1068ì"1Remove this unused "mRecoListener" private field.(×ýÚ•
-t
-java:S2293q"YReplace the type specification in this constructor call with the diamond operator ("<>").(ÑÓ<C391>¥üÿÿÿÿ

-t
-java:S2293z"YReplace the type specification in this constructor call with the diamond operator ("<>").(®ú÷õþÿÿÿÿ

-u
-java:S2293ƒ
"YReplace the type specification in this constructor call with the diamond operator ("<>").(êÝýÂþÿÿÿÿ

-p
-java:S2293‹
"YReplace the type specification in this constructor call with the diamond operator ("<>").(À—’¢
-p
-java:S2293µ
"YReplace the type specification in this constructor call with the diamond operator ("<>").(…·ú¿
-p
-java:S2293¼"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥ð
-p
-java:S2293Ÿ"YReplace the type specification in this constructor call with the diamond operator ("<>").(ãÞõ•
-l	java:S117¹
"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(õç¢üøÿÿÿÿ

-l	java:S117º
"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(“Ó<E2809C><C393>øÿÿÿÿ

-?
-java:S1604ï"(Make this anonymous inner class a lambda(ά¯”
-?
-java:S1604›"(Make this anonymous inner class a lambda(¨›Ì÷
-?
-java:S1604Ê"(Make this anonymous inner class a lambda(××ß’
-?
-java:S1604Þ"(Make this anonymous inner class a lambda(„ñ×æ
-D
-java:S1604ê"(Make this anonymous inner class a lambda(ˆÐï<C390>øÿÿÿÿ

-?
-java:S1604÷"(Make this anonymous inner class a lambda(ά¯”
-q
-java:S1104d"VMake tvModified a static final constant or non-public and provide accessors if needed.(ƒëÔ£ÿÿÿÿÿ

-r
-java:S1104f"WMake ivAlertIcon a static final constant or non-public and provide accessors if needed.(ªà¶±ûÿÿÿÿ

-r
-java:S1104h"WMake tvAlertDate a static final constant or non-public and provide accessors if needed.(“²<E2809C>Öúÿÿÿÿ

-s
-java:S1104j"XMake ibSetBgColor a static final constant or non-public and provide accessors if needed.(ýãä¬üÿÿÿÿ

-h
-java:S1104l"RMake ivLock a static final constant or non-public and provide accessors if needed.(›ÍØ•
-n
-java:S1104n"SMake ivRadio a static final constant or non-public and provide accessors if needed.(¿ž”®ùÿÿÿÿ

-O
-java:S3516Æ"9Refactor this method to not always return the same value.(™‘Æl

src/Notes-master1/.idea/sonarlint/issuestore/7/2/72971ba5cd5eebd08ece719bc9283211cd06a429

@@ -1,9 +0,0 @@
-
-z
-java:S1149	"_Replace the synchronized class "StringBuffer" by an unsynchronized one such as "StringBuilder".(¦ªÙÎþÿÿÿÿ

-z
-java:S1149"_Replace the synchronized class "StringBuffer" by an unsynchronized one such as "StringBuilder".(¦ªÙÎþÿÿÿÿ

-z
-java:S11498"_Replace the synchronized class "StringBuffer" by an unsynchronized one such as "StringBuilder".(¦ªÙÎþÿÿÿÿ

-U
-java:S1118":Add a private constructor to hide the implicit public one.(¸ôôÅùÿÿÿÿ

src/Notes-master1/.idea/sonarlint/issuestore/7/b/7bccae5ecd745bba36ddfd464ec07b66de678477

@@ -1,177 +1,121 @@
 
-i	java:S116o"TRename this field "time_mode" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(šÛÜõ
+i	java:S116e"TRename this field "time_mode" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(šÛÜõ
-o	java:S116q"URename this field "succ_login" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(<28>ÿ§Åüÿÿÿÿ

+i
-j
+java:S3008q"SRename this field "VIEW_WAY" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(´÷èÏ
-java:S3008…
"SRename this field "VIEW_WAY" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(´÷èÏ
+c	java:S119d"IRename this generic name to match the regular expression '^[A-Z][0-9]?$'.(Ù礪üÿÿÿÿ

-^	java:S119m"IRename this generic name to match the regular expression '^[A-Z][0-9]?$'.(Ӈį
+7
-8
+java:S1116{"Remove this empty statement.(ôŸŽìúÿÿÿÿ

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

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

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

 [
-java:S1124¾
"EReorder the modifiers to comply with the Java Language Specification.(ìѾk
+java:S1124ª
"EReorder the modifiers to comply with the Java Language Specification.(ìѾk
-F
+p
-java:S1874ä
"/Remove this use of "Handler"; it is deprecated.(ŸÇŸÇ
+java:S3776¿
"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.(ŸŒ¹Ñ8ÁÚŒÎÐ/
-i
+T
-java:S3776‹"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.(ŸŒ¹Ñ
+java:S1874Æ
"6Remove this use of "BitmapDrawable"; it is deprecated.(<28>ÖÙ•8ðÿ…ÎÐ/
-M
-java:S1874’"6Remove this use of "BitmapDrawable"; it is deprecated.(<28>ÖÙ•
-R	java:S125“"<This block of commented-out lines of code should be removed.(²þú¿
 2
-java:S3626½"Remove this redundant jump.(ûÁÝ…

+java:S3626ñ
"Remove this redundant jump.(ûÁÝ…

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

+java:S3626…"Remove this redundant jump.(ûÁÝ…

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

+java:S1135÷
"2Complete the task associated to this TODO comment.(ÕÌ<C395>®þÿÿÿÿ

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

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

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

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

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

+java:S1135Þ"2Complete the task associated to this TODO comment.(» æžÿÿÿÿÿ

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

+java:S1135ã"2Complete the task associated to this TODO comment.(» æžÿÿÿÿÿ

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

+java:S1874ž"9Remove this use of "getDefaultDisplay"; it is deprecated.(ĸ¬Ìýÿÿÿÿ
8ב„ÎÐ/
 M
-java:S1874ë"1Remove this use of "getHeight"; it is deprecated.(·¡ªÃýÿÿÿÿ

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

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

+java:S1116Õ"Remove this empty statement.(ôŸŽìúÿÿÿÿ

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

+java:S3776ª"RRefactor this method to reduce its Cognitive Complexity from 32 to the 15 allowed.(ãìîí

 H
-java:S1874€"1Remove this use of "AsyncTask"; it is deprecated.(””ú±
+java:S1874±"1Remove this use of "AsyncTask"; it is deprecated.(””ú±
-?	java:S108‡")Either remove or fill this block of code.(žûÊ¥
+?	java:S108¸")Either remove or fill this block of code.(žûÊ¥
 a
-java:S1874 "JDon't override a deprecated method or explicitly mark it as "@Deprecated".(§Í¿Â
+java:S1874Ñ"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(§Í¿Â
 K
-java:S1874«"/Remove this use of "execute"; it is deprecated.( å«<C3A5>ûÿÿÿÿ

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

 h
-java:S3776™"RRefactor this method to reduce its Cognitive Complexity from 20 to the 15 allowed.(ÅôÉ#
+java:S3776Ê"RRefactor this method to reduce its Cognitive Complexity from 20 to the 15 allowed.(ÅôÉ#
 N
-java:S1135î"2Complete the task associated to this TODO comment.(» æžÿÿÿÿÿ

+java:S1135Ÿ"2Complete the task associated to this TODO comment.(» æžÿÿÿÿÿ

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

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

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

+java:S1135¬"2Complete the task associated to this TODO comment.(» æžÿÿÿÿÿ

-R	java:S125<18>"<This block of commented-out lines of code should be removed.(¡Î•Ò
 M
-java:S2696«"6Make the enclosing method "static" or remove this set.(œõ½€
+java:S2696×"6Make the enclosing method "static" or remove this set.(œõ½€
 M
-java:S2696¯"6Make the enclosing method "static" or remove this set.(ºãÑÐ
+java:S2696Û"6Make the enclosing method "static" or remove this set.(ºãÑÐ
 M
-java:S1874À"1Remove this use of "AsyncTask"; it is deprecated.(ЧðÛýÿÿÿÿ

+java:S1874€"1Remove this use of "AsyncTask"; it is deprecated.(ЧðÛýÿÿÿÿ

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

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

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

+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
+java:S3776´"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(ôŒùb
-g	java:S128‹	"LEnd this switch case with an unconditional break, return or throw statement.(δ¡Ûøÿÿÿÿ

+g	java:S128Ë"LEnd this switch case with an unconditional break, return or throw statement.(δ¡Ûøÿÿÿÿ

-d	java:S100Ð	"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ÆóÈù
+k	java:S100<18>	"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ÆóÈù8»ÿ…ÎÐ/
-V	java:S899Õ	";Do something with the "boolean" value returned by "delete".(²Œ­<C592>ûÿÿÿÿ

+]	java:S899•	";Do something with the "boolean" value returned by "delete".(²Œ­<C592>ûÿÿÿÿ
8Áÿ…ÎÐ/
-j
+q
-java:S4042Õ	"NUse "java.nio.file.Files#delete" here for better messages on error conditions.(²Œ­<C592>ûÿÿÿÿ

+java:S4042•	"NUse "java.nio.file.Files#delete" here for better messages on error conditions.(²Œ­<C592>ûÿÿÿÿ
8Âÿ…ÎÐ/
-]	java:S899×	"BDo something with the "boolean" value returned by "createNewFile".(Ð<>’Íùÿÿÿÿ

+d	java:S899—	"BDo something with the "boolean" value returned by "createNewFile".(Ð<>’Íùÿÿÿÿ
8Âÿ…ÎÐ/
-i	java:S100å	"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ÁìÁ¹ÿÿÿÿÿ

+p	java:S100¥	"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ÁìÁ¹ÿÿÿÿÿ
8Ãÿ…ÎÐ/
-\
+c
-java:S3252ý	"@Use static access with "android.provider.BaseColumns" for "_ID".(»¨–öýÿÿÿÿ

+java:S3252½	"@Use static access with "android.provider.BaseColumns" for "_ID".(»¨–öýÿÿÿÿ
8çÿ…ÎÐ/
-T
+[
-java:S1117Œ
+java:S1117Ì	"8Rename "uri" which hides the field declared at line 115.(Ÿ®ù“ûÿÿÿÿ
8Ú²ˆÎÐ/
-"8Rename "uri" which hides the field declared at line 135.(Ÿ®ù“ûÿÿÿÿ

+k
-d
+java:S3252Ö	"MUse static access with "android.provider.MediaStore$MediaColumns" for "DATA".(äµõŒ8ìÿ…ÎÐ/
-java:S3252–
-"MUse static access with "android.provider.MediaStore$MediaColumns" for "DATA".(äµõŒ
-C
-java:S1874–
-",Remove this use of "DATA"; it is deprecated.(äµõŒ
-W	java:S125 
-"<This block of commented-out lines of code should be removed.(š•å°þÿÿÿÿ

-M
-java:S1874¡
-"6Remove this use of "BitmapDrawable"; it is deprecated.(<28>ÖÙ•
-J
-java:S1172þ
-".Remove this unused method parameter "context".(ãÕÚ€ýÿÿÿÿ

-i	java:S100‡"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ÉðçËÿÿÿÿÿ

-J
-java:S1172”".Remove this unused method parameter "context".(Žà®þýÿÿÿÿ

-i	java:S100¨"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ù²þíþÿÿÿÿ

 J
-java:S1172¨".Remove this unused method parameter "context".(ù²þíþÿÿÿÿ

+java:S1874Ö	",Remove this use of "DATA"; it is deprecated.(äµõŒ8ìÿ…ÎÐ/
+^	java:S125à	"<This block of commented-out lines of code should be removed.(š•å°þÿÿÿÿ
8íÿ…ÎÐ/
+T
+java:S1874á	"6Remove this use of "BitmapDrawable"; it is deprecated.(<28>ÖÙ•8ÄÛŒÎÐ/
+G
+java:S3398ú"0Move this method into "OnListItemClickListener".(‘ðð¡
 K
-java:S3398Ý"/Move this method into "BackgroundQueryHandler".(—÷õŽüÿÿÿÿ

+java:S3398Ž"/Move this method into "BackgroundQueryHandler".(—÷õŽüÿÿÿÿ

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

+java:S3398ª"%Move this method into "ModeCallback".(ãìîí

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

+java:S3398Ü"%Move this method into "ModeCallback".(“ðÉçýÿÿÿÿ

-G
-java:S3398É"0Move this method into "OnListItemClickListener".(‘ðð¡
-I
-java:S1068q".Remove this unused "succ_login" private field.(<28>ÿ§Åüÿÿÿÿ

 p
-java:S2293´"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥ð
+java:S2293å"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥ð
 b
-java:S1192´
"FDefine a constant instead of duplicating this literal " AND " 5 times.(’²—òøÿÿÿÿ

+java:S1192 
"FDefine a constant instead of duplicating this literal " AND " 5 times.(’²—òøÿÿÿÿ

-]
-java:S1192­"FDefine a constant instead of duplicating this literal " DESC" 4 times.(¼üäÍ
 ]
-java:S1192Ê"FDefine a constant instead of duplicating this literal "first" 3 times.(ø¿¶€
+java:S1192á"FDefine a constant instead of duplicating this literal " DESC" 4 times.(¼üäÍ
-g	java:S117Ö"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( ú<C2A0>ª
+g	java:S117‡"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( ú<C2A0>ª
 >
-java:S1604<EFBFBD>"(Make this anonymous inner class a lambda(—̺V
+java:S1604Á"(Make this anonymous inner class a lambda(—̺V
 ?
-java:S1604Ò"(Make this anonymous inner class a lambda(ά¯”
+java:S1604†"(Make this anonymous inner class a lambda(ά¯”
 ?
-java:S1604á"(Make this anonymous inner class a lambda(¿Ü´ã
+java:S1604’"(Make this anonymous inner class a lambda(¿Ü´ã
 ?
-java:S1604Ñ"(Make this anonymous inner class a lambda(„ñ×æ
+java:S1604‚"(Make this anonymous inner class a lambda(„ñ×æ
 D
-java:S1604â"(Make this anonymous inner class a lambda(ˆÐï<C390>øÿÿÿÿ

+java:S1604“"(Make this anonymous inner class a lambda(ˆÐï<C390>øÿÿÿÿ

 D
-java:S1604¬"(Make this anonymous inner class a lambda(ˆÐï<C390>øÿÿÿÿ

+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(ά¯”
+java:S1604å"(Make this anonymous inner class a lambda(øÄì‡
->
-java:S1604À
-"(Make this anonymous inner class a lambda(£·®
-?
-java:S1604¼
-"(Make this anonymous inner class a lambda(„ñ×æ
-D
-java:S1604Ù
-"(Make this anonymous inner class a lambda(ˆÐï<C390>øÿÿÿÿ

 ?
-java:S1604î
+java:S1604Ý"(Make this anonymous inner class a lambda(Û±¼ 
-"(Make this anonymous inner class a lambda(Éãî
 ?
-java:S1604ê
+java:S1604€"(Make this anonymous inner class a lambda(ά¯”
-"(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(Éãî
-?
-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(ŒÎ–µ
-g
-java:S1301ç
"KReplace this "switch" statement by "if" statements to increase readability.(ýÞ³‹ùÿÿÿÿ

 g
-java:S1301„"KReplace this "switch" statement by "if" statements to increase readability.(ד¾ñùÿÿÿÿ

+java:S1301µ"KReplace this "switch" statement by "if" statements to increase readability.(ד¾ñùÿÿÿÿ

src/Notes-master1/.idea/sonarlint/issuestore/9/a/9a3090deb50adc3dab06c8adbacdac2adbb5fdad

@@ -1,106 +0,0 @@
-
-P
-java:S1118":Add a private constructor to hide the implicit public one.(® ©þ
-h	java:S100}"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ÄÞÆ•ýÿÿÿÿ

-m
-java:S3776}"RRefactor this method to reduce its Cognitive Complexity from 19 to the 15 allowed.(ÄÞÆ•ýÿÿÿÿ

-D
-java:S4925Š
"-Remove this "Class.forName()", it is useless.(Æ…ÈŸ
-N	java:S106‹
"9Replace this use of System.out or System.err by a logger.(í„Ì&
-N	java:S106‘
"9Replace this use of System.out or System.err by a logger.(°²×$
-i	java:S100Ê
"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(Õåôµýÿÿÿÿ

-J
-java:S1172Ê
".Remove this unused method parameter "context".(Õåôµýÿÿÿÿ

-D
-java:S4925Ñ
"-Remove this "Class.forName()", it is useless.(Æ…ÈŸ
-W	java:S125Ø
"<This block of commented-out lines of code should be removed.(çµ®îúÿÿÿÿ

-d	java:S100ø
"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(õÊ×ñ
-i
-java:S3776ø
"RRefactor this method to reduce its Cognitive Complexity from 20 to the 15 allowed.(õÊ×ñ
-D
-java:S1172ø
"-Remove this unused method parameter "Passwd".(õÊ×ñ
-D
-java:S4925þ
"-Remove this "Class.forName()", it is useless.(Æ…ÈŸ
-d	java:S100ñ"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(òôî¿
-D
-java:S1172ñ"-Remove this unused method parameter "Passwd".(òôî¿
-D
-java:S4925ø"-Remove this "Class.forName()", it is useless.(Æ…ÈŸ
-O
-java:S1068U"9Remove this unused "INSERT_NOTE_TABLE_SQL" private field.(Š¤Œµ

-c
-java:S11921"HDefine a constant instead of duplicating this literal " TEXT ," 4 times.(ÛÅÑ÷ýÿÿÿÿ

-`
-java:S1192<18>
"JDefine a constant instead of duplicating this literal "XIExie123" 4 times.(ʃÃ
-]
-java:S1192»
"FDefine a constant instead of duplicating this literal "close" 7 times.(ˆ<>½‹
-{
-java:S1192"fDefine a constant instead of duplicating this literal "jdbc:mysql://1.15.97.223:3306/xm_data" 3 times.(ƒöž,
-_
-java:S1192)"JDefine a constant instead of duplicating this literal "describe1" 3 times.(¬¢ô
-d
-java:S1192"IDefine a constant instead of duplicating this literal " BIGINT," 3 times.(Ò¦éèþÿÿÿÿ

-b
-java:S1192"GDefine a constant instead of duplicating this literal " TEXT," 3 times.(éØ<C3A9><C398>ùÿÿÿÿ

-^
-java:S1192¬"GDefine a constant instead of duplicating this literal "upSync" 3 times.(®çòñ
-m
-java:S1192Š
"VDefine a constant instead of duplicating this literal "com.mysql.jdbc.Driver" 4 times.(Æ…ÈŸ
-^
-java:S1192Ý
"GDefine a constant instead of duplicating this literal "passwd" 3 times.(—šäº
-s
-java:S1192"]Define a constant instead of duplicating this literal " BIGINT NOT NULL DEFAULT 0," 16 times.(®¶ÞÔ
-Q
-java:S1141œ
"5Extract this nested try block into a separate method.(¡»¢üùÿÿÿÿ

-Q
-java:S1141«
"5Extract this nested try block into a separate method.(¡»¢üùÿÿÿÿ

-Q
-java:S1141º
"5Extract this nested try block into a separate method.(¡»¢üùÿÿÿÿ

-Q
-java:S1141ä
"5Extract this nested try block into a separate method.(¡»¢üùÿÿÿÿ

-Q
-java:S1141Ñ"5Extract this nested try block into a separate method.(¡»¢üùÿÿÿÿ

-g	java:S117ø
"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(õÊ×ñ
-g	java:S117ø
"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(õÊ×ñ
-g	java:S117ñ"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(òôî¿
-g	java:S117ñ"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(òôî¿
-_
-java:S2095Ö
"HUse try-with-resources or close this "Connection" in a "finally" clause.(ëŽÂº
-k
-java:S2095¦
"OUse try-with-resources or close this "PreparedStatement" in a "finally" clause.(´âîæùÿÿÿÿ

-k
-java:S2095´
"OUse try-with-resources or close this "PreparedStatement" in a "finally" clause.(·ë¡ãøÿÿÿÿ

-k
-java:S2095·
"OUse try-with-resources or close this "PreparedStatement" in a "finally" clause.(·ë¡ãøÿÿÿÿ

-d
-java:S2095²
"HUse try-with-resources or close this "Connection" in a "finally" clause.(á¾µÆùÿÿÿÿ

-f
-java:S2095»"OUse try-with-resources or close this "PreparedStatement" in a "finally" clause.(ÒÖ˜ª
-k
-java:S2095¬"OUse try-with-resources or close this "PreparedStatement" in a "finally" clause.(´âîæùÿÿÿÿ

-k
-java:S2095‡"OUse try-with-resources or close this "PreparedStatement" in a "finally" clause.(ø’ÁÇûÿÿÿÿ

-_
-java:S2095<18>
"HUse try-with-resources or close this "Connection" in a "finally" clause.(ëŽÂº
-k
-java:S2095°"OUse try-with-resources or close this "PreparedStatement" in a "finally" clause.(»ÆÃ<C386>þÿÿÿÿ

-_
-java:S2095‰"HUse try-with-resources or close this "Connection" in a "finally" clause.(ëŽÂº
-f
-java:S2095<18>"OUse try-with-resources or close this "PreparedStatement" in a "finally" clause.(ÒÖ˜ª
-f
-java:S2095Ž"OUse try-with-resources or close this "PreparedStatement" in a "finally" clause.(ÒÖ˜ª
-f
-java:S2095Ù
"OUse try-with-resources or close this "PreparedStatement" in a "finally" clause.(ÒÖ˜ª
-_
-java:S2095ƒ"HUse try-with-resources or close this "Connection" in a "finally" clause.(ëŽÂº
-f
-java:S2095“
"OUse try-with-resources or close this "PreparedStatement" in a "finally" clause.(ÒÖ˜ª
-N
-java:S2589›
"7Remove this expression which always evaluates to "true"(¤òª£

-N
-java:S2589ª
"7Remove this expression which always evaluates to "true"(¤òª£

-N
-java:S2589ã
"7Remove this expression which always evaluates to "true"(¤òª£

-N
-java:S2589¹
"7Remove this expression which always evaluates to "true"(¡ææú

src/Notes-master1/.idea/sonarlint/issuestore/9/e/9e6a9e3dc79d0c3c0054eabc0e10309b0f133645

@@ -1,24 +0,0 @@
-
-€

-java:S3008Z"eRename this field "NOTES_SNIPPET_SEARCH_QUERY" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(Èò<C388>ƒùÿÿÿÿ

-i
-java:S3776¥
"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(ëÒ<C3AB>Ä
-_
-java:S1659§
"CDeclare "noteId" and all following declarations on a separate line.(Ÿàؘøÿÿÿÿ

-T
-java:S2130ÿ
"8Use "Long.parseLong" for this string-to-long conversion.(•ãÿ¬ÿÿÿÿÿ

-W	java:S125œ"<This block of commented-out lines of code should be removed.(ÓðáÖÿÿÿÿÿ

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

-i	java:S100–"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(¢ã›íüÿÿÿÿ

-i	java:S100¤"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(÷¾€©üÿÿÿÿ

-i
-java:S1192œ
"MDefine a constant instead of duplicating this literal "Unknown URI " 4 times.(¶ª¦þüÿÿÿÿ

-g	java:S117µ
"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(‰©‰<C2A9>
-l	java:S117¶
"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(˜ˆ<CB9C>Þÿÿÿÿÿ

-X
-java:S4973¸
"<Strings and Boxed types should be compared using "equals()".(áÿÿ¾úÿÿÿÿ

-X
-java:S4973¸
"<Strings and Boxed types should be compared using "equals()".(áÿÿ¾úÿÿÿÿ

-M
-java:S1153ç"1Directly append the argument of String.valueOf().(œËߦýÿÿÿÿ

src/Notes-master1/.idea/sonarlint/issuestore/d/8/d8a02a8652b122905e3406dbc06e48f48ca280f7

@@ -1,63 +0,0 @@
-
-Y
-java:S1214#"CMove constants defined in this interfaces to another class or enum.(áÅÔö
-Z
-java:S1854ð">Remove this useless assignment to local variable "oldVersion".(Úã—Üþÿÿÿÿ

-d	java:S100»"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ŒåÌÑ
-d	java:S100Í"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(¢ï„ô

-X
-java:S1144»"ARemove this unused private "LO_reCreateNoteTableTriggers" method.(ŒåÌÑ
-X
-java:S1144Í"ARemove this unused private "LO_reCreateDataTableTriggers" method.(¢ï„ô

-w
-java:S1192<"\Define a constant instead of duplicating this literal " TEXT NOT NULL DEFAULT ''," 10 times.(ƒþÞ¿ùÿÿÿÿ

-c
-java:S1192d"HDefine a constant instead of duplicating this literal " BEGIN " 8 times.(ÕêïŠþÿÿÿÿ

-g
-java:S1192£
"KDefine a constant instead of duplicating this literal " WHEN old." 4 times.(šì÷öþÿÿÿÿ

-i
-java:S11923"NDefine a constant instead of duplicating this literal "CREATE TABLE " 4 times.(ÜΧ­þÿÿÿÿ

-b
-java:S1192s"GDefine a constant instead of duplicating this literal "=old." 12 times.(”»ÎÔüÿÿÿÿ

-d
-java:S1192—
"HDefine a constant instead of duplicating this literal " BEGIN" 12 times.(ÕêïŠþÿÿÿÿ

-b
-java:S1192t"GDefine a constant instead of duplicating this literal "  AND " 4 times.(â¿Å†øÿÿÿÿ

-t
-java:S11925"^Define a constant instead of duplicating this literal " INTEGER NOT NULL DEFAULT 0," 28 times.(çÀœª
-e
-java:S1192¾
"ODefine a constant instead of duplicating this literal "  DELETE FROM " 4 times.(”Ѿg
-`
-java:S1192g"JDefine a constant instead of duplicating this literal "  WHERE " 16 times.(Øëž°
-e
-java:S1192S"JDefine a constant instead of duplicating this literal " INTEGER," 4 times.(ଉ†þÿÿÿÿ

-s
-java:S1192<18>"\Define a constant instead of duplicating this literal " INTEGER NOT NULL DEFAULT 0" 3 times.(”€æ†
-m
-java:S1192c"RDefine a constant instead of duplicating this literal " AFTER UPDATE OF " 4 times.(™†±¸ýÿÿÿÿ

-]
-java:S1192g"GDefine a constant instead of duplicating this literal "=new." 12 times.(Øëž°
-i
-java:S1192‚"MDefine a constant instead of duplicating this literal " ADD COLUMN " 6 times.(ÔäúÊýÿÿÿÿ

-h
-java:S1192ˆ
"RDefine a constant instead of duplicating this literal " AFTER DELETE ON " 6 times.(“áâB
-n
-java:S1192¢
"RDefine a constant instead of duplicating this literal " AFTER UPDATE ON " 4 times.(ÏïÜŸùÿÿÿÿ

-f
-java:S1192¿
"JDefine a constant instead of duplicating this literal "   WHERE " 4 times.( –¢Ïøÿÿÿÿ

-i
-java:S1192‚"MDefine a constant instead of duplicating this literal "ALTER TABLE " 6 times.(ÔäúÊýÿÿÿÿ

-m
-java:S1192|"RDefine a constant instead of duplicating this literal " AFTER INSERT ON " 4 times.(ÈœÐÐûÿÿÿÿ

-d
-java:S1192f"IDefine a constant instead of duplicating this literal "   SET " 16 times.(Õ÷Ë“üÿÿÿÿ

-a
-java:S1192e"KDefine a constant instead of duplicating this literal "  UPDATE " 16 times.(ìó¥Ä
-o
-java:S1192H"ZDefine a constant instead of duplicating this literal " TEXT NOT NULL DEFAULT ''" 6 times.(«ÛÆ]
-b
-java:S1192–
"KDefine a constant instead of duplicating this literal " WHEN new." 4 times.(õÄô¬
-l
-java:S11924"VDefine a constant instead of duplicating this literal " INTEGER PRIMARY KEY," 4 times.(ܺóà
-<EFBFBD>

-java:S11928"yDefine a constant instead of duplicating this literal " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," 8 times.(˜›£·

src/Notes-master1/.idea/sonarlint/issuestore/d/9/d92e16000f49ca8e38a8b0a8ef8d26ecfa0c30ff

@@ -1,12 +0,0 @@
-
-s
-java:S4144Ó
"\Update this method so that its implementation is not identical to "getParentId" on line 203.(ø¦¯ÿ
->
-java:S1125^"(Remove the unnecessary boolean literals.(ú«€É
-m
-java:S3776}"RRefactor this method to reduce its Cognitive Complexity from 22 to the 15 allowed.(Ñý¨úýÿÿÿÿ

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

->
-java:S1125"(Remove the unnecessary boolean literals.(ãêÛì
-l	java:S117‡
"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(áçÙ®øÿÿÿÿ

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

@@ -87,31 +87,9 @@ h
 8app/src/main/java/net/micode/notes/ui/NotesListItem.java,5\d\5dfe6902d8ec740690f88d644e74362c3be08fad
 <
 build.gradle,f\0\f07866736216be0ee2aba49e392191aeae700a35
-A
-gradle.properties,2\a\2afbb999f001938c88fa43fc2ef52abf0f8213e4
-^
-.src/main/java/net/micode/notes/data/Notes.java,3\2\322f2bcce3dd21425ff2a882b59142fb9d0cef8b
-l
-<src/main/java/net/micode/notes/data/NotesDatabaseHelper.java,d\8\d8a02a8652b122905e3406dbc06e48f48ca280f7
-@
-local.properties,0\7\0712df971a99ac4d2fccb8e0fb19f377f3374cca
-L
-src/main/AndroidManifest.xml,0\6\066a3db98a4a279fde40d6ddf92c417b5c93198b
-c
-3src/main/java/net/micode/notes/ui/NoteItemData.java,d\9\d92e16000f49ca8e38a8b0a8ef8d26ecfa0c30ff
-c
-3src/main/java/net/micode/notes/ui/DropdownMenu.java,1\e\1e8670b74afc171cd1cff4b54f19c5c5e2b275e2
-X
-(src/main/java/net/micode/notes/ui/a.puml,d\1\d17d5bb6acc7bdc3d72673ddc02442f83d1b2206
-g
-7src/main/java/net/micode/notes/ui/NoteEditActivity.java,6\c\6c40630893054a28c13c2eb04ceb5fa51173b0b6
-f
-6src/main/java/net/micode/notes/data/NotesProvider.java,9\e\9e6a9e3dc79d0c3c0054eabc0e10309b0f133645
 h
 8src/main/java/net/micode/notes/ui/NotesListActivity.java,7\b\7bccae5ecd745bba36ddfd464ec07b66de678477
-g
+L
-7src/main/java/net/micode/notes/ui/NotesListAdapter.java,5\3\53b98e6d0ece8f8c43934ef63db400be3bbe507c
+src/main/AndroidManifest.xml,0\6\066a3db98a4a279fde40d6ddf92c417b5c93198b
-c
+A
-3src/main/java/net/micode/notes/ui/DBConnection.java,9\a\9a3090deb50adc3dab06c8adbacdac2adbb5fdad
+gradle.properties,2\a\2afbb999f001938c88fa43fc2ef52abf0f8213e4
-a
-1src/main/java/net/micode/notes/ui/JsonParser.java,7\2\72971ba5cd5eebd08ece719bc9283211cd06a429

src/Notes-master1/.idea/workspace.xml

@@ -6,7 +6,6 @@
     </shared>
   </component>
   <component name="AndroidLogFilters">
-    <option name="TOOL_WINDOW_LOG_LEVEL" value="debug" />
     <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="No Filters" />
   </component>
   <component name="AutoImportSettings">
@@ -14,20 +13,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="f028e52a-5f24-429b-8af1-f5a0863e8065" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/../../doc/实践资源-开源软件维护方案及成果模板.docx" beforeDir="false" />
+      <change afterPath="$PROJECT_DIR$/app/src/main/res/xml/file_paths.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/7.0.2/dependencies-accessors/dependencies-accessors.lock" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/7.0.2/dependencies-accessors/gc.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/7.0.2/executionHistory/executionHistory.bin" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/7.0.2/executionHistory/executionHistory.lock" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/7.0.2/fileChanges/last-build.bin" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/7.0.2/fileHashes/fileHashes.bin" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/7.0.2/fileHashes/fileHashes.lock" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/7.0.2/fileHashes/resourceHashesCache.bin" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/7.0.2/gc.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/7.0.2/javaCompile/classAnalysis.bin" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/7.0.2/javaCompile/jarAnalysis.bin" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/7.0.2/javaCompile/javaCompile.lock" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/7.0.2/javaCompile/taskHistory.bin" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/7.2/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.2/executionHistory/executionHistory.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/7.2/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.2/executionHistory/executionHistory.lock" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/7.2/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.2/fileHashes/fileHashes.bin" afterDir="false" />
@@ -36,27 +22,27 @@
       <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/checksums/checksums.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/checksums/checksums.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/checksums/md5-checksums.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/checksums/md5-checksums.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/checksums/sha1-checksums.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/checksums/sha1-checksums.bin" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/dbnavigator.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dbnavigator.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/gradle.properties" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/sonarlint/issuestore/4/6/4623bd3eb8366c31819ef25a6dc50fee4400c6d6" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/sonarlint/issuestore/0/6/066a3db98a4a279fde40d6ddf92c417b5c93198b" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/sonarlint/issuestore/0/e/0e854f4195c0d44c8ada29e4ad9b0cb3970cb0e6" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/sonarlint/issuestore/2/a/2afbb999f001938c88fa43fc2ef52abf0f8213e4" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/sonarlint/issuestore/5/3/53b98e6d0ece8f8c43934ef63db400be3bbe507c" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/sonarlint/issuestore/6/c/6c40630893054a28c13c2eb04ceb5fa51173b0b6" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/sonarlint/issuestore/7/b/7bccae5ecd745bba36ddfd464ec07b66de678477" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/sonarlint/issuestore/d/8/d8a02a8652b122905e3406dbc06e48f48ca280f7" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/sonarlint/issuestore/f/0/f07866736216be0ee2aba49e392191aeae700a35" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/sonarlint/issuestore/index.pb" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/sonarlint/issuestore/index.pb" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/AccountDialogTitleBinding.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/AccountDialogTitleBinding.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/AddAccountTextBinding.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/AddAccountTextBinding.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/AppBarMainBinding.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/AppBarMainBinding.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/DatetimePickerBinding.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/DatetimePickerBinding.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/DialogAddSecretBinding.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/DialogAddSecretBinding.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/DialogDeleteSenoteBinding.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/DialogDeleteSenoteBinding.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/DialogEditTextBinding.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/DialogEditTextBinding.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/DialogInputPasswdBinding.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/DialogInputPasswdBinding.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/DialogLoginBinding.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/DialogLoginBinding.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/DialogRegisterBinding.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/DialogRegisterBinding.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/FolderListItemBinding.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/FolderListItemBinding.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/NavHeaderMainBinding.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/NavHeaderMainBinding.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/NoteEditBinding.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/NoteEditBinding.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/NoteEditListItemBinding.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/NoteEditListItemBinding.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/NoteItemBinding.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/NoteItemBinding.java" afterDir="false" />
@@ -66,197 +52,37 @@
       <change beforePath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/SettingsHeaderBinding.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/SettingsHeaderBinding.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/Widget2xBinding.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/Widget2xBinding.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/Widget4xBinding.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/Widget4xBinding.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/generated/source/buildConfig/androidTest/debug/net/micode/notes/test/BuildConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/source/buildConfig/androidTest/debug/net/micode/notes/test/BuildConfig.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/app_classes/debug/classes.jar" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/app_classes/debug/classes.jar" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/app_metadata/debug/app-metadata.properties" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/app_metadata/debug/app-metadata.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debugAndroidTest/R.jar" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debugAndroidTest/R.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/data_binding_base_class_log_artifact/debug/out/net.micode.notes-binding_classes.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/data_binding_base_class_log_artifact/debug/out/net.micode.notes-binding_classes.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/data_binding_layout_info_type_merge/debug/out/nav_header_main-layout.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/data_binding_layout_info_type_merge/debug/out/nav_header_main-layout.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_0/graph.bin" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_1/graph.bin" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_2/graph.bin" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_3/graph.bin" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/dex_archive_input_jar_hashes/debug/out" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/dex_archive_input_jar_hashes/debug/out" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/external_file_lib_dex_archives/debug/0_Msc.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/dex_number_of_buckets_file/debug/out" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/dex_number_of_buckets_file/debug/out" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/dataBindingGenBaseClassesDebug/base_builder_log.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/dataBindingGenBaseClassesDebug/base_builder_log.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0D2yDvZl4lEhlaxhdAzQOT4TmLE=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0O+thHfp2Nei7nuFVmYtcJHNqxE=" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0O+thHfp2Nei7nuFVmYtcJHNqxE=" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0Q42Jc7gh_SqfN4_UPnJekZ6UEk=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1O4oIvbLsNtuHroKk8SvgBbDJrw=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1bKz5JhRBCSadZyyBFaT0vv8ra0=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/2g6Cx59kgGMmC3vaiF1Nkjciv6Y=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3d9enWVJFlN+EGH8JD7RrhJzIOI=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3uyBSeuyO2Q3zhtRhxvZ8nxbvL8=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/492ynwLq6u571X3PZnWQb9Tye5k=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/5sk0bMuFckoM9zQ3t83QR0bJETU=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/68JSZElYqGfKmbHSD14VmCiHrs4=" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/68JSZElYqGfKmbHSD14VmCiHrs4=" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6T3N5XuFvPYc3l2s76DVY94w0MY=" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6T3N5XuFvPYc3l2s76DVY94w0MY=" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6Tu3HOkTDHE5aYDXmS2dolySIEc=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6iSx44oUggla66KKnhTGNtQ+Kks=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6wOK_spmRYiPH38XyoZjr0fYtuA=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/8iAo7TSwCmQqWlRXt6U0tna86kw=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/90zBq0rJwfZ6_3Adzsxbfu2xPh0=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9WEud9jWWFXAF7N6IeWtcP7wX5k=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9hyhtkqKZThXedPp3JEuDEkRhbI=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/AjxHFnGNab4lckzQe8N6tZRgRaY=" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/AjxHFnGNab4lckzQe8N6tZRgRaY=" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CVDfBLndCfBRCVIDSjiHbfFYgK4=" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CVDfBLndCfBRCVIDSjiHbfFYgK4=" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/D__J7peuFluGZCckbewJG6hjbJI=" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/D__J7peuFluGZCckbewJG6hjbJI=" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DimYq3SrhBMmEDUq6G_u4hF0u8E=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/F8Bk3N1BZ6kaCKHDRTRxdkgCh1o=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/FKAOeNPJYbpPaIIlKU5M4OMTfdA=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/FRRlUnUyhtavQZClHcctgSKurAI=" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/FRRlUnUyhtavQZClHcctgSKurAI=" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/G9+gGpAadLhe1LfCoDi9kibvxvg=" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/G9+gGpAadLhe1LfCoDi9kibvxvg=" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/G9hNMoOnCVke1aWLwuAHMaUMw80=" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/G9hNMoOnCVke1aWLwuAHMaUMw80=" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GgWGKtcdhRITYqlknqdiHk5u960=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Gu+kcXT1ow3gIutL6c0sWYPP9xg=" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Gu+kcXT1ow3gIutL6c0sWYPP9xg=" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GzLKXjPWcpGQpXxBI0AXNuYf7Ww=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Hukiy+IwqrQzI8YKag3ST9fWjyY=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/I0l9tvmCFo3y7e_4Mp7aJToYy1M=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/IEU02alb5_7N97mvz7VJ4A6F9Rw=" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/IEU02alb5_7N97mvz7VJ4A6F9Rw=" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/IF4G1vM5fYzNXcscBsKi1IH13Go=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/IRFfOIVyLvKI5krXfMNHzPRGhc0=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/JXAN0UZuwlzBXpbdr6F6zv4Rlow=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/JXqsn_asbgYwD8J1a9h12tBi0sg=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/JqdoOlvdqa7mnlg4E0EDxi+jQR0=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Jy8pl10hIerKH5GEFbEZmAExDVs=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KRPD2Y4TAb90m+3GsgC8ZHmZbOE=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KbmFVS0HILi3SqyJqjYtZlBwvzg=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KwRtgYViIPnDsmfrlxciDkiSYDI=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KyxiwpB61m5z5nL2ZJ0bWRDghtc=" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KyxiwpB61m5z5nL2ZJ0bWRDghtc=" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/LBm9N9fDv7HyJl1OjsVRReN7VZc=" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/LBm9N9fDv7HyJl1OjsVRReN7VZc=" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/LnrX5jMeRwGkSyDnnxThyGLBmS8=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/LzDmrJnMR82iNgSgDfMICEtrs5E=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/MrzqV7AGJBUz3348JgM5TA0bNhI=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/My0J4TAbhGpTNQQhAYc4uZhQTdI=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/N7z_V0d20dBOOdBljbS049jdrrk=" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/N7z_V0d20dBOOdBljbS049jdrrk=" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NETHWWhePdU5gQCrnBAhKm34hbs=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Nua0SiErzdtQ90B74q1k0VT1ecE=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/O03xvi6J0iYZmywc22E0zhq_Jvs=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Ooc8nSKjn+ahESns9aoyKlLGFp0=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/PpzHs6gjrA6ErVG0rLeRfuGh2Bo=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Q5P1eQmeWpmd_dH28+0XuK0nNYY=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QHdTdYYWKFvS07hyik80KJGSsNs=" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QHdTdYYWKFvS07hyik80KJGSsNs=" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QMA3Hi4iw5c9B98I+RQFbVxBOGs=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QRjkieaXdzjZHRWO06NItmCu8fg=" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QRjkieaXdzjZHRWO06NItmCu8fg=" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Qa9ktMjgd30V+OTjNWpC7OyFozg=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SI17k9iwzS2xyeQcz690D42vABQ=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SMxpaCj2KxONY+Knb0nIWNeTn0A=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/UJGjVPkEwYo7pUwMdYaL85WyuDA=" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/UJGjVPkEwYo7pUwMdYaL85WyuDA=" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/WCmu+cHcvbQPRE+uhCNqlU0Bjgk=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Xek0j0fdR8UYOrJ1IJ4pn3uWSCE=" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Xek0j0fdR8UYOrJ1IJ4pn3uWSCE=" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/YYSflyRoZfcb6_egRb14Svg9NSo=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ZFXVEE0Q+_pgwM9zIlOfTE3hKWk=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ZNJB8z+Rx8QG_MHAXH7dxGbaPr8=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/_d2RL4OQAJk8U11_R+QRAA1v+Hk=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/aUsoarN1tozjq35XSMwQvryUThA=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/aZwAD4RR2M5p7N9rnu6g1Wd35Sk=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/adw7QYibDRLBF+sXs16Ev0zmEEU=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/aujIChqebceixHR+A4PnzAK6Tiw=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/bW1MIvhhVzZ2X_+L7Fa6YLEd9lE=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/bvZ7tsg4LnFnp+GUzkNcUj13hQQ=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ckBSyLsOMQZRFVnaUpcFut3PBlY=" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ckBSyLsOMQZRFVnaUpcFut3PBlY=" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/cuswIUJ_XVBMvnLITScwP9XvmVw=" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/cuswIUJ_XVBMvnLITScwP9XvmVw=" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/d1GVdz3af2_mVVhrYbj8IpL7d3g=" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/d1GVdz3af2_mVVhrYbj8IpL7d3g=" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/d39mCe0TVnHgIFL0eFaZr_Ir4So=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/dF4sgZwx4b+bv0JSomEgqR81+xM=" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/dF4sgZwx4b+bv0JSomEgqR81+xM=" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/dLTnCqGkbd71_T_Y7gyZzPUNmZk=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/eFgLsL_hw3aKKzMsyFQvf043v6A=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/eObdOiv0PdIpYIIJydLoCTSe3_w=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/fX9PdX1Kd2zZ6g8sXIlVnBF33OY=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/fXR0Gy_d2VeiFuNLlEgAfwSSOoE=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/fqWY2qVL4_Ez5Kv0dfX3jMn9qDc=" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/fqWY2qVL4_Ez5Kv0dfX3jMn9qDc=" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/g373oxwayQBpO92Mmz0wYxsqbLE=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/gQ+7Pobujbf+Lv8j+PGmfCoBqcw=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/gZsvIWthOdyBHb2ImuuV3ummgYA=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/j3MYmUjAZ09L9KPgQRGOTHgFuMY=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/j4yejSjIDyNRJruXTLrRH1goQfg=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jO92wKRGGEuMOXOWG15hJIY9a9c=" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jO92wKRGGEuMOXOWG15hJIY9a9c=" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jTL3nVyltHJWTayuQpfpi2l3jVE=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jldW6upa2DouwpT4HKfGOK86AFE=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/kEMWC86DX9Ma1XZNXXNRcHek2PU=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/kJOsB4vJfdADBK1dp379kwTjAHM=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/kVuWFk3v38bk_s3DhT3HBimZi5A=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/kxOJ6omnkGTGSLkWkK6uvE3WPbA=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lAjQK_esGKsaMqa0ehgHCEHtLx0=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lOd5M8rdUcg3SxiGkOSVGZ3z2eM=" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lOd5M8rdUcg3SxiGkOSVGZ3z2eM=" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lQXS655Y1f0ikALw8KJ2XGRqTCM=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lh5eUEU7i_s4uVNaCLBHiy+bVT4=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/m1MFs00EVR+PRUJYH+tEN0l50p0=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/m7FxWFqXfcpk7O5I1kawOMgjELM=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/oMRbVSO127SynEO0PF52lM6BI0U=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/pwD31j3uqAmZXTP9V1JknNCyqas=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qZalQQtqmIOiIROHJ4su9Awk2hY=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qnOO+n11i0CYfZGNnhQgvni__Ak=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qy5QdwgYhkqfo9rupIMs5Zct0xg=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rnWhB17wx6vpupDzhGOxQJ7WRrw=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rp6ras1ObNzlZRWN6IWuQckK_Y8=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rqTNaZPL59fCsVwBdjnx5tMkjkc=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tcXRAGRG9XqV0zNhssCeSUF0bCQ=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/uKFWa2MSAnwcyI7+5Krula_64p0=" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/uKFWa2MSAnwcyI7+5Krula_64p0=" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ulvMB7l9pe7u3_2baIViwVz2BbM=" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ulvMB7l9pe7u3_2baIViwVz2BbM=" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/uvYlxeM45N8j6BeoqATmsL5BtlE=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vC9X2WfF4nX7eEzjs5PoF2U24L8=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vCKwT20Bhlx6HkiLdWwK_xdZK4A=" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vCKwT20Bhlx6HkiLdWwK_xdZK4A=" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vHe4xZfNMnHIevDWSOtu8t6vf_M=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wPpgwunQ7sR03T6bK2SIW6ZgVyw=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/xJkIlW5q2WnJZgfJXh8Ets0kdls=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/yNbCdk6+kIGF6eeyNwShKzMzYQg=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ynHVpgIVzjlbrmfz8TCVsRMqMYk=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zsfM+WAMYXAKUNEo4yG4F_fCy9o=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugAssets/merger.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugAssets/merger.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merger.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merger.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/stripped.dir/layout/dialog_login.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/stripped.dir/layout/dialog_register.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugShaders/merger.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugShaders/merger.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/AppBarMainBinding.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/AppBarMainBinding.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/DatetimePickerBinding.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/DatetimePickerBinding.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/FolderListItemBinding.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/FolderListItemBinding.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NavHeaderMainBinding.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NavHeaderMainBinding.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteEditBinding.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteEditBinding.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteItemBinding.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteItemBinding.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteListBinding.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteListBinding.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteListDropdownMenuBinding.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteListDropdownMenuBinding.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/SettingsHeaderBinding.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/SettingsHeaderBinding.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/Widget2xBinding.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/Widget2xBinding.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/Widget4xBinding.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/Widget4xBinding.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DBConnection.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DBConnection.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11$1.class" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$12.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$12.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$13$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$13.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$13.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$14.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$14.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$15.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$15.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$16.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$16.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$17$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$17.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$17.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$18.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$18.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$19.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$19.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class" afterDir="false" />
@@ -266,248 +92,20 @@
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_java_res/debug/base.jar" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_java_res/debug/base.jar" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_manifests/debug/output-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_manifests/debug/output-metadata.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_ic_launcher.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_ic_launcher.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_ic_menu_nav_all.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_ic_menu_nav_all.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_ic_menu_nav_life.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_ic_menu_nav_life.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_ic_menu_nav_recycle.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_ic_menu_nav_recycle.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_ic_menu_nav_ungrouped.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_ic_menu_nav_ungrouped.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_ic_menu_nav_work.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_ic_menu_nav_work.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_lock.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_lock.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_p1.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_p1.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_radio.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_radio.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_side_nav_bar.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_side_nav_bar.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_trash_background.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_trash_background.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_user_img.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_user_img.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_app_bar_main.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_app_bar_main.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_dialog_add_secret.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_dialog_add_secret.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_dialog_delete_senote.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_dialog_delete_senote.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_dialog_input_passwd.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_dialog_input_passwd.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_dialog_login.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_dialog_login.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_dialog_register.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_dialog_register.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_nav_header_main.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_nav_header_main.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/menu_activity_main_drawer.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/menu_activity_main_drawer.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/menu_background.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/menu_background.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/menu_trash_folder.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/menu_trash_folder.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/raw_introduction.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/raw_introduction.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-af_values-af.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-af_values-af.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-am_values-am.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-am_values-am.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ar_values-ar.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ar_values-ar.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-as_values-as.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-as_values-as.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-az_values-az.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-az_values-az.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-b+sr+Latn_values-b+sr+Latn.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-b+sr+Latn_values-b+sr+Latn.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-be_values-be.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-be_values-be.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-bg_values-bg.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-bg_values-bg.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-bn_values-bn.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-bn_values-bn.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-bs_values-bs.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-bs_values-bs.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ca_values-ca.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ca_values-ca.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-cs_values-cs.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-cs_values-cs.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-da_values-da.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-da_values-da.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-de_values-de.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-de_values-de.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-el_values-el.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-el_values-el.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-en-rAU_values-en-rAU.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-en-rAU_values-en-rAU.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-en-rCA_values-en-rCA.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-en-rCA_values-en-rCA.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-en-rGB_values-en-rGB.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-en-rGB_values-en-rGB.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-en-rIN_values-en-rIN.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-en-rIN_values-en-rIN.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-en-rXC_values-en-rXC.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-en-rXC_values-en-rXC.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-es-rUS_values-es-rUS.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-es-rUS_values-es-rUS.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-es_values-es.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-es_values-es.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-et_values-et.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-et_values-et.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-eu_values-eu.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-eu_values-eu.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-fa_values-fa.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-fa_values-fa.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-fi_values-fi.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-fi_values-fi.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-fr-rCA_values-fr-rCA.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-fr-rCA_values-fr-rCA.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-fr_values-fr.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-fr_values-fr.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-gl_values-gl.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-gl_values-gl.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-gu_values-gu.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-gu_values-gu.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-h720dp-v13_values-h720dp-v13.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-h720dp-v13_values-h720dp-v13.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-hdpi-v4_values-hdpi-v4.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-hdpi-v4_values-hdpi-v4.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-hi_values-hi.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-hi_values-hi.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-hr_values-hr.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-hr_values-hr.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-hu_values-hu.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-hu_values-hu.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-hy_values-hy.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-hy_values-hy.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-in_values-in.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-in_values-in.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-is_values-is.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-is_values-is.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-it_values-it.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-it_values-it.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-iw_values-iw.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-iw_values-iw.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ja_values-ja.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ja_values-ja.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ka_values-ka.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ka_values-ka.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-kk_values-kk.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-kk_values-kk.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-km_values-km.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-km_values-km.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-kn_values-kn.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-kn_values-kn.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ko_values-ko.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ko_values-ko.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ky_values-ky.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ky_values-ky.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-land_values-land.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-land_values-land.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-large-v4_values-large-v4.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-large-v4_values-large-v4.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ldltr-v21_values-ldltr-v21.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ldltr-v21_values-ldltr-v21.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-lo_values-lo.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-lo_values-lo.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-lt_values-lt.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-lt_values-lt.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-lv_values-lv.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-lv_values-lv.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-mk_values-mk.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-mk_values-mk.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ml_values-ml.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ml_values-ml.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-mn_values-mn.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-mn_values-mn.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-mr_values-mr.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-mr_values-mr.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ms_values-ms.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ms_values-ms.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-my_values-my.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-my_values-my.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-nb_values-nb.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-nb_values-nb.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ne_values-ne.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ne_values-ne.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-night-v8_values-night-v8.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-night-v8_values-night-v8.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-nl_values-nl.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-nl_values-nl.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-or_values-or.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-or_values-or.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-pa_values-pa.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-pa_values-pa.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-pl_values-pl.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-pl_values-pl.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-port_values-port.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-port_values-port.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-pt-rBR_values-pt-rBR.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-pt-rBR_values-pt-rBR.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-pt-rPT_values-pt-rPT.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-pt-rPT_values-pt-rPT.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-pt_values-pt.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-pt_values-pt.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ro_values-ro.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ro_values-ro.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ru_values-ru.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ru_values-ru.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-si_values-si.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-si_values-si.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-sk_values-sk.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-sk_values-sk.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-sl_values-sl.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-sl_values-sl.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-sq_values-sq.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-sq_values-sq.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-sr_values-sr.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-sr_values-sr.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-sv_values-sv.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-sv_values-sv.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-sw600dp-v13_values-sw600dp-v13.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-sw600dp-v13_values-sw600dp-v13.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-sw_values-sw.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-sw_values-sw.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ta_values-ta.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ta_values-ta.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-te_values-te.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-te_values-te.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-th_values-th.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-th_values-th.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-tl_values-tl.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-tl_values-tl.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-tr-rTR_values-tr-rTR.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-tr-rTR_values-tr-rTR.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-tr_values-tr.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-tr_values-tr.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-uk_values-uk.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-uk_values-uk.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ur_values-ur.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ur_values-ur.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-uz_values-uz.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-uz_values-uz.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v16_values-v16.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v16_values-v16.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v17_values-v17.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v17_values-v17.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v18_values-v18.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v18_values-v18.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v21_values-v21.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v21_values-v21.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v22_values-v22.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v22_values-v22.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v23_values-v23.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v23_values-v23.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v24_values-v24.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v24_values-v24.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v25_values-v25.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v25_values-v25.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v26_values-v26.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v26_values-v26.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v28_values-v28.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v28_values-v28.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-vi_values-vi.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-vi_values-vi.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-watch-v20_values-watch-v20.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-watch-v20_values-watch-v20.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-watch-v21_values-watch-v21.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-watch-v21_values-watch-v21.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-xlarge-v4_values-xlarge-v4.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-xlarge-v4_values-xlarge-v4.arsc.flat" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-zh-rHK_values-zh-rHK.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-zh-rHK_values-zh-rHK.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-zh_values-zh.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-zh_values-zh.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-zu_values-zu.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-zu_values-zu.arsc.flat" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values_values.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values_values.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/xml_file_paths.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/xml_file_paths.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json" afterDir="false" />
@@ -593,7 +191,6 @@
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-te.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-te.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-th.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-th.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tl.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tl.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr-rTR.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr-rTR.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uk.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uk.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ur.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ur.json" afterDir="false" />
@@ -615,59 +212,23 @@
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rHK.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rHK.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zu.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zu.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/single/layout.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/single/layout.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/packaged_manifests/debug/output-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/packaged_manifests/debug/output-metadata.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/packaged_manifests/debugAndroidTest/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/packaged_manifests/debugAndroidTest/AndroidManifest.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/packaged_manifests/debugAndroidTest/output-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/packaged_manifests/debugAndroidTest/output-metadata.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/processed_res/debug/out/output-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/processed_res/debug/out/output-metadata.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/processed_res/debug/out/resources-debug.ap_" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/processed_res/debug/out/resources-debug.ap_" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/processed_res/debugAndroidTest/out/output-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/processed_res/debugAndroidTest/out/output-metadata.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/processed_res/debugAndroidTest/out/resources-debugAndroidTest.ap_" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/processed_res/debugAndroidTest/out/resources-debugAndroidTest.ap_" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/0cd0f6e34d41ef507196546ddfc0e568933f7ae68ecf698e746fe8c3d2c58193_0.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/0cd0f6e34d41ef507196546ddfc0e568933f7ae68ecf698e746fe8c3d2c58193_1.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/0cd0f6e34d41ef507196546ddfc0e568933f7ae68ecf698e746fe8c3d2c58193_2.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/0cd0f6e34d41ef507196546ddfc0e568933f7ae68ecf698e746fe8c3d2c58193_3.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/a4d97d72aa7dcc7944441070c5106077985fd484ceaf37329b49faa44c897fef_0.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/a4d97d72aa7dcc7944441070c5106077985fd484ceaf37329b49faa44c897fef_1.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/a4d97d72aa7dcc7944441070c5106077985fd484ceaf37329b49faa44c897fef_2.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/a4d97d72aa7dcc7944441070c5106077985fd484ceaf37329b49faa44c897fef_3.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/a4d97d72aa7dcc7944441070c5106077985fd484ceaf37329b49faa44c897fef_4.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/a4d97d72aa7dcc7944441070c5106077985fd484ceaf37329b49faa44c897fef_5.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/AppBarMainBinding.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/AppBarMainBinding.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/DatetimePickerBinding.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/DatetimePickerBinding.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/FolderListItemBinding.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/FolderListItemBinding.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/NavHeaderMainBinding.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/NavHeaderMainBinding.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/NoteEditBinding.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/NoteEditBinding.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/NoteItemBinding.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/NoteItemBinding.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/NoteListBinding.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/NoteListBinding.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/NoteListDropdownMenuBinding.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/NoteListDropdownMenuBinding.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/SettingsHeaderBinding.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/SettingsHeaderBinding.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/Widget2xBinding.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/Widget2xBinding.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/Widget4xBinding.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/databinding/Widget4xBinding.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DBConnection.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DBConnection.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$10.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$10.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$11$1.dex" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$11.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$11.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$12.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$12.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$13$1.dex" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$13.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$13.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$14.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$14.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$15.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$15.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$16.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$16.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$17$1.dex" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$17.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$17.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$18.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$18.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$19.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$19.dex" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex" afterDir="false" />
@@ -677,36 +238,27 @@
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/runtime_symbol_list/debug/R.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/runtime_symbol_list/debug/R.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/outputs/apk/debug/app-debug.apk" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/outputs/apk/debug/app-debug.apk" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/outputs/apk/debug/output-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/outputs/apk/debug/output-metadata.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/outputs/logs/manifest-merger-debug-report.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/outputs/logs/manifest-merger-debug-report.txt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/NotesProvider.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/NotesProvider.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/DBConnection.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/DBConnection.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/a.puml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/a.puml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/nav_header_main.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/nav_header_main.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/res/menu/activity_main_drawer.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/menu/activity_main_drawer.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/res/menu/note_list.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/menu/note_list.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/res/menu/trash_folder.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/menu/trash_folder.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/values-zh-rCN/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-zh-rCN/strings.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/sonar/report-task.txt" beforeDir="false" afterPath="$PROJECT_DIR$/build/sonar/report-task.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/gradle.properties" beforeDir="false" afterPath="$PROJECT_DIR$/gradle.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/local.properties" beforeDir="false" afterPath="$PROJECT_DIR$/local.properties" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -755,7 +307,6 @@
       <list>
         <option value="UML Class" />
         <option value="layoutResourceFile_vertical" />
-        <option value="Class" />
         <option value="layoutResourceFile" />
         <option value="resourceFile" />
       </list>
@@ -772,6 +323,9 @@
       <filtered-out-file-type name="COMMIT_BY_MESSAGE" />
     </file-type-list>
   </component>
+  <component name="ProblemsViewState">
+    <option name="selectedIndex" value="1" />
+  </component>
   <component name="ProjectId" id="1y8bCK8aNrO5m0nUFKRWf6mKZ1Z" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
     <ConfirmationsSetting value="2" id="Add" />
@@ -789,15 +343,14 @@
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="SHOW_ALL_PROCESSES" value="false" />
-    <property name="android-custom-viewC:/Users/fanyi/.gradle/caches/modules-2/files-2.1/androidx.drawerlayout/drawerlayout/1.0.0/9ecd4ecb7da215ba4c5c3e00bf8d290dad6f2bc5/drawerlayout-1.0.0-sources.jar!/androidx/drawerlayout/widget/DrawerLayout.java_SELECTED" value="DrawerLayout" />
     <property name="android-custom-viewD:/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditText.java_NoteEditText_DIMENSIONS" value="1080&#10;1920" />
     <property name="android-custom-viewD:/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditText.java_SELECTED" value="NoteEditText" />
     <property name="android-custom-viewE:/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditText.java_NoteEditText_DIMENSIONS" value="1080&#10;1920" />
     <property name="android-custom-viewE:/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditText.java_SELECTED" value="NoteEditText" />
     <property name="android-custom-viewE:/git/xcr_weihu/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditText.java_NoteEditText_DIMENSIONS" value="1080&#10;1920" />
     <property name="android-custom-viewE:/git/xcr_weihu/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditText.java_SELECTED" value="NoteEditText" />
-    <property name="last_opened_file_path" value="$USER_HOME$/Desktop/软件工程/实践一/xcr_weihu/src/Notes-master1" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/Notes-master1.zip" />
-    <property name="project.structure.last.edited" value="Modules" />
+    <property name="project.structure.last.edited" value="Dependencies" />
     <property name="project.structure.proportion" value="0.17" />
     <property name="project.structure.side.proportion" value="0.2" />
     <property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
@@ -807,11 +360,9 @@
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
-      <recent name="D:\Notes-master1\app\src\main\res\menu" />
-      <recent name="D:\Notes-master1\app\src\main\res\layout" />
-      <recent name="E:\git\xcr_weihu\src\Notes-master1\app\libs" />
       <recent name="E:\git\xcr_weihu\src\Notes-master1\app\src\main\res\drawable-hdpi" />
       <recent name="E:\git\xcr_weihu\src\Notes-master1\app" />
+      <recent name="E:\git\xcr_weihu\src\Notes-master1\app\src\main" />
     </key>
     <key name="android.template.2039368219">
       <recent name="net.micode.notes.ui" />

src/Notes-master1/app/build.gradle

@@ -6,7 +6,7 @@ android {
 
     defaultConfig {
         applicationId "net.micode.notes"
-        minSdkVersion 16
+        minSdkVersion 19
         //noinspection ExpiredTargetSdkVersion
         targetSdkVersion 23
     }
@@ -29,21 +29,9 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:2.0.4'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation files('libs\\Msc.jar')
-    implementation "androidx.drawerlayout:drawerlayout:1.1.1"
-    implementation 'com.android.support:design:29.1.1'
-    implementation 'com.zhihu.android:matisse:0.5.2-beta4'
-    implementation 'com.github.bumptech.glide:glide:4.8.0'
-    implementation files('libs\\mysql-connector-java-5.1.46-bin.jar')
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.8.0'
-
-    implementation 'com.simple:spiderman:1.0.2'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 }
 sonarqube {
     properties {

src/Notes-master1/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/AppBarMainBinding.java

@@ -1,103 +0,0 @@
-// Generated by view binder compiler. Do not edit!
-package net.micode.notes.databinding;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.ListView;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.widget.SearchView;
-import androidx.coordinatorlayout.widget.CoordinatorLayout;
-import androidx.viewbinding.ViewBinding;
-import androidx.viewbinding.ViewBindings;
-import java.lang.NullPointerException;
-import java.lang.Override;
-import java.lang.String;
-import net.micode.notes.R;
-
-public final class AppBarMainBinding implements ViewBinding {
-  @NonNull
-  private final CoordinatorLayout rootView;
-
-  @NonNull
-  public final Button btnNewNote;
-
-  @NonNull
-  public final ListView notesList;
-
-  @NonNull
-  public final SearchView searchView;
-
-  @NonNull
-  public final TextView tvTitleBar;
-
-  private AppBarMainBinding(@NonNull CoordinatorLayout rootView, @NonNull Button btnNewNote,
-      @NonNull ListView notesList, @NonNull SearchView searchView, @NonNull TextView tvTitleBar) {
-    this.rootView = rootView;
-    this.btnNewNote = btnNewNote;
-    this.notesList = notesList;
-    this.searchView = searchView;
-    this.tvTitleBar = tvTitleBar;
-  }
-
-  @Override
-  @NonNull
-  public CoordinatorLayout getRoot() {
-    return rootView;
-  }
-
-  @NonNull
-  public static AppBarMainBinding inflate(@NonNull LayoutInflater inflater) {
-    return inflate(inflater, null, false);
-  }
-
-  @NonNull
-  public static AppBarMainBinding inflate(@NonNull LayoutInflater inflater,
-      @Nullable ViewGroup parent, boolean attachToParent) {
-    View root = inflater.inflate(R.layout.app_bar_main, parent, false);
-    if (attachToParent) {
-      parent.addView(root);
-    }
-    return bind(root);
-  }
-
-  @NonNull
-  public static AppBarMainBinding bind(@NonNull View rootView) {
-    // The body of this method is generated in a way you would not otherwise write.
-    // This is done to optimize the compiled bytecode for size and performance.
-    int id;
-    missingId: {
-      id = R.id.btn_new_note;
-      Button btnNewNote = ViewBindings.findChildViewById(rootView, id);
-      if (btnNewNote == null) {
-        break missingId;
-      }
-
-      id = R.id.notes_list;
-      ListView notesList = ViewBindings.findChildViewById(rootView, id);
-      if (notesList == null) {
-        break missingId;
-      }
-
-      id = R.id.search_view;
-      SearchView searchView = ViewBindings.findChildViewById(rootView, id);
-      if (searchView == null) {
-        break missingId;
-      }
-
-      id = R.id.tv_title_bar;
-      TextView tvTitleBar = ViewBindings.findChildViewById(rootView, id);
-      if (tvTitleBar == null) {
-        break missingId;
-      }
-
-      return new AppBarMainBinding((CoordinatorLayout) rootView, btnNewNote, notesList, searchView,
-          tvTitleBar);
-    }
-    String missingId = rootView.getResources().getResourceName(id);
-    throw new NullPointerException("Missing required view with ID: ".concat(missingId));
-  }
-}

src/Notes-master1/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/DialogLoginBinding.java

@@ -1,79 +0,0 @@
-// Generated by view binder compiler. Do not edit!
-package net.micode.notes.databinding;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.viewbinding.ViewBinding;
-import androidx.viewbinding.ViewBindings;
-import java.lang.NullPointerException;
-import java.lang.Override;
-import java.lang.String;
-import net.micode.notes.R;
-
-public final class DialogLoginBinding implements ViewBinding {
-  @NonNull
-  private final LinearLayout rootView;
-
-  @NonNull
-  public final EditText editTextPasswd;
-
-  @NonNull
-  public final EditText editTextUser;
-
-  private DialogLoginBinding(@NonNull LinearLayout rootView, @NonNull EditText editTextPasswd,
-      @NonNull EditText editTextUser) {
-    this.rootView = rootView;
-    this.editTextPasswd = editTextPasswd;
-    this.editTextUser = editTextUser;
-  }
-
-  @Override
-  @NonNull
-  public LinearLayout getRoot() {
-    return rootView;
-  }
-
-  @NonNull
-  public static DialogLoginBinding inflate(@NonNull LayoutInflater inflater) {
-    return inflate(inflater, null, false);
-  }
-
-  @NonNull
-  public static DialogLoginBinding inflate(@NonNull LayoutInflater inflater,
-      @Nullable ViewGroup parent, boolean attachToParent) {
-    View root = inflater.inflate(R.layout.dialog_login, parent, false);
-    if (attachToParent) {
-      parent.addView(root);
-    }
-    return bind(root);
-  }
-
-  @NonNull
-  public static DialogLoginBinding bind(@NonNull View rootView) {
-    // The body of this method is generated in a way you would not otherwise write.
-    // This is done to optimize the compiled bytecode for size and performance.
-    int id;
-    missingId: {
-      id = R.id.editText_passwd;
-      EditText editTextPasswd = ViewBindings.findChildViewById(rootView, id);
-      if (editTextPasswd == null) {
-        break missingId;
-      }
-
-      id = R.id.editText_user;
-      EditText editTextUser = ViewBindings.findChildViewById(rootView, id);
-      if (editTextUser == null) {
-        break missingId;
-      }
-
-      return new DialogLoginBinding((LinearLayout) rootView, editTextPasswd, editTextUser);
-    }
-    String missingId = rootView.getResources().getResourceName(id);
-    throw new NullPointerException("Missing required view with ID: ".concat(missingId));
-  }
-}

src/Notes-master1/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/DialogRegisterBinding.java

@@ -1,90 +0,0 @@
-// Generated by view binder compiler. Do not edit!
-package net.micode.notes.databinding;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.viewbinding.ViewBinding;
-import androidx.viewbinding.ViewBindings;
-import java.lang.NullPointerException;
-import java.lang.Override;
-import java.lang.String;
-import net.micode.notes.R;
-
-public final class DialogRegisterBinding implements ViewBinding {
-  @NonNull
-  private final LinearLayout rootView;
-
-  @NonNull
-  public final EditText editTextRegPasswd;
-
-  @NonNull
-  public final EditText editTextRegUser;
-
-  @NonNull
-  public final EditText editTextRepasswd;
-
-  private DialogRegisterBinding(@NonNull LinearLayout rootView, @NonNull EditText editTextRegPasswd,
-      @NonNull EditText editTextRegUser, @NonNull EditText editTextRepasswd) {
-    this.rootView = rootView;
-    this.editTextRegPasswd = editTextRegPasswd;
-    this.editTextRegUser = editTextRegUser;
-    this.editTextRepasswd = editTextRepasswd;
-  }
-
-  @Override
-  @NonNull
-  public LinearLayout getRoot() {
-    return rootView;
-  }
-
-  @NonNull
-  public static DialogRegisterBinding inflate(@NonNull LayoutInflater inflater) {
-    return inflate(inflater, null, false);
-  }
-
-  @NonNull
-  public static DialogRegisterBinding inflate(@NonNull LayoutInflater inflater,
-      @Nullable ViewGroup parent, boolean attachToParent) {
-    View root = inflater.inflate(R.layout.dialog_register, parent, false);
-    if (attachToParent) {
-      parent.addView(root);
-    }
-    return bind(root);
-  }
-
-  @NonNull
-  public static DialogRegisterBinding bind(@NonNull View rootView) {
-    // The body of this method is generated in a way you would not otherwise write.
-    // This is done to optimize the compiled bytecode for size and performance.
-    int id;
-    missingId: {
-      id = R.id.editText_reg_passwd;
-      EditText editTextRegPasswd = ViewBindings.findChildViewById(rootView, id);
-      if (editTextRegPasswd == null) {
-        break missingId;
-      }
-
-      id = R.id.editText_reg_user;
-      EditText editTextRegUser = ViewBindings.findChildViewById(rootView, id);
-      if (editTextRegUser == null) {
-        break missingId;
-      }
-
-      id = R.id.editText_repasswd;
-      EditText editTextRepasswd = ViewBindings.findChildViewById(rootView, id);
-      if (editTextRepasswd == null) {
-        break missingId;
-      }
-
-      return new DialogRegisterBinding((LinearLayout) rootView, editTextRegPasswd, editTextRegUser,
-          editTextRepasswd);
-    }
-    String missingId = rootView.getResources().getResourceName(id);
-    throw new NullPointerException("Missing required view with ID: ".concat(missingId));
-  }
-}

src/Notes-master1/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/NavHeaderMainBinding.java

@@ -1,80 +0,0 @@
-// Generated by view binder compiler. Do not edit!
-package net.micode.notes.databinding;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.viewbinding.ViewBinding;
-import androidx.viewbinding.ViewBindings;
-import java.lang.NullPointerException;
-import java.lang.Override;
-import java.lang.String;
-import net.micode.notes.R;
-
-public final class NavHeaderMainBinding implements ViewBinding {
-  @NonNull
-  private final LinearLayout rootView;
-
-  @NonNull
-  public final ImageView imageView;
-
-  @NonNull
-  public final TextView navTvUser;
-
-  private NavHeaderMainBinding(@NonNull LinearLayout rootView, @NonNull ImageView imageView,
-      @NonNull TextView navTvUser) {
-    this.rootView = rootView;
-    this.imageView = imageView;
-    this.navTvUser = navTvUser;
-  }
-
-  @Override
-  @NonNull
-  public LinearLayout getRoot() {
-    return rootView;
-  }
-
-  @NonNull
-  public static NavHeaderMainBinding inflate(@NonNull LayoutInflater inflater) {
-    return inflate(inflater, null, false);
-  }
-
-  @NonNull
-  public static NavHeaderMainBinding inflate(@NonNull LayoutInflater inflater,
-      @Nullable ViewGroup parent, boolean attachToParent) {
-    View root = inflater.inflate(R.layout.nav_header_main, parent, false);
-    if (attachToParent) {
-      parent.addView(root);
-    }
-    return bind(root);
-  }
-
-  @NonNull
-  public static NavHeaderMainBinding bind(@NonNull View rootView) {
-    // The body of this method is generated in a way you would not otherwise write.
-    // This is done to optimize the compiled bytecode for size and performance.
-    int id;
-    missingId: {
-      id = R.id.imageView;
-      ImageView imageView = ViewBindings.findChildViewById(rootView, id);
-      if (imageView == null) {
-        break missingId;
-      }
-
-      id = R.id.nav_tv_user;
-      TextView navTvUser = ViewBindings.findChildViewById(rootView, id);
-      if (navTvUser == null) {
-        break missingId;
-      }
-
-      return new NavHeaderMainBinding((LinearLayout) rootView, imageView, navTvUser);
-    }
-    String missingId = rootView.getResources().getResourceName(id);
-    throw new NullPointerException("Missing required view with ID: ".concat(missingId));
-  }
-}

src/Notes-master1/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/NoteListBinding.java

@@ -4,12 +4,14 @@ package net.micode.notes.databinding;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.FrameLayout;
+import android.widget.ListView;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.viewbinding.ViewBinding;
 import androidx.viewbinding.ViewBindings;
-import com.google.android.material.navigation.NavigationView;
 import java.lang.NullPointerException;
 import java.lang.Override;
 import java.lang.String;
@@ -17,24 +19,28 @@ import net.micode.notes.R;
 
 public final class NoteListBinding implements ViewBinding {
   @NonNull
-  private final DrawerLayout rootView;
+  private final FrameLayout rootView;
 
   @NonNull
-  public final DrawerLayout drawerLayout;
+  public final Button btnNewNote;
 
   @NonNull
-  public final NavigationView navView;
+  public final ListView notesList;
 
-  private NoteListBinding(@NonNull DrawerLayout rootView, @NonNull DrawerLayout drawerLayout,
+  @NonNull
-      @NonNull NavigationView navView) {
+  public final TextView tvTitleBar;
+
+  private NoteListBinding(@NonNull FrameLayout rootView, @NonNull Button btnNewNote,
+      @NonNull ListView notesList, @NonNull TextView tvTitleBar) {
     this.rootView = rootView;
-    this.drawerLayout = drawerLayout;
+    this.btnNewNote = btnNewNote;
-    this.navView = navView;
+    this.notesList = notesList;
+    this.tvTitleBar = tvTitleBar;
   }
 
   @Override
   @NonNull
-  public DrawerLayout getRoot() {
+  public FrameLayout getRoot() {
     return rootView;
   }
 
@@ -59,15 +65,25 @@ public final class NoteListBinding implements ViewBinding {
     // This is done to optimize the compiled bytecode for size and performance.
     int id;
     missingId: {
-      DrawerLayout drawerLayout = (DrawerLayout) rootView;
+      id = R.id.btn_new_note;
+      Button btnNewNote = ViewBindings.findChildViewById(rootView, id);
+      if (btnNewNote == null) {
+        break missingId;
+      }
+
+      id = R.id.notes_list;
+      ListView notesList = ViewBindings.findChildViewById(rootView, id);
+      if (notesList == null) {
+        break missingId;
+      }
 
-      id = R.id.nav_view;
+      id = R.id.tv_title_bar;
-      NavigationView navView = ViewBindings.findChildViewById(rootView, id);
+      TextView tvTitleBar = ViewBindings.findChildViewById(rootView, id);
-      if (navView == null) {
+      if (tvTitleBar == null) {
         break missingId;
       }
 
-      return new NoteListBinding((DrawerLayout) rootView, drawerLayout, navView);
+      return new NoteListBinding((FrameLayout) rootView, btnNewNote, notesList, tvTitleBar);
     }
     String missingId = rootView.getResources().getResourceName(id);
     throw new NullPointerException("Missing required view with ID: ".concat(missingId));

src/Notes-master1/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json

@@ -1 +1 @@
-{"compiler-4.8.0.jar (com.github.bumptech.glide:compiler:4.8.0)":false}
+{}

src/Notes-master1/app/build/intermediates/data_binding_layout_info_type_merge/debug/out/app_bar_main-layout.xml

@@ -1 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?><Layout layout="app_bar_main" modulePackage="net.micode.notes" filePath="app\src\main\res\layout\app_bar_main.xml" directory="layout" isMerge="false" isBindingData="false" rootNodeType="androidx.coordinatorlayout.widget.CoordinatorLayout"><Targets><Target tag="layout/app_bar_main_0" view="androidx.coordinatorlayout.widget.CoordinatorLayout"><Expressions/><location startLine="1" startOffset="0" endLine="74" endOffset="53"/></Target><Target id="@+id/search_view" view="androidx.appcompat.widget.SearchView"><Expressions/><location startLine="28" startOffset="12" endLine="34" endOffset="50"/></Target><Target id="@+id/tv_title_bar" view="TextView"><Expressions/><location startLine="40" startOffset="8" endLine="49" endOffset="61"/></Target><Target id="@+id/notes_list" view="ListView"><Expressions/><location startLine="51" startOffset="8" endLine="59" endOffset="63"/></Target><Target id="@+id/btn_new_note" view="Button"><Expressions/><location startLine="64" startOffset="4" endLine="70" endOffset="41"/></Target></Targets></Layout>

src/Notes-master1/app/build/intermediates/data_binding_layout_info_type_merge/debug/out/dialog_login-layout.xml

@@ -1 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?><Layout layout="dialog_login" modulePackage="net.micode.notes" filePath="app\src\main\res\layout\dialog_login.xml" directory="layout" isMerge="false" isBindingData="false" rootNodeType="android.widget.LinearLayout"><Targets><Target tag="layout/dialog_login_0" view="LinearLayout"><Expressions/><location startLine="1" startOffset="0" endLine="31" endOffset="14"/></Target><Target id="@+id/editText_user" view="EditText"><Expressions/><location startLine="6" startOffset="4" endLine="16" endOffset="14"/></Target><Target id="@+id/editText_passwd" view="EditText"><Expressions/><location startLine="19" startOffset="4" endLine="28" endOffset="5"/></Target></Targets></Layout>

src/Notes-master1/app/build/intermediates/data_binding_layout_info_type_merge/debug/out/dialog_register-layout.xml

@@ -1 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?><Layout layout="dialog_register" modulePackage="net.micode.notes" filePath="app\src\main\res\layout\dialog_register.xml" directory="layout" isMerge="false" isBindingData="false" rootNodeType="android.widget.LinearLayout"><Targets><Target tag="layout/dialog_register_0" view="LinearLayout"><Expressions/><location startLine="1" startOffset="0" endLine="42" endOffset="14"/></Target><Target id="@+id/editText_reg_user" view="EditText"><Expressions/><location startLine="6" startOffset="4" endLine="16" endOffset="14"/></Target><Target id="@+id/editText_reg_passwd" view="EditText"><Expressions/><location startLine="18" startOffset="4" endLine="27" endOffset="9"/></Target><Target id="@+id/editText_repasswd" view="EditText"><Expressions/><location startLine="30" startOffset="4" endLine="39" endOffset="9"/></Target></Targets></Layout>

src/Notes-master1/app/build/intermediates/data_binding_layout_info_type_merge/debug/out/nav_header_main-layout.xml

@@ -1 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?><Layout layout="nav_header_main" modulePackage="net.micode.notes" filePath="app\src\main\res\layout\nav_header_main.xml" directory="layout" isMerge="false" isBindingData="false" rootNodeType="android.widget.LinearLayout"><Targets><Target tag="layout/nav_header_main_0" view="LinearLayout"><Expressions/><location startLine="1" startOffset="0" endLine="31" endOffset="14"/></Target><Target id="@+id/imageView" view="ImageView"><Expressions/><location startLine="14" startOffset="4" endLine="20" endOffset="44"/></Target><Target id="@+id/nav_tv_user" view="TextView"><Expressions/><location startLine="22" startOffset="4" endLine="28" endOffset="72"/></Target></Targets></Layout>

src/Notes-master1/app/build/intermediates/data_binding_layout_info_type_merge/debug/out/note_list-layout.xml

@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?><Layout layout="note_list" modulePackage="net.micode.notes" filePath="app\src\main\res\layout\note_list.xml" directory="layout" isMerge="false" isBindingData="false" rootNodeType="androidx.drawerlayout.widget.DrawerLayout" rootNodeViewId="@+id/drawer_layout"><Targets><Target id="@+id/drawer_layout" tag="layout/note_list_0" view="androidx.drawerlayout.widget.DrawerLayout"><Expressions/><location startLine="1" startOffset="0" endLine="26" endOffset="43"/></Target><Target tag="layout/note_list_0" include="app_bar_main"><Expressions/><location startLine="11" startOffset="4" endLine="14" endOffset="46"/></Target><Target id="@+id/nav_view" view="com.google.android.material.navigation.NavigationView"><Expressions/><location startLine="16" startOffset="4" endLine="23" endOffset="46"/></Target></Targets></Layout>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?><Layout layout="note_list" modulePackage="net.micode.notes" filePath="app\src\main\res\layout\note_list.xml" directory="layout" isMerge="false" isBindingData="false" rootNodeType="android.widget.FrameLayout"><Targets><Target tag="layout/note_list_0" view="FrameLayout"><Expressions/><location startLine="17" startOffset="0" endLine="56" endOffset="13"/></Target><Target id="@+id/tv_title_bar" view="TextView"><Expressions/><location startLine="27" startOffset="8" endLine="36" endOffset="61"/></Target><Target id="@+id/notes_list" view="ListView"><Expressions/><location startLine="38" startOffset="8" endLine="46" endOffset="63"/></Target><Target id="@+id/btn_new_note" view="Button"><Expressions/><location startLine="49" startOffset="4" endLine="55" endOffset="41"/></Target></Targets></Layout>