diff --git a/doc/实践一/新建文本文档.txt b/doc/实践一/新建文本文档.txt new file mode 100644 index 0000000..0a5ca43 --- /dev/null +++ b/doc/实践一/新建文本文档.txt @@ -0,0 +1,2 @@ +add +add \ No newline at end of file diff --git a/doc/实践一/第一次实践分工.txt b/doc/实践一/第一次实践分工.txt new file mode 100644 index 0000000..157b612 --- /dev/null +++ b/doc/实践一/第一次实践分工.txt @@ -0,0 +1,22 @@ +谢成扬：软件需求文档,软件体系结构图； +胡逸飞：SonarQube的开源软件质量报告,软件体系结构图； +王俊龙：描述开源软件的模块构成,软件体系结构图; +王志成:软件体系结构图; + +由于小米便签软件体系结构图内容繁多，故细分给小组成员如下： +<<<<<<< HEAD +<<<<<<< HEAD +谢成扬 data（74+280+363+306=1023）model(254+369=623) +胡逸飞：tool,widget +王俊龙: gtask （82+101+189+505+351+343+33+34+133+585+800+128=3284） +======= +谢成扬 data，model +======= +胡逸飞：tool,widget +谢成扬 data，model (74+280+363+306=1023) (254+369=623） +>>>>>>> bfe22819090f7c7b9ef26e33482b64759f60cc3a +胡逸飞：tool（342+296+114+182=934），widget(133+47+47=227) +王俊龙: gtask +王志成:ui + +、 diff --git a/doc/第一次实践分工.txt b/doc/第一次实践分工.txt deleted file mode 100644 index 9fcbe72..0000000 --- a/doc/第一次实践分工.txt +++ /dev/null @@ -1,13 +0,0 @@ -谢成扬：软件需求文档,软件体系结构图； -胡逸飞：SonarQube的开源软件质量报告,软件体系结构图； -王俊龙：描述开源软件的模块构成,软件体系结构图; -王志成:软件体系结构图; - -由于小米便签软件体系结构图内容繁多，故细分给小组成员如下： -谢成扬 data,model -胡逸飞：tool,widget -王俊龙: gtask -王志成:ui - -12s -好 \ No newline at end of file diff --git a/doc/软件工程.docx b/doc/软件工程.docx new file mode 100644 index 0000000..6239a55 Binary files /dev/null and b/doc/软件工程.docx differ diff --git a/src/Notes-master3/.gradle/7.5/checksums/checksums.lock b/src/Notes-master3/.gradle/7.5/checksums/checksums.lock new file mode 100644 index 0000000..f774aeb Binary files /dev/null and b/src/Notes-master3/.gradle/7.5/checksums/checksums.lock differ diff --git a/src/Notes-master3/.gradle/7.5/checksums/md5-checksums.bin b/src/Notes-master3/.gradle/7.5/checksums/md5-checksums.bin new file mode 100644 index 0000000..fc2523e Binary files /dev/null and b/src/Notes-master3/.gradle/7.5/checksums/md5-checksums.bin differ diff --git a/src/Notes-master3/.gradle/7.5/checksums/sha1-checksums.bin b/src/Notes-master3/.gradle/7.5/checksums/sha1-checksums.bin new file mode 100644 index 0000000..415d955 Binary files /dev/null and b/src/Notes-master3/.gradle/7.5/checksums/sha1-checksums.bin differ diff --git a/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.bin b/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.bin new file mode 100644 index 0000000..8c063c7 Binary files /dev/null and b/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.bin differ diff --git a/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.lock b/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.lock new file mode 100644 index 0000000..5cebefd Binary files /dev/null and b/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.lock differ diff --git a/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.bin b/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.bin new file mode 100644 index 0000000..397e99e Binary files /dev/null and b/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.bin differ diff --git a/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.lock b/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.lock new file mode 100644 index 0000000..c2cda0b Binary files /dev/null and b/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.lock differ diff --git a/src/Notes-master3/.gradle/7.5/fileHashes/resourceHashesCache.bin b/src/Notes-master3/.gradle/7.5/fileHashes/resourceHashesCache.bin new file mode 100644 index 0000000..ff65e24 Binary files /dev/null and b/src/Notes-master3/.gradle/7.5/fileHashes/resourceHashesCache.bin differ diff --git a/src/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 0000000..3226fae Binary files /dev/null and b/src/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/Notes-master3/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes-master3/.gradle/buildOutputCleanup/outputFiles.bin new file mode 100644 index 0000000..0543e86 Binary files /dev/null and b/src/Notes-master3/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/src/Notes-master3/.gradle/file-system.probe b/src/Notes-master3/.gradle/file-system.probe new file mode 100644 index 0000000..ef9fb1a Binary files /dev/null and b/src/Notes-master3/.gradle/file-system.probe differ diff --git a/src/Notes-master3/.idea/Notes-master3.iml b/src/Notes-master3/.idea/Notes-master3.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/src/Notes-master3/.idea/Notes-master3.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/Notes-master3/.idea/checkstyle-idea.xml b/src/Notes-master3/.idea/checkstyle-idea.xml new file mode 100644 index 0000000..ac8ae2c --- /dev/null +++ b/src/Notes-master3/.idea/checkstyle-idea.xml @@ -0,0 +1,16 @@ + + + + 10.7.0 + JavaOnly + true + + + \ No newline at end of file diff --git a/src/Notes-master3/.idea/deploymentTargetDropDown.xml b/src/Notes-master3/.idea/deploymentTargetDropDown.xml new file mode 100644 index 0000000..ac7aa55 --- /dev/null +++ b/src/Notes-master3/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Notes-master3/.idea/gradle.xml b/src/Notes-master3/.idea/gradle.xml new file mode 100644 index 0000000..df39334 --- /dev/null +++ b/src/Notes-master3/.idea/gradle.xml @@ -0,0 +1,20 @@ + + + + + + + \ No newline at end of file diff --git a/src/Notes-master3/.idea/misc.xml b/src/Notes-master3/.idea/misc.xml new file mode 100644 index 0000000..a9f22fe --- /dev/null +++ b/src/Notes-master3/.idea/misc.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/src/Notes-master3/.idea/modules.xml b/src/Notes-master3/.idea/modules.xml new file mode 100644 index 0000000..5db786f --- /dev/null +++ b/src/Notes-master3/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/src/Notes-master3/.idea/vcs.xml b/src/Notes-master3/.idea/vcs.xml new file mode 100644 index 0000000..b2bdec2 --- /dev/null +++ b/src/Notes-master3/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/apk/debug/app-debug.apk b/src/Notes-master3/app/build/intermediates/apk/debug/app-debug.apk new file mode 100644 index 0000000..ab52cd4 Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out new file mode 100644 index 0000000..56b20fc Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties new file mode 100644 index 0000000..7e63071 --- /dev/null +++ b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -0,0 +1,96 @@ +#Wed Apr 05 15:19:48 CST 2023 +net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat +net.micode.notes.app-main-7\:/menu/sub_folder.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat +net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat +net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat +net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat +net.micode.notes.app-main-7\:/layout/widget_4x.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat +net.micode.notes.app-main-7\:/layout/note_edit.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat +net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat +net.micode.notes.app-main-7\:/xml/preferences.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat +net.micode.notes.app-main-7\:/menu/call_record_folder.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat +net.micode.notes.app-main-7\:/layout/widget_2x.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat +net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat +net.micode.notes.app-main-7\:/layout/add_account_text.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat +net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat +net.micode.notes.app-main-7\:/layout/settings_header.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat +net.micode.notes.app-main-7\:/menu/note_list.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat +net.micode.notes.app-main-7\:/menu/call_note_edit.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat +net.micode.notes.app-main-7\:/drawable/new_note.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat +net.micode.notes.app-main-7\:/layout/note_list.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat +net.micode.notes.app-main-7\:/color/primary_text_dark.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat +net.micode.notes.app-main-7\:/layout/datetime_picker.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat +net.micode.notes.app-main-7\:/raw/introduction=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat +net.micode.notes.app-main-7\:/menu/note_list_options.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat +net.micode.notes.app-main-7\:/layout/note_item.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat +net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat +net.micode.notes.app-main-7\:/layout/note_list_footer.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat +net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat +net.micode.notes.app-main-7\:/xml/searchable.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\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=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat +net.micode.notes.app-main-7\:/menu/note_edit.xml=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml new file mode 100644 index 0000000..26c9e3c --- /dev/null +++ b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml @@ -0,0 +1,56 @@ + + + -%s + --%s + --%s + --%s + + Messaging + Email + #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\" + + 短信 + 邮件 + 便签便签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“的搜尋結果 + \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml new file mode 100644 index 0000000..36b31d1 --- /dev/null +++ b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml new file mode 100644 index 0000000..13c8488 --- /dev/null +++ b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugShaders/merger.xml new file mode 100644 index 0000000..6e03a2d --- /dev/null +++ b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt new file mode 100644 index 0000000..25511cd --- /dev/null +++ b/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -0,0 +1,4 @@ +#Fri Mar 31 17:04:20 CST 2023 +base.0=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex +renamed.0=classes.dex +path.0=classes.dex diff --git a/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources new file mode 100644 index 0000000..ebe91fc Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt new file mode 100644 index 0000000..3ff6fc1 --- /dev/null +++ b/src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -0,0 +1,285 @@ +1 +2 +17 +21 +22 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 +23 android:minSdkVersion="14" +23-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:15-41 +24 android:targetSdkVersion="33" /> +24-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 +25 +26 +26-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:5-81 +26-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:22-78 +27 +27-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:5-88 +27-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:22-85 +28 +28-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:5-67 +28-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:22-64 +29 +29-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:5-72 +29-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:22-69 +30 +30-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:5-74 +30-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:22-71 +31 +31-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:5-80 +31-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:22-77 +32 +32-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:5-71 +32-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:22-68 +33 +33-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:5-74 +33-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:22-71 +34 +34-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:5-81 +34-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:22-78 +35 +36 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:37:5-158:19 +37 android:debuggable="true" +38 android:icon="@drawable/icon_app" +38-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:38:9-42 +39 android:label="@string/app_name" +39-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:39:9-41 +40 android:testOnly="true" > +41 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:40:9-53:20 +42 android:name="net.micode.notes.ui.NotesListActivity" +42-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:41:13-49 +43 android:configChanges="keyboardHidden|orientation|screenSize" +43-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:42:13-74 +44 android:exported="true" +44-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:43:13-36 +45 android:launchMode="singleTop" +45-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:44:13-43 +46 android:theme="@style/NoteTheme" +46-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:45:13-45 +47 android:uiOptions="splitActionBarWhenNarrow" +47-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:46:13-57 +48 android:windowSoftInputMode="adjustPan" > +48-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:47:13-52 +49 +49-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:49:13-52:29 +50 +50-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:17-69 +50-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:25-66 +51 +52 +52-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:17-77 +52-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:27-74 +53 +54 +55 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:55:9-85:20 +56 android:name="net.micode.notes.ui.NoteEditActivity" +56-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:56:13-48 +57 android:configChanges="keyboardHidden|orientation|screenSize" +57-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:57:13-74 +58 android:exported="true" +58-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:60:13-36 +59 android:launchMode="singleTop" +59-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:58:13-43 +60 android:theme="@style/NoteTheme" > +60-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:59:13-45 +61 +61-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:13-68:29 +61-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:28-49 +62 +62-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:17-69 +62-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:25-66 +63 +64 +64-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76 +64-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73 +65 +66 +66-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78 +66-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75 +67 +67-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78 +67-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75 +68 +69 +69-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:70:13-75:29 +70 +70-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:17-79 +70-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:25-76 +71 +72 +72-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76 +72-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73 +73 +74 +74-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78 +74-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75 +75 +75-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78 +75-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75 +76 +77 +77-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:77:13-80:29 +78 +78-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:17-71 +78-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:25-68 +79 +80 +80-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76 +80-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73 +81 +82 +83 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:82:13-84:54 +84 android:name="android.app.searchable" +84-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:83:17-54 +85 android:resource="@xml/searchable" /> +85-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:84:17-51 +86 +87 +88 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:87:9-91:40 +89 android:name="net.micode.notes.data.NotesProvider" +89-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:88:13-63 +90 android:authorities="micode_notes" +90-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:89:13-47 +91 android:exported="false" +91-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:91:13-37 +92 android:multiprocess="true" /> +92-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:90:13-40 +93 +94 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:93:9-106:20 +95 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" +95-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:94:13-57 +96 android:exported="true" +96-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:96:13-36 +97 android:label="@string/app_widget2x2" > +97-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:95:13-50 +98 +98-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29 +99 +99-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:17-84 +99-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:25-81 +100 +100-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:17-85 +100-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:25-82 +101 +101-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85 +101-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82 +102 +103 +104 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58 +105 android:name="android.appwidget.provider" +105-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58 +106 android:resource="@xml/widget_2x_info" /> +106-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55 +107 +108 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:107:9-121:20 +109 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" +109-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:108:13-57 +110 android:exported="true" +110-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:110:13-36 +111 android:label="@string/app_widget4x4" > +111-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:109:13-50 +112 +112-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29 +113 +113-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:17-84 +113-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:25-81 +114 +114-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:17-85 +114-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:25-82 +115 +115-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85 +115-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82 +116 +117 +118 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58 +119 android:name="android.appwidget.provider" +119-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58 +120 android:resource="@xml/widget_4x_info" /> +120-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55 +121 +122 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:9-128:20 +123 android:name="net.micode.notes.ui.AlarmInitReceiver" +123-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:19-55 +124 android:exported="true" > +124-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:124:13-36 +125 +125-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:125:13-127:29 +126 +126-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:17-79 +126-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:25-76 +127 +128 +129 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:130:9-133:20 +130 android:name="net.micode.notes.ui.AlarmReceiver" +130-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:131:13-61 +131 android:process=":remote" > +131-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:132:13-38 +132 +133 +134 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:135:9-141:20 +135 android:name="net.micode.notes.ui.AlarmAlertActivity" +135-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:136:13-50 +136 android:label="@string/app_name" +136-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:137:13-45 +137 android:launchMode="singleInstance" +137-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:138:13-48 +138 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > +138-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:139:13-75 +139 +140 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:143:9-148:20 +141 android:name="net.micode.notes.ui.NotesPreferenceActivity" +141-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:144:13-71 +142 android:label="@string/preferences_title" +142-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:145:13-54 +143 android:launchMode="singleTop" +143-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:146:13-43 +144 android:theme="@android:style/Theme.Holo.Light" > +144-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:147:13-60 +145 +146 +147 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:150:9-153:19 +148 android:name="net.micode.notes.gtask.remote.GTaskSyncService" +148-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:151:13-74 +149 android:exported="false" > +149-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:152:13-37 +150 +151 +152 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:155:9-157:52 +153 android:name="android.app.default_searchable" +153-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:156:13-58 +154 android:value=".ui.NoteEditActivity" /> +154-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:157:13-49 +155 +156 +157 diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat new file mode 100644 index 0000000..b8cc9ab Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat new file mode 100644 index 0000000..f3a6c60 Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat new file mode 100644 index 0000000..8a98c38 Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat new file mode 100644 index 0000000..9a4b989 Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat new file mode 100644 index 0000000..f82dd6d Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat new file mode 100644 index 0000000..d57fe3a Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat new file mode 100644 index 0000000..e75e056 Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat new file mode 100644 index 0000000..f7b11e8 Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat new file mode 100644 index 0000000..224f699 Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat new file mode 100644 index 0000000..6c1bc35 Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat new file mode 100644 index 0000000..394cf64 Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat new file mode 100644 index 0000000..d3094aa Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat new file mode 100644 index 0000000..812fbce Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat new file mode 100644 index 0000000..a0b2963 Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat new file mode 100644 index 0000000..87aeb20 Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat new file mode 100644 index 0000000..e25eb7b Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json new file mode 100644 index 0000000..d169236 --- /dev/null +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -0,0 +1,186 @@ +{ + "logs": [ + { + "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat", + "map": [ + { + "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endLines": "21", + "endColumns": "19", + "endOffsets": "838" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } + }, + { + "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\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" + } + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat", + "map": [ + { + "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\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": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "758,1073", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1065,1191" + }, + "to": { + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" + } + }, + { + "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\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": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\styles.xml", + "from": { + "startLines": "50,55,64,60,22,26,30,35,40,18,45", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905", + "endLines": "53,58,67,62,25,29,33,38,43,21,48", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104" + }, + "to": { + "startLines": "125,129,133,137,140,144,148,152,156,160,164", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", + "endLines": "128,132,136,139,143,147,151,155,159,163,167", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" + } + }, + { + "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\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" + } + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat", + "map": [ + { + "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endLines": "21", + "endColumns": "19", + "endOffsets": "838" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } + }, + { + "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\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" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json new file mode 100644 index 0000000..ee1fb7d --- /dev/null +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json @@ -0,0 +1,47 @@ +{ + "logs": [ + { + "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml", + "map": [ + { + "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endLines": "21", + "endColumns": "19", + "endOffsets": "838" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } + }, + { + "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\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" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json new file mode 100644 index 0000000..1630d03 --- /dev/null +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json @@ -0,0 +1,47 @@ +{ + "logs": [ + { + "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml", + "map": [ + { + "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endLines": "21", + "endColumns": "19", + "endOffsets": "838" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } + }, + { + "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\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" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json new file mode 100644 index 0000000..5b285d0 --- /dev/null +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -0,0 +1,100 @@ +{ + "logs": [ + { + "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml", + "map": [ + { + "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\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": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "758,1073", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1065,1191" + }, + "to": { + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" + } + }, + { + "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\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": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\styles.xml", + "from": { + "startLines": "50,55,64,60,22,26,30,35,40,18,45", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905", + "endLines": "53,58,67,62,25,29,33,38,43,21,48", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104" + }, + "to": { + "startLines": "125,129,133,137,140,144,148,152,156,160,164", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", + "endLines": "128,132,136,139,143,147,151,155,159,163,167", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" + } + }, + { + "source": "C:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\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" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/Notes-master3/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ new file mode 100644 index 0000000..80170f5 Binary files /dev/null and b/src/Notes-master3/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ diff --git a/src/Notes-master3/app/build/intermediates/source_set_path_map/debug/file-map.txt b/src/Notes-master3/app/build/intermediates/source_set_path_map/debug/file-map.txt new file mode 100644 index 0000000..143e472 --- /dev/null +++ b/src/Notes-master3/app/build/intermediates/source_set_path_map/debug/file-map.txt @@ -0,0 +1,8 @@ +net.micode.notes.app-pngs-0 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\build\generated\res\pngs\debug +net.micode.notes.app-resValues-1 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\build\generated\res\resValues\debug +net.micode.notes.app-rs-2 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\build\generated\res\rs\debug +net.micode.notes.app-mergeDebugResources-3 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir +net.micode.notes.app-mergeDebugResources-4 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir +net.micode.notes.app-merged_res-5 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\build\intermediates\merged_res\debug +net.micode.notes.app-debug-6 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\debug\res +net.micode.notes.app-main-7 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res diff --git a/src/Notes-master3/app/build/outputs/apk/debug/app-debug.apk b/src/Notes-master3/app/build/outputs/apk/debug/app-debug.apk new file mode 100644 index 0000000..5d50799 Binary files /dev/null and b/src/Notes-master3/app/build/outputs/apk/debug/app-debug.apk differ diff --git a/src/Notes-master3/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/Notes-master3/app/build/outputs/logs/manifest-merger-debug-report.txt new file mode 100644 index 0000000..8a80d46 --- /dev/null +++ b/src/Notes-master3/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -0,0 +1,255 @@ +-- Merging decision tree log --- +manifest +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 +INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 +INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 +INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 +INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 +INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 +INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 + package + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:20:5-31 + INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml + INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml + android:versionName + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:22:5-30 + INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml + INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml + xmlns:tools + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:19:5-51 + xmlns:android + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:11-69 + android:versionCode + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:21:5-28 + INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml + INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml +uses-sdk +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 +INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 +INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 +INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 +INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 + android:targetSdkVersion + INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 + INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml + tools:ignore + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:25:9-39 + android:minSdkVersion + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:15-41 + INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml + INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml +uses-permission#android.permission.WRITE_EXTERNAL_STORAGE +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:5-81 + android:name + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:22-78 +uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:5-88 + android:name + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:22-85 +uses-permission#android.permission.INTERNET +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:5-67 + android:name + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:22-64 +uses-permission#android.permission.READ_CONTACTS +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:5-72 + android:name + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:22-69 +uses-permission#android.permission.MANAGE_ACCOUNTS +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:5-74 + android:name + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:22-71 +uses-permission#android.permission.AUTHENTICATE_ACCOUNTS +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:5-80 + android:name + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:22-77 +uses-permission#android.permission.GET_ACCOUNTS +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:5-71 + android:name + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:22-68 +uses-permission#android.permission.USE_CREDENTIALS +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:5-74 + android:name + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:22-71 +uses-permission#android.permission.RECEIVE_BOOT_COMPLETED +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:5-81 + android:name + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:22-78 +application +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:37:5-158:19 + android:label + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:39:9-41 + android:icon + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:38:9-42 +activity#net.micode.notes.ui.NotesListActivity +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:40:9-53:20 + android:launchMode + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:44:13-43 + android:windowSoftInputMode + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:47:13-52 + android:exported + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:43:13-36 + android:uiOptions + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:46:13-57 + android:configChanges + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:42:13-74 + android:theme + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:45:13-45 + android:name + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:41:13-49 +intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:49:13-52:29 +action#android.intent.action.MAIN +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:17-69 + android:name + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:25-66 +category#android.intent.category.LAUNCHER +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:17-77 + android:name + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:27-74 +activity#net.micode.notes.ui.NoteEditActivity +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:55:9-85:20 + android:launchMode + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:58:13-43 + android:exported + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:60:13-36 + android:configChanges + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:57:13-74 + android:theme + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:59:13-45 + android:name + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:56: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 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:13-68:29 + android:scheme + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:28-49 + tools:ignore + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:63:17-47 +action#android.intent.action.VIEW +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:17-69 + android:name + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:25-66 +category#android.intent.category.DEFAULT +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76 + android:name + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73 +data +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78 + android:mimeType + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\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 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:70:13-75:29 +action#android.intent.action.INSERT_OR_EDIT +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:17-79 + android:name + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:25-76 +intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:77:13-80:29 +action#android.intent.action.SEARCH +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:17-71 + android:name + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:25-68 +meta-data#android.app.searchable +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:82:13-84:54 + android:resource + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:84:17-51 + android:name + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:83:17-54 +provider#net.micode.notes.data.NotesProvider +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:87:9-91:40 + android:authorities + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:89:13-47 + android:multiprocess + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:90:13-40 + android:exported + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:91:13-37 + android:name + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:88:13-63 +receiver#net.micode.notes.widget.NoteWidgetProvider_2x +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:93:9-106:20 + android:label + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:95:13-50 + android:exported + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:96:13-36 + android:name + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:94: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 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29 +action#android.appwidget.action.APPWIDGET_UPDATE +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:17-84 + android:name + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:25-81 +action#android.appwidget.action.APPWIDGET_DELETED +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:17-85 + android:name + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:25-82 +action#android.intent.action.PRIVACY_MODE_CHANGED +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85 + android:name + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82 +meta-data#android.appwidget.provider +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58 + android:resource + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55 + android:name + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58 +receiver#net.micode.notes.widget.NoteWidgetProvider_4x +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:107:9-121:20 + android:label + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:109:13-50 + android:exported + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:110:13-36 + android:name + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:108:13-57 +receiver#net.micode.notes.ui.AlarmInitReceiver +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:9-128:20 + android:exported + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:124:13-36 + android:name + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:19-55 +intent-filter#action:name:android.intent.action.BOOT_COMPLETED +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:125:13-127:29 +action#android.intent.action.BOOT_COMPLETED +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:17-79 + android:name + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:25-76 +receiver#net.micode.notes.ui.AlarmReceiver +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:130:9-133:20 + android:process + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:132:13-38 + android:name + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:131:13-61 +activity#net.micode.notes.ui.AlarmAlertActivity +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:135:9-141:20 + android:label + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:137:13-45 + android:launchMode + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:138:13-48 + tools:ignore + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:140:13-42 + android:theme + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:139:13-75 + android:name + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:136:13-50 +activity#net.micode.notes.ui.NotesPreferenceActivity +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:143:9-148:20 + android:label + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:145:13-54 + android:launchMode + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:146:13-43 + android:theme + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:147:13-60 + android:name + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:144:13-71 +service#net.micode.notes.gtask.remote.GTaskSyncService +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:150:9-153:19 + android:exported + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:152:13-37 + android:name + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:151:13-74 +meta-data#android.app.default_searchable +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:155:9-157:52 + android:value + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:157:13-49 + android:name + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:156:13-58 diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin new file mode 100644 index 0000000..de3f596 Binary files /dev/null and b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ diff --git a/src/Notes-master3/local.properties b/src/Notes-master3/local.properties new file mode 100644 index 0000000..3a6cb12 --- /dev/null +++ b/src/Notes-master3/local.properties @@ -0,0 +1,8 @@ +## This file must *NOT* be checked into Version Control Systems, +# as it contains information specific to your local configuration. +# +# Location of the SDK. This is only used by Gradle. +# For customization when using a Version Control System, please read the +# header note. +#Wed Apr 05 15:07:38 CST 2023 +sdk.dir=C\:\\Users\\13293\\AppData\\Local\\Android\\Sdk