update

src/mi_and_login/.idea/gradle.xml

@@ -7,7 +7,6 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="Android Studio default JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

src/mi_and_login/app/build.gradle

@@ -7,7 +7,7 @@ android {
     defaultConfig {
         applicationId "net.micode.notes"
         minSdkVersion 14
-        targetSdkVersion 14
+        targetSdkVersion 29
     }
 
     buildTypes {
@@ -27,7 +27,6 @@ android {
 
     dependencies {
         implementation files('D:\\http\\httpcomponents-client-4.5.12\\lib\\httpclient-4.5.12.jar')
-        implementation files('D:\\http\\httpcomponents-client-4.5.12\\lib\\httpclient-cache-4.5.12.jar')
         implementation files('D:\\http\\httpcomponents-client-4.5.12\\lib\\httpcore-4.4.13.jar')
         implementation 'com.android.support:appcompat-v7:27.1.1'
         implementation 'com.android.support:cardview-v7:27.1.1'
@@ -37,5 +36,6 @@ android {
         androidTestImplementation 'com.android.support.test:runner:1.0.2'
         androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
     }
+    namespace 'net.micode.notes'
 }
 

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

@@ -1,134 +1,134 @@
-#Fri May 19 16:32:36 GMT+08:00 2023
-net.micode.notes.app-main-16\:/drawable-hdpi/list_red_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/menu_move.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
-net.micode.notes.app-main-16\:/layout/register.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_register.xml.flat
-net.micode.notes.app-main-16\:/layout/note_edit_list_item.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/list_blue_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/font_super.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/new_note_normal.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
-net.micode.notes.app-main-16\:/color/primary_text_dark.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/widget_4x_red.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/list_red_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
-net.micode.notes.app-main-16\:/layout/widget_4x.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
-net.micode.notes.app-main-16\:/drawable/btn_signup.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_btn_signup.xml.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/font_normal.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
-net.micode.notes.app-main-16\:/drawable/lock.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_lock.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/list_white_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
-net.micode.notes.app-pngs-9\:/drawable-hdpi/ic_launcher_foreground.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_ic_launcher_foreground.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/edit_title_green.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
-net.micode.notes.app-main-16\:/menu/call_note_edit.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/list_white_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
-net.micode.notes.app-pngs-9\:/drawable-xxhdpi/ic_launcher_foreground.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-xxhdpi_ic_launcher_foreground.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
-net.micode.notes.app-main-16\:/drawable/diego_ph.jpg=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_diego_ph.jpg.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/list_green_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/title_bar_bg.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/edit_red.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
-net.micode.notes.app-main-16\:/layout/activity_main.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_main.xml.flat
-net.micode.notes.app-pngs-9\:/drawable-mdpi/ic_launcher_foreground.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-mdpi_ic_launcher_foreground.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/widget_4x_green.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
-net.micode.notes.app-main-16\:/layout/note_list_dropdown_menu.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
-net.micode.notes.app-main-16\:/raw/introduction=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/new_note_pressed.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/notification.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
-net.micode.notes.app-main-16\:/raw-zh-rCN/introduction=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
-net.micode.notes.app-pngs-9\:/drawable-xxxhdpi/ic_launcher_background.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-xxxhdpi_ic_launcher_background.png.flat
-net.micode.notes.app-main-16\:/menu/sub_folder.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
-net.micode.notes.app-main-16\:/layout/note_list.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
-net.micode.notes.app-main-16\:/drawable/new_note.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/list_footer_bg.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/delete.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
-net.micode.notes.app-main-16\:/layout/note_item.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/list_green_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
-net.micode.notes.app-main-16\:/layout/account_dialog_title.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/list_green_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
-net.micode.notes.app-main-16\:/xml/widget_4x_info.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/list_green_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
-net.micode.notes.app-pngs-9\:/drawable-xxxhdpi/ic_background.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-xxxhdpi_ic_background.png.flat
-net.micode.notes.app-pngs-9\:/drawable-xxxhdpi/ic_foreground.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-xxxhdpi_ic_foreground.png.flat
-net.micode.notes.app-pngs-9\:/drawable-xhdpi/ic_launcher_foreground.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-xhdpi_ic_launcher_foreground.png.flat
-net.micode.notes.app-pngs-9\:/drawable-hdpi/ic_launcher_background.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_ic_launcher_background.png.flat
-net.micode.notes.app-main-16\:/layout/note_edit.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
-net.micode.notes.app-main-16\:/layout/dialog_edit_text.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/list_yellow_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
-net.micode.notes.app-main-16\:/menu/note_list_options.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
-net.micode.notes.app-pngs-9\:/drawable-hdpi/ic_foreground.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_ic_foreground.png.flat
-net.micode.notes.app-main-16\:/layout/note_list_footer.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/search_result.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/clock.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/edit_title_white.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
-net.micode.notes.app-pngs-9\:/drawable-mdpi/ic_launcher_background.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-mdpi_ic_launcher_background.png.flat
-net.micode.notes.app-pngs-9\:/drawable-ldpi/ic_launcher_foreground.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-ldpi_ic_launcher_foreground.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/edit_title_blue.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
-net.micode.notes.app-main-16\:/drawable/new_botton_signup.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_botton_signup.xml.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/bg_btn_set_color.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
-net.micode.notes.app-pngs-9\:/drawable-ldpi/ic_foreground.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-ldpi_ic_foreground.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/list_white_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/widget_2x_white.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
-net.micode.notes.app-main-16\:/menu/call_record_folder.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
-net.micode.notes.app-pngs-9\:/drawable-xxhdpi/ic_background.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-xxhdpi_ic_background.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/list_white_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
-net.micode.notes.app-pngs-9\:/drawable-xxhdpi/ic_foreground.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-xxhdpi_ic_foreground.png.flat
-net.micode.notes.app-main-16\:/xml/widget_2x_info.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
-net.micode.notes.app-main-16\:/drawable/logo.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_logo.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/widget_2x_green.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/widget_2x_blue.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
-net.micode.notes.app-pngs-9\:/drawable-anydpi-v24/ic_foreground.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-anydpi-v24_ic_foreground.xml.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/edit_white.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/edit_green.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
-net.micode.notes.app-main-16\:/menu/note_edit.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
-net.micode.notes.app-main-16\:/xml/searchable.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
-net.micode.notes.app-pngs-9\:/drawable-mdpi/ic_foreground.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-mdpi_ic_foreground.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/list_red_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/list_folder.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/menu_delete.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/icon_app.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
-net.micode.notes.app-main-16\:/layout/add_account_text.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/font_small.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/dropdown_icon.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
-net.micode.notes.app-main-16\:/color/secondary_text_dark.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
-net.micode.notes.app-pngs-9\:/drawable-ldpi/ic_launcher_background.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-ldpi_ic_launcher_background.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/widget_4x_blue.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
-net.micode.notes.app-pngs-9\:/drawable-ldpi/ic_background.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-ldpi_ic_background.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/list_blue_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
-net.micode.notes.app-main-16\:/xml/preferences.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/list_yellow_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
-net.micode.notes.app-main-16\:/layout/datetime_picker.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/widget_2x_yellow.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/widget_4x_yellow.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/edit_title_red.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
-net.micode.notes.app-pngs-9\:/drawable-anydpi-v21/ic_launcher_background.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-anydpi-v21_ic_launcher_background.xml.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/selected.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/title_alert.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
-net.micode.notes.app-main-16\:/drawable/avatar.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_avatar.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/list_yellow_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
-net.micode.notes.app-pngs-9\:/drawable-hdpi/ic_background.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_ic_background.png.flat
-net.micode.notes.app-pngs-9\:/drawable-mdpi/ic_background.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-mdpi_ic_background.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/list_blue_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/edit_blue.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
-net.micode.notes.app-pngs-9\:/drawable-xxhdpi/ic_launcher_background.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-xxhdpi_ic_launcher_background.png.flat
-net.micode.notes.app-pngs-9\:/drawable-xhdpi/ic_background.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-xhdpi_ic_background.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/list_background.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
-net.micode.notes.app-pngs-9\:/drawable-xhdpi/ic_foreground.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-xhdpi_ic_foreground.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/list_blue_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
-net.micode.notes.app-main-16\:/layout/widget_2x.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/list_red_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
-net.micode.notes.app-pngs-9\:/drawable-xhdpi/ic_launcher_background.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-xhdpi_ic_launcher_background.png.flat
-net.micode.notes.app-main-16\:/drawable/new_button_login.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_button_login.xml.flat
-net.micode.notes.app-main-16\:/menu/note_list.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
-net.micode.notes.app-main-16\:/layout/settings_header.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/edit_yellow.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
-net.micode.notes.app-pngs-9\:/drawable-anydpi-v21/ic_background.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-anydpi-v21_ic_background.xml.flat
-net.micode.notes.app-main-16\:/drawable/btn_login.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_btn_login.xml.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/widget_4x_white.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/font_large.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/call_record.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
-net.micode.notes.app-pngs-9\:/drawable-xxxhdpi/ic_launcher_foreground.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-xxxhdpi_ic_launcher_foreground.png.flat
-net.micode.notes.app-main-16\:/layout/folder_list_item.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
-net.micode.notes.app-pngs-9\:/drawable-anydpi-v24/ic_launcher_foreground.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-anydpi-v24_ic_launcher_foreground.xml.flat
-net.micode.notes.app-main-16\:/menu/note_list_dropdown.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
-net.micode.notes.app-main-16\:/drawable-hdpi/widget_2x_red.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
+#Tue May 23 11:44:02 GMT+08:00 2023
+net.micode.notes.app-main-16\:/drawable-hdpi/list_red_middle.9.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/menu_move.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
+net.micode.notes.app-main-16\:/layout/register.xml=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\layout_register.xml.flat
+net.micode.notes.app-main-16\:/layout/note_edit_list_item.xml=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/list_blue_up.9.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/font_super.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/new_note_normal.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
+net.micode.notes.app-main-16\:/color/primary_text_dark.xml=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/widget_4x_red.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/list_red_up.9.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
+net.micode.notes.app-main-16\:/layout/widget_4x.xml=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
+net.micode.notes.app-main-16\:/drawable/btn_signup.xml=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable_btn_signup.xml.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/font_normal.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
+net.micode.notes.app-main-16\:/drawable/lock.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable_lock.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/list_white_single.9.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
+net.micode.notes.app-pngs-9\:/drawable-hdpi/ic_launcher_foreground.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_ic_launcher_foreground.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/edit_title_green.9.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
+net.micode.notes.app-main-16\:/menu/call_note_edit.xml=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/list_white_up.9.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
+net.micode.notes.app-pngs-9\:/drawable-xxhdpi/ic_launcher_foreground.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-xxhdpi_ic_launcher_foreground.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
+net.micode.notes.app-main-16\:/drawable/diego_ph.jpg=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable_diego_ph.jpg.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/list_green_up.9.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/title_bar_bg.9.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/edit_red.9.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
+net.micode.notes.app-main-16\:/layout/activity_main.xml=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_main.xml.flat
+net.micode.notes.app-pngs-9\:/drawable-mdpi/ic_launcher_foreground.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-mdpi_ic_launcher_foreground.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/widget_4x_green.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
+net.micode.notes.app-main-16\:/layout/note_list_dropdown_menu.xml=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
+net.micode.notes.app-main-16\:/raw/introduction=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/new_note_pressed.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/notification.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
+net.micode.notes.app-main-16\:/raw-zh-rCN/introduction=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
+net.micode.notes.app-pngs-9\:/drawable-xxxhdpi/ic_launcher_background.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-xxxhdpi_ic_launcher_background.png.flat
+net.micode.notes.app-main-16\:/menu/sub_folder.xml=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
+net.micode.notes.app-main-16\:/layout/note_list.xml=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
+net.micode.notes.app-main-16\:/drawable/new_note.xml=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/list_footer_bg.9.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/delete.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
+net.micode.notes.app-main-16\:/layout/note_item.xml=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/list_green_single.9.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
+net.micode.notes.app-main-16\:/layout/account_dialog_title.xml=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/list_green_middle.9.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
+net.micode.notes.app-main-16\:/xml/widget_4x_info.xml=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/list_green_down.9.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
+net.micode.notes.app-pngs-9\:/drawable-xxxhdpi/ic_background.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-xxxhdpi_ic_background.png.flat
+net.micode.notes.app-pngs-9\:/drawable-xxxhdpi/ic_foreground.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-xxxhdpi_ic_foreground.png.flat
+net.micode.notes.app-pngs-9\:/drawable-xhdpi/ic_launcher_foreground.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-xhdpi_ic_launcher_foreground.png.flat
+net.micode.notes.app-pngs-9\:/drawable-hdpi/ic_launcher_background.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_ic_launcher_background.png.flat
+net.micode.notes.app-main-16\:/layout/note_edit.xml=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
+net.micode.notes.app-main-16\:/layout/dialog_edit_text.xml=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/list_yellow_down.9.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
+net.micode.notes.app-main-16\:/menu/note_list_options.xml=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
+net.micode.notes.app-pngs-9\:/drawable-hdpi/ic_foreground.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_ic_foreground.png.flat
+net.micode.notes.app-main-16\:/layout/note_list_footer.xml=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/search_result.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/clock.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/edit_title_white.9.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
+net.micode.notes.app-pngs-9\:/drawable-mdpi/ic_launcher_background.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-mdpi_ic_launcher_background.png.flat
+net.micode.notes.app-pngs-9\:/drawable-ldpi/ic_launcher_foreground.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-ldpi_ic_launcher_foreground.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/edit_title_blue.9.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
+net.micode.notes.app-main-16\:/drawable/new_botton_signup.xml=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_botton_signup.xml.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/bg_btn_set_color.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
+net.micode.notes.app-pngs-9\:/drawable-ldpi/ic_foreground.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-ldpi_ic_foreground.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/list_white_down.9.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/widget_2x_white.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
+net.micode.notes.app-main-16\:/menu/call_record_folder.xml=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
+net.micode.notes.app-pngs-9\:/drawable-xxhdpi/ic_background.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-xxhdpi_ic_background.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/list_white_middle.9.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
+net.micode.notes.app-pngs-9\:/drawable-xxhdpi/ic_foreground.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-xxhdpi_ic_foreground.png.flat
+net.micode.notes.app-main-16\:/xml/widget_2x_info.xml=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
+net.micode.notes.app-main-16\:/drawable/logo.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable_logo.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/widget_2x_green.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/widget_2x_blue.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
+net.micode.notes.app-pngs-9\:/drawable-anydpi-v24/ic_foreground.xml=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-anydpi-v24_ic_foreground.xml.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/edit_white.9.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/edit_green.9.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
+net.micode.notes.app-main-16\:/menu/note_edit.xml=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
+net.micode.notes.app-main-16\:/xml/searchable.xml=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
+net.micode.notes.app-pngs-9\:/drawable-mdpi/ic_foreground.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-mdpi_ic_foreground.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/list_red_single.9.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/list_folder.9.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/menu_delete.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/icon_app.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
+net.micode.notes.app-main-16\:/layout/add_account_text.xml=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/font_small.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/dropdown_icon.9.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
+net.micode.notes.app-main-16\:/color/secondary_text_dark.xml=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
+net.micode.notes.app-pngs-9\:/drawable-ldpi/ic_launcher_background.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-ldpi_ic_launcher_background.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/widget_4x_blue.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
+net.micode.notes.app-pngs-9\:/drawable-ldpi/ic_background.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-ldpi_ic_background.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/list_blue_down.9.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
+net.micode.notes.app-main-16\:/xml/preferences.xml=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/list_yellow_up.9.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
+net.micode.notes.app-main-16\:/layout/datetime_picker.xml=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/widget_2x_yellow.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/widget_4x_yellow.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/edit_title_red.9.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
+net.micode.notes.app-pngs-9\:/drawable-anydpi-v21/ic_launcher_background.xml=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-anydpi-v21_ic_launcher_background.xml.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/selected.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/title_alert.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
+net.micode.notes.app-main-16\:/drawable/avatar.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable_avatar.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/list_yellow_single.9.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
+net.micode.notes.app-pngs-9\:/drawable-hdpi/ic_background.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_ic_background.png.flat
+net.micode.notes.app-pngs-9\:/drawable-mdpi/ic_background.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-mdpi_ic_background.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/list_blue_single.9.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/edit_blue.9.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
+net.micode.notes.app-pngs-9\:/drawable-xxhdpi/ic_launcher_background.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-xxhdpi_ic_launcher_background.png.flat
+net.micode.notes.app-pngs-9\:/drawable-xhdpi/ic_background.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-xhdpi_ic_background.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/list_background.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
+net.micode.notes.app-pngs-9\:/drawable-xhdpi/ic_foreground.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-xhdpi_ic_foreground.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/list_blue_middle.9.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
+net.micode.notes.app-main-16\:/layout/widget_2x.xml=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/list_red_down.9.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
+net.micode.notes.app-pngs-9\:/drawable-xhdpi/ic_launcher_background.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-xhdpi_ic_launcher_background.png.flat
+net.micode.notes.app-main-16\:/drawable/new_button_login.xml=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_button_login.xml.flat
+net.micode.notes.app-main-16\:/menu/note_list.xml=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
+net.micode.notes.app-main-16\:/layout/settings_header.xml=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/edit_yellow.9.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
+net.micode.notes.app-pngs-9\:/drawable-anydpi-v21/ic_background.xml=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-anydpi-v21_ic_background.xml.flat
+net.micode.notes.app-main-16\:/drawable/btn_login.xml=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable_btn_login.xml.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/widget_4x_white.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/font_large.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/call_record.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
+net.micode.notes.app-pngs-9\:/drawable-xxxhdpi/ic_launcher_foreground.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-xxxhdpi_ic_launcher_foreground.png.flat
+net.micode.notes.app-main-16\:/layout/folder_list_item.xml=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
+net.micode.notes.app-pngs-9\:/drawable-anydpi-v24/ic_launcher_foreground.xml=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-anydpi-v24_ic_launcher_foreground.xml.flat
+net.micode.notes.app-main-16\:/menu/note_list_dropdown.xml=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
+net.micode.notes.app-main-16\:/drawable-hdpi/widget_2x_red.png=D\:\\123\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-#Fri May 19 17:03:52 GMT+08:00 2023
-base.0=D\:\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
+#Tue May 23 11:49:50 GMT+08:00 2023
+base.0=D\:\\123\\mi_and_login\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
 renamed.0=classes.dex
 path.0=classes.dex

src/mi_and_login/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt

@@ -20,104 +20,104 @@
 20    android:versionName="0.1" >
 21
 22    <uses-sdk
-22-->D:\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
+22-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:23:5-44
 23        android:minSdkVersion="14"
-23-->D:\Notes-master1\app\src\main\AndroidManifest.xml:23:15-41
-24        android:targetSdkVersion="14" />
-24-->D:\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
+23-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:23:15-41
+24        android:targetSdkVersion="29" />
+24-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:23:5-44
 25
 26    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-26-->D:\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81
-26-->D:\Notes-master1\app\src\main\AndroidManifest.xml:25:22-78
+26-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:25:5-81
+26-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:25:22-78
 27    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
-27-->D:\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88
-27-->D:\Notes-master1\app\src\main\AndroidManifest.xml:26:22-85
+27-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:26:5-88
+27-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:26:22-85
 28    <uses-permission android:name="android.permission.INTERNET" />
-28-->D:\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67
-28-->D:\Notes-master1\app\src\main\AndroidManifest.xml:27:22-64
+28-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:27:5-67
+28-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:27:22-64
 29    <uses-permission android:name="android.permission.READ_CONTACTS" />
-29-->D:\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72
-29-->D:\Notes-master1\app\src\main\AndroidManifest.xml:28:22-69
+29-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:28:5-72
+29-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:28:22-69
 30    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-30-->D:\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74
-30-->D:\Notes-master1\app\src\main\AndroidManifest.xml:29:22-71
+30-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:29:5-74
+30-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:29:22-71
 31    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-31-->D:\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80
-31-->D:\Notes-master1\app\src\main\AndroidManifest.xml:30:22-77
+31-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:30:5-80
+31-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:30:22-77
 32    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-32-->D:\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71
-32-->D:\Notes-master1\app\src\main\AndroidManifest.xml:31:22-68
+32-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:31:5-71
+32-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:31:22-68
 33    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-33-->D:\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74
-33-->D:\Notes-master1\app\src\main\AndroidManifest.xml:32:22-71
+33-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:32:5-74
+33-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:32:22-71
 34    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-34-->D:\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81
-34-->D:\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78
+34-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:33:5-81
+34-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:33:22-78
 35
 36    <application
-36-->D:\Notes-master1\app\src\main\AndroidManifest.xml:35:5-161:19
+36-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:35:5-161:19
 37        android:debuggable="true"
 38        android:icon="@drawable/icon_app"
-38-->D:\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42
+38-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:36:9-42
 39        android:label="@string/app_name"
-39-->D:\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41
+39-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:37:9-41
 40        android:testOnly="true" >
 41        <activity
-41-->D:\Notes-master1\app\src\main\AndroidManifest.xml:39:9-48:20
+41-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:39:9-48:20
 42            android:name="net.micode.notes.ui.login_signup_ui"
-42-->D:\Notes-master1\app\src\main\AndroidManifest.xml:40:13-49
+42-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:40:13-49
 43            android:label="@string/appname"
-43-->D:\Notes-master1\app\src\main\AndroidManifest.xml:41:13-46
+43-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:41:13-46
 44            android:theme="@style/AppTheme" >
-44-->D:\Notes-master1\app\src\main\AndroidManifest.xml:42:13-46
+44-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:42:13-46
 45            <intent-filter>
-45-->D:\Notes-master1\app\src\main\AndroidManifest.xml:44:13-47:29
+45-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:44:13-47:29
 46                <action android:name="android.intent.action.MAIN" />
-46-->D:\Notes-master1\app\src\main\AndroidManifest.xml:45:17-68
-46-->D:\Notes-master1\app\src\main\AndroidManifest.xml:45:25-66
+46-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:45:17-68
+46-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:45:25-66
 47
 48                <category android:name="android.intent.category.LAUNCHER" />
-48-->D:\Notes-master1\app\src\main\AndroidManifest.xml:46:17-77
-48-->D:\Notes-master1\app\src\main\AndroidManifest.xml:46:27-74
+48-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:46:17-77
+48-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:46:27-74
 49            </intent-filter>
 50        </activity>
 51        <activity
-51-->D:\Notes-master1\app\src\main\AndroidManifest.xml:50:9-63:20
+51-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:50:9-63:20
 52            android:name="net.micode.notes.ui.NotesListActivity"
-52-->D:\Notes-master1\app\src\main\AndroidManifest.xml:51:13-49
+52-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:51:13-49
 53            android:configChanges="keyboardHidden|orientation|screenSize"
-53-->D:\Notes-master1\app\src\main\AndroidManifest.xml:52:13-74
+53-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:52:13-74
 54            android:label="@string/app_name"
-54-->D:\Notes-master1\app\src\main\AndroidManifest.xml:53:13-45
+54-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:53:13-45
 55            android:launchMode="singleTop"
-55-->D:\Notes-master1\app\src\main\AndroidManifest.xml:54:13-43
+55-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:54:13-43
 56            android:theme="@style/NoteTheme"
-56-->D:\Notes-master1\app\src\main\AndroidManifest.xml:55:13-45
+56-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:55:13-45
 57            android:uiOptions="splitActionBarWhenNarrow"
-57-->D:\Notes-master1\app\src\main\AndroidManifest.xml:56:13-57
+57-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:56:13-57
 58            android:windowSoftInputMode="adjustPan" >
-58-->D:\Notes-master1\app\src\main\AndroidManifest.xml:57:13-52
+58-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:57:13-52
 59            <intent-filter>
-59-->D:\Notes-master1\app\src\main\AndroidManifest.xml:59:13-62:29
+59-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:59:13-62:29
 60                <action android:name="android.intent.action.VIEW" />
-60-->D:\Notes-master1\app\src\main\AndroidManifest.xml:60:17-69
-60-->D:\Notes-master1\app\src\main\AndroidManifest.xml:60:25-66
+60-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:60:17-69
+60-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:60:25-66
 61
 62                <category android:name="android.intent.category.DEFAULT" />
-62-->D:\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76
-62-->D:\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73
+62-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:61:17-76
+62-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:61:27-73
 63            </intent-filter>
 64        </activity>
 65        <activity
-65-->D:\Notes-master1\app\src\main\AndroidManifest.xml:65:9-93:20
+65-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:65:9-93:20
 66            android:name="net.micode.notes.ui.NoteEditActivity"
-66-->D:\Notes-master1\app\src\main\AndroidManifest.xml:66:13-48
+66-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:66:13-48
 67            android:configChanges="keyboardHidden|orientation|screenSize"
-67-->D:\Notes-master1\app\src\main\AndroidManifest.xml:67:13-74
+67-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:67:13-74
 68            android:launchMode="singleTop"
-68-->D:\Notes-master1\app\src\main\AndroidManifest.xml:68:13-43
+68-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:68:13-43
 69            android:theme="@style/NoteTheme" >
-69-->D:\Notes-master1\app\src\main\AndroidManifest.xml:69:13-45
+69-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:69:13-45
 70
 71            <!-- <intent-filter> -->
 72            <!-- <action android:name="android.intent.action.VIEW" /> -->
@@ -127,157 +127,157 @@
 76            <!-- </intent-filter> -->
 77
 78            <intent-filter>
-78-->D:\Notes-master1\app\src\main\AndroidManifest.xml:78:13-83:29
+78-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:78:13-83:29
 79                <action android:name="android.intent.action.INSERT_OR_EDIT" />
-79-->D:\Notes-master1\app\src\main\AndroidManifest.xml:79:17-79
-79-->D:\Notes-master1\app\src\main\AndroidManifest.xml:79:25-76
+79-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:79:17-79
+79-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:79:25-76
 80
 81                <category android:name="android.intent.category.DEFAULT" />
-81-->D:\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76
-81-->D:\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73
+81-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:61:17-76
+81-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:61:27-73
 82
 83                <data android:mimeType="vnd.android.cursor.item/text_note" />
-83-->D:\Notes-master1\app\src\main\AndroidManifest.xml:81:17-78
-83-->D:\Notes-master1\app\src\main\AndroidManifest.xml:81:23-75
+83-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:81:17-78
+83-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:81:23-75
 84                <data android:mimeType="vnd.android.cursor.item/call_note" />
-84-->D:\Notes-master1\app\src\main\AndroidManifest.xml:81:17-78
-84-->D:\Notes-master1\app\src\main\AndroidManifest.xml:81:23-75
+84-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:81:17-78
+84-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:81:23-75
 85            </intent-filter>
 86            <intent-filter>
-86-->D:\Notes-master1\app\src\main\AndroidManifest.xml:85:13-88:29
+86-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:85:13-88:29
 87                <action android:name="android.intent.action.SEARCH" />
-87-->D:\Notes-master1\app\src\main\AndroidManifest.xml:86:17-71
-87-->D:\Notes-master1\app\src\main\AndroidManifest.xml:86:25-68
+87-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:86:17-71
+87-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:86:25-68
 88
 89                <category android:name="android.intent.category.DEFAULT" />
-89-->D:\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76
-89-->D:\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73
+89-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:61:17-76
+89-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:61:27-73
 90            </intent-filter>
 91
 92            <meta-data
-92-->D:\Notes-master1\app\src\main\AndroidManifest.xml:90:13-92:54
+92-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:90:13-92:54
 93                android:name="android.app.searchable"
-93-->D:\Notes-master1\app\src\main\AndroidManifest.xml:91:17-54
+93-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:91:17-54
 94                android:resource="@xml/searchable" />
-94-->D:\Notes-master1\app\src\main\AndroidManifest.xml:92:17-51
+94-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:92:17-51
 95        </activity>
 96
 97        <provider
-97-->D:\Notes-master1\app\src\main\AndroidManifest.xml:95:9-98:43
+97-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:95:9-98:43
 98            android:name="net.micode.notes.data.NotesProvider"
-98-->D:\Notes-master1\app\src\main\AndroidManifest.xml:96:13-63
+98-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:96:13-63
 99            android:authorities="micode_notes"
-99-->D:\Notes-master1\app\src\main\AndroidManifest.xml:97:13-47
+99-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:97:13-47
 100            android:multiprocess="true" />
-100-->D:\Notes-master1\app\src\main\AndroidManifest.xml:98:13-40
+100-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:98:13-40
 101
 102        <receiver
-102-->D:\Notes-master1\app\src\main\AndroidManifest.xml:100:9-112:20
+102-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:100:9-112:20
 103            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
-103-->D:\Notes-master1\app\src\main\AndroidManifest.xml:101:13-57
+103-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:101:13-57
 104            android:label="@string/app_widget2x2" >
-104-->D:\Notes-master1\app\src\main\AndroidManifest.xml:102:13-50
+104-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:102:13-50
 105            <intent-filter>
-105-->D:\Notes-master1\app\src\main\AndroidManifest.xml:103:13-107:29
+105-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:103:13-107:29
 106                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-106-->D:\Notes-master1\app\src\main\AndroidManifest.xml:104:17-84
-106-->D:\Notes-master1\app\src\main\AndroidManifest.xml:104:25-81
+106-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:104:17-84
+106-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:104:25-81
 107                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-107-->D:\Notes-master1\app\src\main\AndroidManifest.xml:105:17-85
-107-->D:\Notes-master1\app\src\main\AndroidManifest.xml:105:25-82
+107-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:105:17-85
+107-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:105:25-82
 108                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-108-->D:\Notes-master1\app\src\main\AndroidManifest.xml:106:17-85
-108-->D:\Notes-master1\app\src\main\AndroidManifest.xml:106:25-82
+108-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:106:17-85
+108-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:106:25-82
 109            </intent-filter>
 110
 111            <meta-data
-111-->D:\Notes-master1\app\src\main\AndroidManifest.xml:109:13-111:58
+111-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:109:13-111:58
 112                android:name="android.appwidget.provider"
-112-->D:\Notes-master1\app\src\main\AndroidManifest.xml:110:17-58
+112-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:110:17-58
 113                android:resource="@xml/widget_2x_info" />
-113-->D:\Notes-master1\app\src\main\AndroidManifest.xml:111:17-55
+113-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:111:17-55
 114        </receiver>
 115        <receiver
-115-->D:\Notes-master1\app\src\main\AndroidManifest.xml:113:9-126:20
+115-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:113:9-126:20
 116            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
-116-->D:\Notes-master1\app\src\main\AndroidManifest.xml:114:13-57
+116-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:114:13-57
 117            android:label="@string/app_widget4x4" >
-117-->D:\Notes-master1\app\src\main\AndroidManifest.xml:115:13-50
+117-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:115:13-50
 118            <intent-filter>
-118-->D:\Notes-master1\app\src\main\AndroidManifest.xml:103:13-107:29
+118-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:103:13-107:29
 119                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-119-->D:\Notes-master1\app\src\main\AndroidManifest.xml:104:17-84
-119-->D:\Notes-master1\app\src\main\AndroidManifest.xml:104:25-81
+119-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:104:17-84
+119-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:104:25-81
 120                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-120-->D:\Notes-master1\app\src\main\AndroidManifest.xml:105:17-85
-120-->D:\Notes-master1\app\src\main\AndroidManifest.xml:105:25-82
+120-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:105:17-85
+120-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:105:25-82
 121                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-121-->D:\Notes-master1\app\src\main\AndroidManifest.xml:106:17-85
-121-->D:\Notes-master1\app\src\main\AndroidManifest.xml:106:25-82
+121-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:106:17-85
+121-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:106:25-82
 122            </intent-filter>
 123
 124            <meta-data
-124-->D:\Notes-master1\app\src\main\AndroidManifest.xml:109:13-111:58
+124-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:109:13-111:58
 125                android:name="android.appwidget.provider"
-125-->D:\Notes-master1\app\src\main\AndroidManifest.xml:110:17-58
+125-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:110:17-58
 126                android:resource="@xml/widget_4x_info" />
-126-->D:\Notes-master1\app\src\main\AndroidManifest.xml:111:17-55
+126-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:111:17-55
 127        </receiver>
 128        <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
-128-->D:\Notes-master1\app\src\main\AndroidManifest.xml:128:9-132:20
-128-->D:\Notes-master1\app\src\main\AndroidManifest.xml:128:19-55
+128-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:128:9-132:20
+128-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:128:19-55
 129            <intent-filter>
-129-->D:\Notes-master1\app\src\main\AndroidManifest.xml:129:13-131:29
+129-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:129:13-131:29
 130                <action android:name="android.intent.action.BOOT_COMPLETED" />
-130-->D:\Notes-master1\app\src\main\AndroidManifest.xml:130:17-79
-130-->D:\Notes-master1\app\src\main\AndroidManifest.xml:130:25-76
+130-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:130:17-79
+130-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:130:25-76
 131            </intent-filter>
 132        </receiver>
 133        <receiver
-133-->D:\Notes-master1\app\src\main\AndroidManifest.xml:134:9-137:20
+133-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:134:9-137:20
 134            android:name="net.micode.notes.ui.AlarmReceiver"
-134-->D:\Notes-master1\app\src\main\AndroidManifest.xml:135:13-61
+134-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:135:13-61
 135            android:process=":remote" >
-135-->D:\Notes-master1\app\src\main\AndroidManifest.xml:136:13-38
+135-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:136:13-38
 136        </receiver>
 137
 138        <activity
-138-->D:\Notes-master1\app\src\main\AndroidManifest.xml:139:9-144:20
+138-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:139:9-144:20
 139            android:name="net.micode.notes.ui.AlarmAlertActivity"
-139-->D:\Notes-master1\app\src\main\AndroidManifest.xml:140:13-50
+139-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:140:13-50
 140            android:label="@string/app_name"
-140-->D:\Notes-master1\app\src\main\AndroidManifest.xml:141:13-45
+140-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:141:13-45
 141            android:launchMode="singleInstance"
-141-->D:\Notes-master1\app\src\main\AndroidManifest.xml:142:13-48
+141-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:142:13-48
 142            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
-142-->D:\Notes-master1\app\src\main\AndroidManifest.xml:143:13-75
+142-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:143:13-75
 143        </activity>
 144        <activity
-144-->D:\Notes-master1\app\src\main\AndroidManifest.xml:146:9-151:20
+144-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:146:9-151:20
 145            android:name="net.micode.notes.ui.NotesPreferenceActivity"
-145-->D:\Notes-master1\app\src\main\AndroidManifest.xml:147:13-71
+145-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:147:13-71
 146            android:label="@string/preferences_title"
-146-->D:\Notes-master1\app\src\main\AndroidManifest.xml:148:13-54
+146-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:148:13-54
 147            android:launchMode="singleTop"
-147-->D:\Notes-master1\app\src\main\AndroidManifest.xml:149:13-43
+147-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:149:13-43
 148            android:theme="@android:style/Theme.Holo.Light" >
-148-->D:\Notes-master1\app\src\main\AndroidManifest.xml:150:13-60
+148-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:150:13-60
 149        </activity>
 150
 151        <service
-151-->D:\Notes-master1\app\src\main\AndroidManifest.xml:153:9-156:19
+151-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:153:9-156:19
 152            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-152-->D:\Notes-master1\app\src\main\AndroidManifest.xml:154:13-74
+152-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:154:13-74
 153            android:exported="false" >
-153-->D:\Notes-master1\app\src\main\AndroidManifest.xml:155:13-37
+153-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:155:13-37
 154        </service>
 155
 156        <meta-data
-156-->D:\Notes-master1\app\src\main\AndroidManifest.xml:158:9-160:52
+156-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:158:9-160:52
 157            android:name="android.app.default_searchable"
-157-->D:\Notes-master1\app\src\main\AndroidManifest.xml:159:13-58
+157-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:159:13-58
 158            android:value=".ui.NoteEditActivity" />
-158-->D:\Notes-master1\app\src\main\AndroidManifest.xml:160:13-49
+158-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:160:13-49
 159    </application>
 160
 161</manifest>

src/mi_and_login/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml

@@ -21,7 +21,7 @@
 
     <uses-sdk
         android:minSdkVersion="14"
-        android:targetSdkVersion="14" />
+        android:targetSdkVersion="29" />
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />

src/mi_and_login/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml

@@ -21,7 +21,7 @@
 
     <uses-sdk
         android:minSdkVersion="14"
-        android:targetSdkVersion="14" />
+        android:targetSdkVersion="29" />
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />

src/mi_and_login/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json

@@ -723,23 +723,6 @@
         {
             "outputFile": "net.micode.notes.app-merged_res-14:/values_values.arsc.flat",
             "map": [
-                {
-                    "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml",
-                    "from": {
-                        "startLines": "19,20,21,22,18",
-                        "startColumns": "4,4,4,4,4",
-                        "startOffsets": "764,816,869,922,712",
-                        "endColumns": "51,52,52,51,51",
-                        "endOffsets": "811,864,917,969,759"
-                    },
-                    "to": {
-                        "startLines": "379,380,381,382,383",
-                        "startColumns": "4,4,4,4,4",
-                        "startOffsets": "22373,22425,22478,22531,22583",
-                        "endColumns": "51,52,52,51,51",
-                        "endOffsets": "22420,22473,22526,22578,22630"
-                    }
-                },
                 {
                     "source": "C:\\Users\\薛皓天\\.gradle\\caches\\transforms-3\\180eeefb5c9fa290eae69b6eda4e2eae\\transformed\\appcompat-v7-27.1.1\\res\\values\\values.xml",
                     "from": {
@@ -759,42 +742,6 @@
                         "endOffsets": "1187,1359,1408,6453,6508,6567,6629,6707,6788,6849,6924,7000,7077,7155,7240,7322,7398,7474,7591,7669,7775,7881,7960,8040,8097,8155,9254,9329,9394,9460,9515,9587,9660,9727,9795,9854,9913,9972,10031,10090,10144,10198,10251,10305,10359,10413,10467,10762,10841,10914,10988,11059,11131,11203,11276,11371,11429,11502,11576,11650,11725,11797,11870,11940,12011,12071,12132,12343,12412,12482,12556,12632,12696,12773,12849,12926,12991,13060,13137,13212,13281,13349,13426,13492,13553,13650,13715,13784,13883,13954,14013,14071,14128,14187,14258,14330,14402,14474,14546,14613,14681,14749,14808,14871,14935,15025,15116,15176,15242,15309,15375,15445,15509,15562,15675,15733,15796,15861,15926,16001,16074,16146,16195,16256,16317,16378,16440,16504,16568,16632,16697,16760,16820,16881,16947,17006,17066,17128,17199,17259,17327,20306,20393,20646,20733,20821,20903,20986,21076,21167,22682,22740,22785,22851,22915,22972,23029,23083,23288,23336,23385,23436,23510,23736,23785,23978,24522,24634,24696,24884,24941,26078,26148,26226,26280,26350,26435,26483,26529,26600,26678,26756,26828,26902,26976,27050,27130,27203,27272,27344,27421,27473,27546,27620,27689,27764,27838,27912,28053,28123,35503,36624,36714,36802,36898,36988,38189,38278,38525,38806,39058,39757,40150,40627,40849,41071,41347,41574,41804,42034,42264,42494,42721,43140,43366,43791,44021,44449,44668,44951,45159,45290,45517,45943,46168,46595,46816,47241,47361,47637,47938,48262,48553,48867,49004,49135,49240,49482,49649,49853,50061,50332,50444,50556,50661,50778,50992,51138,51278,51364,51712,51800,52046,52464,52713,52795,52893,53485,53585,53837,54261,54516,54610,54699,54936,56960,57202,57304,57557,59713,69907,71423,81557,83085,84842,85468,85888,86949,88214,88470,88706,89253,89747,90352,90550,91130,91694,92069,92187,92725,92882,93078,93351,93607,93777,93918,93982,94264,94550,95226,95490,95828,96181,96275,96461,96767,97029,97154,97281,97520,97731,97850,98043,98220,98675,98856,98978,99237,99350,99537,99639,99746,99875,100150,100658,101154,102031,102325,102895,103044,103776,103948,104284,104376,104654,111793,116218,116280,116858,117442,117533,117949,118178,118338,118490,118661,118828,119071,119241,119414,119585,119859,120058,120263,120593,120677,120773,120869,120967,121067,121169,121271,121373,121475,121577,121677,121773,121885,122014,122137,122268,122399,122497,122611,122705,122845,122979,123075,123187,123287,123403,123499,123611,123711,123851,123987,124151,124281,124439,124589,124730,124874,125009,125121,125271,125399,125527,125663,125795,125925,126055,126167,126307,128952,129096,129234,130646,130736,130812,130916,131006,131108,131216,131324,131424,131504,131596,131694,131804,131882,131988,132080,132184,132294,132416,132579,132736,134310,134410,134500,134610,134704,134810,134902,135002,135114,135228,135344,135460,135554,135668,135780,135882,136002,136124,136206,136310,136430,136556,136654,136748,136836,136948,137064,137186,137298,137473,137589,137675,137767,137879,138003,138070,138196,138264,138392,138536,138664,138733,138828,138943,139056,139155,139264,139375,139486,139587,139692,139792,139922,140013,140136,140230,140342,140428,140532,140628,140716,140834,140938,141042,141168,141256,141364,141464,141554,141664,141748,141850,141934,141988,142052,142158,142268,142352,142472,148449,148553,148654,148701,148949,149141,149581,151067,151641,151961,152550,159234,159850,163203,163730,172457,175020,175241,175400,175659,177786,178225,178876,179004,179178,180851,181243,182574,184175,186699,186944,187489,187642"
                     }
                 },
-                {
-                    "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml",
-                    "from": {
-                        "startLines": "23,21,19,20,25,18,22,24",
-                        "startColumns": "4,4,4,4,4,4,4,4",
-                        "startOffsets": "955,867,769,816,1038,712,913,995",
-                        "endColumns": "39,45,46,50,37,56,41,42",
-                        "endOffsets": "990,908,811,862,1071,764,950,1033"
-                    },
-                    "to": {
-                        "startLines": "156,169,170,171,213,226,227,228",
-                        "startColumns": "4,4,4,4,4,4,4,4",
-                        "startOffsets": "7479,8409,8455,8502,11281,12137,12194,12236",
-                        "endColumns": "39,45,46,50,37,56,41,42",
-                        "endOffsets": "7514,8450,8497,8548,11314,12189,12231,12274"
-                    }
-                },
-                {
-                    "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml",
-                    "from": {
-                        "startLines": "159,154,153,151,152,148,150,146,149,147,155,145,72,75,74,73,19,20,21,144,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,156,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "9567,9407,9370,9291,9331,9176,9253,9093,9213,9133,9477,9052,3898,4159,4063,3994,827,870,922,9003,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,9515,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084",
-                        "endLines": "163,154,153,151,152,148,150,146,149,147,155,145,72,75,74,73,19,20,21,144,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,156,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
-                        "endColumns": "14,69,36,39,38,36,37,39,39,42,37,40,95,82,95,68,42,51,51,48,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,49,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "9971,9472,9402,9326,9365,9208,9286,9128,9248,9171,9510,9088,3989,4237,4154,4058,865,917,969,9047,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,9560,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169"
-                    },
-                    "to": {
-                        "startLines": "433,438,439,440,441,442,443,444,445,446,447,448,478,479,480,481,482,483,484,486,488,489,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507,508,509,510,511,512,513,514,515,516,517,518,519,520,521,522,523,524,525,526,527,528,529,530,531,532,533,534,535,536,537,538,539,540,541,542,543,544,545,546,547,548,549,555,556,557,558,559,560,561,562,563,564,565,566,567,568,569,570,571,572,573,574,575,576,578,579,581,582,583,584,585,586,587,588,589,590,591",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "25193,25546,25616,25653,25693,25732,25769,25807,25847,25887,25930,25968,28128,28224,28307,28403,28472,28515,28567,28764,28934,28983,29133,29191,29242,29326,29420,29528,29599,29683,29766,29832,29915,30017,30078,30140,30191,30269,30322,30382,30487,30546,30648,30703,30774,30823,30881,30928,30987,31044,31115,31176,31233,31283,31335,31388,31438,31488,31548,31601,31667,31729,31792,31839,31894,31982,32040,32102,32152,32197,32240,32300,32367,32422,32477,32530,32577,32630,32686,32734,32789,33657,33741,33808,33872,33968,34042,34123,34212,34375,34519,34598,34673,34755,34814,34894,34974,35029,35151,35254,35304,35345,35398,35508,35582,35718,35786,35872,35952,36021,36115,36174,36229,36291,36351,36461",
-                        "endLines": "437,438,439,440,441,442,443,444,445,446,447,448,478,479,480,481,482,483,484,486,488,489,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507,508,509,510,511,512,513,514,515,516,517,518,519,520,521,522,523,524,525,526,527,528,529,530,531,532,533,534,535,536,537,538,539,540,541,542,543,544,545,546,547,548,549,555,556,557,558,559,560,561,562,563,564,565,566,567,568,569,570,571,572,573,574,575,576,578,579,581,582,583,584,585,586,587,588,589,590,591",
-                        "endColumns": "14,69,36,39,38,36,37,39,39,42,37,40,95,82,95,68,42,51,51,48,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,49,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "25541,25611,25648,25688,25727,25764,25802,25842,25882,25925,25963,26004,28219,28302,28398,28467,28510,28562,28614,28808,28978,29041,29186,29237,29321,29415,29523,29594,29678,29761,29827,29910,30012,30073,30135,30186,30264,30317,30377,30482,30541,30643,30698,30769,30818,30876,30923,30982,31039,31110,31171,31228,31278,31330,31383,31433,31483,31543,31596,31662,31724,31787,31834,31889,31977,32035,32097,32147,32192,32235,32295,32362,32417,32472,32525,32572,32625,32681,32729,32784,32837,33736,33803,33867,33963,34037,34118,34207,34370,34514,34593,34668,34750,34809,34889,34969,35024,35146,35249,35299,35340,35393,35450,35577,35642,35781,35867,35947,36016,36110,36169,36224,36286,36346,36456,36546"
-                    }
-                },
                 {
                     "source": "C:\\Users\\薛皓天\\.gradle\\caches\\transforms-3\\3ba5c51a1f730cf47c761db4c2383520\\transformed\\recyclerview-v7-27.1.1\\res\\values\\values.xml",
                     "from": {
@@ -831,6 +778,78 @@
                         "endOffsets": "1132,146534,169610,171811"
                     }
                 },
+                {
+                    "source": "D:\\123\\mi_and_login\\app\\src\\main\\res\\values\\colors.xml",
+                    "from": {
+                        "startLines": "23,21,19,20,25,18,22,24",
+                        "startColumns": "4,4,4,4,4,4,4,4",
+                        "startOffsets": "955,867,769,816,1038,712,913,995",
+                        "endColumns": "39,45,46,50,37,56,41,42",
+                        "endOffsets": "990,908,811,862,1071,764,950,1033"
+                    },
+                    "to": {
+                        "startLines": "156,169,170,171,213,226,227,228",
+                        "startColumns": "4,4,4,4,4,4,4,4",
+                        "startOffsets": "7479,8409,8455,8502,11281,12137,12194,12236",
+                        "endColumns": "39,45,46,50,37,56,41,42",
+                        "endOffsets": "7514,8450,8497,8548,11314,12189,12231,12274"
+                    }
+                },
+                {
+                    "source": "D:\\123\\mi_and_login\\app\\src\\main\\res\\values\\dimens.xml",
+                    "from": {
+                        "startLines": "19,20,21,22,18",
+                        "startColumns": "4,4,4,4,4",
+                        "startOffsets": "764,816,869,922,712",
+                        "endColumns": "51,52,52,51,51",
+                        "endOffsets": "811,864,917,969,759"
+                    },
+                    "to": {
+                        "startLines": "379,380,381,382,383",
+                        "startColumns": "4,4,4,4,4",
+                        "startOffsets": "22373,22425,22478,22531,22583",
+                        "endColumns": "51,52,52,51,51",
+                        "endOffsets": "22420,22473,22526,22578,22630"
+                    }
+                },
+                {
+                    "source": "D:\\123\\mi_and_login\\app\\src\\main\\res\\values\\arrays.xml",
+                    "from": {
+                        "startLines": "19,26",
+                        "startColumns": "4,4",
+                        "startOffsets": "739,1047",
+                        "endLines": "24,29",
+                        "endColumns": "19,19",
+                        "endOffsets": "1041,1162"
+                    },
+                    "to": {
+                        "startLines": "2,8",
+                        "startColumns": "4,4",
+                        "startOffsets": "150,345",
+                        "endLines": "7,11",
+                        "endColumns": "19,19",
+                        "endOffsets": "340,460"
+                    }
+                },
+                {
+                    "source": "D:\\123\\mi_and_login\\app\\src\\main\\res\\values\\strings.xml",
+                    "from": {
+                        "startLines": "159,154,153,151,152,148,150,146,149,147,155,145,72,75,74,73,19,20,21,144,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,156,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "9567,9407,9370,9291,9331,9176,9253,9093,9213,9133,9477,9052,3898,4159,4063,3994,827,870,922,9003,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,9515,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084",
+                        "endLines": "163,154,153,151,152,148,150,146,149,147,155,145,72,75,74,73,19,20,21,144,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,156,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
+                        "endColumns": "14,69,36,39,38,36,37,39,39,42,37,40,95,82,95,68,42,51,51,48,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,49,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+                        "endOffsets": "9971,9472,9402,9326,9365,9208,9286,9128,9248,9171,9510,9088,3989,4237,4154,4058,865,917,969,9047,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,9560,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169"
+                    },
+                    "to": {
+                        "startLines": "433,438,439,440,441,442,443,444,445,446,447,448,478,479,480,481,482,483,484,486,488,489,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507,508,509,510,511,512,513,514,515,516,517,518,519,520,521,522,523,524,525,526,527,528,529,530,531,532,533,534,535,536,537,538,539,540,541,542,543,544,545,546,547,548,549,555,556,557,558,559,560,561,562,563,564,565,566,567,568,569,570,571,572,573,574,575,576,578,579,581,582,583,584,585,586,587,588,589,590,591",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "25193,25546,25616,25653,25693,25732,25769,25807,25847,25887,25930,25968,28128,28224,28307,28403,28472,28515,28567,28764,28934,28983,29133,29191,29242,29326,29420,29528,29599,29683,29766,29832,29915,30017,30078,30140,30191,30269,30322,30382,30487,30546,30648,30703,30774,30823,30881,30928,30987,31044,31115,31176,31233,31283,31335,31388,31438,31488,31548,31601,31667,31729,31792,31839,31894,31982,32040,32102,32152,32197,32240,32300,32367,32422,32477,32530,32577,32630,32686,32734,32789,33657,33741,33808,33872,33968,34042,34123,34212,34375,34519,34598,34673,34755,34814,34894,34974,35029,35151,35254,35304,35345,35398,35508,35582,35718,35786,35872,35952,36021,36115,36174,36229,36291,36351,36461",
+                        "endLines": "437,438,439,440,441,442,443,444,445,446,447,448,478,479,480,481,482,483,484,486,488,489,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507,508,509,510,511,512,513,514,515,516,517,518,519,520,521,522,523,524,525,526,527,528,529,530,531,532,533,534,535,536,537,538,539,540,541,542,543,544,545,546,547,548,549,555,556,557,558,559,560,561,562,563,564,565,566,567,568,569,570,571,572,573,574,575,576,578,579,581,582,583,584,585,586,587,588,589,590,591",
+                        "endColumns": "14,69,36,39,38,36,37,39,39,42,37,40,95,82,95,68,42,51,51,48,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,49,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+                        "endOffsets": "25541,25611,25648,25688,25727,25764,25802,25842,25882,25925,25963,26004,28219,28302,28398,28467,28510,28562,28614,28808,28978,29041,29186,29237,29321,29415,29523,29594,29678,29761,29827,29910,30012,30073,30135,30186,30264,30317,30377,30482,30541,30643,30698,30769,30818,30876,30923,30982,31039,31110,31171,31228,31278,31330,31383,31433,31483,31543,31596,31662,31724,31787,31834,31889,31977,32035,32097,32147,32192,32235,32295,32362,32417,32472,32525,32572,32625,32681,32729,32784,32837,33736,33803,33867,33963,34037,34118,34207,34370,34514,34593,34668,34750,34809,34889,34969,35024,35146,35249,35299,35340,35393,35450,35577,35642,35781,35867,35947,36016,36110,36169,36224,36286,36346,36456,36546"
+                    }
+                },
                 {
                     "source": "C:\\Users\\薛皓天\\.gradle\\caches\\transforms-3\\8f46bdb1e2fc1f37aa6e8763107a146c\\transformed\\cardview-v7-27.1.1\\res\\values\\values.xml",
                     "from": {
@@ -888,25 +907,6 @@
                         "endOffsets": "521,812,912,964,1025,1071,1314,1469,1529,1599,1732,1800,1929,2055,2117,2182,2250,2317,2440,2565,2632,2697,2762,2943,3064,3185,3251,3318,3528,3597,3663,3788,3914,3981,4107,4234,4359,4486,4551,4677,4800,4865,5073,5140,5320,5440,5560,5625,5687,5749,5811,5870,5930,5991,6052,6111,6412,166306,166438,169440,174427"
                     }
                 },
-                {
-                    "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml",
-                    "from": {
-                        "startLines": "70,77,88,83,93,94,97,100,50,55,64,60,106,22,26,30,35,40,18,45",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "2886,3219,3762,3490,4044,4104,4255,4408,2062,2267,2640,2479,4609,895,1078,1263,1449,1653,712,1860",
-                        "endLines": "75,81,92,87,93,96,99,104,53,58,67,62,111,25,29,33,38,43,21,48",
-                        "endColumns": "12,12,12,12,59,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "3213,3484,4039,3757,4099,4250,4403,4603,2261,2473,2843,2634,4907,1073,1258,1443,1647,1854,890,2056"
-                    },
-                    "to": {
-                        "startLines": "601,1684,1689,1694,1699,1700,1703,1706,1711,1715,1719,1723,1864,2016,2020,2024,2028,2032,2036,2040",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "37280,105347,105617,105899,106171,106230,106381,106534,106734,106938,107149,107356,117538,129239,129422,129607,129792,129995,130201,130384",
-                        "endLines": "606,1688,1693,1698,1699,1702,1705,1710,1714,1718,1722,1725,1869,2019,2023,2027,2031,2035,2039,2043",
-                        "endColumns": "12,12,12,12,58,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "37607,105612,105894,106166,106225,106376,106529,106729,106933,107144,107351,107511,117836,129417,129602,129787,129990,130196,130379,130580"
-                    }
-                },
                 {
                     "source": "C:\\Users\\薛皓天\\.gradle\\caches\\transforms-3\\86c4a1052e37b4375f5b87b8ed6a71a3\\transformed\\transition-27.1.1\\res\\values\\values.xml",
                     "from": {
@@ -924,25 +924,6 @@
                         "endOffsets": "23476,23689,23832,23887,23932,24278,24330,24379,24440,24490"
                     }
                 },
-                {
-                    "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml",
-                    "from": {
-                        "startLines": "19,26",
-                        "startColumns": "4,4",
-                        "startOffsets": "739,1047",
-                        "endLines": "24,29",
-                        "endColumns": "19,19",
-                        "endOffsets": "1041,1162"
-                    },
-                    "to": {
-                        "startLines": "2,8",
-                        "startColumns": "4,4",
-                        "startOffsets": "150,345",
-                        "endLines": "7,11",
-                        "endColumns": "19,19",
-                        "endOffsets": "340,460"
-                    }
-                },
                 {
                     "source": "C:\\Users\\薛皓天\\.gradle\\caches\\transforms-3\\55305e3db23cb94d99efb75b6b3485cf\\transformed\\support-compat-27.1.1\\res\\values\\values.xml",
                     "from": {
@@ -978,6 +959,25 @@
                         "endColumns": "88,65,121,60,65,66",
                         "endOffsets": "10688,126691,126923,126984,127251,127447"
                     }
+                },
+                {
+                    "source": "D:\\123\\mi_and_login\\app\\src\\main\\res\\values\\styles.xml",
+                    "from": {
+                        "startLines": "70,77,88,83,93,94,97,100,50,55,64,60,106,22,26,30,35,40,18,45",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "2886,3219,3762,3490,4044,4104,4255,4408,2062,2267,2640,2479,4609,895,1078,1263,1449,1653,712,1860",
+                        "endLines": "75,81,92,87,93,96,99,104,53,58,67,62,111,25,29,33,38,43,21,48",
+                        "endColumns": "12,12,12,12,59,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12",
+                        "endOffsets": "3213,3484,4039,3757,4099,4250,4403,4603,2261,2473,2843,2634,4907,1073,1258,1443,1647,1854,890,2056"
+                    },
+                    "to": {
+                        "startLines": "601,1684,1689,1694,1699,1700,1703,1706,1711,1715,1719,1723,1864,2016,2020,2024,2028,2032,2036,2040",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "37280,105347,105617,105899,106171,106230,106381,106534,106734,106938,107149,107356,117538,129239,129422,129607,129792,129995,130201,130384",
+                        "endLines": "606,1688,1693,1698,1699,1702,1705,1710,1714,1718,1722,1725,1869,2019,2023,2027,2031,2035,2039,2043",
+                        "endColumns": "12,12,12,12,58,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12",
+                        "endOffsets": "37607,105612,105894,106166,106225,106376,106529,106729,106933,107144,107351,107511,117836,129417,129602,129787,129990,130196,130379,130580"
+                    }
                 }
             ]
         },
@@ -2057,7 +2057,26 @@
             "outputFile": "net.micode.notes.app-merged_res-14:/values-zh-rTW_values-zh-rTW.arsc.flat",
             "map": [
                 {
-                    "source": "D:\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+                    "source": "D:\\123\\mi_and_login\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+                    "from": {
+                        "startLines": "18",
+                        "startColumns": "4",
+                        "startOffsets": "712",
+                        "endLines": "21",
+                        "endColumns": "19",
+                        "endOffsets": "817"
+                    },
+                    "to": {
+                        "startLines": "2",
+                        "startColumns": "4",
+                        "startOffsets": "105",
+                        "endLines": "5",
+                        "endColumns": "19",
+                        "endOffsets": "210"
+                    }
+                },
+                {
+                    "source": "D:\\123\\mi_and_login\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
                     "from": {
                         "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
@@ -2092,25 +2111,6 @@
                         "endOffsets": "474,567,667,749,846,954,1030,1106,1184,1280,1376,1471,1568,1663,1763,1913,2007,6946"
                     }
                 },
-                {
-                    "source": "D:\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
-                    "from": {
-                        "startLines": "18",
-                        "startColumns": "4",
-                        "startOffsets": "712",
-                        "endLines": "21",
-                        "endColumns": "19",
-                        "endOffsets": "817"
-                    },
-                    "to": {
-                        "startLines": "2",
-                        "startColumns": "4",
-                        "startOffsets": "105",
-                        "endLines": "5",
-                        "endColumns": "19",
-                        "endOffsets": "210"
-                    }
-                },
                 {
                     "source": "C:\\Users\\薛皓天\\.gradle\\caches\\transforms-3\\55305e3db23cb94d99efb75b6b3485cf\\transformed\\support-compat-27.1.1\\res\\values-zh-rTW\\values-zh-rTW.xml",
                     "from": {
@@ -2986,26 +2986,7 @@
                     }
                 },
                 {
-                    "source": "D:\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
-                    "from": {
-                        "startLines": "18",
-                        "startColumns": "4",
-                        "startOffsets": "712",
-                        "endLines": "21",
-                        "endColumns": "19",
-                        "endOffsets": "817"
-                    },
-                    "to": {
-                        "startLines": "2",
-                        "startColumns": "4",
-                        "startOffsets": "105",
-                        "endLines": "5",
-                        "endColumns": "19",
-                        "endOffsets": "210"
-                    }
-                },
-                {
-                    "source": "D:\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+                    "source": "D:\\123\\mi_and_login\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
                     "from": {
                         "startLines": "137,30,29,27,28,24,26,22,25,23,31,21,87,86,85,84,35,36,37,20,128,129,136,135,42,93,94,92,91,90,106,105,104,96,76,45,46,97,88,130,83,79,54,60,65,55,75,74,73,69,68,66,67,70,71,61,82,72,80,59,64,63,62,78,58,77,56,57,81,44,50,52,49,51,48,47,41,40,113,112,115,127,120,119,121,122,124,123,114,118,116,117,111,125,126,32,134,132,131,133,43,95,103,108,107,109,102,101,100,99,38,39",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
@@ -3022,6 +3003,25 @@
                         "endColumns": "14,69,36,39,38,36,37,39,39,42,37,40,72,65,72,49,39,47,47,48,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,49,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
                         "endOffsets": "379,449,486,526,565,602,640,680,720,763,801,842,2541,2607,2680,2730,2770,2818,2866,2915,2960,3017,3071,3121,3183,3251,3328,3387,3452,3515,3570,3630,3693,3747,3807,3860,3922,4007,4088,4138,4197,4240,4293,4336,4387,4437,4497,4550,4601,4647,4695,4743,4789,4836,4886,4931,4990,5042,5094,5137,5184,5240,5295,5350,5394,5436,5477,5527,5586,5637,5686,5735,5782,5829,5876,5921,5972,6025,6100,6159,6216,6290,6354,6423,6501,6611,6715,6788,6854,6909,6974,7039,7088,7171,7249,7299,7337,7382,7430,7570,7627,7783,7842,7909,7967,8029,8077,8122,8170,8221,8287,8353"
                     }
+                },
+                {
+                    "source": "D:\\123\\mi_and_login\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+                    "from": {
+                        "startLines": "18",
+                        "startColumns": "4",
+                        "startOffsets": "712",
+                        "endLines": "21",
+                        "endColumns": "19",
+                        "endOffsets": "817"
+                    },
+                    "to": {
+                        "startLines": "2",
+                        "startColumns": "4",
+                        "startOffsets": "105",
+                        "endLines": "5",
+                        "endColumns": "19",
+                        "endOffsets": "210"
+                    }
                 }
             ]
         },

src/mi_and_login/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json

@@ -38,26 +38,7 @@
                     }
                 },
                 {
-                    "source": "D:\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
-                    "from": {
-                        "startLines": "18",
-                        "startColumns": "4",
-                        "startOffsets": "712",
-                        "endLines": "21",
-                        "endColumns": "19",
-                        "endOffsets": "817"
-                    },
-                    "to": {
-                        "startLines": "2",
-                        "startColumns": "4",
-                        "startOffsets": "105",
-                        "endLines": "5",
-                        "endColumns": "19",
-                        "endOffsets": "210"
-                    }
-                },
-                {
-                    "source": "D:\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+                    "source": "D:\\123\\mi_and_login\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
                     "from": {
                         "startLines": "137,30,29,27,28,24,26,22,25,23,31,21,87,86,85,84,35,36,37,20,128,129,136,135,42,93,94,92,91,90,106,105,104,96,76,45,46,97,88,130,83,79,54,60,65,55,75,74,73,69,68,66,67,70,71,61,82,72,80,59,64,63,62,78,58,77,56,57,81,44,50,52,49,51,48,47,41,40,113,112,115,127,120,119,121,122,124,123,114,118,116,117,111,125,126,32,134,132,131,133,43,95,103,108,107,109,102,101,100,99,38,39",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
@@ -74,6 +55,25 @@
                         "endColumns": "14,69,36,39,38,36,37,39,39,42,37,40,72,65,72,49,39,47,47,48,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,49,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
                         "endOffsets": "379,449,486,526,565,602,640,680,720,763,801,842,2541,2607,2680,2730,2770,2818,2866,2915,2960,3017,3071,3121,3183,3251,3328,3387,3452,3515,3570,3630,3693,3747,3807,3860,3922,4007,4088,4138,4197,4240,4293,4336,4387,4437,4497,4550,4601,4647,4695,4743,4789,4836,4886,4931,4990,5042,5094,5137,5184,5240,5295,5350,5394,5436,5477,5527,5586,5637,5686,5735,5782,5829,5876,5921,5972,6025,6100,6159,6216,6290,6354,6423,6501,6611,6715,6788,6854,6909,6974,7039,7088,7171,7249,7299,7337,7382,7430,7570,7627,7783,7842,7909,7967,8029,8077,8122,8170,8221,8287,8353"
                     }
+                },
+                {
+                    "source": "D:\\123\\mi_and_login\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+                    "from": {
+                        "startLines": "18",
+                        "startColumns": "4",
+                        "startOffsets": "712",
+                        "endLines": "21",
+                        "endColumns": "19",
+                        "endOffsets": "817"
+                    },
+                    "to": {
+                        "startLines": "2",
+                        "startColumns": "4",
+                        "startOffsets": "105",
+                        "endLines": "5",
+                        "endColumns": "19",
+                        "endOffsets": "210"
+                    }
                 }
             ]
         }

src/mi_and_login/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json

@@ -4,7 +4,26 @@
             "outputFile": "net.micode.notes.app-mergeDebugResources-12:/values-zh-rTW/values-zh-rTW.xml",
             "map": [
                 {
-                    "source": "D:\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+                    "source": "D:\\123\\mi_and_login\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+                    "from": {
+                        "startLines": "18",
+                        "startColumns": "4",
+                        "startOffsets": "712",
+                        "endLines": "21",
+                        "endColumns": "19",
+                        "endOffsets": "817"
+                    },
+                    "to": {
+                        "startLines": "2",
+                        "startColumns": "4",
+                        "startOffsets": "105",
+                        "endLines": "5",
+                        "endColumns": "19",
+                        "endOffsets": "210"
+                    }
+                },
+                {
+                    "source": "D:\\123\\mi_and_login\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
                     "from": {
                         "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
@@ -39,25 +58,6 @@
                         "endOffsets": "474,567,667,749,846,954,1030,1106,1184,1280,1376,1471,1568,1663,1763,1913,2007,6946"
                     }
                 },
-                {
-                    "source": "D:\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
-                    "from": {
-                        "startLines": "18",
-                        "startColumns": "4",
-                        "startOffsets": "712",
-                        "endLines": "21",
-                        "endColumns": "19",
-                        "endOffsets": "817"
-                    },
-                    "to": {
-                        "startLines": "2",
-                        "startColumns": "4",
-                        "startOffsets": "105",
-                        "endLines": "5",
-                        "endColumns": "19",
-                        "endOffsets": "210"
-                    }
-                },
                 {
                     "source": "C:\\Users\\薛皓天\\.gradle\\caches\\transforms-3\\55305e3db23cb94d99efb75b6b3485cf\\transformed\\support-compat-27.1.1\\res\\values-zh-rTW\\values-zh-rTW.xml",
                     "from": {

src/mi_and_login/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json

@@ -3,23 +3,6 @@
         {
             "outputFile": "net.micode.notes.app-mergeDebugResources-12:/values/values.xml",
             "map": [
-                {
-                    "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml",
-                    "from": {
-                        "startLines": "19,20,21,22,18",
-                        "startColumns": "4,4,4,4,4",
-                        "startOffsets": "764,816,869,922,712",
-                        "endColumns": "51,52,52,51,51",
-                        "endOffsets": "811,864,917,969,759"
-                    },
-                    "to": {
-                        "startLines": "379,380,381,382,383",
-                        "startColumns": "4,4,4,4,4",
-                        "startOffsets": "22373,22425,22478,22531,22583",
-                        "endColumns": "51,52,52,51,51",
-                        "endOffsets": "22420,22473,22526,22578,22630"
-                    }
-                },
                 {
                     "source": "C:\\Users\\薛皓天\\.gradle\\caches\\transforms-3\\180eeefb5c9fa290eae69b6eda4e2eae\\transformed\\appcompat-v7-27.1.1\\res\\values\\values.xml",
                     "from": {
@@ -39,42 +22,6 @@
                         "endOffsets": "1187,1359,1408,6453,6508,6567,6629,6707,6788,6849,6924,7000,7077,7155,7240,7322,7398,7474,7591,7669,7775,7881,7960,8040,8097,8155,9254,9329,9394,9460,9515,9587,9660,9727,9795,9854,9913,9972,10031,10090,10144,10198,10251,10305,10359,10413,10467,10762,10841,10914,10988,11059,11131,11203,11276,11371,11429,11502,11576,11650,11725,11797,11870,11940,12011,12071,12132,12343,12412,12482,12556,12632,12696,12773,12849,12926,12991,13060,13137,13212,13281,13349,13426,13492,13553,13650,13715,13784,13883,13954,14013,14071,14128,14187,14258,14330,14402,14474,14546,14613,14681,14749,14808,14871,14935,15025,15116,15176,15242,15309,15375,15445,15509,15562,15675,15733,15796,15861,15926,16001,16074,16146,16195,16256,16317,16378,16440,16504,16568,16632,16697,16760,16820,16881,16947,17006,17066,17128,17199,17259,17327,20306,20393,20646,20733,20821,20903,20986,21076,21167,22682,22740,22785,22851,22915,22972,23029,23083,23288,23336,23385,23436,23510,23736,23785,23978,24522,24634,24696,24884,24941,26078,26148,26226,26280,26350,26435,26483,26529,26600,26678,26756,26828,26902,26976,27050,27130,27203,27272,27344,27421,27473,27546,27620,27689,27764,27838,27912,28053,28123,35503,36624,36714,36802,36898,36988,38189,38278,38525,38806,39058,39757,40150,40627,40849,41071,41347,41574,41804,42034,42264,42494,42721,43140,43366,43791,44021,44449,44668,44951,45159,45290,45517,45943,46168,46595,46816,47241,47361,47637,47938,48262,48553,48867,49004,49135,49240,49482,49649,49853,50061,50332,50444,50556,50661,50778,50992,51138,51278,51364,51712,51800,52046,52464,52713,52795,52893,53485,53585,53837,54261,54516,54610,54699,54936,56960,57202,57304,57557,59713,69907,71423,81557,83085,84842,85468,85888,86949,88214,88470,88706,89253,89747,90352,90550,91130,91694,92069,92187,92725,92882,93078,93351,93607,93777,93918,93982,94264,94550,95226,95490,95828,96181,96275,96461,96767,97029,97154,97281,97520,97731,97850,98043,98220,98675,98856,98978,99237,99350,99537,99639,99746,99875,100150,100658,101154,102031,102325,102895,103044,103776,103948,104284,104376,104654,111793,116218,116280,116858,117442,117533,117949,118178,118338,118490,118661,118828,119071,119241,119414,119585,119859,120058,120263,120593,120677,120773,120869,120967,121067,121169,121271,121373,121475,121577,121677,121773,121885,122014,122137,122268,122399,122497,122611,122705,122845,122979,123075,123187,123287,123403,123499,123611,123711,123851,123987,124151,124281,124439,124589,124730,124874,125009,125121,125271,125399,125527,125663,125795,125925,126055,126167,126307,128952,129096,129234,130646,130736,130812,130916,131006,131108,131216,131324,131424,131504,131596,131694,131804,131882,131988,132080,132184,132294,132416,132579,132736,134310,134410,134500,134610,134704,134810,134902,135002,135114,135228,135344,135460,135554,135668,135780,135882,136002,136124,136206,136310,136430,136556,136654,136748,136836,136948,137064,137186,137298,137473,137589,137675,137767,137879,138003,138070,138196,138264,138392,138536,138664,138733,138828,138943,139056,139155,139264,139375,139486,139587,139692,139792,139922,140013,140136,140230,140342,140428,140532,140628,140716,140834,140938,141042,141168,141256,141364,141464,141554,141664,141748,141850,141934,141988,142052,142158,142268,142352,142472,148449,148553,148654,148701,148949,149141,149581,151067,151641,151961,152550,159234,159850,163203,163730,172457,175020,175241,175400,175659,177786,178225,178876,179004,179178,180851,181243,182574,184175,186699,186944,187489,187642"
                     }
                 },
-                {
-                    "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml",
-                    "from": {
-                        "startLines": "23,21,19,20,25,18,22,24",
-                        "startColumns": "4,4,4,4,4,4,4,4",
-                        "startOffsets": "955,867,769,816,1038,712,913,995",
-                        "endColumns": "39,45,46,50,37,56,41,42",
-                        "endOffsets": "990,908,811,862,1071,764,950,1033"
-                    },
-                    "to": {
-                        "startLines": "156,169,170,171,213,226,227,228",
-                        "startColumns": "4,4,4,4,4,4,4,4",
-                        "startOffsets": "7479,8409,8455,8502,11281,12137,12194,12236",
-                        "endColumns": "39,45,46,50,37,56,41,42",
-                        "endOffsets": "7514,8450,8497,8548,11314,12189,12231,12274"
-                    }
-                },
-                {
-                    "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml",
-                    "from": {
-                        "startLines": "159,154,153,151,152,148,150,146,149,147,155,145,72,75,74,73,19,20,21,144,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,156,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "9567,9407,9370,9291,9331,9176,9253,9093,9213,9133,9477,9052,3898,4159,4063,3994,827,870,922,9003,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,9515,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084",
-                        "endLines": "163,154,153,151,152,148,150,146,149,147,155,145,72,75,74,73,19,20,21,144,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,156,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
-                        "endColumns": "14,69,36,39,38,36,37,39,39,42,37,40,95,82,95,68,42,51,51,48,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,49,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "9971,9472,9402,9326,9365,9208,9286,9128,9248,9171,9510,9088,3989,4237,4154,4058,865,917,969,9047,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,9560,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169"
-                    },
-                    "to": {
-                        "startLines": "433,438,439,440,441,442,443,444,445,446,447,448,478,479,480,481,482,483,484,486,488,489,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507,508,509,510,511,512,513,514,515,516,517,518,519,520,521,522,523,524,525,526,527,528,529,530,531,532,533,534,535,536,537,538,539,540,541,542,543,544,545,546,547,548,549,555,556,557,558,559,560,561,562,563,564,565,566,567,568,569,570,571,572,573,574,575,576,578,579,581,582,583,584,585,586,587,588,589,590,591",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "25193,25546,25616,25653,25693,25732,25769,25807,25847,25887,25930,25968,28128,28224,28307,28403,28472,28515,28567,28764,28934,28983,29133,29191,29242,29326,29420,29528,29599,29683,29766,29832,29915,30017,30078,30140,30191,30269,30322,30382,30487,30546,30648,30703,30774,30823,30881,30928,30987,31044,31115,31176,31233,31283,31335,31388,31438,31488,31548,31601,31667,31729,31792,31839,31894,31982,32040,32102,32152,32197,32240,32300,32367,32422,32477,32530,32577,32630,32686,32734,32789,33657,33741,33808,33872,33968,34042,34123,34212,34375,34519,34598,34673,34755,34814,34894,34974,35029,35151,35254,35304,35345,35398,35508,35582,35718,35786,35872,35952,36021,36115,36174,36229,36291,36351,36461",
-                        "endLines": "437,438,439,440,441,442,443,444,445,446,447,448,478,479,480,481,482,483,484,486,488,489,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507,508,509,510,511,512,513,514,515,516,517,518,519,520,521,522,523,524,525,526,527,528,529,530,531,532,533,534,535,536,537,538,539,540,541,542,543,544,545,546,547,548,549,555,556,557,558,559,560,561,562,563,564,565,566,567,568,569,570,571,572,573,574,575,576,578,579,581,582,583,584,585,586,587,588,589,590,591",
-                        "endColumns": "14,69,36,39,38,36,37,39,39,42,37,40,95,82,95,68,42,51,51,48,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,49,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "25541,25611,25648,25688,25727,25764,25802,25842,25882,25925,25963,26004,28219,28302,28398,28467,28510,28562,28614,28808,28978,29041,29186,29237,29321,29415,29523,29594,29678,29761,29827,29910,30012,30073,30135,30186,30264,30317,30377,30482,30541,30643,30698,30769,30818,30876,30923,30982,31039,31110,31171,31228,31278,31330,31383,31433,31483,31543,31596,31662,31724,31787,31834,31889,31977,32035,32097,32147,32192,32235,32295,32362,32417,32472,32525,32572,32625,32681,32729,32784,32837,33736,33803,33867,33963,34037,34118,34207,34370,34514,34593,34668,34750,34809,34889,34969,35024,35146,35249,35299,35340,35393,35450,35577,35642,35781,35867,35947,36016,36110,36169,36224,36286,36346,36456,36546"
-                    }
-                },
                 {
                     "source": "C:\\Users\\薛皓天\\.gradle\\caches\\transforms-3\\3ba5c51a1f730cf47c761db4c2383520\\transformed\\recyclerview-v7-27.1.1\\res\\values\\values.xml",
                     "from": {
@@ -111,6 +58,78 @@
                         "endOffsets": "1132,146534,169610,171811"
                     }
                 },
+                {
+                    "source": "D:\\123\\mi_and_login\\app\\src\\main\\res\\values\\colors.xml",
+                    "from": {
+                        "startLines": "23,21,19,20,25,18,22,24",
+                        "startColumns": "4,4,4,4,4,4,4,4",
+                        "startOffsets": "955,867,769,816,1038,712,913,995",
+                        "endColumns": "39,45,46,50,37,56,41,42",
+                        "endOffsets": "990,908,811,862,1071,764,950,1033"
+                    },
+                    "to": {
+                        "startLines": "156,169,170,171,213,226,227,228",
+                        "startColumns": "4,4,4,4,4,4,4,4",
+                        "startOffsets": "7479,8409,8455,8502,11281,12137,12194,12236",
+                        "endColumns": "39,45,46,50,37,56,41,42",
+                        "endOffsets": "7514,8450,8497,8548,11314,12189,12231,12274"
+                    }
+                },
+                {
+                    "source": "D:\\123\\mi_and_login\\app\\src\\main\\res\\values\\dimens.xml",
+                    "from": {
+                        "startLines": "19,20,21,22,18",
+                        "startColumns": "4,4,4,4,4",
+                        "startOffsets": "764,816,869,922,712",
+                        "endColumns": "51,52,52,51,51",
+                        "endOffsets": "811,864,917,969,759"
+                    },
+                    "to": {
+                        "startLines": "379,380,381,382,383",
+                        "startColumns": "4,4,4,4,4",
+                        "startOffsets": "22373,22425,22478,22531,22583",
+                        "endColumns": "51,52,52,51,51",
+                        "endOffsets": "22420,22473,22526,22578,22630"
+                    }
+                },
+                {
+                    "source": "D:\\123\\mi_and_login\\app\\src\\main\\res\\values\\arrays.xml",
+                    "from": {
+                        "startLines": "19,26",
+                        "startColumns": "4,4",
+                        "startOffsets": "739,1047",
+                        "endLines": "24,29",
+                        "endColumns": "19,19",
+                        "endOffsets": "1041,1162"
+                    },
+                    "to": {
+                        "startLines": "2,8",
+                        "startColumns": "4,4",
+                        "startOffsets": "150,345",
+                        "endLines": "7,11",
+                        "endColumns": "19,19",
+                        "endOffsets": "340,460"
+                    }
+                },
+                {
+                    "source": "D:\\123\\mi_and_login\\app\\src\\main\\res\\values\\strings.xml",
+                    "from": {
+                        "startLines": "159,154,153,151,152,148,150,146,149,147,155,145,72,75,74,73,19,20,21,144,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,156,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "9567,9407,9370,9291,9331,9176,9253,9093,9213,9133,9477,9052,3898,4159,4063,3994,827,870,922,9003,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,9515,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084",
+                        "endLines": "163,154,153,151,152,148,150,146,149,147,155,145,72,75,74,73,19,20,21,144,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,156,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
+                        "endColumns": "14,69,36,39,38,36,37,39,39,42,37,40,95,82,95,68,42,51,51,48,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,49,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+                        "endOffsets": "9971,9472,9402,9326,9365,9208,9286,9128,9248,9171,9510,9088,3989,4237,4154,4058,865,917,969,9047,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,9560,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169"
+                    },
+                    "to": {
+                        "startLines": "433,438,439,440,441,442,443,444,445,446,447,448,478,479,480,481,482,483,484,486,488,489,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507,508,509,510,511,512,513,514,515,516,517,518,519,520,521,522,523,524,525,526,527,528,529,530,531,532,533,534,535,536,537,538,539,540,541,542,543,544,545,546,547,548,549,555,556,557,558,559,560,561,562,563,564,565,566,567,568,569,570,571,572,573,574,575,576,578,579,581,582,583,584,585,586,587,588,589,590,591",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "25193,25546,25616,25653,25693,25732,25769,25807,25847,25887,25930,25968,28128,28224,28307,28403,28472,28515,28567,28764,28934,28983,29133,29191,29242,29326,29420,29528,29599,29683,29766,29832,29915,30017,30078,30140,30191,30269,30322,30382,30487,30546,30648,30703,30774,30823,30881,30928,30987,31044,31115,31176,31233,31283,31335,31388,31438,31488,31548,31601,31667,31729,31792,31839,31894,31982,32040,32102,32152,32197,32240,32300,32367,32422,32477,32530,32577,32630,32686,32734,32789,33657,33741,33808,33872,33968,34042,34123,34212,34375,34519,34598,34673,34755,34814,34894,34974,35029,35151,35254,35304,35345,35398,35508,35582,35718,35786,35872,35952,36021,36115,36174,36229,36291,36351,36461",
+                        "endLines": "437,438,439,440,441,442,443,444,445,446,447,448,478,479,480,481,482,483,484,486,488,489,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507,508,509,510,511,512,513,514,515,516,517,518,519,520,521,522,523,524,525,526,527,528,529,530,531,532,533,534,535,536,537,538,539,540,541,542,543,544,545,546,547,548,549,555,556,557,558,559,560,561,562,563,564,565,566,567,568,569,570,571,572,573,574,575,576,578,579,581,582,583,584,585,586,587,588,589,590,591",
+                        "endColumns": "14,69,36,39,38,36,37,39,39,42,37,40,95,82,95,68,42,51,51,48,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,49,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+                        "endOffsets": "25541,25611,25648,25688,25727,25764,25802,25842,25882,25925,25963,26004,28219,28302,28398,28467,28510,28562,28614,28808,28978,29041,29186,29237,29321,29415,29523,29594,29678,29761,29827,29910,30012,30073,30135,30186,30264,30317,30377,30482,30541,30643,30698,30769,30818,30876,30923,30982,31039,31110,31171,31228,31278,31330,31383,31433,31483,31543,31596,31662,31724,31787,31834,31889,31977,32035,32097,32147,32192,32235,32295,32362,32417,32472,32525,32572,32625,32681,32729,32784,32837,33736,33803,33867,33963,34037,34118,34207,34370,34514,34593,34668,34750,34809,34889,34969,35024,35146,35249,35299,35340,35393,35450,35577,35642,35781,35867,35947,36016,36110,36169,36224,36286,36346,36456,36546"
+                    }
+                },
                 {
                     "source": "C:\\Users\\薛皓天\\.gradle\\caches\\transforms-3\\8f46bdb1e2fc1f37aa6e8763107a146c\\transformed\\cardview-v7-27.1.1\\res\\values\\values.xml",
                     "from": {
@@ -168,25 +187,6 @@
                         "endOffsets": "521,812,912,964,1025,1071,1314,1469,1529,1599,1732,1800,1929,2055,2117,2182,2250,2317,2440,2565,2632,2697,2762,2943,3064,3185,3251,3318,3528,3597,3663,3788,3914,3981,4107,4234,4359,4486,4551,4677,4800,4865,5073,5140,5320,5440,5560,5625,5687,5749,5811,5870,5930,5991,6052,6111,6412,166306,166438,169440,174427"
                     }
                 },
-                {
-                    "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml",
-                    "from": {
-                        "startLines": "70,77,88,83,93,94,97,100,50,55,64,60,106,22,26,30,35,40,18,45",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "2886,3219,3762,3490,4044,4104,4255,4408,2062,2267,2640,2479,4609,895,1078,1263,1449,1653,712,1860",
-                        "endLines": "75,81,92,87,93,96,99,104,53,58,67,62,111,25,29,33,38,43,21,48",
-                        "endColumns": "12,12,12,12,59,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "3213,3484,4039,3757,4099,4250,4403,4603,2261,2473,2843,2634,4907,1073,1258,1443,1647,1854,890,2056"
-                    },
-                    "to": {
-                        "startLines": "601,1684,1689,1694,1699,1700,1703,1706,1711,1715,1719,1723,1864,2016,2020,2024,2028,2032,2036,2040",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "37280,105347,105617,105899,106171,106230,106381,106534,106734,106938,107149,107356,117538,129239,129422,129607,129792,129995,130201,130384",
-                        "endLines": "606,1688,1693,1698,1699,1702,1705,1710,1714,1718,1722,1725,1869,2019,2023,2027,2031,2035,2039,2043",
-                        "endColumns": "12,12,12,12,58,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "37607,105612,105894,106166,106225,106376,106529,106729,106933,107144,107351,107511,117836,129417,129602,129787,129990,130196,130379,130580"
-                    }
-                },
                 {
                     "source": "C:\\Users\\薛皓天\\.gradle\\caches\\transforms-3\\86c4a1052e37b4375f5b87b8ed6a71a3\\transformed\\transition-27.1.1\\res\\values\\values.xml",
                     "from": {
@@ -204,25 +204,6 @@
                         "endOffsets": "23476,23689,23832,23887,23932,24278,24330,24379,24440,24490"
                     }
                 },
-                {
-                    "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml",
-                    "from": {
-                        "startLines": "19,26",
-                        "startColumns": "4,4",
-                        "startOffsets": "739,1047",
-                        "endLines": "24,29",
-                        "endColumns": "19,19",
-                        "endOffsets": "1041,1162"
-                    },
-                    "to": {
-                        "startLines": "2,8",
-                        "startColumns": "4,4",
-                        "startOffsets": "150,345",
-                        "endLines": "7,11",
-                        "endColumns": "19,19",
-                        "endOffsets": "340,460"
-                    }
-                },
                 {
                     "source": "C:\\Users\\薛皓天\\.gradle\\caches\\transforms-3\\55305e3db23cb94d99efb75b6b3485cf\\transformed\\support-compat-27.1.1\\res\\values\\values.xml",
                     "from": {
@@ -258,6 +239,25 @@
                         "endColumns": "88,65,121,60,65,66",
                         "endOffsets": "10688,126691,126923,126984,127251,127447"
                     }
+                },
+                {
+                    "source": "D:\\123\\mi_and_login\\app\\src\\main\\res\\values\\styles.xml",
+                    "from": {
+                        "startLines": "70,77,88,83,93,94,97,100,50,55,64,60,106,22,26,30,35,40,18,45",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "2886,3219,3762,3490,4044,4104,4255,4408,2062,2267,2640,2479,4609,895,1078,1263,1449,1653,712,1860",
+                        "endLines": "75,81,92,87,93,96,99,104,53,58,67,62,111,25,29,33,38,43,21,48",
+                        "endColumns": "12,12,12,12,59,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12",
+                        "endOffsets": "3213,3484,4039,3757,4099,4250,4403,4603,2261,2473,2843,2634,4907,1073,1258,1443,1647,1854,890,2056"
+                    },
+                    "to": {
+                        "startLines": "601,1684,1689,1694,1699,1700,1703,1706,1711,1715,1719,1723,1864,2016,2020,2024,2028,2032,2036,2040",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "37280,105347,105617,105899,106171,106230,106381,106534,106734,106938,107149,107356,117538,129239,129422,129607,129792,129995,130201,130384",
+                        "endLines": "606,1688,1693,1698,1699,1702,1705,1710,1714,1718,1722,1725,1869,2019,2023,2027,2031,2035,2039,2043",
+                        "endColumns": "12,12,12,12,58,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12",
+                        "endOffsets": "37607,105612,105894,106166,106225,106376,106529,106729,106933,107144,107351,107511,117836,129417,129602,129787,129990,130196,130379,130580"
+                    }
                 }
             ]
         }

src/mi_and_login/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml

@@ -21,7 +21,7 @@
 
     <uses-sdk
         android:minSdkVersion="14"
-        android:targetSdkVersion="14" />
+        android:targetSdkVersion="29" />
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />

src/mi_and_login/app/build/intermediates/source_set_path_map/debug/file-map.txt

@@ -7,11 +7,11 @@ net.micode.notes.app-support-media-compat-27.1.1-5 C:\Users\薛皓天\.gradle\ca
 net.micode.notes.app-transition-27.1.1-6 C:\Users\薛皓天\.gradle\caches\transforms-3\86c4a1052e37b4375f5b87b8ed6a71a3\transformed\transition-27.1.1\res
 net.micode.notes.app-cardview-v7-27.1.1-7 C:\Users\薛皓天\.gradle\caches\transforms-3\8f46bdb1e2fc1f37aa6e8763107a146c\transformed\cardview-v7-27.1.1\res
 net.micode.notes.app-constraint-layout-1.1.0-8 C:\Users\薛皓天\.gradle\caches\transforms-3\ac71f32b165505a54e1cfb378ab298ed\transformed\constraint-layout-1.1.0\res
-net.micode.notes.app-pngs-9 D:\Notes-master1\app\build\generated\res\pngs\debug
-net.micode.notes.app-resValues-10 D:\Notes-master1\app\build\generated\res\resValues\debug
-net.micode.notes.app-rs-11 D:\Notes-master1\app\build\generated\res\rs\debug
-net.micode.notes.app-mergeDebugResources-12 D:\Notes-master1\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir
-net.micode.notes.app-mergeDebugResources-13 D:\Notes-master1\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir
-net.micode.notes.app-merged_res-14 D:\Notes-master1\app\build\intermediates\merged_res\debug
-net.micode.notes.app-debug-15 D:\Notes-master1\app\src\debug\res
-net.micode.notes.app-main-16 D:\Notes-master1\app\src\main\res
+net.micode.notes.app-pngs-9 D:\123\mi_and_login\app\build\generated\res\pngs\debug
+net.micode.notes.app-resValues-10 D:\123\mi_and_login\app\build\generated\res\resValues\debug
+net.micode.notes.app-rs-11 D:\123\mi_and_login\app\build\generated\res\rs\debug
+net.micode.notes.app-mergeDebugResources-12 D:\123\mi_and_login\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir
+net.micode.notes.app-mergeDebugResources-13 D:\123\mi_and_login\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir
+net.micode.notes.app-merged_res-14 D:\123\mi_and_login\app\build\intermediates\merged_res\debug
+net.micode.notes.app-debug-15 D:\123\mi_and_login\app\src\debug\res
+net.micode.notes.app-main-16 D:\123\mi_and_login\app\src\main\res

src/mi_and_login/app/build/outputs/logs/manifest-merger-debug-report.txt

@@ -1,9 +1,9 @@
 -- Merging decision tree log ---
 manifest
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:18:1-162:12
-INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml:18:1-162:12
-INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml:18:1-162:12
-INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml:18:1-162:12
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:18:1-162:12
+INJECTED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:18:1-162:12
+INJECTED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:18:1-162:12
+INJECTED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:18:1-162:12
 MERGED from [com.android.support:design:27.1.1] C:\Users\薛皓天\.gradle\caches\transforms-3\08b2c4759a9370b79c1db521afdee5a8\transformed\design-27.1.1\AndroidManifest.xml:17:1-22:12
 MERGED from [com.android.support:appcompat-v7:27.1.1] C:\Users\薛皓天\.gradle\caches\transforms-3\180eeefb5c9fa290eae69b6eda4e2eae\transformed\appcompat-v7-27.1.1\AndroidManifest.xml:17:1-22:12
 MERGED from [com.android.support:cardview-v7:27.1.1] C:\Users\薛皓天\.gradle\caches\transforms-3\8f46bdb1e2fc1f37aa6e8763107a146c\transformed\cardview-v7-27.1.1\AndroidManifest.xml:17:1-22:12
@@ -22,27 +22,27 @@ MERGED from [android.arch.lifecycle:livedata-core:1.1.0] C:\Users\Ѧ
 MERGED from [android.arch.lifecycle:viewmodel:1.1.0] C:\Users\薛皓天\.gradle\caches\transforms-3\b72ac6ec134689bfc1b7371703528866\transformed\viewmodel-1.1.0\AndroidManifest.xml:17:1-22:12
 MERGED from [android.arch.lifecycle:runtime:1.1.0] C:\Users\薛皓天\.gradle\caches\transforms-3\fa7fdda1e28a52e8d35570faa2c1916b\transformed\runtime-1.1.0\AndroidManifest.xml:17:1-22:12
 MERGED from [android.arch.core:runtime:1.1.0] C:\Users\薛皓天\.gradle\caches\transforms-3\efb3bde11e95de2829444273d12eec38\transformed\runtime-1.1.0\AndroidManifest.xml:17:1-22:12
-INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml:18:1-162:12
-INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml:18:1-162:12
-INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml:18:1-162:12
+INJECTED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:18:1-162:12
+INJECTED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:18:1-162:12
+INJECTED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:18:1-162:12
 	package
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:19:5-31
-		INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml
-		INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:19:5-31
+		INJECTED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml
+		INJECTED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml
 	android:versionName
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:21:5-30
-		INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml
-		INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:21:5-30
+		INJECTED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml
+		INJECTED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml
 	xmlns:android
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:18:11-69
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:18:11-69
 	android:versionCode
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:20:5-28
-		INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml
-		INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:20:5-28
+		INJECTED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml
+		INJECTED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml
 uses-sdk
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
-INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
-INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:23:5-44
+INJECTED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:23:5-44
+INJECTED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:23:5-44
 MERGED from [com.android.support:design:27.1.1] C:\Users\薛皓天\.gradle\caches\transforms-3\08b2c4759a9370b79c1db521afdee5a8\transformed\design-27.1.1\AndroidManifest.xml:20:5-44
 MERGED from [com.android.support:design:27.1.1] C:\Users\薛皓天\.gradle\caches\transforms-3\08b2c4759a9370b79c1db521afdee5a8\transformed\design-27.1.1\AndroidManifest.xml:20:5-44
 MERGED from [com.android.support:appcompat-v7:27.1.1] C:\Users\薛皓天\.gradle\caches\transforms-3\180eeefb5c9fa290eae69b6eda4e2eae\transformed\appcompat-v7-27.1.1\AndroidManifest.xml:20:5-44
@@ -79,221 +79,221 @@ MERGED from [android.arch.lifecycle:runtime:1.1.0] C:\Users\Ѧ
 MERGED from [android.arch.lifecycle:runtime:1.1.0] C:\Users\薛皓天\.gradle\caches\transforms-3\fa7fdda1e28a52e8d35570faa2c1916b\transformed\runtime-1.1.0\AndroidManifest.xml:20:5-44
 MERGED from [android.arch.core:runtime:1.1.0] C:\Users\薛皓天\.gradle\caches\transforms-3\efb3bde11e95de2829444273d12eec38\transformed\runtime-1.1.0\AndroidManifest.xml:20:5-44
 MERGED from [android.arch.core:runtime:1.1.0] C:\Users\薛皓天\.gradle\caches\transforms-3\efb3bde11e95de2829444273d12eec38\transformed\runtime-1.1.0\AndroidManifest.xml:20:5-44
-INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
-INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
+INJECTED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:23:5-44
+INJECTED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:23:5-44
 	android:targetSdkVersion
-		INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
-		INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml
+		INJECTED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:23:5-44
+		INJECTED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml
 	android:minSdkVersion
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:23:15-41
-		INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml
-		INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:23:15-41
+		INJECTED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml
+		INJECTED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml
 uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:25:5-81
 	android:name
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:25:22-78
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:25:22-78
 uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:26:5-88
 	android:name
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:26:22-85
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:26:22-85
 uses-permission#android.permission.INTERNET
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:27:5-67
 	android:name
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:27:22-64
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:27:22-64
 uses-permission#android.permission.READ_CONTACTS
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:28:5-72
 	android:name
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:28:22-69
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:28:22-69
 uses-permission#android.permission.MANAGE_ACCOUNTS
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:29:5-74
 	android:name
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:29:22-71
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:29:22-71
 uses-permission#android.permission.AUTHENTICATE_ACCOUNTS
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:30:5-80
 	android:name
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:30:22-77
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:30:22-77
 uses-permission#android.permission.GET_ACCOUNTS
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:31:5-71
 	android:name
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:31:22-68
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:31:22-68
 uses-permission#android.permission.USE_CREDENTIALS
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:32:5-74
 	android:name
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:32:22-71
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:32:22-71
 uses-permission#android.permission.RECEIVE_BOOT_COMPLETED
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:33:5-81
 	android:name
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:33:22-78
 application
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:35:5-161:19
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:35:5-161:19
 MERGED from [com.android.support.constraint:constraint-layout:1.1.0] C:\Users\薛皓天\.gradle\caches\transforms-3\ac71f32b165505a54e1cfb378ab298ed\transformed\constraint-layout-1.1.0\AndroidManifest.xml:9:5-20
 MERGED from [com.android.support.constraint:constraint-layout:1.1.0] C:\Users\薛皓天\.gradle\caches\transforms-3\ac71f32b165505a54e1cfb378ab298ed\transformed\constraint-layout-1.1.0\AndroidManifest.xml:9:5-20
 	android:label
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:37:9-41
 	android:icon
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:36:9-42
 activity#net.micode.notes.ui.login_signup_ui
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:39:9-48:20
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:39:9-48:20
 	android:label
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:41:13-46
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:41:13-46
 	android:theme
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:42:13-46
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:42:13-46
 	android:name
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:40:13-49
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:40:13-49
 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:44:13-47:29
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:44:13-47:29
 action#android.intent.action.MAIN
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:45:17-68
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:45:17-68
 	android:name
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:45:25-66
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:45:25-66
 category#android.intent.category.LAUNCHER
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:46:17-77
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:46:17-77
 	android:name
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:46:27-74
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:46:27-74
 activity#net.micode.notes.ui.NotesListActivity
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:50:9-63:20
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:50:9-63:20
 	android:label
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:53:13-45
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:53:13-45
 	android:launchMode
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:54:13-43
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:54:13-43
 	android:windowSoftInputMode
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:57:13-52
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:57:13-52
 	android:uiOptions
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:56:13-57
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:56:13-57
 	android:configChanges
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:52:13-74
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:52:13-74
 	android:theme
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:55:13-45
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:55:13-45
 	android:name
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:51:13-49
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:51:13-49
 intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:59:13-62:29
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:59:13-62:29
 action#android.intent.action.VIEW
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:60:17-69
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:60:17-69
 	android:name
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:60:25-66
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:60:25-66
 category#android.intent.category.DEFAULT
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:61:17-76
 	android:name
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:61:27-73
 activity#net.micode.notes.ui.NoteEditActivity
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:65:9-93:20
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:65:9-93:20
 	android:launchMode
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:68:13-43
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:68:13-43
 	android:configChanges
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:67:13-74
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:67:13-74
 	android:theme
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:69:13-45
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:69:13-45
 	android:name
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:66:13-48
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:66:13-48
 intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:78:13-83:29
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:78:13-83:29
 action#android.intent.action.INSERT_OR_EDIT
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:79:17-79
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:79:17-79
 	android:name
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:79:25-76
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:79:25-76
 data
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:81:17-78
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:81:17-78
 	android:mimeType
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:81:23-75
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:81:23-75
 intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:85:13-88:29
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:85:13-88:29
 action#android.intent.action.SEARCH
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:86:17-71
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:86:17-71
 	android:name
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:86:25-68
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:86:25-68
 meta-data#android.app.searchable
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:90:13-92:54
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:90:13-92:54
 	android:resource
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:92:17-51
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:92:17-51
 	android:name
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:91:17-54
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:91:17-54
 provider#net.micode.notes.data.NotesProvider
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:95:9-98:43
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:95:9-98:43
 	android:authorities
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:97:13-47
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:97:13-47
 	android:multiprocess
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:98:13-40
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:98:13-40
 	android:name
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:96:13-63
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:96:13-63
 receiver#net.micode.notes.widget.NoteWidgetProvider_2x
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:100:9-112:20
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:100:9-112:20
 	android:label
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:102:13-50
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:102:13-50
 	android:name
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:101:13-57
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:101:13-57
 intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:103:13-107:29
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:103:13-107:29
 action#android.appwidget.action.APPWIDGET_UPDATE
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:104:17-84
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:104:17-84
 	android:name
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:104:25-81
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:104:25-81
 action#android.appwidget.action.APPWIDGET_DELETED
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:105:17-85
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:105:17-85
 	android:name
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:105:25-82
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:105:25-82
 action#android.intent.action.PRIVACY_MODE_CHANGED
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:106:17-85
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:106:17-85
 	android:name
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:106:25-82
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:106:25-82
 meta-data#android.appwidget.provider
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:109:13-111:58
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:109:13-111:58
 	android:resource
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:111:17-55
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:111:17-55
 	android:name
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:110:17-58
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:110:17-58
 receiver#net.micode.notes.widget.NoteWidgetProvider_4x
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:113:9-126:20
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:113:9-126:20
 	android:label
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:115:13-50
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:115:13-50
 	android:name
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:114:13-57
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:114:13-57
 receiver#net.micode.notes.ui.AlarmInitReceiver
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:128:9-132:20
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:128:9-132:20
 	android:name
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:128:19-55
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:128:19-55
 intent-filter#action:name:android.intent.action.BOOT_COMPLETED
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:129:13-131:29
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:129:13-131:29
 action#android.intent.action.BOOT_COMPLETED
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:130:17-79
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:130:17-79
 	android:name
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:130:25-76
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:130:25-76
 receiver#net.micode.notes.ui.AlarmReceiver
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:134:9-137:20
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:134:9-137:20
 	android:process
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:136:13-38
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:136:13-38
 	android:name
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:135:13-61
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:135:13-61
 activity#net.micode.notes.ui.AlarmAlertActivity
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:139:9-144:20
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:139:9-144:20
 	android:label
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:141:13-45
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:141:13-45
 	android:launchMode
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:142:13-48
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:142:13-48
 	android:theme
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:143:13-75
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:143:13-75
 	android:name
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:140:13-50
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:140:13-50
 activity#net.micode.notes.ui.NotesPreferenceActivity
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:146:9-151:20
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:146:9-151:20
 	android:label
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:148:13-54
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:148:13-54
 	android:launchMode
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:149:13-43
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:149:13-43
 	android:theme
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:150:13-60
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:150:13-60
 	android:name
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:147:13-71
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:147:13-71
 service#net.micode.notes.gtask.remote.GTaskSyncService
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:153:9-156:19
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:153:9-156:19
 	android:exported
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:155:13-37
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:155:13-37
 	android:name
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:154:13-74
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:154:13-74
 meta-data#android.app.default_searchable
-ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:158:9-160:52
+ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:158:9-160:52
 	android:value
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:160:13-49
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:160:13-49
 	android:name
-		ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:159:13-58
+		ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:159:13-58

src/mi_and_login/app/src/main/java/net/micode/notes/data/Notes.java

@@ -83,6 +83,9 @@ public class Notes {
          * <P> Type: INTEGER (long) </P>
          */
 
+        // 用户名
+        public static final String user_name = "_user_name";
+
         // 对于一行唯一的ID
         public static final String ID = "_id";
 

src/mi_and_login/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java

@@ -45,6 +45,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
     private static final String CREATE_NOTE_TABLE_SQL =
         "CREATE TABLE " + TABLE.NOTE + "(" +
             NoteColumns.ID + " INTEGER PRIMARY KEY," +
+            NoteColumns.user_name + " TEXT NOT NULL DEFAULT ''," +
             NoteColumns.PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +
             NoteColumns.ALERTED_DATE + " INTEGER NOT NULL DEFAULT 0," +
             NoteColumns.BG_COLOR_ID + " INTEGER NOT NULL DEFAULT 0," +
@@ -66,6 +67,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
     private static final String CREATE_DATA_TABLE_SQL =
         "CREATE TABLE " + TABLE.DATA + "(" +
             DataColumns.ID + " INTEGER PRIMARY KEY," +
+            NoteColumns.user_name + " TEXT NOT NULL DEFAULT ''," +
             DataColumns.MIME_TYPE + " TEXT NOT NULL," +
             DataColumns.NOTE_ID + " INTEGER NOT NULL DEFAULT 0," +
             NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +

src/mi_and_login/app/src/main/java/net/micode/notes/data/NotesProvider.java

@@ -33,6 +33,7 @@ import net.micode.notes.R;
 import net.micode.notes.data.Notes.DataColumns;
 import net.micode.notes.data.Notes.NoteColumns;
 import net.micode.notes.data.NotesDatabaseHelper.TABLE;
+import net.micode.notes.ui.login_signup_ui;
 
 
 // NotesProvider 继承 ContentProvider
@@ -97,30 +98,61 @@ public class NotesProvider extends ContentProvider {
     public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
             String sortOrder) {
         Cursor c = null;
+        /**
+         * 注意筛选条件！！！！！！！！！！！！！！！！！！！！
+         */
+        String[] select = new String[]{login_signup_ui.get_user_name()} ;
+        /**
+         * ！！！！！！！！！！！！！！！！！！！！！！！！！！！
+         */
         SQLiteDatabase db = mHelper.getReadableDatabase();
         String id = null;
         switch (mMatcher.match(uri)) {
             case URI_NOTE:
                 // 当匹配结果是1的时候 查询便签信息
-                c = db.query(TABLE.NOTE, projection, selection, selectionArgs, null, null,
+                /**
+                 * 注意筛选条件！！！！！！！！！！！！！！！！！！！！
+                 */
+                c = db.query(TABLE.NOTE, projection, NoteColumns.user_name + " = ?", select , null, null,
                         sortOrder);
+                /**
+                 * 注意筛选条件！！！！！！！！！！！！！！！！！！！！
+                 */
                 break;
             case URI_NOTE_ITEM:
                 // 当匹配结果是2的时候 查询便签信息 获取id
-                id = uri.getPathSegments().get(1);
-                c = db.query(TABLE.NOTE, projection, NoteColumns.ID + "=" + id
-                        + parseSelection(selection), selectionArgs, null, null, sortOrder);
+                // id = uri.getPathSegments().get(1);
+                /**
+                 * 注意筛选条件！！！！！！！！！！！！！！！！！！！！
+                 */
+                c = db.query(TABLE.NOTE, projection, NoteColumns.user_name + " = ?"
+                        , select, null, null, sortOrder);
+                /**
+                 * 注意筛选条件！！！！！！！！！！！！！！！！！！！！
+                 */
                 break;
             case URI_DATA:
                 // 当匹配结果是3的时候 查询数据信息
-                c = db.query(TABLE.DATA, projection, selection, selectionArgs, null, null,
+                /**
+                 * 注意筛选条件！！！！！！！！！！！！！！！！！！！！
+                 */
+                c = db.query(TABLE.DATA, projection, NoteColumns.user_name + " = ?", select, null, null,
                         sortOrder);
+                /**
+                 * 注意筛选条件！！！！！！！！！！！！！！！！！！！！
+                 */
                 break;
             case URI_DATA_ITEM:
                 // 当匹配结果是4的时候 查询数据
-                id = uri.getPathSegments().get(1);
-                c = db.query(TABLE.DATA, projection, DataColumns.ID + "=" + id
-                        + parseSelection(selection), selectionArgs, null, null, sortOrder);
+                // id = uri.getPathSegments().get(1);
+                /**
+                 * 注意筛选条件！！！！！！！！！！！！！！！！！！！！
+                 */
+                c = db.query(TABLE.DATA, projection, NoteColumns.user_name + " = ?", select
+                        , null, null, sortOrder);
+                /**
+                 * 注意筛选条件！！！！！！！！！！！！！！！！！！！！
+                 */
                 break;
             case URI_SEARCH:
             case URI_SEARCH_SUGGEST:
@@ -163,6 +195,7 @@ public class NotesProvider extends ContentProvider {
     @Override
     public Uri insert(Uri uri, ContentValues values) {
         SQLiteDatabase db = mHelper.getWritableDatabase();
+        values.put("_user_name" , login_signup_ui.get_user_name());
         long dataId = 0, noteId = 0, insertedId = 0;
         switch (mMatcher.match(uri)) {
             case URI_NOTE:

src/mi_and_login/app/src/main/java/net/micode/notes/ui/login_signup_ui.java

@@ -30,8 +30,13 @@ import net.micode.notes.ui._user;
 
 public class login_signup_ui extends AppCompatActivity {
 
-    EditText username, password, reg_username, reg_password,
-            reg_firstName, reg_lastName, reg_email;
+    static EditText username;
+    EditText password;
+    EditText reg_username;
+    EditText reg_password;
+    EditText reg_firstName;
+    EditText reg_lastName;
+    EditText reg_email;
     Button login, signUp, reg_register;
     TextInputLayout txtInLayoutUsername, txtInLayoutPassword, txtInLayoutRegPassword;
     CheckBox rememberMe;
@@ -105,6 +110,10 @@ public class login_signup_ui extends AppCompatActivity {
         });
     }
 
+    public static String get_user_name()
+    {
+        return username.getText().toString().trim();
+    }
     // 用于打开注册页面的方法以及用于注册的其他处理或检查
     private void ClickSignUp() {
         // 先定义 AlertDialog.Builder 父类 builder

src/mi_and_login/local.properties

@@ -2,6 +2,7 @@
 # as it contains information specific to your local configuration.
 #
 # Location of the SDK. This is only used by Gradle.
-#
-#Sat Mar 18 10:45:44 GMT+08:00 2023
+# For customization when using a Version Control System, please read the
+# header note.
+#Tue May 23 11:43:00 GMT+08:00 2023
 sdk.dir=D\:\\androidSDK