Merge branch 'CHENHELIN_BRANCH' of https://bdgit.educoder.net/pycalf7qb/MINOTES into GAOYUAN_BRANCH

# Conflicts:
#	app/src/main/java/net/micode/notes/data/Notes.java
#	app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
#	app/src/main/java/net/micode/notes/data/NotesProvider.java
#	app/src/main/java/net/micode/notes/gtask/data/MetaData.java
#	app/src/main/java/net/micode/notes/gtask/data/Node.java
#	app/src/main/java/net/micode/notes/gtask/data/SqlData.java
#	app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
#	app/src/main/java/net/micode/notes/gtask/data/Task.java
#	app/src/main/java/net/micode/notes/gtask/data/TaskList.java
#	app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
#	app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
#	app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
#	app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
#	app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
#	app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
#	app/src/main/java/net/micode/notes/model/Note.java
#	app/src/main/java/net/micode/notes/model/WorkingNote.java
#	app/src/main/java/net/micode/notes/tool/BackupUtils.java
#	app/src/main/java/net/micode/notes/tool/DataUtils.java
#	app/src/main/java/net/micode/notes/tool/ResourceParser.java
#	app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
#	app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
#	app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
#	app/src/main/java/net/micode/notes/ui/DateTimePicker.java
#	app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
#	app/src/main/java/net/micode/notes/ui/DropdownMenu.java
#	app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
#	app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
#	app/src/main/java/net/micode/notes/ui/NoteEditText.java
#	app/src/main/java/net/micode/notes/ui/NoteItemData.java
#	app/src/main/java/net/micode/notes/ui/NotesListActivity.java
#	app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
#	app/src/main/java/net/micode/notes/ui/NotesListItem.java
#	app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
#	app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
#	app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
#	app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java

Signed-off-by: 高源 <3056440880@qq.com>

.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Mon Apr 10 21:32:01 HKT 2023
+gradle.version=7.5

.idea/.name

@@ -0,0 +1 @@
+Contact.java

.idea/compiler.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>

.idea/deploymentTargetDropDown.xml

@@ -7,11 +7,11 @@
         <deviceKey>
           <Key>
             <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="C:\Users\82590\.android\avd\Pixel_6_Pro_API_28_1.avd" />
+            <value value="C:\Users\82590\.android\avd\Pixel_XL_API_28.avd" />
           </Key>
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2023-06-03T16:26:33.294608400Z" />
+    <timeTargetWasSelectedWithDropDown value="2023-04-10T13:35:46.860465400Z" />
   </component>
 </project>

.idea/gradle.xml

@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="Embedded JDK" />
+        <option name="gradleJvm" value="#JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

.idea/misc.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17_PREVIEW" project-jdk-name="liberica-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

.idea/sonarlint/issuestore/0/8/08c35f02f11c35ae9ebf8db0a482054dfa1cf493

@@ -0,0 +1,11 @@
+
+s
+java:S4144Á
"\Update this method so that its implementation is not identical to "getParentId" on line 185.(ø¦¯ÿ
+>
+java:S1125T"(Remove the unnecessary boolean literals.(ú«€É
+m
+java:S3776p"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(Ñý¨úýÿÿÿÿ

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

+>
+java:S1125r"(Remove the unnecessary boolean literals.(ãêÛì

.idea/sonarlint/issuestore/2/8/283f16cc23da56ca65616082bc810304d3511d0a

@@ -0,0 +1,39 @@
+
+t
+java:S22930"YReplace the type specification in this constructor call with the diamond operator ("<>").(àÉ™âùÿÿÿÿ

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

+ˆ

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

+ˆ

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

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

+C
+java:S5411_"(Use a primitive boolean expression here.(ɯÀÐüÿÿÿÿ

+C
+java:S5411o"(Use a primitive boolean expression here.(ɯÀÐüÿÿÿÿ

+D
+java:S5411‹
"(Use a primitive boolean expression here.( „Œ¢ùÿÿÿÿ

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

+D
+java:S1874/".Remove this use of "<init>"; it is deprecated.(ÌÖçü
+J
+java:S2864^"4Iterate over the "entrySet" instead of the "keySet".(਷â

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

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

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

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

.idea/sonarlint/issuestore/3/2/32360bf24febc78f20db52498c7576b3d8650d56

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

+t
+java:S2293Z"YReplace the type specification in this constructor call with the diamond operator ("<>").(áºÐ»ûÿÿÿÿ

+u
+java:S2293Ò
"YReplace the type specification in this constructor call with the diamond operator ("<>").(Ûª¡úÿÿÿÿ

+b
+java:S1192D"GDefine a constant instead of duplicating this literal "%s: %s" 4 times.(ÇÇ÷«ùÿÿÿÿ

+c
+java:S1192x"HDefine a constant instead of duplicating this literal "=? AND " 4 times.(„¼¹<C2BC>úÿÿÿÿ

+J
+java:S1066~"/Merge this if statement with the enclosing one.(䲜¼øÿÿÿÿ

+v
+java:S1319("`The type of "ids" should be an interface such as "Set" rather than the implementation "HashSet".(îîè“
+{
+java:S1319S"`The type of "ids" should be an interface such as "Set" rather than the implementation "HashSet".(󆱋ÿÿÿÿÿ

+‰

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

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

+T
+java:S1155-">Use isEmpty() to check whether the collection is empty or not.(´¤”Ó
+Z
+java:S2147E"DCombine this catch with the one at line 67, which has the same body.(æš©›
+[
+java:S2147l"ECombine this catch with the one at line 106, which has the same body.(æš©›
+k
+java:S3252æ
"OUse static access with "net.micode.notes.data.Notes$DataColumns" for "NOTE_ID".(ž“ñ§ûÿÿÿÿ

+m
+java:S3252æ
"QUse static access with "net.micode.notes.data.Notes$DataColumns" for "MIME_TYPE".(ž“ñ§ûÿÿÿÿ

+f
+java:S3252ø
"OUse static access with "net.micode.notes.data.Notes$DataColumns" for "NOTE_ID".(ýʹà
+m
+java:S3252ù
"QUse static access with "net.micode.notes.data.Notes$DataColumns" for "MIME_TYPE".(±ðŒ“úÿÿÿÿ

.idea/sonarlint/issuestore/5/0/503adcf2a0be1ecdb94a15efba4433b6589877b9

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

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

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

+<	java:S131h""Add a default case to this switch.(ãÁð™øÿÿÿÿ

+^
+java:S1126­
"BReplace this if-then-else statement by a single method invocation.(‚å¿¥ûÿÿÿÿ

+P
+java:S2864Â
"4Iterate over the "entrySet" instead of the "keySet".(ΚŸ<C5A1>ûÿÿÿÿ

.idea/sonarlint/issuestore/5/d/5dfe6902d8ec740690f88d644e74362c3be08fad

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

.idea/sonarlint/issuestore/f/9/f9f49497f95afd327db7a7a512612aa1089003d4

@@ -0,0 +1,7 @@
+
+3
+java:S2386!"Make this member "protected".(±ê™–
+D
+java:S1874*".Remove this use of "<init>"; it is deprecated.(椱
+M
+java:S1135+"2Complete the task associated to this TODO comment.(ƒŠ® úÿÿÿÿ

.idea/sonarlint/issuestore/index.pb

@@ -0,0 +1,13 @@
+
+g
+7app/src/main/java/net/micode/notes/ui/NoteItemData.java,0\8\08c35f02f11c35ae9ebf8db0a482054dfa1cf493
+m
+=app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java,f\9\f9f49497f95afd327db7a7a512612aa1089003d4
+k
+;app/src/main/java/net/micode/notes/ui/NotesListAdapter.java,2\8\283f16cc23da56ca65616082bc810304d3511d0a
+h
+8app/src/main/java/net/micode/notes/ui/NotesListItem.java,5\d\5dfe6902d8ec740690f88d644e74362c3be08fad
+g
+7app/src/main/java/net/micode/notes/ui/NoteEditText.java,5\0\503adcf2a0be1ecdb94a15efba4433b6589877b9
+f
+6app/src/main/java/net/micode/notes/tool/DataUtils.java,3\2\32360bf24febc78f20db52498c7576b3d8650d56

.idea/sonarlint/securityhotspotstore/index.pb

@@ -0,0 +1,13 @@
+
+k
+;app/src/main/java/net/micode/notes/ui/NotesListAdapter.java,2\8\283f16cc23da56ca65616082bc810304d3511d0a
+g
+7app/src/main/java/net/micode/notes/ui/NoteItemData.java,0\8\08c35f02f11c35ae9ebf8db0a482054dfa1cf493
+h
+8app/src/main/java/net/micode/notes/ui/NotesListItem.java,5\d\5dfe6902d8ec740690f88d644e74362c3be08fad
+m
+=app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java,f\9\f9f49497f95afd327db7a7a512612aa1089003d4
+g
+7app/src/main/java/net/micode/notes/ui/NoteEditText.java,5\0\503adcf2a0be1ecdb94a15efba4433b6589877b9
+f
+6app/src/main/java/net/micode/notes/tool/DataUtils.java,3\2\32360bf24febc78f20db52498c7576b3d8650d56

app/build.gradle

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdk 24
+    compileSdk 16
     buildToolsVersion "33.0.2"
-    useLibrary 'org.apache.http.legacy'
+
     defaultConfig {
         applicationId "net.micode.notes"
-        minSdkVersion 24
-        targetSdkVersion 24
+        minSdkVersion 14
+        targetSdkVersion 14
     }
 
     buildTypes {
@@ -17,8 +17,3 @@ android {
         }
     }
 }
-
-dependencies {
-    implementation 'org.jetbrains:annotations:15.0'
-    implementation 'androidx.annotation:annotation-jvm:+'
-}

app/build/intermediates/apk/debug/output-metadata.json

@@ -0,0 +1,20 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "net.micode.notes",
+  "variantName": "debug",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 1,
+      "versionName": "0.1",
+      "outputFile": "app-debug.apk"
+    }
+  ],
+  "elementType": "File"
+}

app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt

@@ -0,0 +1,2 @@
+#- File Locator -
+listingFile=../../apk/debug/output-metadata.json

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

@@ -0,0 +1,102 @@
+#Fri Apr 14 21:15:52 HKT 2023
+net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
+net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
+net.micode.notes.app-main-7\:/layout/widget_4x.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
+net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
+net.micode.notes.app-main-7\:/xml/preferences.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
+net.micode.notes.app-main-7\:/menu/call_record_folder.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
+net.micode.notes.app-main-7\:/layout/widget_2x.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
+net.micode.notes.app-main-7\:/menu/long_click_menu.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\menu_long_click_menu.xml.flat
+net.micode.notes.app-main-7\:/layout/add_account_text.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
+net.micode.notes.app-main-7\:/color/font_color_red.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\color_font_color_red.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
+net.micode.notes.app-main-7\:/layout/settings_header.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
+net.micode.notes.app-main-7\:/menu/call_note_edit.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
+net.micode.notes.app-main-7\:/raw/introduction=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/font_color_green.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_color_green.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
+net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
+net.micode.notes.app-main-7\:/layout/note_list_footer.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
+net.micode.notes.app-main-7\:/xml/searchable.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
+net.micode.notes.app-main-7\:/color/font_color_default.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\color_font_color_default.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
+net.micode.notes.app-main-7\:/menu/note_edit.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
+net.micode.notes.app-main-7\:/menu/sub_folder.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
+net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
+net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
+net.micode.notes.app-main-7\:/color/font_color_green.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\color_font_color_green.xml.flat
+net.micode.notes.app-main-7\:/layout/note_edit.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
+net.micode.notes.app-main-7\:/color/font_color_bright_blue.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\color_font_color_bright_blue.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
+net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
+net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
+net.micode.notes.app-main-7\:/menu/note_list.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
+net.micode.notes.app-main-7\:/drawable/new_note.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
+net.micode.notes.app-main-7\:/layout/note_list.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
+net.micode.notes.app-main-7\:/color/primary_text_dark.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
+net.micode.notes.app-main-7\:/layout/datetime_picker.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
+net.micode.notes.app-main-7\:/menu/note_list_options.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
+net.micode.notes.app-main-7\:/layout/note_item.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
+net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
+net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
+net.micode.notes.app-main-7\:/layout/folder_list_item.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat

app/build/intermediates/incremental/mergeDebugAssets/merger.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\assets"/><source path="C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\debug\assets"/></dataSet></merger>

app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\debug\jniLibs"/></dataSet></merger>

app/build/intermediates/incremental/mergeDebugShaders/merger.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\debug\shaders"/></dataSet></merger>

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

@@ -0,0 +1,4 @@
+#Fri Apr 14 21:15:53 HKT 2023
+base.0=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
+renamed.0=classes.dex
+path.0=classes.dex