diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..b898c0a --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6ff4d26 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..d155f99 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + 1694696247469 + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..495c503 --- /dev/null +++ b/build.gradle @@ -0,0 +1 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. diff --git a/doc/~$模板-开源软件泛读、标注和维护报告文档.docx b/doc/~$模板-开源软件泛读、标注和维护报告文档.docx new file mode 100644 index 0000000..8f50a51 Binary files /dev/null and b/doc/~$模板-开源软件泛读、标注和维护报告文档.docx differ diff --git a/doc/实践模板-开源软件泛读、标注和维护报告文档.docx b/doc/实践模板-开源软件泛读、标注和维护报告文档.docx new file mode 100644 index 0000000..fb45934 Binary files /dev/null and b/doc/实践模板-开源软件泛读、标注和维护报告文档.docx differ diff --git a/src/app/build.gradle b/src/app/build.gradle index 6517ee4..34b5ba5 100644 --- a/src/app/build.gradle +++ b/src/app/build.gradle @@ -23,7 +23,12 @@ android { } dependencies { +<<<<<<< HEAD implementation fileTree(dir: 'E:\\code\\Android\\mi-note\\src\\httpcomponents-client-4.5.14-bin\\lib', include: ['*.aar', '*.jar'], exclude: ['commons-codec-1.11.jar','httpclient-4.5.14.jar','httpclient-cache-4.5.14.jar','httpmime-4.5.14.jar','fluent-hc-4.5.14.jar']) +======= + implementation fileTree(dir: 'D:\\Code\\Repository\\Android\\Notes2\\src\\httpcomponents-client-4.5.14-bin\\lib', include: ['*.aar', '*.jar'], exclude: [], + excludes: ['commons-codec-1.11.jar','httpclient-4.5.14.jar','httpclient-cache-4.5.14.jar','httpmime-4.5.14.jar','fluent-hc-4.5.14.jar']) +>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5 } diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f13e3a193c26766762d2ed1b9064df3f8189c5cc9414f33a282a3bc6e81b795_bucket_0/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f13e3a193c26766762d2ed1b9064df3f8189c5cc9414f33a282a3bc6e81b795_bucket_0/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f13e3a193c26766762d2ed1b9064df3f8189c5cc9414f33a282a3bc6e81b795_bucket_0/graph.bin differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f13e3a193c26766762d2ed1b9064df3f8189c5cc9414f33a282a3bc6e81b795_bucket_1/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f13e3a193c26766762d2ed1b9064df3f8189c5cc9414f33a282a3bc6e81b795_bucket_1/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f13e3a193c26766762d2ed1b9064df3f8189c5cc9414f33a282a3bc6e81b795_bucket_1/graph.bin differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f13e3a193c26766762d2ed1b9064df3f8189c5cc9414f33a282a3bc6e81b795_bucket_2/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f13e3a193c26766762d2ed1b9064df3f8189c5cc9414f33a282a3bc6e81b795_bucket_2/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f13e3a193c26766762d2ed1b9064df3f8189c5cc9414f33a282a3bc6e81b795_bucket_2/graph.bin differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f13e3a193c26766762d2ed1b9064df3f8189c5cc9414f33a282a3bc6e81b795_bucket_3/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f13e3a193c26766762d2ed1b9064df3f8189c5cc9414f33a282a3bc6e81b795_bucket_3/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f13e3a193c26766762d2ed1b9064df3f8189c5cc9414f33a282a3bc6e81b795_bucket_3/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 bf73ce7..cc52e81 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/incremental/debug-mergeJavaRes/zip-cache/4RAB6B9Jbn+ShrXEc2L75k3k9DM= b/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/4RAB6B9Jbn+ShrXEc2L75k3k9DM= new file mode 100644 index 0000000..aed581e Binary files /dev/null and b/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/4RAB6B9Jbn+ShrXEc2L75k3k9DM= differ diff --git a/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/AUqLPJJDIkxWooGLRQYiuhq5VfU= b/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/AUqLPJJDIkxWooGLRQYiuhq5VfU= new file mode 100644 index 0000000..270124f Binary files /dev/null and b/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/AUqLPJJDIkxWooGLRQYiuhq5VfU= differ diff --git a/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/C7bKwrsJIO_8Whe_ViZFsjbUssQ= b/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/C7bKwrsJIO_8Whe_ViZFsjbUssQ= new file mode 100644 index 0000000..66c75aa Binary files /dev/null and b/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/C7bKwrsJIO_8Whe_ViZFsjbUssQ= differ diff --git a/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/LgBLt55ZF+NTpzOZgDF8s6z5bvY= b/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/LgBLt55ZF+NTpzOZgDF8s6z5bvY= new file mode 100644 index 0000000..93a3b9f Binary files /dev/null and b/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/LgBLt55ZF+NTpzOZgDF8s6z5bvY= differ diff --git a/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/XlxyjEJSgjj_Z7JiyxH5_dVda+k= b/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/XlxyjEJSgjj_Z7JiyxH5_dVda+k= new file mode 100644 index 0000000..78e2058 Binary files /dev/null and b/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/XlxyjEJSgjj_Z7JiyxH5_dVda+k= differ diff --git a/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/iH4K81ZhOeXIZ2VgDF5l9VlU84g= b/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/iH4K81ZhOeXIZ2VgDF5l9VlU84g= new file mode 100644 index 0000000..aa34419 Binary files /dev/null and b/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/iH4K81ZhOeXIZ2VgDF5l9VlU84g= 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 6d7b615..a2d0986 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,3 +1,4 @@ +<<<<<<< HEAD #Thu Sep 14 17:58:45 CST 2023 net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat @@ -94,3 +95,101 @@ net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=E\:\\code\\Android net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat net.micode.notes.app-main-7\:/menu/note_edit.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat +======= +#Fri Sep 15 09:58:37 CST 2023 +net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat +net.micode.notes.app-main-7\:/menu/sub_folder.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat +net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat +net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat +net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat +net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat +net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat +net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat +net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat +net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat +net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat +net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat +net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat +net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat +net.micode.notes.app-main-7\:/layout/settings_header.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat +net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat +net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat +net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat +net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat +net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat +net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat +net.micode.notes.app-main-7\:/raw/introduction=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat +net.micode.notes.app-main-7\:/menu/note_list_options.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat +net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat +net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat +net.micode.notes.app-main-7\:/layout/note_list_footer.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat +net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat +net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat +net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat +net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat +net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat +>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5 diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml index 1660f2e..9dc5d83 100644 --- a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml +++ b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml @@ -1,5 +1,9 @@ +<<<<<<< HEAD +======= + +>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5 -%s --%s --%s @@ -7,11 +11,19 @@ Messaging Email +<<<<<<< HEAD #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel %1$s result for \"%2$s\" %1$s results for \"%2$s\" 短信 邮件 @@ -53,4 +66,17 @@ 郵件 便簽便簽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“的搜尋結果 - \ No newline at end of file + +======= + + 短信 + 邮件 + 便签便签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“的搜尋結果 + +>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5 diff --git a/src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index faaf2d0..cbd580a 100644 --- a/src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml @@ -1,2 +1,6 @@ - \ No newline at end of file +<<<<<<< HEAD + +======= + +>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5 diff --git a/src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index 4554325..39c4631 100644 --- a/src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -1,2 +1,6 @@ - \ No newline at end of file +<<<<<<< HEAD + +======= + +>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5 diff --git a/src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml index 14f9ed5..fb7fe35 100644 --- a/src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -1,2 +1,6 @@ - \ No newline at end of file +<<<<<<< HEAD + +======= + +>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5 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 a60c4c8..6c449f4 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,4 +1,9 @@ +<<<<<<< HEAD #Thu Sep 14 18:02:40 CST 2023 base.0=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex +======= +#Sun Sep 17 16:46:56 CST 2023 +base.0=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex +>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5 renamed.0=classes.dex path.0=classes.dex 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 26ce4ed..89d3194 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 e264a55..ee0265e 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 ee85e1c..7640e9f 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 6bf106b..4f372f4 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/NotesProvider.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class index 976265d..f9c1ed4 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/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class index 5012ef9..ff8642f 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class index 354ae8e..d08ded4 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class index fea6568..ef21b0e 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class index 864ac3f..6019ab9 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class index 4121fa5..2c9c086 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class index 53c8d55..3c717dd 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class index fe615e5..4d67cc2 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class index 16e7cca..e4bb0ec 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class index 6cb3e5c..32e1554 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class index 7d0dfb1..2806728 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class index 03e742a..df0b0f2 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class index c71fabd..4d603dc 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class index 04bd75e..2dafd06 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class index d5141ec..cb3a29b 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class index b6d967b..4af37e9 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class index fb094fd..28e9059 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class index 1e80cb2..1539e13 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class index 00dcca6..f786267 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class index 95c7b5b..9e7f8c3 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class index 5d8717b..f5fd9db 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class index b58eac3..80c444a 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class index 9ec847b..414fe22 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.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 be46dec..8cc68f1 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,6 +20,7 @@ 20 android:versionName="0.1" > 21 22 E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:24:5-44 23 android:minSdkVersion="14" 23-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:24:15-41 @@ -288,6 +289,276 @@ 157-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:157:13-58 158 android:value=".ui.NoteEditActivity" /> 158-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:158:13-49 +======= +22-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:24:5-44 +23 android:minSdkVersion="14" +23-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:24:15-41 +24 android:targetSdkVersion="33" /> +24-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:24:5-44 +25 +26 +26-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:26:5-81 +26-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:26:22-78 +27 +27-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:27:5-88 +27-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:27:22-85 +28 +28-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:28:5-67 +28-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:28:22-64 +29 +29-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:29:5-72 +29-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:29:22-69 +30 +30-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:30:5-74 +30-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:30:22-71 +31 +31-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:31:5-80 +31-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:31:22-77 +32 +32-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:32:5-71 +32-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:32:22-68 +33 +33-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:33:5-74 +33-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:33:22-71 +34 +34-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:34:5-81 +34-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:34:22-78 +35 +36 D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:36:5-159:19 +37 android:debuggable="true" +38 android:icon="@drawable/icon_app" +38-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:37:9-42 +39 android:label="@string/app_name" +39-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:38:9-41 +40 android:testOnly="true" > +41 D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:39:9-53:20 +42 android:name="net.micode.notes.ui.NotesListActivity" +42-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:41:13-49 +43 android:configChanges="keyboardHidden|orientation|screenSize" +43-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:42:13-74 +44 android:exported="true" +44-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:40:13-36 +45 android:label="@string/app_name" +45-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:43:13-45 +46 android:launchMode="singleTop" +46-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:44:13-43 +47 android:theme="@style/NoteTheme" +47-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:45:13-45 +48 android:uiOptions="splitActionBarWhenNarrow" +48-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:46:13-57 +49 android:windowSoftInputMode="adjustPan" > +49-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:47:13-52 +50 +50-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:49:13-52:29 +51 +51-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:50:17-69 +51-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:50:25-66 +52 +53 +53-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:51:17-77 +53-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:51:27-74 +54 +55 +56 D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:55:9-85:20 +57 android:name="net.micode.notes.ui.NoteEditActivity" +57-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:57:13-48 +58 android:configChanges="keyboardHidden|orientation|screenSize" +58-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:58:13-74 +59 android:exported="true" +59-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:56:13-36 +60 android:launchMode="singleTop" +60-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:59:13-43 +61 android:theme="@style/NoteTheme" > +61-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:60:13-45 +62 +62-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:62:13-68:29 +62-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:62:28-49 +63 +63-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:64:17-69 +63-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:64:25-66 +64 +65 +65-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:65:17-76 +65-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:65:27-73 +66 +67 +67-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:17-78 +67-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:23-75 +68 +68-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:17-78 +68-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:23-75 +69 +70 +70-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:70:13-75:29 +71 +71-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:71:17-79 +71-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:71:25-76 +72 +73 +73-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:65:17-76 +73-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:65:27-73 +74 +75 +75-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:17-78 +75-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:23-75 +76 +76-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:17-78 +76-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:23-75 +77 +78 +78-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:77:13-80:29 +79 +79-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:78:17-71 +79-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:78:25-68 +80 +81 +81-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:65:17-76 +81-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:65:27-73 +82 +83 +84 D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:82:13-84:54 +85 android:name="android.app.searchable" +85-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:83:17-54 +86 android:resource="@xml/searchable" /> +86-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:84:17-51 +87 +88 +89 D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:87:9-91:43 +90 android:name="net.micode.notes.data.NotesProvider" +90-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:89:13-63 +91 android:authorities="micode_notes" +91-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:90:13-47 +92 android:exported="false" +92-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:88:13-37 +93 android:multiprocess="true" /> +93-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:91:13-40 +94 +95 D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:93:9-106:20 +96 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" +96-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:95:13-57 +97 android:exported="false" +97-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:94:13-37 +98 android:label="@string/app_widget2x2" > +98-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:96:13-50 +99 +99-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:97:13-101:29 +100 +100-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:98:17-84 +100-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:98:25-81 +101 +101-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:99:17-85 +101-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:99:25-82 +102 +102-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:100:17-85 +102-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:100:25-82 +103 +104 +105 D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:103:13-105:58 +106 android:name="android.appwidget.provider" +106-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:104:17-58 +107 android:resource="@xml/widget_2x_info" /> +107-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:105:17-55 +108 +109 D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:107:9-121:20 +110 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" +110-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:109:13-57 +111 android:exported="true" +111-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:108:13-36 +112 android:label="@string/app_widget4x4" > +112-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:110:13-50 +113 +113-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:97:13-101:29 +114 +114-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:98:17-84 +114-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:98:25-81 +115 +115-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:99:17-85 +115-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:99:25-82 +116 +116-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:100:17-85 +116-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:100:25-82 +117 +118 +119 D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:103:13-105:58 +120 android:name="android.appwidget.provider" +120-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:104:17-58 +121 android:resource="@xml/widget_4x_info" /> +121-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:105:17-55 +122 +123 D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:123:9-127:20 +124 android:name="net.micode.notes.ui.AlarmInitReceiver" +124-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:123:19-55 +125 android:exported="false" > +125-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:123:56-80 +126 +126-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:124:13-126:29 +127 +127-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:125:17-79 +127-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:125:25-76 +128 +129 +130 D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:129:9-133:20 +131 android:name="net.micode.notes.ui.AlarmReceiver" +131-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:131:13-61 +132 android:exported="false" +132-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:130:13-37 +133 android:process=":remote" > +133-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:132:13-38 +134 +135 +136 D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:135:9-141:20 +137 android:name="net.micode.notes.ui.AlarmAlertActivity" +137-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:137:13-50 +138 android:exported="false" +138-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:136:13-37 +139 android:label="@string/app_name" +139-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:138:13-45 +140 android:launchMode="singleInstance" +140-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:139:13-48 +141 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > +141-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:140:13-75 +142 +143 D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:143:9-149:20 +144 android:name="net.micode.notes.ui.NotesPreferenceActivity" +144-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:145:13-71 +145 android:exported="false" +145-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:144:13-37 +146 android:label="@string/preferences_title" +146-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:146:13-54 +147 android:launchMode="singleTop" +147-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:147:13-43 +148 android:theme="@android:style/Theme.Holo.Light" > +148-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:148:13-60 +149 +150 +151 D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:151:9-154:19 +152 android:name="net.micode.notes.gtask.remote.GTaskSyncService" +152-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:152:13-74 +153 android:exported="false" > +153-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:153:13-37 +154 +155 +156 D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:156:9-158:52 +157 android:name="android.app.default_searchable" +157-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:157:13-58 +158 android:value=".ui.NoteEditActivity" /> +158-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:158:13-49 +>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5 159 160 161 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 eddffdf..8c61305 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 @@ -4,7 +4,30 @@ "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat", "map": [ { +<<<<<<< HEAD "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", +======= + "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\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": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052", + "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": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113" + }, + "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" + } + }, + { + "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", +>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5 "from": { "startLines": "18", "startColumns": "4", @@ -47,6 +70,7 @@ "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat", "map": [ { +<<<<<<< HEAD "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values\\dimens.xml", "from": { "startLines": "19,20,21,22,18", @@ -82,6 +106,9 @@ }, { "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values\\arrays.xml", +======= + "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values\\arrays.xml", +>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5 "from": { "startLines": "19,26", "startColumns": "4,4", @@ -100,7 +127,64 @@ } }, { +<<<<<<< HEAD "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values\\styles.xml", +======= + "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\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": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107", + "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": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192" + }, + "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" + } + }, + { + "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values\\dimens.xml", + "from": { + "startLines": "19,20,21,22,18", + "startColumns": "4,4,4,4,4", + "startOffsets": "783,836,890,944,730", + "endColumns": "51,52,52,51,51", + "endOffsets": "830,884,938,991,777" + }, + "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": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values\\colors.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endColumns": "56", + "endOffsets": "782" + }, + "to": { + "startLines": "12", + "startColumns": "4", + "startOffsets": "420", + "endColumns": "56", + "endOffsets": "472" + } + }, + { + "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values\\styles.xml", +>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5 "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", @@ -117,6 +201,7 @@ "endColumns": "12,12,12,12,12,12,12,12,12,12,12", "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" } +<<<<<<< HEAD }, { "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values\\strings.xml", @@ -136,6 +221,8 @@ "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" } +======= +>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5 } ] }, @@ -143,6 +230,7 @@ "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat", "map": [ { +<<<<<<< HEAD "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "from": { "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", @@ -163,6 +251,9 @@ }, { "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", +======= + "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", +>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5 "from": { "startLines": "18", "startColumns": "4", @@ -179,6 +270,25 @@ "endColumns": "19", "endOffsets": "210" } + }, + { + "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "from": { + "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052", + "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113" + }, + "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,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", + "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,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" + } } ] } 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 5040794..187af52 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,7 +4,30 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml", "map": [ { +<<<<<<< HEAD "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", +======= + "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\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": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052", + "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": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113" + }, + "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" + } + }, + { + "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", +>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5 "from": { "startLines": "18", "startColumns": "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 293566a..17da0e6 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,6 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml", "map": [ { +<<<<<<< HEAD "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "from": { "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", @@ -24,6 +25,9 @@ }, { "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", +======= + "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", +>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5 "from": { "startLines": "18", "startColumns": "4", @@ -40,6 +44,25 @@ "endColumns": "19", "endOffsets": "210" } + }, + { + "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "from": { + "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052", + "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113" + }, + "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,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", + "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,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" + } } ] } 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 e0b1e34..2c825c6 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,6 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml", "map": [ { +<<<<<<< HEAD "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values\\dimens.xml", "from": { "startLines": "19,20,21,22,18", @@ -39,6 +40,9 @@ }, { "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values\\arrays.xml", +======= + "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values\\arrays.xml", +>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5 "from": { "startLines": "19,26", "startColumns": "4,4", @@ -57,7 +61,64 @@ } }, { +<<<<<<< HEAD "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values\\styles.xml", +======= + "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\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": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107", + "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": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192" + }, + "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" + } + }, + { + "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values\\dimens.xml", + "from": { + "startLines": "19,20,21,22,18", + "startColumns": "4,4,4,4,4", + "startOffsets": "783,836,890,944,730", + "endColumns": "51,52,52,51,51", + "endOffsets": "830,884,938,991,777" + }, + "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": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values\\colors.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endColumns": "56", + "endOffsets": "782" + }, + "to": { + "startLines": "12", + "startColumns": "4", + "startOffsets": "420", + "endColumns": "56", + "endOffsets": "472" + } + }, + { + "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values\\styles.xml", +>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5 "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", @@ -74,6 +135,7 @@ "endColumns": "12,12,12,12,12,12,12,12,12,12,12", "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" } +<<<<<<< HEAD }, { "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values\\strings.xml", @@ -93,6 +155,8 @@ "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" } +======= +>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5 } ] } diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex index c522fa4..82a2f92 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex index a61f541..a2176a6 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex index e631c11..c17c922 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex index bdba861..ca6099e 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex index 33a1e8e..39f0ab3 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex index f2219ba..3083cf6 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex index c64b75d..568f2d9 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex index feb5c80..503889d 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex index 4b4507f..9e1d7e8 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex index c31f209..83d4a33 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex index 3bba530..72a0974 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex index f65f98e..04af6e4 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex index 34892e9..5d294d6 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex index 337fd1e..ee2be4f 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex index 319da80..5791a99 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex index e9705a8..0e99723 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex index 1a39656..54f179b 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex index 98f3f02..808c2bc 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex index fc82b1f..023b1ef 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex index 35b763d..4c5708b 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex index a25b844..e59992a 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex index 56ac3e3..20a2587 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex index c5a0aca..2533848 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex index 2e6cd58..c8ac013 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex index dd72238..7654a04 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex index ab39c99..2d74d57 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex index f8c2de3..ca0cc07 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex differ diff --git a/src/app/build/intermediates/source_set_path_map/debug/file-map.txt b/src/app/build/intermediates/source_set_path_map/debug/file-map.txt index 8de0cee..a1b7824 100644 --- a/src/app/build/intermediates/source_set_path_map/debug/file-map.txt +++ b/src/app/build/intermediates/source_set_path_map/debug/file-map.txt @@ -1,3 +1,4 @@ +<<<<<<< HEAD net.micode.notes.app-pngs-0 E:\code\Android\mi-note\src\app\build\generated\res\pngs\debug net.micode.notes.app-resValues-1 E:\code\Android\mi-note\src\app\build\generated\res\resValues\debug net.micode.notes.app-rs-2 E:\code\Android\mi-note\src\app\build\generated\res\rs\debug @@ -6,3 +7,13 @@ net.micode.notes.app-mergeDebugResources-4 E:\code\Android\mi-note\src\app\build net.micode.notes.app-merged_res-5 E:\code\Android\mi-note\src\app\build\intermediates\merged_res\debug net.micode.notes.app-debug-6 E:\code\Android\mi-note\src\app\src\debug\res net.micode.notes.app-main-7 E:\code\Android\mi-note\src\app\src\main\res +======= +net.micode.notes.app-pngs-0 D:\Code\Repository\Android\Notes2\src\app\build\generated\res\pngs\debug +net.micode.notes.app-resValues-1 D:\Code\Repository\Android\Notes2\src\app\build\generated\res\resValues\debug +net.micode.notes.app-rs-2 D:\Code\Repository\Android\Notes2\src\app\build\generated\res\rs\debug +net.micode.notes.app-mergeDebugResources-3 D:\Code\Repository\Android\Notes2\src\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir +net.micode.notes.app-mergeDebugResources-4 D:\Code\Repository\Android\Notes2\src\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir +net.micode.notes.app-merged_res-5 D:\Code\Repository\Android\Notes2\src\app\build\intermediates\merged_res\debug +net.micode.notes.app-debug-6 D:\Code\Repository\Android\Notes2\src\app\src\debug\res +net.micode.notes.app-main-7 D:\Code\Repository\Android\Notes2\src\app\src\main\res +>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5 diff --git a/src/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/app/build/outputs/logs/manifest-merger-debug-report.txt index 8e35cd5..5597d45 100644 --- a/src/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/src/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,5 +1,6 @@ -- Merging decision tree log --- manifest +<<<<<<< HEAD ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:18:1-160:12 INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:18:1-160:12 INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:18:1-160:12 @@ -257,3 +258,262 @@ ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:156:9-15 ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:158:13-49 android:name ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:157:13-58 +======= +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:18:1-160:12 +INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:18:1-160:12 +INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:18:1-160:12 +INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:18:1-160:12 +INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:18:1-160:12 +INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:18:1-160:12 +INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:18:1-160:12 + package + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:20:5-31 + INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml + INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml + android:versionName + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:22:5-30 + INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml + INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml + xmlns:tools + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:19:5-51 + xmlns:android + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:18:11-69 + android:versionCode + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:21:5-28 + INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml + INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml +uses-sdk +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:24:5-44 +INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:24:5-44 +INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:24:5-44 +INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:24:5-44 +INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:24:5-44 + android:targetSdkVersion + INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:24:5-44 + INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml + android:minSdkVersion + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:24:15-41 + INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml + INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml +uses-permission#android.permission.WRITE_EXTERNAL_STORAGE +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:26:5-81 + android:name + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:26:22-78 +uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:27:5-88 + android:name + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:27:22-85 +uses-permission#android.permission.INTERNET +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:28:5-67 + android:name + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:28:22-64 +uses-permission#android.permission.READ_CONTACTS +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:29:5-72 + android:name + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:29:22-69 +uses-permission#android.permission.MANAGE_ACCOUNTS +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:30:5-74 + android:name + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:30:22-71 +uses-permission#android.permission.AUTHENTICATE_ACCOUNTS +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:31:5-80 + android:name + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:31:22-77 +uses-permission#android.permission.GET_ACCOUNTS +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:32:5-71 + android:name + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:32:22-68 +uses-permission#android.permission.USE_CREDENTIALS +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:33:5-74 + android:name + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:33:22-71 +uses-permission#android.permission.RECEIVE_BOOT_COMPLETED +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:34:5-81 + android:name + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:34:22-78 +application +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:36:5-159:19 + android:label + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:38:9-41 + android:icon + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:37:9-42 +activity#net.micode.notes.ui.NotesListActivity +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:39:9-53:20 + android:label + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:43:13-45 + android:launchMode + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:44:13-43 + android:windowSoftInputMode + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:47:13-52 + android:exported + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:40:13-36 + android:uiOptions + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:46:13-57 + android:configChanges + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:42:13-74 + android:theme + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:45:13-45 + android:name + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:41:13-49 +intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:49:13-52:29 +action#android.intent.action.MAIN +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:50:17-69 + android:name + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:50:25-66 +category#android.intent.category.LAUNCHER +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:51:17-77 + android:name + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:51:27-74 +activity#net.micode.notes.ui.NoteEditActivity +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:55:9-85:20 + android:launchMode + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:59:13-43 + android:exported + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:56:13-36 + android:configChanges + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:58:13-74 + android:theme + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:60:13-45 + android:name + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:57:13-48 +intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:62:13-68:29 + android:scheme + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:62:28-49 + tools:ignore + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:63:17-47 +action#android.intent.action.VIEW +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:64:17-69 + android:name + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:64:25-66 +category#android.intent.category.DEFAULT +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:65:17-76 + android:name + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:65:27-73 +data +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:17-78 + android:mimeType + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:23-75 +intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:70:13-75:29 +action#android.intent.action.INSERT_OR_EDIT +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:71:17-79 + android:name + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:71:25-76 +intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:77:13-80:29 +action#android.intent.action.SEARCH +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:78:17-71 + android:name + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:78:25-68 +meta-data#android.app.searchable +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:82:13-84:54 + android:resource + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:84:17-51 + android:name + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:83:17-54 +provider#net.micode.notes.data.NotesProvider +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:87:9-91:43 + android:authorities + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:90:13-47 + android:multiprocess + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:91:13-40 + android:exported + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:88:13-37 + android:name + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:89:13-63 +receiver#net.micode.notes.widget.NoteWidgetProvider_2x +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:93:9-106:20 + android:label + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:96:13-50 + android:exported + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:94:13-37 + android:name + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:95:13-57 +intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:97:13-101:29 +action#android.appwidget.action.APPWIDGET_UPDATE +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:98:17-84 + android:name + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:98:25-81 +action#android.appwidget.action.APPWIDGET_DELETED +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:99:17-85 + android:name + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:99:25-82 +action#android.intent.action.PRIVACY_MODE_CHANGED +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:100:17-85 + android:name + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:100:25-82 +meta-data#android.appwidget.provider +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:103:13-105:58 + android:resource + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:105:17-55 + android:name + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:104:17-58 +receiver#net.micode.notes.widget.NoteWidgetProvider_4x +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:107:9-121:20 + android:label + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:110:13-50 + android:exported + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:108:13-36 + android:name + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:109:13-57 +receiver#net.micode.notes.ui.AlarmInitReceiver +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:123:9-127:20 + android:exported + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:123:56-80 + android:name + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:123:19-55 +intent-filter#action:name:android.intent.action.BOOT_COMPLETED +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:124:13-126:29 +action#android.intent.action.BOOT_COMPLETED +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:125:17-79 + android:name + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:125:25-76 +receiver#net.micode.notes.ui.AlarmReceiver +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:129:9-133:20 + android:process + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:132:13-38 + android:exported + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:130:13-37 + android:name + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:131:13-61 +activity#net.micode.notes.ui.AlarmAlertActivity +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:135:9-141:20 + android:label + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:138:13-45 + android:launchMode + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:139:13-48 + android:exported + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:136:13-37 + android:theme + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:140:13-75 + android:name + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:137:13-50 +activity#net.micode.notes.ui.NotesPreferenceActivity +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:143:9-149:20 + android:label + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:146:13-54 + android:launchMode + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:147:13-43 + android:exported + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:144:13-37 + android:theme + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:148:13-60 + android:name + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:145:13-71 +service#net.micode.notes.gtask.remote.GTaskSyncService +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:151:9-154:19 + android:exported + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:153:13-37 + android:name + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:152:13-74 +meta-data#android.app.default_searchable +ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:156:9-158:52 + android:value + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:158:13-49 + android:name + ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:157:13-58 +>>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5 diff --git a/src/app/src/main/java/net/micode/notes/data/Notes.java b/src/app/src/main/java/net/micode/notes/data/Notes.java index 338b891..48afe3d 100644 --- a/src/app/src/main/java/net/micode/notes/data/Notes.java +++ b/src/app/src/main/java/net/micode/notes/data/Notes.java @@ -22,8 +22,11 @@ import android.net.Uri; public class Notes { public static final String AUTHORITY = "micode_notes"; public static final String TAG = "Notes"; + //模块类型为笔记 public static final int TYPE_NOTE = 0; + //模块类型为文件夹 public static final int TYPE_FOLDER = 1; + //TODO 类型？ public static final int TYPE_SYSTEM = 2; /** @@ -63,6 +66,7 @@ public class Notes { */ public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data"); + //数据库表列名定义 public interface NoteColumns { /** * The unique ID for a row diff --git a/src/app/src/main/java/net/micode/notes/data/NotesProvider.java b/src/app/src/main/java/net/micode/notes/data/NotesProvider.java index edb0a60..4a1a27d 100644 --- a/src/app/src/main/java/net/micode/notes/data/NotesProvider.java +++ b/src/app/src/main/java/net/micode/notes/data/NotesProvider.java @@ -35,6 +35,7 @@ import net.micode.notes.data.Notes.NoteColumns; import net.micode.notes.data.NotesDatabaseHelper.TABLE; +//数据访问类 public class NotesProvider extends ContentProvider { private static final UriMatcher mMatcher; diff --git a/src/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java b/src/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java index 96b77da..07a063a 100644 --- a/src/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java +++ b/src/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java @@ -29,6 +29,7 @@ import net.micode.notes.data.Notes; import net.micode.notes.data.Notes.NoteColumns; +//文件夹列表适配器 public class FoldersListAdapter extends CursorAdapter { public static final String [] PROJECTION = { NoteColumns.ID, diff --git a/src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java index a674d7a..1ae5a77 100644 --- a/src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java +++ b/src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java @@ -71,7 +71,7 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; - +//笔记编辑界面 public class NoteEditActivity extends Activity implements OnClickListener, NoteSettingChangedListener, OnTextViewChangeListener { private class HeadViewHolder { diff --git a/src/app/src/main/java/net/micode/notes/ui/NoteItemData.java b/src/app/src/main/java/net/micode/notes/ui/NoteItemData.java index 0f5a878..d9d7004 100644 --- a/src/app/src/main/java/net/micode/notes/ui/NoteItemData.java +++ b/src/app/src/main/java/net/micode/notes/ui/NoteItemData.java @@ -26,6 +26,7 @@ import net.micode.notes.data.Notes.NoteColumns; import net.micode.notes.tool.DataUtils; +// 笔记属性类 public class NoteItemData { static final String [] PROJECTION = new String [] { NoteColumns.ID, @@ -219,6 +220,6 @@ public class NoteItemData { } public static int getNoteType(Cursor cursor) { - return cursor.getInt(TYPE_COLUMN); + return cursor.getInt(TYPE_COLUMN); } } diff --git a/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java index 0813597..a96bd53 100644 --- a/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java +++ b/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -61,11 +61,8 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.util.HashSet; -//主界面，一进入就是这个界面 -/** - * @author k - * - */ + +//主界面 public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener { //没有用特定的标签加注释。。。感觉没有什么用 private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0; @@ -124,7 +121,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt private final static int REQUEST_CODE_NEW_NODE = 103; @Override - // 创建类 protected void onCreate(final Bundle savedInstanceState) { //需要是final类型 根据程序上下文环境，Java关键字final有“这是无法改变的”或者“终态的”含义，它可以修饰非抽象类、非抽象类成员方法和变量。你可能出于两种理解而需要阻止改变：设计或效率。 // final类不能被继承，没有子类，final类中的方法默认是final的。 //final方法不能被子类的方法覆盖，但可以被继承。 @@ -235,11 +231,11 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt mModeCallBack = new ModeCallback(); } - // 继承自ListView.MultiChoiceModeListener 和 OnMenuItemClickListener + // 长按笔记后执行的回调 private class ModeCallback implements ListView.MultiChoiceModeListener, OnMenuItemClickListener { private DropdownMenu mDropDownMenu; private ActionMode mActionMode; - private MenuItem mMoveMenu; + private MenuItem mMoveMenu;// 长按笔记产生的下部菜单 public boolean onCreateActionMode(ActionMode mode, Menu menu) { getMenuInflater().inflate(R.menu.note_list_options, menu); @@ -318,6 +314,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt updateMenu(); } + // public boolean onMenuItemClick(MenuItem item) { if (mNotesListAdapter.getSelectedCount() == 0) { Toast.makeText(NotesListActivity.this, getString(R.string.menu_select_none), @@ -352,6 +349,9 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } } + /** + * 下方“写便签”按钮的监听器 + */ private class NewNoteOnTouchListener implements OnTouchListener { public boolean onTouch(View v, MotionEvent event) { @@ -423,6 +423,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC"); } + //后台SQL操作类 private final class BackgroundQueryHandler extends AsyncQueryHandler { public BackgroundQueryHandler(ContentResolver contentResolver) { super(contentResolver); @@ -511,7 +512,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } }.execute(); } - + /**删除文件夹*/ private void deleteFolder(long folderId) { if (folderId == Notes.ID_ROOT_FOLDER) { Log.e(TAG, "Wrong folder id, should not happen " + folderId); @@ -539,6 +540,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } } + /**打开笔记*/ private void openNode(NoteItemData data) { Intent intent = new Intent(this, NoteEditActivity.class); intent.setAction(Intent.ACTION_VIEW); @@ -546,6 +548,10 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt this.startActivityForResult(intent, REQUEST_CODE_OPEN_NODE); } + /** + * 根据data类型来。。打开文件夹 + * @param data + */ private void openFolder(NoteItemData data) { mCurrentFolderId = data.getId(); startAsyncNotesListQuery(); @@ -562,7 +568,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } mTitleBar.setVisibility(View.VISIBLE); } - + //按钮监听 + @Override public void onClick(View v) { switch (v.getId()) { case R.id.btn_new_note: @@ -585,6 +592,10 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0); } + /** + * 函数功能：当create为true时为创建文件夹，为false则为修改文件夹，创建相应的对话框 + * @param create + */ private void showCreateOrModifyFolderDialog(final boolean create) { final AlertDialog.Builder builder = new AlertDialog.Builder(this); View view = LayoutInflater.from(this).inflate(R.layout.dialog_edit_text, null); @@ -670,8 +681,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt }); } - /* (non-Javadoc) - * @see android.app.Activity#onBackPressed() + /** * 按返回键时根据情况更改类中的数据 */ @Override @@ -722,7 +732,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } /** - * 声明监听器，建立菜单，包括名称，视图，删除操作，更改名称操作； + * 长按文件夹的监听器 声明监听器，建立菜单，包括名称，视图，删除操作，更改名称操作； */ private final OnCreateContextMenuListener mFolderOnCreateContextMenuListener = new OnCreateContextMenuListener() { public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) { @@ -735,6 +745,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } }; + /** 关闭菜单事件 */ @Override public void onContextMenuClosed(Menu menu) { if (mNotesListView != null) { @@ -743,10 +754,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt super.onContextMenuClosed(menu); } - /* (non-Javadoc) - * @see android.app.Activity#onContextItemSelected(android.view.MenuItem) - * 针对menu中不同的选择进行不同的处理，里面详细注释 - */ + /** 长按文件夹产生的menu 针对menu中不同的选择进行不同的处理 */ @Override public boolean onContextItemSelected(MenuItem item) { if (mFocusNoteDataItem == null) { @@ -781,6 +789,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt return true; } + /** @param menu 根据列表编辑状态生成相应菜单 + * TODO analyse different ListEditState */ @Override public boolean onPrepareOptionsMenu(Menu menu) { menu.clear(); @@ -799,6 +809,10 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt return true; } + /** + * 根据item的类型调用菜单相应功能，此菜单是在文件或笔记列表状态打开的 + * @param item + */ @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { @@ -839,10 +853,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt return true; } - /* (non-Javadoc) - * @see android.app.Activity#onSearchRequested() - * 直接调用startSearch函数 - */ @Override public boolean onSearchRequested() { startSearch(null, false, null /* appData */, false); @@ -912,7 +922,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } /** - * @author k * 函数功能：实现对便签列表项的点击事件（短按） */ private class OnListItemClickListener implements OnItemClickListener { @@ -920,6 +929,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt public void onItemClick(AdapterView parent, View view, int position, long id) { if (view instanceof NotesListItem) { NoteItemData item = ((NotesListItem) view).getItemData(); + //由于长按会触发短按，此处判断当前是否处于选择状态，并且长按先于短按触发 if (mNotesListAdapter.isInChoiceMode()) { if (item.getType() == Notes.TYPE_NOTE) { position = position - mNotesListView.getHeaderViewsCount(); @@ -977,23 +987,22 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt NoteColumns.MODIFIED_DATE + " DESC"); } - /* (non-Javadoc) + /** * @see android.widget.AdapterView.OnItemLongClickListener#onItemLongClick(android.widget.AdapterView, android.view.View, int, long) * 长按某一项时进行的操作 * 如果长按的是便签，则通过ActionMode菜单实现；如果长按的是文件夹，则通过ContextMenu菜单实现； - * 具体ActionMOde菜单和ContextMenu菜单的详细见精度笔记 */ public boolean onItemLongClick(AdapterView parent, View view, int position, long id) { if (view instanceof NotesListItem) { mFocusNoteDataItem = ((NotesListItem) view).getItemData(); - if (mFocusNoteDataItem.getType() == Notes.TYPE_NOTE && !mNotesListAdapter.isInChoiceMode()) { - if (mNotesListView.startActionMode(mModeCallBack) != null) { + if (mFocusNoteDataItem.getType() == Notes.TYPE_NOTE && !mNotesListAdapter.isInChoiceMode()) { //当长按的列表项类型为笔记时 + if (mNotesListView.startActionMode(mModeCallBack) != null) {//启动ActionMode并且把mChoiceMode设为true mModeCallBack.onItemCheckedStateChanged(null, position, id, true); mNotesListView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS); } else { Log.e(TAG, "startActionMode fails"); } - } else if (mFocusNoteDataItem.getType() == Notes.TYPE_FOLDER) { + } else if (mFocusNoteDataItem.getType() == Notes.TYPE_FOLDER) { //当长按的列表项类型为文件夹时 mNotesListView.setOnCreateContextMenuListener(mFolderOnCreateContextMenuListener); } } diff --git a/src/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java b/src/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java index 51c9cb9..3d28fcc 100644 --- a/src/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java +++ b/src/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java @@ -31,6 +31,7 @@ import java.util.HashSet; import java.util.Iterator; +//笔记列表适配器 public class NotesListAdapter extends CursorAdapter { private static final String TAG = "NotesListAdapter"; private Context mContext; @@ -167,6 +168,7 @@ public class NotesListAdapter extends CursorAdapter { calcNotesCount(); } + /** 计算当前文件夹下笔记数量 */ private void calcNotesCount() { mNotesCount = 0; for (int i = 0; i < getCount(); i++) { diff --git a/src/app/src/main/java/net/micode/notes/ui/NotesListItem.java b/src/app/src/main/java/net/micode/notes/ui/NotesListItem.java index 1221e80..fb4d6c1 100644 --- a/src/app/src/main/java/net/micode/notes/ui/NotesListItem.java +++ b/src/app/src/main/java/net/micode/notes/ui/NotesListItem.java @@ -30,6 +30,7 @@ import net.micode.notes.tool.DataUtils; import net.micode.notes.tool.ResourceParser.NoteItemBgResources; +//列表笔记项的自定义布局 public class NotesListItem extends LinearLayout { private ImageView mAlert; private TextView mTitle;