diff --git a/src/mi_and_login/.gradle/7.5/executionHistory/executionHistory.bin b/src/mi_and_login/.gradle/7.5/executionHistory/executionHistory.bin index 19e4fca..39cbd4b 100644 Binary files a/src/mi_and_login/.gradle/7.5/executionHistory/executionHistory.bin and b/src/mi_and_login/.gradle/7.5/executionHistory/executionHistory.bin differ diff --git a/src/mi_and_login/.gradle/7.5/executionHistory/executionHistory.lock b/src/mi_and_login/.gradle/7.5/executionHistory/executionHistory.lock index c608f99..6371610 100644 Binary files a/src/mi_and_login/.gradle/7.5/executionHistory/executionHistory.lock and b/src/mi_and_login/.gradle/7.5/executionHistory/executionHistory.lock differ diff --git a/src/mi_and_login/.gradle/7.5/fileHashes/fileHashes.bin b/src/mi_and_login/.gradle/7.5/fileHashes/fileHashes.bin index 75753a0..92a5aa3 100644 Binary files a/src/mi_and_login/.gradle/7.5/fileHashes/fileHashes.bin and b/src/mi_and_login/.gradle/7.5/fileHashes/fileHashes.bin differ diff --git a/src/mi_and_login/.gradle/7.5/fileHashes/fileHashes.lock b/src/mi_and_login/.gradle/7.5/fileHashes/fileHashes.lock index 0a4c9c2..8151342 100644 Binary files a/src/mi_and_login/.gradle/7.5/fileHashes/fileHashes.lock and b/src/mi_and_login/.gradle/7.5/fileHashes/fileHashes.lock differ diff --git a/src/mi_and_login/.gradle/7.5/fileHashes/resourceHashesCache.bin b/src/mi_and_login/.gradle/7.5/fileHashes/resourceHashesCache.bin index e3e4124..a69c042 100644 Binary files a/src/mi_and_login/.gradle/7.5/fileHashes/resourceHashesCache.bin and b/src/mi_and_login/.gradle/7.5/fileHashes/resourceHashesCache.bin differ diff --git a/src/mi_and_login/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/mi_and_login/.gradle/buildOutputCleanup/buildOutputCleanup.lock index cbbb01c..55b2178 100644 Binary files a/src/mi_and_login/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/mi_and_login/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/mi_and_login/.gradle/buildOutputCleanup/outputFiles.bin b/src/mi_and_login/.gradle/buildOutputCleanup/outputFiles.bin index a4dd228..bbce4a1 100644 Binary files a/src/mi_and_login/.gradle/buildOutputCleanup/outputFiles.bin and b/src/mi_and_login/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/src/mi_and_login/.gradle/file-system.probe b/src/mi_and_login/.gradle/file-system.probe index 9ff734f..a346276 100644 Binary files a/src/mi_and_login/.gradle/file-system.probe and b/src/mi_and_login/.gradle/file-system.probe differ diff --git a/src/mi_and_login/app/build.gradle b/src/mi_and_login/app/build.gradle index 277caba..d26db6e 100644 --- a/src/mi_and_login/app/build.gradle +++ b/src/mi_and_login/app/build.gradle @@ -26,8 +26,10 @@ android { } dependencies { - implementation files('D:\\http\\httpcomponents-client-4.5.12\\lib\\httpclient-4.5.12.jar') + // implementation files('D:\\as_workplace\\httpcomponents-client-4.5.12-bin\\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 files('D:\\http\\httpcomponents-client-4.5.12\\lib\\httpclient-4.5.12.jar') implementation 'com.android.support:appcompat-v7:27.1.1' implementation 'com.android.support:cardview-v7:27.1.1' implementation 'com.android.support:design:27.1.1' diff --git a/src/mi_and_login/app/build/intermediates/apk/debug/app-debug.apk b/src/mi_and_login/app/build/intermediates/apk/debug/app-debug.apk index 1ad6492..10b4d13 100644 Binary files a/src/mi_and_login/app/build/intermediates/apk/debug/app-debug.apk and b/src/mi_and_login/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/src/mi_and_login/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/mi_and_login/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index 45fdf3c..92e9724 100644 Binary files a/src/mi_and_login/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/src/mi_and_login/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/src/mi_and_login/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/mi_and_login/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index b280083..eb70ec4 100644 Binary files a/src/mi_and_login/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/mi_and_login/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/src/mi_and_login/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex b/src/mi_and_login/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex index ccb789a..2708359 100644 Binary files a/src/mi_and_login/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex and b/src/mi_and_login/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex differ diff --git a/src/mi_and_login/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/src/mi_and_login/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state index 1b7564d..f91c532 100644 Binary files a/src/mi_and_login/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state and b/src/mi_and_login/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state differ diff --git a/src/mi_and_login/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lqfBCY5_gT7FYCvGvBdYRvJIUP0= b/src/mi_and_login/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lqfBCY5_gT7FYCvGvBdYRvJIUP0= index 163dc43..c1c1a70 100644 Binary files a/src/mi_and_login/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lqfBCY5_gT7FYCvGvBdYRvJIUP0= and b/src/mi_and_login/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lqfBCY5_gT7FYCvGvBdYRvJIUP0= differ diff --git a/src/mi_and_login/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/mi_and_login/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index bce98b0..d912eb0 100644 --- a/src/mi_and_login/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/src/mi_and_login/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,134 +1,134 @@ -#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 +#Tue May 30 14:54:58 GMT+08:00 2023 +net.micode.notes.app-main-16\:/drawable-hdpi/list_red_middle.9.png=D\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\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\:\\mi_and_login\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat diff --git a/src/mi_and_login/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/mi_and_login/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml index fedffc5..d27b51a 100644 --- a/src/mi_and_login/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml +++ b/src/mi_and_login/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml @@ -1901,7 +1901,7 @@ + 短信 邮件 - Login_Signup用户名密码记住我登录返回Logo姓名邮箱Confirm Email Address注册注册界面便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 + Login_Signup用户名密码记住我登录返回Logo姓名邮箱Confirm Email Address注册注册界面便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 %1$s 条符合“%2$s”的搜索结果 - + 短信 郵件 - 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 + 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 %1$s 條符合”%2$s“的搜尋結果 - + diff --git a/src/mi_and_login/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/mi_and_login/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index 4375955..282870d 100644 --- a/src/mi_and_login/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/src/mi_and_login/app/build/intermediates/incremental/mergeDebugAssets/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/mi_and_login/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/mi_and_login/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index 3e1dd1b..9128cad 100644 --- a/src/mi_and_login/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/src/mi_and_login/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/mi_and_login/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/mi_and_login/app/build/intermediates/incremental/mergeDebugShaders/merger.xml index 1b525e0..8cff9e2 100644 --- a/src/mi_and_login/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/src/mi_and_login/app/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/mi_and_login/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/mi_and_login/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 71c8afd..cc8cb60 100644 --- a/src/mi_and_login/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/mi_and_login/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#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 +#Tue May 30 20:16:28 GMT+08:00 2023 +base.0=D\:\\mi_and_login\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex renamed.0=classes.dex path.0=classes.dex diff --git a/src/mi_and_login/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 b/src/mi_and_login/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 index ff9c15f..ffa79a8 100644 Binary files a/src/mi_and_login/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 and b/src/mi_and_login/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 differ diff --git a/src/mi_and_login/app/build/intermediates/javac/debug/classes/net/micode/notes/data/DBmanager.class b/src/mi_and_login/app/build/intermediates/javac/debug/classes/net/micode/notes/data/DBmanager.class index 6c7976f..6e7fae7 100644 Binary files a/src/mi_and_login/app/build/intermediates/javac/debug/classes/net/micode/notes/data/DBmanager.class and b/src/mi_and_login/app/build/intermediates/javac/debug/classes/net/micode/notes/data/DBmanager.class differ diff --git a/src/mi_and_login/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class b/src/mi_and_login/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class index 81ba1d1..7a66cf5 100644 Binary files a/src/mi_and_login/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class and b/src/mi_and_login/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class differ diff --git a/src/mi_and_login/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/mi_and_login/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index f1081a5..85e09ee 100644 --- a/src/mi_and_login/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/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 D:\123\mi_and_login\app\src\main\AndroidManifest.xml:23:5-44 +22-->D:\mi_and_login\app\src\main\AndroidManifest.xml:23:5-44 23 android:minSdkVersion="14" -23-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:23:15-41 +23-->D:\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 +24-->D:\mi_and_login\app\src\main\AndroidManifest.xml:23:5-44 25 26 -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 +26-->D:\mi_and_login\app\src\main\AndroidManifest.xml:25:5-81 +26-->D:\mi_and_login\app\src\main\AndroidManifest.xml:25:22-78 27 -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 +27-->D:\mi_and_login\app\src\main\AndroidManifest.xml:26:5-88 +27-->D:\mi_and_login\app\src\main\AndroidManifest.xml:26:22-85 28 -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 +28-->D:\mi_and_login\app\src\main\AndroidManifest.xml:27:5-67 +28-->D:\mi_and_login\app\src\main\AndroidManifest.xml:27:22-64 29 -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 +29-->D:\mi_and_login\app\src\main\AndroidManifest.xml:28:5-72 +29-->D:\mi_and_login\app\src\main\AndroidManifest.xml:28:22-69 30 -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 +30-->D:\mi_and_login\app\src\main\AndroidManifest.xml:29:5-74 +30-->D:\mi_and_login\app\src\main\AndroidManifest.xml:29:22-71 31 -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 +31-->D:\mi_and_login\app\src\main\AndroidManifest.xml:30:5-80 +31-->D:\mi_and_login\app\src\main\AndroidManifest.xml:30:22-77 32 -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 +32-->D:\mi_and_login\app\src\main\AndroidManifest.xml:31:5-71 +32-->D:\mi_and_login\app\src\main\AndroidManifest.xml:31:22-68 33 -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 +33-->D:\mi_and_login\app\src\main\AndroidManifest.xml:32:5-74 +33-->D:\mi_and_login\app\src\main\AndroidManifest.xml:32:22-71 34 -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 +34-->D:\mi_and_login\app\src\main\AndroidManifest.xml:33:5-81 +34-->D:\mi_and_login\app\src\main\AndroidManifest.xml:33:22-78 35 36 D:\123\mi_and_login\app\src\main\AndroidManifest.xml:35:5-161:19 +36-->D:\mi_and_login\app\src\main\AndroidManifest.xml:35:5-161:19 37 android:debuggable="true" 38 android:icon="@drawable/icon_app" -38-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:36:9-42 +38-->D:\mi_and_login\app\src\main\AndroidManifest.xml:36:9-42 39 android:label="@string/app_name" -39-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:37:9-41 +39-->D:\mi_and_login\app\src\main\AndroidManifest.xml:37:9-41 40 android:testOnly="true" > 41 D:\123\mi_and_login\app\src\main\AndroidManifest.xml:39:9-48:20 +41-->D:\mi_and_login\app\src\main\AndroidManifest.xml:39:9-48:20 42 android:name="net.micode.notes.ui.login_signup_ui" -42-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:40:13-49 +42-->D:\mi_and_login\app\src\main\AndroidManifest.xml:40:13-49 43 android:label="@string/appname" -43-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:41:13-46 +43-->D:\mi_and_login\app\src\main\AndroidManifest.xml:41:13-46 44 android:theme="@style/AppTheme" > -44-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:42:13-46 +44-->D:\mi_and_login\app\src\main\AndroidManifest.xml:42:13-46 45 -45-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:44:13-47:29 +45-->D:\mi_and_login\app\src\main\AndroidManifest.xml:44:13-47:29 46 -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 +46-->D:\mi_and_login\app\src\main\AndroidManifest.xml:45:17-68 +46-->D:\mi_and_login\app\src\main\AndroidManifest.xml:45:25-66 47 48 -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 +48-->D:\mi_and_login\app\src\main\AndroidManifest.xml:46:17-77 +48-->D:\mi_and_login\app\src\main\AndroidManifest.xml:46:27-74 49 50 51 D:\123\mi_and_login\app\src\main\AndroidManifest.xml:50:9-63:20 +51-->D:\mi_and_login\app\src\main\AndroidManifest.xml:50:9-63:20 52 android:name="net.micode.notes.ui.NotesListActivity" -52-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:51:13-49 +52-->D:\mi_and_login\app\src\main\AndroidManifest.xml:51:13-49 53 android:configChanges="keyboardHidden|orientation|screenSize" -53-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:52:13-74 +53-->D:\mi_and_login\app\src\main\AndroidManifest.xml:52:13-74 54 android:label="@string/app_name" -54-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:53:13-45 +54-->D:\mi_and_login\app\src\main\AndroidManifest.xml:53:13-45 55 android:launchMode="singleTop" -55-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:54:13-43 +55-->D:\mi_and_login\app\src\main\AndroidManifest.xml:54:13-43 56 android:theme="@style/NoteTheme" -56-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:55:13-45 +56-->D:\mi_and_login\app\src\main\AndroidManifest.xml:55:13-45 57 android:uiOptions="splitActionBarWhenNarrow" -57-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:56:13-57 +57-->D:\mi_and_login\app\src\main\AndroidManifest.xml:56:13-57 58 android:windowSoftInputMode="adjustPan" > -58-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:57:13-52 +58-->D:\mi_and_login\app\src\main\AndroidManifest.xml:57:13-52 59 -59-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:59:13-62:29 +59-->D:\mi_and_login\app\src\main\AndroidManifest.xml:59:13-62:29 60 -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 +60-->D:\mi_and_login\app\src\main\AndroidManifest.xml:60:17-69 +60-->D:\mi_and_login\app\src\main\AndroidManifest.xml:60:25-66 61 62 -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 +62-->D:\mi_and_login\app\src\main\AndroidManifest.xml:61:17-76 +62-->D:\mi_and_login\app\src\main\AndroidManifest.xml:61:27-73 63 64 65 D:\123\mi_and_login\app\src\main\AndroidManifest.xml:65:9-93:20 +65-->D:\mi_and_login\app\src\main\AndroidManifest.xml:65:9-93:20 66 android:name="net.micode.notes.ui.NoteEditActivity" -66-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:66:13-48 +66-->D:\mi_and_login\app\src\main\AndroidManifest.xml:66:13-48 67 android:configChanges="keyboardHidden|orientation|screenSize" -67-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:67:13-74 +67-->D:\mi_and_login\app\src\main\AndroidManifest.xml:67:13-74 68 android:launchMode="singleTop" -68-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:68:13-43 +68-->D:\mi_and_login\app\src\main\AndroidManifest.xml:68:13-43 69 android:theme="@style/NoteTheme" > -69-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:69:13-45 +69-->D:\mi_and_login\app\src\main\AndroidManifest.xml:69:13-45 70 71 72 @@ -127,157 +127,157 @@ 76 77 78 -78-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:78:13-83:29 +78-->D:\mi_and_login\app\src\main\AndroidManifest.xml:78:13-83:29 79 -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 +79-->D:\mi_and_login\app\src\main\AndroidManifest.xml:79:17-79 +79-->D:\mi_and_login\app\src\main\AndroidManifest.xml:79:25-76 80 81 -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 +81-->D:\mi_and_login\app\src\main\AndroidManifest.xml:61:17-76 +81-->D:\mi_and_login\app\src\main\AndroidManifest.xml:61:27-73 82 83 -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 +83-->D:\mi_and_login\app\src\main\AndroidManifest.xml:81:17-78 +83-->D:\mi_and_login\app\src\main\AndroidManifest.xml:81:23-75 84 -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 +84-->D:\mi_and_login\app\src\main\AndroidManifest.xml:81:17-78 +84-->D:\mi_and_login\app\src\main\AndroidManifest.xml:81:23-75 85 86 -86-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:85:13-88:29 +86-->D:\mi_and_login\app\src\main\AndroidManifest.xml:85:13-88:29 87 -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 +87-->D:\mi_and_login\app\src\main\AndroidManifest.xml:86:17-71 +87-->D:\mi_and_login\app\src\main\AndroidManifest.xml:86:25-68 88 89 -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 +89-->D:\mi_and_login\app\src\main\AndroidManifest.xml:61:17-76 +89-->D:\mi_and_login\app\src\main\AndroidManifest.xml:61:27-73 90 91 92 D:\123\mi_and_login\app\src\main\AndroidManifest.xml:90:13-92:54 +92-->D:\mi_and_login\app\src\main\AndroidManifest.xml:90:13-92:54 93 android:name="android.app.searchable" -93-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:91:17-54 +93-->D:\mi_and_login\app\src\main\AndroidManifest.xml:91:17-54 94 android:resource="@xml/searchable" /> -94-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:92:17-51 +94-->D:\mi_and_login\app\src\main\AndroidManifest.xml:92:17-51 95 96 97 D:\123\mi_and_login\app\src\main\AndroidManifest.xml:95:9-98:43 +97-->D:\mi_and_login\app\src\main\AndroidManifest.xml:95:9-98:43 98 android:name="net.micode.notes.data.NotesProvider" -98-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:96:13-63 +98-->D:\mi_and_login\app\src\main\AndroidManifest.xml:96:13-63 99 android:authorities="micode_notes" -99-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:97:13-47 +99-->D:\mi_and_login\app\src\main\AndroidManifest.xml:97:13-47 100 android:multiprocess="true" /> -100-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:98:13-40 +100-->D:\mi_and_login\app\src\main\AndroidManifest.xml:98:13-40 101 102 D:\123\mi_and_login\app\src\main\AndroidManifest.xml:100:9-112:20 +102-->D:\mi_and_login\app\src\main\AndroidManifest.xml:100:9-112:20 103 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -103-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:101:13-57 +103-->D:\mi_and_login\app\src\main\AndroidManifest.xml:101:13-57 104 android:label="@string/app_widget2x2" > -104-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:102:13-50 +104-->D:\mi_and_login\app\src\main\AndroidManifest.xml:102:13-50 105 -105-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:103:13-107:29 +105-->D:\mi_and_login\app\src\main\AndroidManifest.xml:103:13-107:29 106 -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 +106-->D:\mi_and_login\app\src\main\AndroidManifest.xml:104:17-84 +106-->D:\mi_and_login\app\src\main\AndroidManifest.xml:104:25-81 107 -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 +107-->D:\mi_and_login\app\src\main\AndroidManifest.xml:105:17-85 +107-->D:\mi_and_login\app\src\main\AndroidManifest.xml:105:25-82 108 -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 +108-->D:\mi_and_login\app\src\main\AndroidManifest.xml:106:17-85 +108-->D:\mi_and_login\app\src\main\AndroidManifest.xml:106:25-82 109 110 111 D:\123\mi_and_login\app\src\main\AndroidManifest.xml:109:13-111:58 +111-->D:\mi_and_login\app\src\main\AndroidManifest.xml:109:13-111:58 112 android:name="android.appwidget.provider" -112-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:110:17-58 +112-->D:\mi_and_login\app\src\main\AndroidManifest.xml:110:17-58 113 android:resource="@xml/widget_2x_info" /> -113-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:111:17-55 +113-->D:\mi_and_login\app\src\main\AndroidManifest.xml:111:17-55 114 115 D:\123\mi_and_login\app\src\main\AndroidManifest.xml:113:9-126:20 +115-->D:\mi_and_login\app\src\main\AndroidManifest.xml:113:9-126:20 116 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -116-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:114:13-57 +116-->D:\mi_and_login\app\src\main\AndroidManifest.xml:114:13-57 117 android:label="@string/app_widget4x4" > -117-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:115:13-50 +117-->D:\mi_and_login\app\src\main\AndroidManifest.xml:115:13-50 118 -118-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:103:13-107:29 +118-->D:\mi_and_login\app\src\main\AndroidManifest.xml:103:13-107:29 119 -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 +119-->D:\mi_and_login\app\src\main\AndroidManifest.xml:104:17-84 +119-->D:\mi_and_login\app\src\main\AndroidManifest.xml:104:25-81 120 -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 +120-->D:\mi_and_login\app\src\main\AndroidManifest.xml:105:17-85 +120-->D:\mi_and_login\app\src\main\AndroidManifest.xml:105:25-82 121 -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 +121-->D:\mi_and_login\app\src\main\AndroidManifest.xml:106:17-85 +121-->D:\mi_and_login\app\src\main\AndroidManifest.xml:106:25-82 122 123 124 D:\123\mi_and_login\app\src\main\AndroidManifest.xml:109:13-111:58 +124-->D:\mi_and_login\app\src\main\AndroidManifest.xml:109:13-111:58 125 android:name="android.appwidget.provider" -125-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:110:17-58 +125-->D:\mi_and_login\app\src\main\AndroidManifest.xml:110:17-58 126 android:resource="@xml/widget_4x_info" /> -126-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:111:17-55 +126-->D:\mi_and_login\app\src\main\AndroidManifest.xml:111:17-55 127 128 -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 +128-->D:\mi_and_login\app\src\main\AndroidManifest.xml:128:9-132:20 +128-->D:\mi_and_login\app\src\main\AndroidManifest.xml:128:19-55 129 -129-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:129:13-131:29 +129-->D:\mi_and_login\app\src\main\AndroidManifest.xml:129:13-131:29 130 -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 +130-->D:\mi_and_login\app\src\main\AndroidManifest.xml:130:17-79 +130-->D:\mi_and_login\app\src\main\AndroidManifest.xml:130:25-76 131 132 133 D:\123\mi_and_login\app\src\main\AndroidManifest.xml:134:9-137:20 +133-->D:\mi_and_login\app\src\main\AndroidManifest.xml:134:9-137:20 134 android:name="net.micode.notes.ui.AlarmReceiver" -134-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:135:13-61 +134-->D:\mi_and_login\app\src\main\AndroidManifest.xml:135:13-61 135 android:process=":remote" > -135-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:136:13-38 +135-->D:\mi_and_login\app\src\main\AndroidManifest.xml:136:13-38 136 137 138 D:\123\mi_and_login\app\src\main\AndroidManifest.xml:139:9-144:20 +138-->D:\mi_and_login\app\src\main\AndroidManifest.xml:139:9-144:20 139 android:name="net.micode.notes.ui.AlarmAlertActivity" -139-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:140:13-50 +139-->D:\mi_and_login\app\src\main\AndroidManifest.xml:140:13-50 140 android:label="@string/app_name" -140-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:141:13-45 +140-->D:\mi_and_login\app\src\main\AndroidManifest.xml:141:13-45 141 android:launchMode="singleInstance" -141-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:142:13-48 +141-->D:\mi_and_login\app\src\main\AndroidManifest.xml:142:13-48 142 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -142-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:143:13-75 +142-->D:\mi_and_login\app\src\main\AndroidManifest.xml:143:13-75 143 144 D:\123\mi_and_login\app\src\main\AndroidManifest.xml:146:9-151:20 +144-->D:\mi_and_login\app\src\main\AndroidManifest.xml:146:9-151:20 145 android:name="net.micode.notes.ui.NotesPreferenceActivity" -145-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:147:13-71 +145-->D:\mi_and_login\app\src\main\AndroidManifest.xml:147:13-71 146 android:label="@string/preferences_title" -146-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:148:13-54 +146-->D:\mi_and_login\app\src\main\AndroidManifest.xml:148:13-54 147 android:launchMode="singleTop" -147-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:149:13-43 +147-->D:\mi_and_login\app\src\main\AndroidManifest.xml:149:13-43 148 android:theme="@android:style/Theme.Holo.Light" > -148-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:150:13-60 +148-->D:\mi_and_login\app\src\main\AndroidManifest.xml:150:13-60 149 150 151 D:\123\mi_and_login\app\src\main\AndroidManifest.xml:153:9-156:19 +151-->D:\mi_and_login\app\src\main\AndroidManifest.xml:153:9-156:19 152 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -152-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:154:13-74 +152-->D:\mi_and_login\app\src\main\AndroidManifest.xml:154:13-74 153 android:exported="false" > -153-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:155:13-37 +153-->D:\mi_and_login\app\src\main\AndroidManifest.xml:155:13-37 154 155 156 D:\123\mi_and_login\app\src\main\AndroidManifest.xml:158:9-160:52 +156-->D:\mi_and_login\app\src\main\AndroidManifest.xml:158:9-160:52 157 android:name="android.app.default_searchable" -157-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:159:13-58 +157-->D:\mi_and_login\app\src\main\AndroidManifest.xml:159:13-58 158 android:value=".ui.NoteEditActivity" /> -158-->D:\123\mi_and_login\app\src\main\AndroidManifest.xml:160:13-49 +158-->D:\mi_and_login\app\src\main\AndroidManifest.xml:160:13-49 159 160 161 diff --git a/src/mi_and_login/app/build/intermediates/merged_java_res/debug/base.jar b/src/mi_and_login/app/build/intermediates/merged_java_res/debug/base.jar index 371d526..ba54127 100644 Binary files a/src/mi_and_login/app/build/intermediates/merged_java_res/debug/base.jar and b/src/mi_and_login/app/build/intermediates/merged_java_res/debug/base.jar differ diff --git a/src/mi_and_login/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/mi_and_login/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json index fae0f50..91f7204 100644 --- a/src/mi_and_login/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ b/src/mi_and_login/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -723,6 +723,23 @@ { "outputFile": "net.micode.notes.app-merged_res-14:/values_values.arsc.flat", "map": [ + { + "source": "D:\\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": "C:\\Users\\薛皓天\\.gradle\\caches\\transforms-3\\180eeefb5c9fa290eae69b6eda4e2eae\\transformed\\appcompat-v7-27.1.1\\res\\values\\values.xml", "from": { @@ -778,78 +795,6 @@ "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,6 +833,44 @@ "endOffsets": "8622,8703,8767,8833,8903,8973,9043,9113,9180,17892,17971,18044,18109,18172,18243,18314,18376,18445,18511,18578,18645,18701,18752,18805,18857,18911,18974,19033,19095,19154,19214,19277,19352,19424,19495,19551,19622,19679,19736,19802,19866,19937,19994,20047,20110,20162,20220,24144,24189,24570,24762,24824,25004,25061,25118,28759,28929,29128,32928,33229,33395,33550,33652,37275,59871,104751,105342,127648,127740,127919,128087,128262,128515,128806,132956,133314,133546,133916,134076,134230,142711,142952,143387,143594,143778,144343,144704,144833,145500,145680,146389,149835,150001,150508,159433,159738,162680,163042,172034,173054,173191,174319,178688,179937,180070,181026,182716,183696,185326" } }, + { + "source": "D:\\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" + } + }, + { + "source": "D:\\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": "C:\\Users\\薛皓天\\.gradle\\caches\\transforms-3\\ac71f32b165505a54e1cfb378ab298ed\\transformed\\constraint-layout-1.1.0\\res\\values\\values.xml", "from": { @@ -924,6 +907,25 @@ "endOffsets": "23476,23689,23832,23887,23932,24278,24330,24379,24440,24490" } }, + { + "source": "D:\\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\\55305e3db23cb94d99efb75b6b3485cf\\transformed\\support-compat-27.1.1\\res\\values\\values.xml", "from": { @@ -943,6 +945,23 @@ "endOffsets": "10536,10599,17567,17635,17707,17777,17838,21451,21512,21574,21638,21700,21761,21829,21929,21989,22055,22128,22197,22254,22306,22368,23155,23231,23611,23646,24028,24062,24097,24224,25188,35713,126424,126625,126801,127185,127380,142544,142611,173752,174117" } }, + { + "source": "D:\\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": "C:\\Users\\薛皓天\\.gradle\\caches\\transforms-3\\75bdcf25050a121bb488a0dddc0959ed\\transformed\\support-media-compat-27.1.1\\res\\values\\values.xml", "from": { @@ -959,25 +978,6 @@ "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,7 @@ "outputFile": "net.micode.notes.app-merged_res-14:/values-zh-rTW_values-zh-rTW.arsc.flat", "map": [ { - "source": "D:\\123\\mi_and_login\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "D:\\mi_and_login\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", @@ -2075,25 +2075,6 @@ "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", - "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", - "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" - }, - "to": { - "startLines": "6,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,112,113,115,116,117,118,119,120,121,122,123,124,125", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,2012,2084,2150,2223,2273,2313,2361,2409,2454,2511,2565,2615,2677,2745,2822,2881,2947,3010,3065,3125,3188,3242,3302,3355,3417,3501,3581,3631,3690,3733,3786,3829,3880,3930,3990,4043,4094,4140,4188,4236,4282,4329,4379,4424,4483,4535,4587,4630,4677,4733,4788,4843,4887,4929,4970,5020,5079,5130,5179,5228,5275,5322,5369,5414,5465,5518,5593,5652,5709,5783,5847,5916,5994,6104,6208,6281,6347,6402,6467,6532,6581,6664,6742,6780,6825,6951,7013,7171,7226,7285,7352,7410,7472,7520,7565,7613,7664,7730", - "endLines": "8,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,112,113,115,116,117,118,119,120,121,122,123,124,125", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,2079,2145,2218,2268,2308,2356,2404,2449,2506,2560,2610,2672,2740,2817,2876,2942,3005,3060,3120,3183,3237,3297,3350,3412,3496,3576,3626,3685,3728,3781,3824,3875,3925,3985,4038,4089,4135,4183,4231,4277,4324,4374,4419,4478,4530,4582,4625,4672,4728,4783,4838,4882,4924,4965,5015,5074,5125,5174,5223,5270,5317,5364,5409,5460,5513,5588,5647,5704,5778,5842,5911,5989,6099,6203,6276,6342,6397,6462,6527,6576,6659,6737,6775,6820,6868,7008,7065,7221,7280,7347,7405,7467,7515,7560,7608,7659,7725,7791" - } - }, { "source": "C:\\Users\\薛皓天\\.gradle\\caches\\transforms-3\\180eeefb5c9fa290eae69b6eda4e2eae\\transformed\\appcompat-v7-27.1.1\\res\\values-zh-rTW\\values-zh-rTW.xml", "from": { @@ -2127,6 +2108,25 @@ "endColumns": "100", "endOffsets": "7166" } + }, + { + "source": "D:\\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", + "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", + "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" + }, + "to": { + "startLines": "6,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,112,113,115,116,117,118,119,120,121,122,123,124,125", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,2012,2084,2150,2223,2273,2313,2361,2409,2454,2511,2565,2615,2677,2745,2822,2881,2947,3010,3065,3125,3188,3242,3302,3355,3417,3501,3581,3631,3690,3733,3786,3829,3880,3930,3990,4043,4094,4140,4188,4236,4282,4329,4379,4424,4483,4535,4587,4630,4677,4733,4788,4843,4887,4929,4970,5020,5079,5130,5179,5228,5275,5322,5369,5414,5465,5518,5593,5652,5709,5783,5847,5916,5994,6104,6208,6281,6347,6402,6467,6532,6581,6664,6742,6780,6825,6951,7013,7171,7226,7285,7352,7410,7472,7520,7565,7613,7664,7730", + "endLines": "8,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,112,113,115,116,117,118,119,120,121,122,123,124,125", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,2079,2145,2218,2268,2308,2356,2404,2449,2506,2560,2610,2672,2740,2817,2876,2942,3005,3060,3120,3183,3237,3297,3350,3412,3496,3576,3626,3685,3728,3781,3824,3875,3925,3985,4038,4089,4135,4183,4231,4277,4324,4374,4419,4478,4530,4582,4625,4672,4728,4783,4838,4882,4924,4965,5015,5074,5125,5174,5223,5270,5317,5364,5409,5460,5513,5588,5647,5704,5778,5842,5911,5989,6099,6203,6276,6342,6397,6462,6527,6576,6659,6737,6775,6820,6868,7008,7065,7221,7280,7347,7405,7467,7515,7560,7608,7659,7725,7791" + } } ] }, @@ -2952,41 +2952,7 @@ "outputFile": "net.micode.notes.app-merged_res-14:/values-zh-rCN_values-zh-rCN.arsc.flat", "map": [ { - "source": "C:\\Users\\薛皓天\\.gradle\\caches\\transforms-3\\55305e3db23cb94d99efb75b6b3485cf\\transformed\\support-compat-27.1.1\\res\\values-zh-rCN\\values-zh-rCN.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "127", - "startColumns": "4", - "startOffsets": "7632", - "endColumns": "100", - "endOffsets": "7728" - } - }, - { - "source": "C:\\Users\\薛皓天\\.gradle\\caches\\transforms-3\\180eeefb5c9fa290eae69b6eda4e2eae\\transformed\\appcompat-v7-27.1.1\\res\\values-zh-rCN\\values-zh-rCN.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,201,296,396,478,575,681,757,833,911,1007,1103,1198,1295,1390,1488,1637,1731", - "endColumns": "95,94,99,81,96,105,75,75,77,95,95,94,96,94,97,148,93,77", - "endOffsets": "196,291,391,473,570,676,752,828,906,1002,1098,1193,1290,1385,1483,1632,1726,1804" - }, - "to": { - "startLines": "20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,124", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "847,943,1038,1138,1220,1317,1423,1499,1575,1653,1749,1845,1940,2037,2132,2230,2379,7435", - "endColumns": "95,94,99,81,96,105,75,75,77,95,95,94,96,94,97,148,93,77", - "endOffsets": "938,1033,1133,1215,1312,1418,1494,1570,1648,1744,1840,1935,2032,2127,2225,2374,2468,7508" - } - }, - { - "source": "D:\\123\\mi_and_login\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "D:\\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", @@ -3005,7 +2971,24 @@ } }, { - "source": "D:\\123\\mi_and_login\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "C:\\Users\\薛皓天\\.gradle\\caches\\transforms-3\\55305e3db23cb94d99efb75b6b3485cf\\transformed\\support-compat-27.1.1\\res\\values-zh-rCN\\values-zh-rCN.xml", + "from": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "100", + "endOffsets": "151" + }, + "to": { + "startLines": "127", + "startColumns": "4", + "startOffsets": "7632", + "endColumns": "100", + "endOffsets": "7728" + } + }, + { + "source": "D:\\mi_and_login\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", @@ -3022,6 +3005,23 @@ "endColumns": "19", "endOffsets": "210" } + }, + { + "source": "C:\\Users\\薛皓天\\.gradle\\caches\\transforms-3\\180eeefb5c9fa290eae69b6eda4e2eae\\transformed\\appcompat-v7-27.1.1\\res\\values-zh-rCN\\values-zh-rCN.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "105,201,296,396,478,575,681,757,833,911,1007,1103,1198,1295,1390,1488,1637,1731", + "endColumns": "95,94,99,81,96,105,75,75,77,95,95,94,96,94,97,148,93,77", + "endOffsets": "196,291,391,473,570,676,752,828,906,1002,1098,1193,1290,1385,1483,1632,1726,1804" + }, + "to": { + "startLines": "20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,124", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "847,943,1038,1138,1220,1317,1423,1499,1575,1653,1749,1845,1940,2037,2132,2230,2379,7435", + "endColumns": "95,94,99,81,96,105,75,75,77,95,95,94,96,94,97,148,93,77", + "endOffsets": "938,1033,1133,1215,1312,1418,1494,1570,1648,1744,1840,1935,2032,2127,2225,2374,2468,7508" + } } ] }, diff --git a/src/mi_and_login/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/mi_and_login/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json index ae95515..f418d67 100644 --- a/src/mi_and_login/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ b/src/mi_and_login/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json @@ -4,41 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-12:/values-zh-rCN/values-zh-rCN.xml", "map": [ { - "source": "C:\\Users\\薛皓天\\.gradle\\caches\\transforms-3\\55305e3db23cb94d99efb75b6b3485cf\\transformed\\support-compat-27.1.1\\res\\values-zh-rCN\\values-zh-rCN.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "127", - "startColumns": "4", - "startOffsets": "7632", - "endColumns": "100", - "endOffsets": "7728" - } - }, - { - "source": "C:\\Users\\薛皓天\\.gradle\\caches\\transforms-3\\180eeefb5c9fa290eae69b6eda4e2eae\\transformed\\appcompat-v7-27.1.1\\res\\values-zh-rCN\\values-zh-rCN.xml", - "from": { - "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "105,201,296,396,478,575,681,757,833,911,1007,1103,1198,1295,1390,1488,1637,1731", - "endColumns": "95,94,99,81,96,105,75,75,77,95,95,94,96,94,97,148,93,77", - "endOffsets": "196,291,391,473,570,676,752,828,906,1002,1098,1193,1290,1385,1483,1632,1726,1804" - }, - "to": { - "startLines": "20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,124", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "847,943,1038,1138,1220,1317,1423,1499,1575,1653,1749,1845,1940,2037,2132,2230,2379,7435", - "endColumns": "95,94,99,81,96,105,75,75,77,95,95,94,96,94,97,148,93,77", - "endOffsets": "938,1033,1133,1215,1312,1418,1494,1570,1648,1744,1840,1935,2032,2127,2225,2374,2468,7508" - } - }, - { - "source": "D:\\123\\mi_and_login\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "D:\\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", @@ -57,7 +23,24 @@ } }, { - "source": "D:\\123\\mi_and_login\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "C:\\Users\\薛皓天\\.gradle\\caches\\transforms-3\\55305e3db23cb94d99efb75b6b3485cf\\transformed\\support-compat-27.1.1\\res\\values-zh-rCN\\values-zh-rCN.xml", + "from": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "100", + "endOffsets": "151" + }, + "to": { + "startLines": "127", + "startColumns": "4", + "startOffsets": "7632", + "endColumns": "100", + "endOffsets": "7728" + } + }, + { + "source": "D:\\mi_and_login\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", @@ -74,6 +57,23 @@ "endColumns": "19", "endOffsets": "210" } + }, + { + "source": "C:\\Users\\薛皓天\\.gradle\\caches\\transforms-3\\180eeefb5c9fa290eae69b6eda4e2eae\\transformed\\appcompat-v7-27.1.1\\res\\values-zh-rCN\\values-zh-rCN.xml", + "from": { + "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "105,201,296,396,478,575,681,757,833,911,1007,1103,1198,1295,1390,1488,1637,1731", + "endColumns": "95,94,99,81,96,105,75,75,77,95,95,94,96,94,97,148,93,77", + "endOffsets": "196,291,391,473,570,676,752,828,906,1002,1098,1193,1290,1385,1483,1632,1726,1804" + }, + "to": { + "startLines": "20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,124", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "847,943,1038,1138,1220,1317,1423,1499,1575,1653,1749,1845,1940,2037,2132,2230,2379,7435", + "endColumns": "95,94,99,81,96,105,75,75,77,95,95,94,96,94,97,148,93,77", + "endOffsets": "938,1033,1133,1215,1312,1418,1494,1570,1648,1744,1840,1935,2032,2127,2225,2374,2468,7508" + } } ] } diff --git a/src/mi_and_login/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/mi_and_login/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json index db883af..f020788 100644 --- a/src/mi_and_login/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json +++ b/src/mi_and_login/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-12:/values-zh-rTW/values-zh-rTW.xml", "map": [ { - "source": "D:\\123\\mi_and_login\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "D:\\mi_and_login\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", @@ -22,25 +22,6 @@ "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", - "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", - "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" - }, - "to": { - "startLines": "6,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,112,113,115,116,117,118,119,120,121,122,123,124,125", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,2012,2084,2150,2223,2273,2313,2361,2409,2454,2511,2565,2615,2677,2745,2822,2881,2947,3010,3065,3125,3188,3242,3302,3355,3417,3501,3581,3631,3690,3733,3786,3829,3880,3930,3990,4043,4094,4140,4188,4236,4282,4329,4379,4424,4483,4535,4587,4630,4677,4733,4788,4843,4887,4929,4970,5020,5079,5130,5179,5228,5275,5322,5369,5414,5465,5518,5593,5652,5709,5783,5847,5916,5994,6104,6208,6281,6347,6402,6467,6532,6581,6664,6742,6780,6825,6951,7013,7171,7226,7285,7352,7410,7472,7520,7565,7613,7664,7730", - "endLines": "8,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,112,113,115,116,117,118,119,120,121,122,123,124,125", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,2079,2145,2218,2268,2308,2356,2404,2449,2506,2560,2610,2672,2740,2817,2876,2942,3005,3060,3120,3183,3237,3297,3350,3412,3496,3576,3626,3685,3728,3781,3824,3875,3925,3985,4038,4089,4135,4183,4231,4277,4324,4374,4419,4478,4530,4582,4625,4672,4728,4783,4838,4882,4924,4965,5015,5074,5125,5174,5223,5270,5317,5364,5409,5460,5513,5588,5647,5704,5778,5842,5911,5989,6099,6203,6276,6342,6397,6462,6527,6576,6659,6737,6775,6820,6868,7008,7065,7221,7280,7347,7405,7467,7515,7560,7608,7659,7725,7791" - } - }, { "source": "C:\\Users\\薛皓天\\.gradle\\caches\\transforms-3\\180eeefb5c9fa290eae69b6eda4e2eae\\transformed\\appcompat-v7-27.1.1\\res\\values-zh-rTW\\values-zh-rTW.xml", "from": { @@ -74,6 +55,25 @@ "endColumns": "100", "endOffsets": "7166" } + }, + { + "source": "D:\\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", + "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", + "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" + }, + "to": { + "startLines": "6,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,112,113,115,116,117,118,119,120,121,122,123,124,125", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,2012,2084,2150,2223,2273,2313,2361,2409,2454,2511,2565,2615,2677,2745,2822,2881,2947,3010,3065,3125,3188,3242,3302,3355,3417,3501,3581,3631,3690,3733,3786,3829,3880,3930,3990,4043,4094,4140,4188,4236,4282,4329,4379,4424,4483,4535,4587,4630,4677,4733,4788,4843,4887,4929,4970,5020,5079,5130,5179,5228,5275,5322,5369,5414,5465,5518,5593,5652,5709,5783,5847,5916,5994,6104,6208,6281,6347,6402,6467,6532,6581,6664,6742,6780,6825,6951,7013,7171,7226,7285,7352,7410,7472,7520,7565,7613,7664,7730", + "endLines": "8,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,112,113,115,116,117,118,119,120,121,122,123,124,125", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,2079,2145,2218,2268,2308,2356,2404,2449,2506,2560,2610,2672,2740,2817,2876,2942,3005,3060,3120,3183,3237,3297,3350,3412,3496,3576,3626,3685,3728,3781,3824,3875,3925,3985,4038,4089,4135,4183,4231,4277,4324,4374,4419,4478,4530,4582,4625,4672,4728,4783,4838,4882,4924,4965,5015,5074,5125,5174,5223,5270,5317,5364,5409,5460,5513,5588,5647,5704,5778,5842,5911,5989,6099,6203,6276,6342,6397,6462,6527,6576,6659,6737,6775,6820,6868,7008,7065,7221,7280,7347,7405,7467,7515,7560,7608,7659,7725,7791" + } } ] } diff --git a/src/mi_and_login/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/mi_and_login/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json index 2372653..a98310f 100644 --- a/src/mi_and_login/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ b/src/mi_and_login/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -3,6 +3,23 @@ { "outputFile": "net.micode.notes.app-mergeDebugResources-12:/values/values.xml", "map": [ + { + "source": "D:\\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": "C:\\Users\\薛皓天\\.gradle\\caches\\transforms-3\\180eeefb5c9fa290eae69b6eda4e2eae\\transformed\\appcompat-v7-27.1.1\\res\\values\\values.xml", "from": { @@ -58,78 +75,6 @@ "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,6 +113,44 @@ "endOffsets": "8622,8703,8767,8833,8903,8973,9043,9113,9180,17892,17971,18044,18109,18172,18243,18314,18376,18445,18511,18578,18645,18701,18752,18805,18857,18911,18974,19033,19095,19154,19214,19277,19352,19424,19495,19551,19622,19679,19736,19802,19866,19937,19994,20047,20110,20162,20220,24144,24189,24570,24762,24824,25004,25061,25118,28759,28929,29128,32928,33229,33395,33550,33652,37275,59871,104751,105342,127648,127740,127919,128087,128262,128515,128806,132956,133314,133546,133916,134076,134230,142711,142952,143387,143594,143778,144343,144704,144833,145500,145680,146389,149835,150001,150508,159433,159738,162680,163042,172034,173054,173191,174319,178688,179937,180070,181026,182716,183696,185326" } }, + { + "source": "D:\\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" + } + }, + { + "source": "D:\\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": "C:\\Users\\薛皓天\\.gradle\\caches\\transforms-3\\ac71f32b165505a54e1cfb378ab298ed\\transformed\\constraint-layout-1.1.0\\res\\values\\values.xml", "from": { @@ -204,6 +187,25 @@ "endOffsets": "23476,23689,23832,23887,23932,24278,24330,24379,24440,24490" } }, + { + "source": "D:\\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\\55305e3db23cb94d99efb75b6b3485cf\\transformed\\support-compat-27.1.1\\res\\values\\values.xml", "from": { @@ -223,6 +225,23 @@ "endOffsets": "10536,10599,17567,17635,17707,17777,17838,21451,21512,21574,21638,21700,21761,21829,21929,21989,22055,22128,22197,22254,22306,22368,23155,23231,23611,23646,24028,24062,24097,24224,25188,35713,126424,126625,126801,127185,127380,142544,142611,173752,174117" } }, + { + "source": "D:\\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": "C:\\Users\\薛皓天\\.gradle\\caches\\transforms-3\\75bdcf25050a121bb488a0dddc0959ed\\transformed\\support-media-compat-27.1.1\\res\\values\\values.xml", "from": { @@ -239,25 +258,6 @@ "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" - } } ] } diff --git a/src/mi_and_login/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/DBmanager.dex b/src/mi_and_login/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/DBmanager.dex index 9e5eab7..1e7d525 100644 Binary files a/src/mi_and_login/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/DBmanager.dex and b/src/mi_and_login/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/DBmanager.dex differ diff --git a/src/mi_and_login/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex b/src/mi_and_login/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex index ca74952..04c7dd0 100644 Binary files a/src/mi_and_login/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex and b/src/mi_and_login/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex differ diff --git a/src/mi_and_login/app/build/intermediates/source_set_path_map/debug/file-map.txt b/src/mi_and_login/app/build/intermediates/source_set_path_map/debug/file-map.txt index 6023f0a..5d389d0 100644 --- a/src/mi_and_login/app/build/intermediates/source_set_path_map/debug/file-map.txt +++ b/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:\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 +net.micode.notes.app-pngs-9 D:\mi_and_login\app\build\generated\res\pngs\debug +net.micode.notes.app-resValues-10 D:\mi_and_login\app\build\generated\res\resValues\debug +net.micode.notes.app-rs-11 D:\mi_and_login\app\build\generated\res\rs\debug +net.micode.notes.app-mergeDebugResources-12 D:\mi_and_login\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir +net.micode.notes.app-mergeDebugResources-13 D:\mi_and_login\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir +net.micode.notes.app-merged_res-14 D:\mi_and_login\app\build\intermediates\merged_res\debug +net.micode.notes.app-debug-15 D:\mi_and_login\app\src\debug\res +net.micode.notes.app-main-16 D:\mi_and_login\app\src\main\res diff --git a/src/mi_and_login/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/mi_and_login/app/build/outputs/logs/manifest-merger-debug-report.txt index 4630916..30b1b38 100644 --- a/src/mi_and_login/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/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:\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 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:18:1-162:12 +INJECTED from D:\mi_and_login\app\src\main\AndroidManifest.xml:18:1-162:12 +INJECTED from D:\mi_and_login\app\src\main\AndroidManifest.xml:18:1-162:12 +INJECTED from D:\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:\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:\mi_and_login\app\src\main\AndroidManifest.xml:18:1-162:12 +INJECTED from D:\mi_and_login\app\src\main\AndroidManifest.xml:18:1-162:12 +INJECTED from D:\mi_and_login\app\src\main\AndroidManifest.xml:18:1-162:12 package - 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 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:19:5-31 + INJECTED from D:\mi_and_login\app\src\main\AndroidManifest.xml + INJECTED from D:\mi_and_login\app\src\main\AndroidManifest.xml android:versionName - 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 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:21:5-30 + INJECTED from D:\mi_and_login\app\src\main\AndroidManifest.xml + INJECTED from D:\mi_and_login\app\src\main\AndroidManifest.xml xmlns:android - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:18:11-69 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:18:11-69 android:versionCode - 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 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:20:5-28 + INJECTED from D:\mi_and_login\app\src\main\AndroidManifest.xml + INJECTED from D:\mi_and_login\app\src\main\AndroidManifest.xml uses-sdk -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 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\mi_and_login\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\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:\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:\mi_and_login\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\mi_and_login\app\src\main\AndroidManifest.xml:23:5-44 android:targetSdkVersion - 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 + INJECTED from D:\mi_and_login\app\src\main\AndroidManifest.xml + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:23:5-44 + INJECTED from D:\mi_and_login\app\src\main\AndroidManifest.xml android:minSdkVersion - 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 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:23:15-41 + INJECTED from D:\mi_and_login\app\src\main\AndroidManifest.xml + INJECTED from D:\mi_and_login\app\src\main\AndroidManifest.xml uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:25:5-81 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:25:5-81 android:name - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:25:22-78 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:25:22-78 uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT -ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:26:5-88 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:26:5-88 android:name - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:26:22-85 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:26:22-85 uses-permission#android.permission.INTERNET -ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:27:5-67 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:27:5-67 android:name - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:27:22-64 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:27:22-64 uses-permission#android.permission.READ_CONTACTS -ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:28:5-72 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:28:5-72 android:name - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:28:22-69 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:28:22-69 uses-permission#android.permission.MANAGE_ACCOUNTS -ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:29:5-74 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:29:5-74 android:name - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:29:22-71 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:29:22-71 uses-permission#android.permission.AUTHENTICATE_ACCOUNTS -ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:30:5-80 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:30:5-80 android:name - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:30:22-77 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:30:22-77 uses-permission#android.permission.GET_ACCOUNTS -ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:31:5-71 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:31:5-71 android:name - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:31:22-68 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:31:22-68 uses-permission#android.permission.USE_CREDENTIALS -ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:32:5-74 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:32:5-74 android:name - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:32:22-71 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:32:22-71 uses-permission#android.permission.RECEIVE_BOOT_COMPLETED -ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:33:5-81 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:33:5-81 android:name - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:33:22-78 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:33:22-78 application -ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:35:5-161:19 +ADDED from D:\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:\123\mi_and_login\app\src\main\AndroidManifest.xml:37:9-41 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:37:9-41 android:icon - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:36:9-42 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:36:9-42 activity#net.micode.notes.ui.login_signup_ui -ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:39:9-48:20 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:39:9-48:20 android:label - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:41:13-46 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:41:13-46 android:theme - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:42:13-46 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:42:13-46 android:name - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:40:13-49 + ADDED from D:\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:\123\mi_and_login\app\src\main\AndroidManifest.xml:44:13-47:29 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:44:13-47:29 action#android.intent.action.MAIN -ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:45:17-68 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:45:17-68 android:name - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:45:25-66 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:45:25-66 category#android.intent.category.LAUNCHER -ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:46:17-77 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:46:17-77 android:name - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:46:27-74 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:46:27-74 activity#net.micode.notes.ui.NotesListActivity -ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:50:9-63:20 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:50:9-63:20 android:label - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:53:13-45 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:53:13-45 android:launchMode - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:54:13-43 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:54:13-43 android:windowSoftInputMode - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:57:13-52 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:57:13-52 android:uiOptions - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:56:13-57 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:56:13-57 android:configChanges - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:52:13-74 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:52:13-74 android:theme - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:55:13-45 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:55:13-45 android:name - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:51:13-49 + ADDED from D:\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:\123\mi_and_login\app\src\main\AndroidManifest.xml:59:13-62:29 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:59:13-62:29 action#android.intent.action.VIEW -ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:60:17-69 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:60:17-69 android:name - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:60:25-66 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:60:25-66 category#android.intent.category.DEFAULT -ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:61:17-76 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:61:17-76 android:name - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:61:27-73 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:61:27-73 activity#net.micode.notes.ui.NoteEditActivity -ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:65:9-93:20 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:65:9-93:20 android:launchMode - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:68:13-43 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:68:13-43 android:configChanges - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:67:13-74 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:67:13-74 android:theme - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:69:13-45 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:69:13-45 android:name - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:66:13-48 + ADDED from D:\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:\123\mi_and_login\app\src\main\AndroidManifest.xml:78:13-83:29 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:78:13-83:29 action#android.intent.action.INSERT_OR_EDIT -ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:79:17-79 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:79:17-79 android:name - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:79:25-76 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:79:25-76 data -ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:81:17-78 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:81:17-78 android:mimeType - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:81:23-75 + ADDED from D:\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:\123\mi_and_login\app\src\main\AndroidManifest.xml:85:13-88:29 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:85:13-88:29 action#android.intent.action.SEARCH -ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:86:17-71 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:86:17-71 android:name - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:86:25-68 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:86:25-68 meta-data#android.app.searchable -ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:90:13-92:54 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:90:13-92:54 android:resource - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:92:17-51 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:92:17-51 android:name - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:91:17-54 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:91:17-54 provider#net.micode.notes.data.NotesProvider -ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:95:9-98:43 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:95:9-98:43 android:authorities - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:97:13-47 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:97:13-47 android:multiprocess - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:98:13-40 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:98:13-40 android:name - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:96:13-63 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:96:13-63 receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:100:9-112:20 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:100:9-112:20 android:label - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:102:13-50 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:102:13-50 android:name - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:101:13-57 + ADDED from D:\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:\123\mi_and_login\app\src\main\AndroidManifest.xml:103:13-107:29 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:103:13-107:29 action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:104:17-84 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:104:17-84 android:name - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:104:25-81 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:104:25-81 action#android.appwidget.action.APPWIDGET_DELETED -ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:105:17-85 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:105:17-85 android:name - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:105:25-82 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:105:25-82 action#android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:106:17-85 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:106:17-85 android:name - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:106:25-82 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:106:25-82 meta-data#android.appwidget.provider -ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:109:13-111:58 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:109:13-111:58 android:resource - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:111:17-55 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:111:17-55 android:name - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:110:17-58 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:110:17-58 receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:113:9-126:20 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:113:9-126:20 android:label - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:115:13-50 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:115:13-50 android:name - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:114:13-57 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:114:13-57 receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:128:9-132:20 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:128:9-132:20 android:name - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:128:19-55 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:128:19-55 intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:129:13-131:29 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:129:13-131:29 action#android.intent.action.BOOT_COMPLETED -ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:130:17-79 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:130:17-79 android:name - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:130:25-76 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:130:25-76 receiver#net.micode.notes.ui.AlarmReceiver -ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:134:9-137:20 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:134:9-137:20 android:process - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:136:13-38 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:136:13-38 android:name - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:135:13-61 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:135:13-61 activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:139:9-144:20 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:139:9-144:20 android:label - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:141:13-45 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:141:13-45 android:launchMode - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:142:13-48 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:142:13-48 android:theme - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:143:13-75 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:143:13-75 android:name - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:140:13-50 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:140:13-50 activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:146:9-151:20 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:146:9-151:20 android:label - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:148:13-54 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:148:13-54 android:launchMode - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:149:13-43 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:149:13-43 android:theme - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:150:13-60 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:150:13-60 android:name - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:147:13-71 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:147:13-71 service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:153:9-156:19 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:153:9-156:19 android:exported - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:155:13-37 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:155:13-37 android:name - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:154:13-74 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:154:13-74 meta-data#android.app.default_searchable -ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:158:9-160:52 +ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:158:9-160:52 android:value - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:160:13-49 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:160:13-49 android:name - ADDED from D:\123\mi_and_login\app\src\main\AndroidManifest.xml:159:13-58 + ADDED from D:\mi_and_login\app\src\main\AndroidManifest.xml:159:13-58 diff --git a/src/mi_and_login/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/mi_and_login/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin index 50f2566..7280766 100644 Binary files a/src/mi_and_login/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/src/mi_and_login/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ diff --git a/src/mi_and_login/app/src/main/java/net/micode/notes/data/DBmanager.java b/src/mi_and_login/app/src/main/java/net/micode/notes/data/DBmanager.java index a75fcfb..faba5ed 100644 --- a/src/mi_and_login/app/src/main/java/net/micode/notes/data/DBmanager.java +++ b/src/mi_and_login/app/src/main/java/net/micode/notes/data/DBmanager.java @@ -52,7 +52,7 @@ public class DBmanager boolean flag = false; while(cur.moveToNext()) { - String pass = cur.getString(2); + String pass = cur.getString(1); if(pass.equals(reg_password.getText().toString().trim())) { @@ -73,8 +73,8 @@ public class DBmanager boolean flag = false; while (cur.moveToNext()) { - String name = cur.getString(1); - + String name = cur.getString(0); + System.out.println(name); if (name.equals(reg_username.getText().toString().trim())) { flag = true; diff --git a/src/mi_and_login/app/src/main/java/net/micode/notes/data/NotesProvider.java b/src/mi_and_login/app/src/main/java/net/micode/notes/data/NotesProvider.java index 9aaed8b..fcd4d3b 100644 --- a/src/mi_and_login/app/src/main/java/net/micode/notes/data/NotesProvider.java +++ b/src/mi_and_login/app/src/main/java/net/micode/notes/data/NotesProvider.java @@ -98,61 +98,31 @@ 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, 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.user_name + " = ?" , select, null, null, sortOrder); - /** - * 注意筛选条件！！！！！！！！！！！！！！！！！！！！ - */ break; case URI_DATA: // 当匹配结果是3的时候 查询数据信息 - /** - * 注意筛选条件！！！！！！！！！！！！！！！！！！！！ - */ 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, NoteColumns.user_name + " = ?", select , null, null, sortOrder); - /** - * 注意筛选条件！！！！！！！！！！！！！！！！！！！！ - */ break; case URI_SEARCH: case URI_SEARCH_SUGGEST: diff --git a/src/mi_and_login/local.properties b/src/mi_and_login/local.properties index 831525f..31c3efa 100644 --- a/src/mi_and_login/local.properties +++ b/src/mi_and_login/local.properties @@ -4,5 +4,5 @@ # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -#Tue May 23 11:43:00 GMT+08:00 2023 +#Mon May 22 21:38:21 CST 2023 sdk.dir=D\:\\androidSDK