diff --git a/src/.gradle/8.0/executionHistory/executionHistory.bin b/src/.gradle/8.0/executionHistory/executionHistory.bin index aa0f5cb6..f7e5d141 100644 Binary files a/src/.gradle/8.0/executionHistory/executionHistory.bin and b/src/.gradle/8.0/executionHistory/executionHistory.bin differ diff --git a/src/.gradle/8.0/executionHistory/executionHistory.lock b/src/.gradle/8.0/executionHistory/executionHistory.lock index dcc0aebb..27e4bcfe 100644 Binary files a/src/.gradle/8.0/executionHistory/executionHistory.lock and b/src/.gradle/8.0/executionHistory/executionHistory.lock differ diff --git a/src/.gradle/8.0/fileHashes/fileHashes.bin b/src/.gradle/8.0/fileHashes/fileHashes.bin index 827f3df5..a5c1a8e7 100644 Binary files a/src/.gradle/8.0/fileHashes/fileHashes.bin and b/src/.gradle/8.0/fileHashes/fileHashes.bin differ diff --git a/src/.gradle/8.0/fileHashes/fileHashes.lock b/src/.gradle/8.0/fileHashes/fileHashes.lock index c9d98fbe..fc2f3ee9 100644 Binary files a/src/.gradle/8.0/fileHashes/fileHashes.lock and b/src/.gradle/8.0/fileHashes/fileHashes.lock differ diff --git a/src/.gradle/8.0/fileHashes/resourceHashesCache.bin b/src/.gradle/8.0/fileHashes/resourceHashesCache.bin index 42a32094..50576676 100644 Binary files a/src/.gradle/8.0/fileHashes/resourceHashesCache.bin and b/src/.gradle/8.0/fileHashes/resourceHashesCache.bin differ diff --git a/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 4eb9108f..8cacd7a9 100644 Binary files a/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/.gradle/buildOutputCleanup/outputFiles.bin b/src/.gradle/buildOutputCleanup/outputFiles.bin index f8f8c1b4..de7ccaa0 100644 Binary files a/src/.gradle/buildOutputCleanup/outputFiles.bin and b/src/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/src/.gradle/file-system.probe b/src/.gradle/file-system.probe index 19794a81..6c9ecda3 100644 Binary files a/src/.gradle/file-system.probe and b/src/.gradle/file-system.probe differ diff --git a/src/.idea/deploymentTargetDropDown.xml b/src/.idea/deploymentTargetDropDown.xml index 0974c4a1..02150a46 100644 --- a/src/.idea/deploymentTargetDropDown.xml +++ b/src/.idea/deploymentTargetDropDown.xml @@ -7,19 +7,11 @@ -<<<<<<< HEAD - -======= ->>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241 -<<<<<<< HEAD - -======= ->>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241 \ No newline at end of file diff --git a/src/Notes-master.zip b/src/Notes-master.zip deleted file mode 100644 index 102fec5f..00000000 Binary files a/src/Notes-master.zip and /dev/null differ diff --git a/src/app/build.gradle b/src/app/build.gradle index 5f8dae69..d9938176 100644 --- a/src/app/build.gradle +++ b/src/app/build.gradle @@ -2,18 +2,10 @@ apply plugin: 'com.android.application' android { namespace "net.micode.notes" -<<<<<<< HEAD - compileSdkVersion 22 - buildToolsVersion "34.0.0" - useLibrary'org.apache.http.legacy' - - -======= compileSdk 34 buildToolsVersion "34.0.0" useLibrary'org.apache.http.legacy' ->>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241 defaultConfig { applicationId "net.micode.notes" targetSdkVersion 14 diff --git a/src/app/build/intermediates/apk/debug/app-debug.apk b/src/app/build/intermediates/apk/debug/app-debug.apk index bd61f099..1f614d97 100644 Binary files a/src/app/build/intermediates/apk/debug/app-debug.apk and b/src/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin index b0643ce7..601f245f 100644 Binary files a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin index 0e94a866..601f245f 100644 Binary files a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin index d5d163c7..601f245f 100644 Binary files a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin index f44416a7..601f245f 100644 Binary files a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin index 8caf6c09..601f245f 100644 Binary files a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin index 2e3bb371..601f245f 100644 Binary files a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin differ diff --git a/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index 05a4c8f9..e127ff43 100644 Binary files a/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index b0aea649..2c3e11f2 100644 Binary files a/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index 2af09343..1d013836 100644 --- a/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,101 +1,3 @@ -<<<<<<< HEAD -#Mon Nov 06 20:07:48 CST 2023 -net.micode.notes.app-main-6\:/color/primary_text_dark.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat -net.micode.notes.app-main-6\:/color/secondary_text_dark.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat -net.micode.notes.app-main-6\:/drawable-hdpi/bg_btn_set_color.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/bg_color_btn_mask.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/call_record.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/clock.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/delete.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/dropdown_icon.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/edit_blue.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/edit_green.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/edit_red.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_blue.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_green.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_red.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_white.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_yellow.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/edit_white.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/edit_yellow.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/font_large.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/font_normal.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/font_size_selector_bg.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/font_small.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/font_super.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/icon_app.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_background.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_down.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_middle.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_single.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_up.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_folder.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_footer_bg.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_green_down.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_green_middle.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_green_single.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_green_up.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_red_down.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_red_middle.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_red_single.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_red_up.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_white_down.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_white_middle.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_white_single.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_white_up.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_down.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_middle.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_single.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_up.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/menu_delete.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/menu_move.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/new_note_normal.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/new_note_pressed.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/note_edit_color_selector_panel.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/notification.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/search_result.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/selected.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/title_alert.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/title_bar_bg.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_blue.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_green.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_red.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_white.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_yellow.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_blue.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_green.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_red.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_white.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_yellow.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat -net.micode.notes.app-main-6\:/drawable/new_note.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat -net.micode.notes.app-main-6\:/layout/account_dialog_title.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat -net.micode.notes.app-main-6\:/layout/add_account_text.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat -net.micode.notes.app-main-6\:/layout/datetime_picker.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat -net.micode.notes.app-main-6\:/layout/dialog_edit_text.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat -net.micode.notes.app-main-6\:/layout/folder_list_item.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat -net.micode.notes.app-main-6\:/layout/note_edit.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat -net.micode.notes.app-main-6\:/layout/note_edit_list_item.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat -net.micode.notes.app-main-6\:/layout/note_item.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat -net.micode.notes.app-main-6\:/layout/note_list.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat -net.micode.notes.app-main-6\:/layout/note_list_dropdown_menu.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat -net.micode.notes.app-main-6\:/layout/note_list_footer.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat -net.micode.notes.app-main-6\:/layout/settings_header.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat -net.micode.notes.app-main-6\:/layout/widget_2x.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat -net.micode.notes.app-main-6\:/layout/widget_4x.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat -net.micode.notes.app-main-6\:/menu/call_note_edit.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat -net.micode.notes.app-main-6\:/menu/call_record_folder.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat -net.micode.notes.app-main-6\:/menu/note_edit.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat -net.micode.notes.app-main-6\:/menu/note_list.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat -net.micode.notes.app-main-6\:/menu/note_list_dropdown.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat -net.micode.notes.app-main-6\:/menu/note_list_options.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat -net.micode.notes.app-main-6\:/menu/sub_folder.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat -net.micode.notes.app-main-6\:/raw-zh-rCN/introduction=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat -net.micode.notes.app-main-6\:/raw/introduction=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat -net.micode.notes.app-main-6\:/xml/preferences.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat -net.micode.notes.app-main-6\:/xml/searchable.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat -net.micode.notes.app-main-6\:/xml/widget_2x_info.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat -net.micode.notes.app-main-6\:/xml/widget_4x_info.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat -======= #Sat Dec 09 00:14:06 CST 2023 net.micode.notes.app-main-6\:/color/primary_text_dark.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat net.micode.notes.app-main-6\:/color/secondary_text_dark.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat @@ -192,4 +94,3 @@ net.micode.notes.app-main-6\:/xml/preferences.xml=C\:\\Users\\huigenb\\Desktop\\ net.micode.notes.app-main-6\:/xml/searchable.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat net.micode.notes.app-main-6\:/xml/widget_2x_info.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat net.micode.notes.app-main-6\:/xml/widget_4x_info.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat ->>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241 diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml index 866320d1..01024588 100644 --- a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml +++ b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml @@ -133,11 +133,7 @@ - 短信 - 邮件 - 便签便签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新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 - %1$s 條符合”%2$s“的搜尋結果 - -======= visible 短信 @@ -79,5 +53,4 @@ 郵件 便簽便簽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“的搜尋結果 - ->>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241 + \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/src/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties index d83408f4..fddad53e 100644 --- a/src/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties +++ b/src/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties @@ -1,101 +1,3 @@ -<<<<<<< HEAD -#Mon Nov 06 20:07:49 CST 2023 -net.micode.notes.app-main-5\:/color/primary_text_dark.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml -net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml -net.micode.notes.app-main-5\:/drawable-hdpi/bg_btn_set_color.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_btn_set_color.png -net.micode.notes.app-main-5\:/drawable-hdpi/bg_color_btn_mask.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_color_btn_mask.png -net.micode.notes.app-main-5\:/drawable-hdpi/call_record.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\call_record.png -net.micode.notes.app-main-5\:/drawable-hdpi/clock.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\clock.png -net.micode.notes.app-main-5\:/drawable-hdpi/delete.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\delete.png -net.micode.notes.app-main-5\:/drawable-hdpi/dropdown_icon.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\dropdown_icon.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_blue.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_blue.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_green.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_green.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_red.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_red.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_blue.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_blue.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_green.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_green.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_red.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_red.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_white.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_white.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_yellow.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_yellow.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_white.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_white.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_yellow.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_yellow.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/font_large.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_large.png -net.micode.notes.app-main-5\:/drawable-hdpi/font_normal.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_normal.png -net.micode.notes.app-main-5\:/drawable-hdpi/font_size_selector_bg.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_size_selector_bg.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/font_small.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_small.png -net.micode.notes.app-main-5\:/drawable-hdpi/font_super.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_super.png -net.micode.notes.app-main-5\:/drawable-hdpi/icon_app.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\icon_app.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_background.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_background.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_down.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_down.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_middle.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_middle.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_single.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_single.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_up.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_up.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_folder.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_folder.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_footer_bg.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_footer_bg.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_green_down.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_down.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_green_middle.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_middle.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_green_single.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_single.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_green_up.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_up.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_red_down.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_down.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_red_middle.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_middle.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_red_single.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_single.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_red_up.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_up.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_white_down.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_down.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_white_middle.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_middle.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_white_single.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_single.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_white_up.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_up.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_down.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_down.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_middle.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_middle.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_single.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_single.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_up.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_up.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/menu_delete.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_delete.png -net.micode.notes.app-main-5\:/drawable-hdpi/menu_move.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_move.png -net.micode.notes.app-main-5\:/drawable-hdpi/new_note_normal.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_normal.png -net.micode.notes.app-main-5\:/drawable-hdpi/new_note_pressed.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_pressed.png -net.micode.notes.app-main-5\:/drawable-hdpi/note_edit_color_selector_panel.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\note_edit_color_selector_panel.png -net.micode.notes.app-main-5\:/drawable-hdpi/notification.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\notification.png -net.micode.notes.app-main-5\:/drawable-hdpi/search_result.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\search_result.png -net.micode.notes.app-main-5\:/drawable-hdpi/selected.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\selected.png -net.micode.notes.app-main-5\:/drawable-hdpi/title_alert.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_alert.png -net.micode.notes.app-main-5\:/drawable-hdpi/title_bar_bg.9.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_bar_bg.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_blue.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_blue.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_green.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_green.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_red.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_red.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_white.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_white.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_yellow.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_yellow.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_blue.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_blue.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_green.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_green.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_red.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_red.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_white.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_white.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_yellow.png=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_yellow.png -net.micode.notes.app-main-5\:/drawable/new_note.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\new_note.xml -net.micode.notes.app-main-5\:/layout/account_dialog_title.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\account_dialog_title.xml -net.micode.notes.app-main-5\:/layout/add_account_text.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\add_account_text.xml -net.micode.notes.app-main-5\:/layout/datetime_picker.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\datetime_picker.xml -net.micode.notes.app-main-5\:/layout/dialog_edit_text.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_edit_text.xml -net.micode.notes.app-main-5\:/layout/folder_list_item.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\folder_list_item.xml -net.micode.notes.app-main-5\:/layout/note_edit.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit.xml -net.micode.notes.app-main-5\:/layout/note_edit_list_item.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit_list_item.xml -net.micode.notes.app-main-5\:/layout/note_item.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_item.xml -net.micode.notes.app-main-5\:/layout/note_list.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list.xml -net.micode.notes.app-main-5\:/layout/note_list_dropdown_menu.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_dropdown_menu.xml -net.micode.notes.app-main-5\:/layout/note_list_footer.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_footer.xml -net.micode.notes.app-main-5\:/layout/settings_header.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\settings_header.xml -net.micode.notes.app-main-5\:/layout/widget_2x.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_2x.xml -net.micode.notes.app-main-5\:/layout/widget_4x.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_4x.xml -net.micode.notes.app-main-5\:/menu/call_note_edit.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_note_edit.xml -net.micode.notes.app-main-5\:/menu/call_record_folder.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_record_folder.xml -net.micode.notes.app-main-5\:/menu/note_edit.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_edit.xml -net.micode.notes.app-main-5\:/menu/note_list.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list.xml -net.micode.notes.app-main-5\:/menu/note_list_dropdown.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_dropdown.xml -net.micode.notes.app-main-5\:/menu/note_list_options.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_options.xml -net.micode.notes.app-main-5\:/menu/sub_folder.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\sub_folder.xml -net.micode.notes.app-main-5\:/raw-zh-rCN/introduction=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\raw-zh-rCN\\introduction -net.micode.notes.app-main-5\:/raw/introduction=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\raw\\introduction -net.micode.notes.app-main-5\:/xml/preferences.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\preferences.xml -net.micode.notes.app-main-5\:/xml/searchable.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\searchable.xml -net.micode.notes.app-main-5\:/xml/widget_2x_info.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_2x_info.xml -net.micode.notes.app-main-5\:/xml/widget_4x_info.xml=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_4x_info.xml -======= #Sat Dec 09 00:14:06 CST 2023 net.micode.notes.app-main-5\:/color/primary_text_dark.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml @@ -192,4 +94,3 @@ net.micode.notes.app-main-5\:/xml/preferences.xml=C\:\\Users\\huigenb\\Desktop\\ net.micode.notes.app-main-5\:/xml/searchable.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\searchable.xml net.micode.notes.app-main-5\:/xml/widget_2x_info.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_2x_info.xml net.micode.notes.app-main-5\:/xml/widget_4x_info.xml=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_4x_info.xml ->>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241 diff --git a/src/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml b/src/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml index 866320d1..01024588 100644 --- a/src/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml +++ b/src/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml @@ -133,11 +133,7 @@ - 短信 - 邮件 - 便签便签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新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 - %1$s 條符合”%2$s“的搜尋結果 - -======= visible 短信 @@ -79,5 +53,4 @@ 郵件 便簽便簽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“的搜尋結果 - ->>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241 + \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index 721ab775..1c454e33 100644 --- a/src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml @@ -1,6 +1,2 @@ -<<<<<<< HEAD - -======= - ->>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241 + \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index a468403b..0fcbe8e9 100644 --- a/src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -1,6 +1,2 @@ -<<<<<<< HEAD - -======= - ->>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241 + \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml index 7cf71e3b..2c78f8c9 100644 --- a/src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -1,6 +1,2 @@ -<<<<<<< HEAD - -======= - ->>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241 + \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 1dd44fff..5a5e78df 100644 --- a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,9 +1,4 @@ -<<<<<<< HEAD -#Mon Nov 06 20:07:52 CST 2023 -base.0=C\:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex -======= #Sat Dec 09 23:27:08 CST 2023 base.0=C\:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex ->>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241 path.0=classes.dex renamed.0=classes.dex diff --git a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index 126fc534..57db451c 100644 Binary files a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class index a7948fd1..9c0c70f0 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class index 42394b73..c3af5563 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class index 76ef96eb..6bb9e91c 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class index 42461a28..2ab9f61b 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class index 413745e5..0d9063b0 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class index 0b075b48..5b2bda47 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class index 1d3de0ea..9103adc4 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class differ diff --git a/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index 15d2aec2..b0efa0ef 100644 --- a/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -20,259 +20,6 @@ 20 android:versionName="0.1" > 21 22 C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 -23 android:minSdkVersion="1" -23-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:23:15-41 -24 android:targetSdkVersion="14" /> -24-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 -25 -26 -26-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:25:5-81 -26-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:25:22-78 -27 -27-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:26:5-88 -27-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:26:22-85 -28 -28-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:27:5-67 -28-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:27:22-64 -29 -29-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:28:5-72 -29-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:28:22-69 -30 -30-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:29:5-74 -30-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:29:22-71 -31 -31-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:30:5-80 -31-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:30:22-77 -32 -32-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:31:5-71 -32-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:31:22-68 -33 -33-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:32:5-74 -33-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:32:22-71 -34 -34-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:33:5-81 -34-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:33:22-78 -35 -36 C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:35:5-149:19 -37 android:debuggable="true" -38 android:icon="@drawable/icon_app" -38-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:36:9-42 -39 android:label="@string/app_name" -39-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:37:9-41 -40 android:testOnly="true" > -41 C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:38:9-51:20 -42 android:name="net.micode.notes.ui.NotesListActivity" -42-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:39:13-49 -43 android:configChanges="keyboardHidden|orientation|screenSize" -43-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:40:13-74 -44 android:label="@string/app_name" -44-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:41:13-45 -45 android:launchMode="singleTop" -45-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:42:13-43 -46 android:theme="@style/NoteTheme" -46-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:43:13-45 -47 android:uiOptions="splitActionBarWhenNarrow" -47-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:44:13-57 -48 android:windowSoftInputMode="adjustPan" > -48-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:45:13-52 -49 -49-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:47:13-50:29 -50 -50-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:48:17-69 -50-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:48:25-66 -51 -52 -52-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:49:17-77 -52-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:49:27-74 -53 -54 -55 C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:53:9-81:20 -56 android:name="net.micode.notes.ui.NoteEditActivity" -56-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:54:13-48 -57 android:configChanges="keyboardHidden|orientation|screenSize" -57-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:55:13-74 -58 android:launchMode="singleTop" -58-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:56:13-43 -59 android:theme="@style/NoteTheme" > -59-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:57:13-45 -60 -60-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:59:13-64:29 -61 -61-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:60:17-69 -61-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:60:25-66 -62 -63 -63-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:61:17-76 -63-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 -64 -65 -65-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 -65-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 -66 -66-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 -66-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 -67 -68 -68-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:66:13-71:29 -69 -69-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:67:17-79 -69-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:67:25-76 -70 -71 -71-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:61:17-76 -71-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 -72 -73 -73-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 -73-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 -74 -74-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 -74-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 -75 -76 -76-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:73:13-76:29 -77 -77-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:74:17-71 -77-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:74:25-68 -78 -79 -79-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:61:17-76 -79-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 -80 -81 -82 C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:78:13-80:54 -83 android:name="android.app.searchable" -83-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:79:17-54 -84 android:resource="@xml/searchable" /> -84-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:80:17-51 -85 -86 -87 C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:83:9-86:43 -88 android:name="net.micode.notes.data.NotesProvider" -88-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:84:13-63 -89 android:authorities="micode_notes" -89-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:85:13-47 -90 android:multiprocess="true" /> -90-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:86:13-40 -91 -92 C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:88:9-100:20 -93 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -93-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:89:13-57 -94 android:label="@string/app_widget2x2" > -94-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:90:13-50 -95 -95-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29 -96 -96-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:92:17-84 -96-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:92:25-81 -97 -97-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:93:17-85 -97-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:93:25-82 -98 -98-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:94:17-85 -98-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:94:25-82 -99 -100 -101 C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58 -102 android:name="android.appwidget.provider" -102-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:98:17-58 -103 android:resource="@xml/widget_2x_info" /> -103-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:99:17-55 -104 -105 C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:101:9-114:20 -106 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -106-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:102:13-57 -107 android:label="@string/app_widget4x4" > -107-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:103:13-50 -108 -108-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29 -109 -109-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:92:17-84 -109-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:92:25-81 -110 -110-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:93:17-85 -110-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:93:25-82 -111 -111-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:94:17-85 -111-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:94:25-82 -112 -113 -114 C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58 -115 android:name="android.appwidget.provider" -115-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:98:17-58 -116 android:resource="@xml/widget_4x_info" /> -116-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:99:17-55 -117 -118 -118-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:116:9-120:20 -118-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:116:19-55 -119 -119-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:117:13-119:29 -120 -120-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:118:17-79 -120-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:118:25-76 -121 -122 -123 C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:122:9-125:20 -124 android:name="net.micode.notes.ui.AlarmReceiver" -124-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:123:13-61 -125 android:process=":remote" > -125-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:124:13-38 -126 -127 -128 C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:127:9-132:20 -129 android:name="net.micode.notes.ui.AlarmAlertActivity" -129-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:128:13-50 -130 android:label="@string/app_name" -130-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:129:13-45 -131 android:launchMode="singleInstance" -131-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:130:13-48 -132 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -132-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:131:13-75 -133 -134 C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:134:9-139:20 -135 android:name="net.micode.notes.ui.NotesPreferenceActivity" -135-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:135:13-71 -136 android:label="@string/preferences_title" -136-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:136:13-54 -137 android:launchMode="singleTop" -137-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:137:13-43 -138 android:theme="@android:style/Theme.Holo.Light" > -138-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:138:13-60 -139 -140 -141 C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:141:9-144:19 -142 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -142-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:142:13-74 -143 android:exported="false" > -143-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:143:13-37 -144 -145 -146 C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:146:9-148:52 -147 android:name="android.app.default_searchable" -147-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:147:13-58 -148 android:value=".ui.NoteEditActivity" /> -148-->C:\Users\86152\Desktop\Tasks\software\Notes-master\app\src\main\AndroidManifest.xml:148:13-49 -149 -150 -151 -======= 22-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 23 android:minSdkVersion="1" 23-->C:\Users\huigenb\Desktop\All tasks\software\Notes-master\app\src\main\AndroidManifest.xml:23:15-41 @@ -522,4 +269,3 @@ 148 149 150 ->>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241 diff --git a/src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml index c9b6298c..9680ab07 100644 --- a/src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml +++ b/src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml @@ -44,10 +44,6 @@ android:label="@string/app_name" android:launchMode="singleTop" android:theme="@style/NoteTheme" -<<<<<<< HEAD - android:uiOptions="splitActionBarWhenNarrow" -======= ->>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241 android:windowSoftInputMode="adjustPan" > diff --git a/src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml index c9b6298c..9680ab07 100644 --- a/src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml +++ b/src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml @@ -44,10 +44,6 @@ android:label="@string/app_name" android:launchMode="singleTop" android:theme="@style/NoteTheme" -<<<<<<< HEAD - android:uiOptions="splitActionBarWhenNarrow" -======= ->>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241 android:windowSoftInputMode="adjustPan" > diff --git a/src/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/src/app/build/intermediates/merged_res/debug/values_values.arsc.flat index 40e69d23..577bcf3f 100644 Binary files a/src/app/build/intermediates/merged_res/debug/values_values.arsc.flat and b/src/app/build/intermediates/merged_res/debug/values_values.arsc.flat differ diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json index e65cf842..9ab429c2 100644 --- a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -1,157 +1,10 @@ { "logs": [ { -<<<<<<< HEAD - "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rCN_values-zh-rCN.arsc.flat", - "map": [ - { - "source": "C:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", -======= "outputFile": "C:\\Users\\huigenb\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\values-zh-rTW_values-zh-rTW.arsc.flat", "map": [ { "source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", ->>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241 - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endLines": "21", - "endColumns": "19", - "endOffsets": "817" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - }, - { -<<<<<<< HEAD - "source": "C:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", - "from": { - "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,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": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", - "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,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", - "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,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,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", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-4:/values_values.arsc.flat", - "map": [ - { - "source": "C:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\styles.xml", - "from": { - "startLines": "50,55,64,60,22,26,30,35,40,18,45", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", - "endLines": "53,58,67,62,25,29,33,38,43,21,48", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" - }, - "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", - "endLines": "128,132,136,139,143,147,151,155,159,163,167", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" - } - }, - { - "source": "C:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\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": "105,300", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "295,415" - } - }, - { - "source": "C:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endColumns": "56", - "endOffsets": "764" - }, - "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "420", - "endColumns": "56", - "endOffsets": "472" - } - }, - { - "source": "C:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\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": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "477,529,582,635,687", - "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" - } - }, - { - "source": "C:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", - "from": { - "startLines": "128,72,75,74,73,19,20,21,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,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", - "startOffsets": "8008,3898,4159,4063,3994,827,870,922,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,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", - "endLines": "132,72,75,74,73,19,20,21,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,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "endColumns": "14,95,82,95,68,42,51,51,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,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "8412,3989,4237,4154,4058,865,917,969,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,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" - }, - "to": { - "startLines": "18,23,24,25,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,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "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", - "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", - "endLines": "22,23,24,25,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,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "endColumns": "14,95,82,95,68,42,51,51,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,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rTW_values-zh-rTW.arsc.flat", - "map": [ - { - "source": "C:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", @@ -170,10 +23,7 @@ } }, { - "source": "C:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", -======= "source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", ->>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241 "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", @@ -192,8 +42,6 @@ } } ] -<<<<<<< HEAD -======= }, { "outputFile": "net.micode.notes.app-merged_res-4:/values_values.arsc.flat", @@ -419,7 +267,6 @@ } } ] ->>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241 } ] } \ No newline at end of file diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json index 10615d22..48b880bd 100644 --- a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values-zh-rCN/values-zh-rCN.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", -======= "source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", ->>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241 "from": { "startLines": "18", "startColumns": "4", @@ -27,11 +23,7 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", -======= "source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", ->>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241 "from": { "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,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", diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json index aac31519..9b4828be 100644 --- a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json +++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json @@ -4,11 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values-zh-rTW/values-zh-rTW.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", -======= "source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", ->>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241 "from": { "startLines": "18", "startColumns": "4", @@ -27,11 +23,7 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", -======= "source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", ->>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241 "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", diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json index 467e6463..60d8a8e9 100644 --- a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -4,16 +4,6 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values/values.xml", "map": [ { -<<<<<<< HEAD - "source": "C:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\styles.xml", - "from": { - "startLines": "50,55,64,60,22,26,30,35,40,18,45", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", - "endLines": "53,58,67,62,25,29,33,38,43,21,48", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" -======= "source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", "from": { "startLines": "-1", @@ -84,21 +74,10 @@ "endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1", "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1", "endOffsets": "-1,-1,2846,-1,-1,-1,-1,-1,-1,-1,-1" ->>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241 }, "to": { "startLines": "125,129,133,137,140,144,148,152,156,160,164", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", -<<<<<<< HEAD - "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", - "endLines": "128,132,136,139,143,147,151,155,159,163,167", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" - } - }, - { - "source": "C:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", -======= "startOffsets": "8124,8328,8539,8749,8909,9092,9277,9462,9665,9871,10054", "endLines": "128,132,136,139,143,147,151,155,159,163,167", "endColumns": "12,12,12,12,12,12,12,12,12,12,12", @@ -146,7 +125,6 @@ }, { "source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", ->>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241 "from": { "startLines": "19,26", "startColumns": "4,4", @@ -165,45 +143,7 @@ } }, { -<<<<<<< HEAD - "source": "C:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endColumns": "56", - "endOffsets": "764" - }, - "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "420", - "endColumns": "56", - "endOffsets": "472" - } - }, - { - "source": "C:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\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": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "477,529,582,635,687", - "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" - } - }, - { - "source": "C:\\Users\\86152\\Desktop\\Tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", -======= "source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", ->>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241 "from": { "startLines": "128,72,75,74,73,19,20,21,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,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", @@ -220,8 +160,6 @@ "endColumns": "14,95,82,95,68,42,51,51,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,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" } -<<<<<<< HEAD -======= }, { "source": "C:\\Users\\huigenb\\Desktop\\All tasks\\software\\Notes-master\\app\\src\\main\\res\\values\\styles.xml", @@ -241,7 +179,6 @@ "endColumns": "12,12,12,12,12,12,12,12,12,12,12", "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" } ->>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241 } ] } diff --git a/src/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml b/src/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml index c9b6298c..9680ab07 100644 --- a/src/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml +++ b/src/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml @@ -44,10 +44,6 @@ android:label="@string/app_name" android:launchMode="singleTop" android:theme="@style/NoteTheme" -<<<<<<< HEAD - android:uiOptions="splitActionBarWhenNarrow" -======= ->>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241 android:windowSoftInputMode="adjustPan" > diff --git a/src/app/build/intermediates/packaged_res/debug/values/values.xml b/src/app/build/intermediates/packaged_res/debug/values/values.xml index 866320d1..01024588 100644 --- a/src/app/build/intermediates/packaged_res/debug/values/values.xml +++ b/src/app/build/intermediates/packaged_res/debug/values/values.xml @@ -133,11 +133,7 @@ \ No newline at end of file diff --git a/src/build.gradle b/src/build.gradle index 47bcdf06..a18def5f 100644 --- a/src/build.gradle +++ b/src/build.gradle @@ -9,10 +9,6 @@ buildscript { '.1' } } -<<<<<<< HEAD - -======= ->>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241 allprojects { repositories { jcenter() diff --git a/src/local.properties b/src/local.properties index 1de5dcae..9c401d2b 100644 --- a/src/local.properties +++ b/src/local.properties @@ -1,16 +1,8 @@ -<<<<<<< HEAD -## This file must *NOT* be checked into Version Control Systems, -======= # This file must *NOT* be checked into Version Control Systems, ->>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241 # as it contains information specific to your local configuration. # # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. #Mon Nov 06 19:57:38 CST 2023 -<<<<<<< HEAD -sdk.dir=C\:\\Users\\86152\\AppData\\Local\\Android\\Sdk -======= sdk.dir=C:\\Users\\huigenb\\AppData\\Local\\Android\\Sdk ->>>>>>> 6c9e3c2980362fd61237bfd56207d3d367495241