diff --git a/.gradle/7.4.2/checksums/checksums.lock b/.gradle/7.4.2/checksums/checksums.lock deleted file mode 100644 index 32765d4..0000000 Binary files a/.gradle/7.4.2/checksums/checksums.lock and /dev/null differ diff --git a/.gradle/7.4.2/checksums/md5-checksums.bin b/.gradle/7.4.2/checksums/md5-checksums.bin deleted file mode 100644 index fa21229..0000000 Binary files a/.gradle/7.4.2/checksums/md5-checksums.bin and /dev/null differ diff --git a/.gradle/7.4.2/checksums/sha1-checksums.bin b/.gradle/7.4.2/checksums/sha1-checksums.bin deleted file mode 100644 index 17d2d09..0000000 Binary files a/.gradle/7.4.2/checksums/sha1-checksums.bin and /dev/null differ diff --git a/.gradle/7.4.2/dependencies-accessors/dependencies-accessors.lock b/.gradle/7.4.2/dependencies-accessors/dependencies-accessors.lock deleted file mode 100644 index 43ff0e8..0000000 Binary files a/.gradle/7.4.2/dependencies-accessors/dependencies-accessors.lock and /dev/null differ diff --git a/.gradle/7.4.2/executionHistory/executionHistory.lock b/.gradle/7.4.2/executionHistory/executionHistory.lock deleted file mode 100644 index 8a49b53..0000000 Binary files a/.gradle/7.4.2/executionHistory/executionHistory.lock and /dev/null differ diff --git a/.gradle/7.4.2/fileHashes/fileHashes.lock b/.gradle/7.4.2/fileHashes/fileHashes.lock deleted file mode 100644 index 3d978cb..0000000 Binary files a/.gradle/7.4.2/fileHashes/fileHashes.lock and /dev/null differ diff --git a/.gradle/7.5/executionHistory/executionHistory.bin b/.gradle/7.5/executionHistory/executionHistory.bin deleted file mode 100644 index 574e115..0000000 Binary files a/.gradle/7.5/executionHistory/executionHistory.bin and /dev/null differ diff --git a/.gradle/7.5/executionHistory/executionHistory.lock b/.gradle/7.5/executionHistory/executionHistory.lock deleted file mode 100644 index 7d815b5..0000000 Binary files a/.gradle/7.5/executionHistory/executionHistory.lock and /dev/null differ diff --git a/.gradle/7.5/fileChanges/last-build.bin b/.gradle/7.5/fileChanges/last-build.bin deleted file mode 100644 index f76dd23..0000000 Binary files a/.gradle/7.5/fileChanges/last-build.bin and /dev/null differ diff --git a/.gradle/7.5/fileHashes/fileHashes.bin b/.gradle/7.5/fileHashes/fileHashes.bin deleted file mode 100644 index e20fa4e..0000000 Binary files a/.gradle/7.5/fileHashes/fileHashes.bin and /dev/null differ diff --git a/.gradle/7.5/fileHashes/fileHashes.lock b/.gradle/7.5/fileHashes/fileHashes.lock deleted file mode 100644 index 21f4470..0000000 Binary files a/.gradle/7.5/fileHashes/fileHashes.lock and /dev/null differ diff --git a/.gradle/7.5/gc.properties b/.gradle/7.5/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock deleted file mode 100644 index efb6566..0000000 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and /dev/null differ diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin deleted file mode 100644 index b541d62..0000000 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and /dev/null differ diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe deleted file mode 100644 index c3d951e..0000000 Binary files a/.gradle/file-system.probe and /dev/null differ diff --git a/.gradle/vcs-1/gc.properties b/.gradle/vcs-1/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/.idea/modules/app/gitProject.app.androidTest.iml b/.idea/modules/app/gitProject.app.androidTest.iml deleted file mode 100644 index c842b84..0000000 --- a/.idea/modules/app/gitProject.app.androidTest.iml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/app/gitProject.app.iml b/.idea/modules/app/gitProject.app.iml deleted file mode 100644 index 8af03bc..0000000 --- a/.idea/modules/app/gitProject.app.iml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/app/gitProject.app.main.iml b/.idea/modules/app/gitProject.app.main.iml deleted file mode 100644 index 80f0640..0000000 --- a/.idea/modules/app/gitProject.app.main.iml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/app/gitProject.app.unitTest.iml b/.idea/modules/app/gitProject.app.unitTest.iml deleted file mode 100644 index 9eb22cb..0000000 --- a/.idea/modules/app/gitProject.app.unitTest.iml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/gitProject.iml b/.idea/modules/gitProject.iml deleted file mode 100644 index 8ca1a97..0000000 --- a/.idea/modules/gitProject.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index a54e1c7..9f1fe60 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -10,109 +10,7 @@ -<<<<<<< HEAD -<<<<<<< remotes/origin/cyx_branch - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -======= ->>>>>>> local -======= - -<<<<<<< HEAD - - - - - - - - - - - - - - - - - - - - - ->>>>>>> 97f59e709a754d9ac92f018b602c051baead5aac -======= ->>>>>>> master diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ce13d23a60c58f5f52995e904816ac4c1bdc8eaeca853b6df06555082277affe_bucket_0/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ce13d23a60c58f5f52995e904816ac4c1bdc8eaeca853b6df06555082277affe_bucket_0/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ce13d23a60c58f5f52995e904816ac4c1bdc8eaeca853b6df06555082277affe_bucket_0/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ce13d23a60c58f5f52995e904816ac4c1bdc8eaeca853b6df06555082277affe_bucket_1/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ce13d23a60c58f5f52995e904816ac4c1bdc8eaeca853b6df06555082277affe_bucket_1/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ce13d23a60c58f5f52995e904816ac4c1bdc8eaeca853b6df06555082277affe_bucket_1/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ce13d23a60c58f5f52995e904816ac4c1bdc8eaeca853b6df06555082277affe_bucket_2/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ce13d23a60c58f5f52995e904816ac4c1bdc8eaeca853b6df06555082277affe_bucket_2/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ce13d23a60c58f5f52995e904816ac4c1bdc8eaeca853b6df06555082277affe_bucket_2/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ce13d23a60c58f5f52995e904816ac4c1bdc8eaeca853b6df06555082277affe_bucket_3/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ce13d23a60c58f5f52995e904816ac4c1bdc8eaeca853b6df06555082277affe_bucket_3/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ce13d23a60c58f5f52995e904816ac4c1bdc8eaeca853b6df06555082277affe_bucket_3/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ce13d23a60c58f5f52995e904816ac4c1bdc8eaeca853b6df06555082277affe_bucket_4/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ce13d23a60c58f5f52995e904816ac4c1bdc8eaeca853b6df06555082277affe_bucket_4/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ce13d23a60c58f5f52995e904816ac4c1bdc8eaeca853b6df06555082277affe_bucket_4/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ce13d23a60c58f5f52995e904816ac4c1bdc8eaeca853b6df06555082277affe_bucket_5/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ce13d23a60c58f5f52995e904816ac4c1bdc8eaeca853b6df06555082277affe_bucket_5/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ce13d23a60c58f5f52995e904816ac4c1bdc8eaeca853b6df06555082277affe_bucket_5/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ce13d23a60c58f5f52995e904816ac4c1bdc8eaeca853b6df06555082277affe_bucket_6/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ce13d23a60c58f5f52995e904816ac4c1bdc8eaeca853b6df06555082277affe_bucket_6/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ce13d23a60c58f5f52995e904816ac4c1bdc8eaeca853b6df06555082277affe_bucket_6/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ce13d23a60c58f5f52995e904816ac4c1bdc8eaeca853b6df06555082277affe_bucket_7/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ce13d23a60c58f5f52995e904816ac4c1bdc8eaeca853b6df06555082277affe_bucket_7/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ce13d23a60c58f5f52995e904816ac4c1bdc8eaeca853b6df06555082277affe_bucket_7/graph.bin and /dev/null differ diff --git a/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex deleted file mode 100644 index a5ed4d6..0000000 Binary files a/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and /dev/null differ diff --git a/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/app/build/intermediates/dex_archive_input_jar_hashes/debug/out deleted file mode 100644 index e2d66f9..0000000 Binary files a/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and /dev/null differ diff --git a/app/build/intermediates/dex_number_of_buckets_file/debug/out b/app/build/intermediates/dex_number_of_buckets_file/debug/out deleted file mode 100644 index 301160a..0000000 --- a/app/build/intermediates/dex_number_of_buckets_file/debug/out +++ /dev/null @@ -1 +0,0 @@ -8 \ No newline at end of file diff --git a/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties deleted file mode 100644 index d94b0a0..0000000 --- a/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ /dev/null @@ -1,96 +0,0 @@ -#Wed Jun 07 14:15:06 CST 2023 -net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat -net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat -net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat -net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat -net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat -net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat -net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat -net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat -net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat -net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat -net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat -net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat -net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat -net.micode.notes.app-main-7\:/layout/note_list_footer.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat -net.micode.notes.app-main-7\:/layout/settings_header.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat -net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat -net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat -net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat -net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat -net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat -net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat -net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat -net.micode.notes.app-main-7\:/menu/note_list_options.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat -net.micode.notes.app-main-7\:/menu/sub_folder.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat -net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat -net.micode.notes.app-main-7\:/raw/introduction=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat -net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat -net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat -net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat -net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat diff --git a/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml deleted file mode 100644 index 28bb31d..0000000 --- a/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - -%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/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/app/build/intermediates/incremental/mergeDebugAssets/merger.xml deleted file mode 100644 index 199e883..0000000 --- a/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml deleted file mode 100644 index 1e5ab0b..0000000 --- a/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/app/build/intermediates/incremental/mergeDebugShaders/merger.xml deleted file mode 100644 index ad7c738..0000000 --- a/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt deleted file mode 100644 index a704224..0000000 --- a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ /dev/null @@ -1,4 +0,0 @@ -#Wed Jun 07 14:15:07 CST 2023 -base.0=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex -path.0=classes.dex -renamed.0=classes.dex diff --git a/app/build/intermediates/incremental/processDebugResources/resources-list-for-resources-debug.ap_.txt b/app/build/intermediates/incremental/processDebugResources/resources-list-for-resources-debug.ap_.txt deleted file mode 100644 index 93424e9..0000000 --- a/app/build/intermediates/incremental/processDebugResources/resources-list-for-resources-debug.ap_.txt +++ /dev/null @@ -1 +0,0 @@ -D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\color_primary_text_dark.xml.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\color_secondary_text_dark.xml.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_bg_btn_set_color.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_bg_color_btn_mask.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_call_record.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_clock.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_delete.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_dropdown_icon.9.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_blue.9.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_green.9.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_red.9.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_blue.9.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_green.9.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_red.9.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_white.9.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_title_yellow.9.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_white.9.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_edit_yellow.9.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_font_large.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_font_normal.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_font_size_selector_bg.9.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_font_small.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_font_super.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_icon_app.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_list_background.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_list_blue_down.9.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_list_blue_middle.9.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_list_blue_single.9.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_list_blue_up.9.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_list_folder.9.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_list_footer_bg.9.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_list_green_down.9.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_list_green_middle.9.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_list_green_single.9.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_list_green_up.9.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_list_red_down.9.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_list_red_middle.9.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_list_red_single.9.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_list_red_up.9.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_list_white_down.9.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_list_white_middle.9.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_list_white_single.9.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_list_white_up.9.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_list_yellow_down.9.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_list_yellow_middle.9.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_list_yellow_single.9.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_list_yellow_up.9.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_menu_delete.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_menu_move.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_new_note_normal.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_new_note_pressed.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_note_edit_color_selector_panel.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_notification.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_search_result.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_selected.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_title_alert.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_title_bar_bg.9.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_blue.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_green.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_red.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_white.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_2x_yellow.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_blue.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_green.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_red.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_white.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable-hdpi_widget_4x_yellow.png.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\drawable_new_note.xml.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\layout_account_dialog_title.xml.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\layout_add_account_text.xml.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\layout_datetime_picker.xml.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\layout_dialog_edit_text.xml.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\layout_folder_list_item.xml.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\layout_note_edit.xml.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\layout_note_edit_list_item.xml.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\layout_note_item.xml.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\layout_note_list.xml.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\layout_note_list_dropdown_menu.xml.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\layout_note_list_footer.xml.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\layout_settings_header.xml.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\layout_widget_2x.xml.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\layout_widget_4x.xml.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\menu_call_note_edit.xml.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\menu_call_record_folder.xml.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\menu_note_edit.xml.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\menu_note_list.xml.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\menu_note_list_dropdown.xml.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\menu_note_list_options.xml.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\menu_sub_folder.xml.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\raw-zh-rCN_introduction.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\raw_introduction.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\values-zh-rCN_values-zh-rCN.arsc.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\values-zh-rTW_values-zh-rTW.arsc.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\values_values.arsc.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\xml_preferences.xml.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\xml_searchable.xml.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\xml_widget_2x_info.xml.flat D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug\xml_widget_4x_info.xml.flat \ No newline at end of file diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class deleted file mode 100644 index b8c4794..0000000 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and /dev/null differ diff --git a/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt deleted file mode 100644 index 8868f1e..0000000 --- a/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ /dev/null @@ -1,273 +0,0 @@ -1 -2 -17 -21 -22 D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:23:5-44 -23 android:minSdkVersion="14" -23-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:23:15-41 -24 android:targetSdkVersion="14" /> -24-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:23:5-44 -25 -26 -26-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:25:5-81 -26-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:25:22-78 -27 -27-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:26:5-88 -27-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:26:22-85 -28 -28-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:27:5-67 -28-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:27:22-64 -29 -29-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:28:5-72 -29-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:28:22-69 -30 -30-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:29:5-74 -30-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:29:22-71 -31 -31-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:30:5-80 -31-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:30:22-77 -32 -32-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:31:5-71 -32-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:31:22-68 -33 -33-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:32:5-74 -33-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:32:22-71 -34 -34-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:33:5-81 -34-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:33:22-78 -35 -36 D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:35:5-149:19 -37 android:debuggable="true" -38 android:icon="@drawable/icon_app" -38-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:36:9-42 -39 android:label="@string/app_name" -39-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:37:9-41 -40 android:testOnly="true" > -41 D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:38:9-51:20 -42 android:name="net.micode.notes.ui.NotesListActivity" -42-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:39:13-49 -43 android:configChanges="keyboardHidden|orientation|screenSize" -43-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:40:13-74 -44 android:label="@string/app_name" -44-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:41:13-45 -45 android:launchMode="singleTop" -45-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:42:13-43 -46 android:theme="@style/NoteTheme" -46-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:43:13-45 -47 android:uiOptions="splitActionBarWhenNarrow" -47-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:44:13-57 -48 android:windowSoftInputMode="adjustPan" > -48-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:45:13-52 -49 -49-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:47:13-50:29 -50 -50-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:48:17-69 -50-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:48:25-66 -51 -52 -52-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:49:17-77 -52-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:49:27-74 -53 -54 -55 D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:53:9-81:20 -56 android:name="net.micode.notes.ui.NoteEditActivity" -56-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:54:13-48 -57 android:configChanges="keyboardHidden|orientation|screenSize" -57-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:55:13-74 -58 android:launchMode="singleTop" -58-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:56:13-43 -59 android:theme="@style/NoteTheme" > -59-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:57:13-45 -60 -60-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:59:13-64:29 -61 -61-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:60:17-69 -61-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:60:25-66 -62 -63 -63-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:61:17-76 -63-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:61:27-73 -64 -65 -65-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:62:17-78 -65-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:62:23-75 -66 -66-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:62:17-78 -66-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:62:23-75 -67 -68 -68-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:66:13-71:29 -69 -69-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:67:17-79 -69-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:67:25-76 -70 -71 -71-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:61:17-76 -71-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:61:27-73 -72 -73 -73-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:62:17-78 -73-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:62:23-75 -74 -74-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:62:17-78 -74-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:62:23-75 -75 -76 -76-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:73:13-76:29 -77 -77-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:74:17-71 -77-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:74:25-68 -78 -79 -79-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:61:17-76 -79-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:61:27-73 -80 -81 -82 D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:78:13-80:54 -83 android:name="android.app.searchable" -83-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:79:17-54 -84 android:resource="@xml/searchable" /> -84-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:80:17-51 -85 -86 -87 D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:83:9-86:43 -88 android:name="net.micode.notes.data.NotesProvider" -88-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:84:13-63 -89 android:authorities="micode_notes" -89-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:85:13-47 -90 android:multiprocess="true" /> -90-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:86:13-40 -91 -92 D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:88:9-100:20 -93 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -93-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:89:13-57 -94 android:label="@string/app_widget2x2" > -94-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:90:13-50 -95 -95-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:91:13-95:29 -96 -96-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:92:17-84 -96-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:92:25-81 -97 -97-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:93:17-85 -97-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:93:25-82 -98 -98-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:94:17-85 -98-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:94:25-82 -99 -100 -101 D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:97:13-99:58 -102 android:name="android.appwidget.provider" -102-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:98:17-58 -103 android:resource="@xml/widget_2x_info" /> -103-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:99:17-55 -104 -105 D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:101:9-114:20 -106 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -106-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:102:13-57 -107 android:label="@string/app_widget4x4" > -107-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:103:13-50 -108 -108-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:91:13-95:29 -109 -109-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:92:17-84 -109-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:92:25-81 -110 -110-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:93:17-85 -110-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:93:25-82 -111 -111-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:94:17-85 -111-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:94:25-82 -112 -113 -114 D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:97:13-99:58 -115 android:name="android.appwidget.provider" -115-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:98:17-58 -116 android:resource="@xml/widget_4x_info" /> -116-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:99:17-55 -117 -118 -118-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:116:9-120:20 -118-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:116:19-55 -119 -119-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:117:13-119:29 -120 -120-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:118:17-79 -120-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:118:25-76 -121 -122 -123 D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:122:9-125:20 -124 android:name="net.micode.notes.ui.AlarmReceiver" -124-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:123:13-61 -125 android:process=":remote" > -125-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:124:13-38 -126 -127 -128 D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:127:9-132:20 -129 android:name="net.micode.notes.ui.AlarmAlertActivity" -129-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:128:13-50 -130 android:label="@string/app_name" -130-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:129:13-45 -131 android:launchMode="singleInstance" -131-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:130:13-48 -132 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -132-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:131:13-75 -133 -134 D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:134:9-139:20 -135 android:name="net.micode.notes.ui.NotesPreferenceActivity" -135-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:135:13-71 -136 android:label="@string/preferences_title" -136-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:136:13-54 -137 android:launchMode="singleTop" -137-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:137:13-43 -138 android:theme="@android:style/Theme.Holo.Light" > -138-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:138:13-60 -139 -140 -141 D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:141:9-144:19 -142 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -142-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:142:13-74 -143 android:exported="false" > -143-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:143:13-37 -144 -145 -146 D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:146:9-148:52 -147 android:name="android.app.default_searchable" -147-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:147:13-58 -148 android:value=".ui.NoteEditActivity" /> -148-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:148:13-49 -149 -150 -151 diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json deleted file mode 100644 index f7db949..0000000 --- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ /dev/null @@ -1,541 +0,0 @@ -{ - "logs": [ - { -<<<<<<< HEAD:app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json - "outputFile": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rCN_values-zh-rCN.arsc.flat", - "map": [ - { - "source": "D:\\gitProjs\\gitProject\\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" -======= - "outputFile": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values_values.arsc.flat", - "map": [ - { - "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values\\dimens.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1" - }, - "to": { - "startLines": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "477,529,582,635,687", - "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" - } - }, - { - "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values\\strings.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" - }, - "to": { - "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", - "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" - } - }, - { - "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values\\styles.xml", - "from": { - "startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,2704,-1,-1,-1,-1,-1,-1,-1,-1", - "endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1", - "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1", - "endOffsets": "-1,-1,2920,-1,-1,-1,-1,-1,-1,-1,-1" - }, - "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,8712,8872,9055,9240,9425,9628,9834,10017", - "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,8707,8867,9050,9235,9420,9623,9829,10012,10213" - } - }, - { - "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values\\arrays.xml", - "from": { - "startLines": "-1,-1", - "startColumns": "-1,-1", - "startOffsets": "-1,-1" - }, - "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,300", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "295,415" - } - }, - { - "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values\\colors.xml", - "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" - }, - "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "420", - "endColumns": "56", - "endOffsets": "472" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat", - "map": [ - { - "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,124,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6833,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6871,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" ->>>>>>> master:src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json - }, - "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,107", - "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", - "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,3547,3596,3645,3692,3739,3786,3831,3882,3935,4010,4069,4126,4200,4264,4333,4411,4521,4625,4698,4764,4819,4884,4949,4998,5081,5159,5197,5242,5290,5352,5409,5464,5523,5590,5648,5710,5758,5803,5851,5902,5968", - "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,107", - "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,42,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,3542,3591,3640,3687,3734,3781,3826,3877,3930,4005,4064,4121,4195,4259,4328,4406,4516,4620,4693,4759,4814,4879,4944,4993,5076,5154,5192,5237,5285,5347,5404,5459,5518,5585,5643,5705,5753,5798,5846,5897,5963,6029" - } - }, - { -<<<<<<< HEAD:app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json - "source": "D:\\gitProjs\\gitProject\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "730", - "endLines": "21", - "endColumns": "19", - "endOffsets": "838" -======= - "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", - "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" ->>>>>>> master:src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat", - "map": [ - { -<<<<<<< HEAD:app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json - "source": "D:\\gitProjs\\gitProject\\app\\src\\main\\res\\values\\colors.xml", - "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" - }, - "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "420", - "endColumns": "56", - "endOffsets": "472" - } - }, - { - "source": "D:\\gitProjs\\gitProject\\app\\src\\main\\res\\values\\arrays.xml", - "from": { -======= - "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values\\dimens.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1" - }, - "to": { - "startLines": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "477,529,582,635,687", - "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" - } - }, - { - "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values\\strings.xml", - "from": { - "startLines": "128,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,133,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "8136,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8550,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endLines": "132,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,133,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,46,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endOffsets": "8544,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8592,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" - }, - "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,125", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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,5031,5086,5139,5186,5239,5295,5343,5398,5451,5535,5602,5666,5762,5836,5917,6006,6169,6313,6392,6467,6549,6608,6688,6768,6823,6945,7048,7089,7142,7199,7273,7338,7406,7492,7572,7641,7735,7794,7849,7911,7971,8081", - "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,125", - "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,46,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,5026,5081,5134,5181,5234,5290,5338,5393,5446,5530,5597,5661,5757,5831,5912,6001,6164,6308,6387,6462,6544,6603,6683,6763,6818,6940,7043,7084,7137,7194,7268,7333,7401,7487,7567,7636,7730,7789,7844,7906,7966,8076,8166" - } - }, - { - "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values\\styles.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" - }, - "to": { - "startLines": "126,130,134,138,141,145,149,153,157,161,165", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8171,8375,8586,8759,8919,9102,9287,9472,9675,9881,10064", - "endLines": "129,133,137,140,144,148,152,156,160,164,168", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8370,8581,8754,8914,9097,9282,9467,9670,9876,10059,10260" - } - }, - { - "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values\\arrays.xml", - "from": { ->>>>>>> master:src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json - "startLines": "-1,-1", - "startColumns": "-1,-1", - "startOffsets": "-1,-1" - }, - "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,300", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "295,415" - } - }, - { -<<<<<<< HEAD:app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json - "source": "D:\\gitProjs\\gitProject\\app\\src\\main\\res\\values\\strings.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" - }, - "to": { - "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", - "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" - } - }, - { - "source": "D:\\gitProjs\\gitProject\\app\\src\\main\\res\\values\\styles.xml", - "from": { - "startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,2704,-1,-1,-1,-1,-1,-1,-1,-1", - "endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1", - "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1", - "endOffsets": "-1,-1,2920,-1,-1,-1,-1,-1,-1,-1,-1" - }, - "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,8712,8872,9055,9240,9425,9628,9834,10017", - "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,8707,8867,9050,9235,9420,9623,9829,10012,10213" - } - }, - { - "source": "D:\\gitProjs\\gitProject\\app\\src\\main\\res\\values\\dimens.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1" - }, - "to": { - "startLines": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "477,529,582,635,687", - "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" -======= - "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values\\colors.xml", - "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" - }, - "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "420", - "endColumns": "56", - "endOffsets": "472" ->>>>>>> master:src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json - } - } - ] - }, - { -<<<<<<< HEAD:app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json - "outputFile": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values_values.arsc.flat", - "map": [ - { - "source": "D:\\gitProjs\\gitProject\\app\\src\\main\\res\\values\\colors.xml", -======= - "outputFile": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rTW_values-zh-rTW.arsc.flat", - "map": [ - { - "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", ->>>>>>> master:src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "730", -<<<<<<< HEAD:app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json - "endColumns": "56", - "endOffsets": "782" - }, - "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "420", - "endColumns": "56", - "endOffsets": "472" - } - }, - { - "source": "D:\\gitProjs\\gitProject\\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": "D:\\gitProjs\\gitProject\\app\\src\\main\\res\\values\\strings.xml", - "from": { - "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107", - "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192" - }, - "to": { - "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", - "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" - } - }, - { - "source": "D:\\gitProjs\\gitProject\\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": "D:\\gitProjs\\gitProject\\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" - } - } - ] - }, - { - "outputFile": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rTW_values-zh-rTW.arsc.flat", - "map": [ - { - "source": "D:\\gitProjs\\gitProject\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", -======= - "endLines": "21", - "endColumns": "19", - "endOffsets": "838" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - }, - { - "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", ->>>>>>> master:src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json - "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" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat", - "map": [ - { - "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", - "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - }, - { -<<<<<<< HEAD:app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json - "source": "D:\\gitProjs\\gitProject\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", -======= - "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,125,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6809,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6847,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" - }, - "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,107", - "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", - "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,3545,3594,3643,3690,3737,3784,3829,3880,3933,4008,4067,4124,4198,4262,4331,4409,4519,4623,4696,4762,4817,4882,4947,4996,5079,5157,5195,5240,5288,5350,5407,5462,5521,5588,5646,5708,5756,5801,5849,5900,5966", - "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,107", - "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,42,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,3540,3589,3638,3685,3732,3779,3824,3875,3928,4003,4062,4119,4193,4257,4326,4404,4514,4618,4691,4757,4812,4877,4942,4991,5074,5152,5190,5235,5283,5345,5402,5457,5516,5583,5641,5703,5751,5796,5844,5895,5961,6027" - } - } - ] - }, - { - "outputFile": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rCN_values-zh-rCN.arsc.flat", - "map": [ - { - "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", - "from": { - "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052", - "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" - } - }, - { - "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", ->>>>>>> master:src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json - "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" - } - } - ] - } - ] -} \ No newline at end of file diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json deleted file mode 100644 index 9ede1b7..0000000 --- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ /dev/null @@ -1,97 +0,0 @@ -{ - "logs": [ - { - "outputFile": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-3:\\values-zh-rCN\\values-zh-rCN.xml", - "map": [ - { -<<<<<<< HEAD:app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json - "source": "D:\\gitProjs\\gitProject\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", -======= - "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", ->>>>>>> master:src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json - "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" - } - }, - { -<<<<<<< HEAD:app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json - "source": "D:\\gitProjs\\gitProject\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", -======= - "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", ->>>>>>> master:src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "730", - "endLines": "21", - "endColumns": "19", - "endOffsets": "838" -<<<<<<< HEAD:app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json -======= - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml", - "map": [ - { - "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,124,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6833,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6871,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" - }, - "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,107", - "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", - "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,3547,3596,3645,3692,3739,3786,3831,3882,3935,4010,4069,4126,4200,4264,4333,4411,4521,4625,4698,4764,4819,4884,4949,4998,5081,5159,5197,5242,5290,5352,5409,5464,5523,5590,5648,5710,5758,5803,5851,5902,5968", - "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,107", - "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,42,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,3542,3591,3640,3687,3734,3781,3826,3877,3930,4005,4064,4121,4195,4259,4328,4406,4516,4620,4693,4759,4814,4879,4944,4993,5076,5154,5192,5237,5285,5347,5404,5459,5518,5585,5643,5705,5753,5798,5846,5897,5963,6029" - } - }, - { - "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", - "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" ->>>>>>> master:src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - } - ] - } - ] -} \ No newline at end of file diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json deleted file mode 100644 index c094815..0000000 --- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json +++ /dev/null @@ -1,109 +0,0 @@ -{ - "logs": [ - { - "outputFile": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-3:\\values-zh-rTW\\values-zh-rTW.xml", - "map": [ - { -<<<<<<< HEAD:app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json - "source": "D:\\gitProjs\\gitProject\\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" - } - }, - { - "source": "D:\\gitProjs\\gitProject\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", -======= - "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", ->>>>>>> master:src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json - "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": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", - "from": { - "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052", - "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml", - "map": [ - { - "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", - "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - }, - { - "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,125,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6809,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6847,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" - }, - "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,107", - "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", - "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,3545,3594,3643,3690,3737,3784,3829,3880,3933,4008,4067,4124,4198,4262,4331,4409,4519,4623,4696,4762,4817,4882,4947,4996,5079,5157,5195,5240,5288,5350,5407,5462,5521,5588,5646,5708,5756,5801,5849,5900,5966", - "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,107", - "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,42,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,3540,3589,3638,3685,3732,3779,3824,3875,3928,4003,4062,4119,4193,4257,4326,4404,4514,4618,4691,4757,4812,4877,4942,4991,5074,5152,5190,5235,5283,5345,5402,5457,5516,5583,5641,5703,5751,5796,5844,5895,5961,6027" - } - } - ] - } - ] -} \ No newline at end of file diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json deleted file mode 100644 index 38aa7a3..0000000 --- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ /dev/null @@ -1,186 +0,0 @@ -{ - "logs": [ - { - "outputFile": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-3:\\values\\values.xml", - "map": [ - { - "source": "D:\\gitProjs\\gitProject\\app\\src\\main\\res\\values\\colors.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "730", - "endColumns": "56", - "endOffsets": "782" - }, - "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "420", - "endColumns": "56", - "endOffsets": "472" - } - }, - { - "source": "D:\\gitProjs\\gitProject\\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": "D:\\gitProjs\\gitProject\\app\\src\\main\\res\\values\\strings.xml", - "from": { - "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107", - "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192" - }, - "to": { - "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", - "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" - } - }, - { - "source": "D:\\gitProjs\\gitProject\\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": "D:\\gitProjs\\gitProject\\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" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml", - "map": [ - { - "source": "D:\\gitProjs\\gitProject\\app\\src\\main\\res\\values\\colors.xml", - "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" - }, - "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "420", - "endColumns": "56", - "endOffsets": "472" - } - }, - { - "source": "D:\\gitProjs\\gitProject\\app\\src\\main\\res\\values\\arrays.xml", - "from": { - "startLines": "-1,-1", - "startColumns": "-1,-1", - "startOffsets": "-1,-1" - }, - "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,300", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "295,415" - } - }, - { - "source": "D:\\gitProjs\\gitProject\\app\\src\\main\\res\\values\\strings.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" - }, - "to": { - "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", - "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" - } - }, - { - "source": "D:\\gitProjs\\gitProject\\app\\src\\main\\res\\values\\styles.xml", - "from": { - "startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,2704,-1,-1,-1,-1,-1,-1,-1,-1", - "endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1", - "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1", - "endOffsets": "-1,-1,2920,-1,-1,-1,-1,-1,-1,-1,-1" - }, - "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,8712,8872,9055,9240,9425,9628,9834,10017", - "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,8707,8867,9050,9235,9420,9623,9829,10012,10213" - } - }, - { - "source": "D:\\gitProjs\\gitProject\\app\\src\\main\\res\\values\\dimens.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1" - }, - "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" - } - } - ] - } - ] -} \ No newline at end of file diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json deleted file mode 100644 index cb41a7f..0000000 --- a/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json +++ /dev/null @@ -1,386 +0,0 @@ -[ - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_single.9.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_single.9.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_add_account_text.xml.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\add_account_text.xml" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_single.9.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_single.9.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_edit_list_item.xml.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_edit_list_item.xml" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_bar_bg.9.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_bar_bg.9.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_middle.9.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_middle.9.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_down.9.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_down.9.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_settings_header.xml.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\settings_header.xml" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_white.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_white.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_folder_list_item.xml.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\folder_list_item.xml" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_call_record_folder.xml.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\call_record_folder.xml" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_down.9.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_down.9.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_note_edit_color_selector_panel.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\note_edit_color_selector_panel.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_up.9.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_up.9.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_edit.xml.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_edit.xml" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_large.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_large.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_secondary_text_dark.xml.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\secondary_text_dark.xml" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_white.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_white.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_delete.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\menu_delete.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_single.9.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_single.9.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_widget_4x_info.xml.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\widget_4x_info.xml" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_call_record.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\call_record.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list.xml.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list.xml" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_normal.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_normal.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_yellow.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_yellow.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_blue.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_blue.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_footer_bg.9.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_footer_bg.9.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_single.9.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_single.9.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_color_btn_mask.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_color_btn_mask.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_new_note.xml.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\new_note.xml" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_search_result.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\search_result.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_pressed.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_pressed.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_widget_2x.xml.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\widget_2x.xml" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_edit.xml.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_edit.xml" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list_options.xml.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list_options.xml" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_green.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_green.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_yellow.9.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_yellow.9.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_primary_text_dark.xml.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\primary_text_dark.xml" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list_dropdown_menu.xml.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list_dropdown_menu.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-5:/menu_note_list.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/note_list.xml" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_widget_4x.xml.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\widget_4x.xml" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_green.9.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_green.9.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_down.9.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_down.9.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_green.9.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_green.9.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_up.9.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_up.9.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_searchable.xml.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\searchable.xml" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_sub_folder.xml.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\sub_folder.xml" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_middle.9.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_middle.9.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_red.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_red.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_selected.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\selected.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_white.9.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_white.9.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_blue.9.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_blue.9.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_dropdown_icon.9.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\dropdown_icon.9.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_red.9.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_red.9.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_small.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_small.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_middle.9.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_middle.9.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_middle.9.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_middle.9.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_call_note_edit.xml.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\call_note_edit.xml" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_red.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_red.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_size_selector_bg.9.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_size_selector_bg.9.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_red.9.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_red.9.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_white.9.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_white.9.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_folder.9.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_folder.9.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_notification.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\notification.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list_footer.xml.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list_footer.xml" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_blue.9.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_blue.9.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_move.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\menu_move.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_yellow.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_yellow.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_delete.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\delete.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_up.9.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_up.9.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_single.9.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_single.9.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list_dropdown.xml.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list_dropdown.xml" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_up.9.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_up.9.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_btn_set_color.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_btn_set_color.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_icon_app.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\icon_app.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_alert.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_alert.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_down.9.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_down.9.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_preferences.xml.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\preferences.xml" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_background.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_background.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_middle.9.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_middle.9.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_super.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_super.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_dialog_edit_text.xml.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\dialog_edit_text.xml" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_yellow.9.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_yellow.9.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\raw-zh-rCN_introduction.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\raw-zh-rCN\\introduction" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_up.9.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_up.9.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\raw_introduction.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\raw\\introduction" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_normal.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_normal.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_blue.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_blue.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_account_dialog_title.xml.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\account_dialog_title.xml" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list.xml.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list.xml" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_datetime_picker.xml.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\datetime_picker.xml" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_widget_2x_info.xml.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\widget_2x_info.xml" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_clock.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\clock.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_down.9.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_down.9.png" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_item.xml.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_item.xml" - }, - { - "merged": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_green.png.flat", - "source": "D:\\Android\\Androidstudio\\plugins\\gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_green.png" - } -] \ No newline at end of file diff --git a/app/build/intermediates/project_dex_archive/debug/out/d2c7dee89a0ed117c02eb69dbbe1e10a85b363a815d45d9afac14a1184c894fc_5.jar b/app/build/intermediates/project_dex_archive/debug/out/d2c7dee89a0ed117c02eb69dbbe1e10a85b363a815d45d9afac14a1184c894fc_5.jar deleted file mode 100644 index 813028b..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/d2c7dee89a0ed117c02eb69dbbe1e10a85b363a815d45d9afac14a1184c894fc_5.jar and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex deleted file mode 100644 index 3a428ed..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex deleted file mode 100644 index 6f9e18f..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex deleted file mode 100644 index b7191bb..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex deleted file mode 100644 index 57f0908..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex deleted file mode 100644 index 7768165..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex deleted file mode 100644 index 49221ea..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex deleted file mode 100644 index 61a84ce..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex deleted file mode 100644 index 0df2655..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex deleted file mode 100644 index d9419a5..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex deleted file mode 100644 index 054f849..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex deleted file mode 100644 index 3a9b0bf..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex deleted file mode 100644 index 4321163..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex deleted file mode 100644 index ddd806d..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex deleted file mode 100644 index 8f07492..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex deleted file mode 100644 index 1f8fb0e..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex deleted file mode 100644 index 7ed2939..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex deleted file mode 100644 index a0cf8e6..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex deleted file mode 100644 index 643f437..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex and /dev/null differ diff --git a/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json b/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json deleted file mode 100644 index 51f6368..0000000 --- a/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json +++ /dev/null @@ -1 +0,0 @@ -{"enableV1Signing":false,"enableV2Signing":true,"enableV3Signing":false,"enableV4Signing":false} \ No newline at end of file diff --git a/app/build/intermediates/source_set_path_map/debug/file-map.txt b/app/build/intermediates/source_set_path_map/debug/file-map.txt deleted file mode 100644 index deafd19..0000000 --- a/app/build/intermediates/source_set_path_map/debug/file-map.txt +++ /dev/null @@ -1,8 +0,0 @@ -net.micode.notes.app-pngs-0 D:\gitProjs\gitProject\app\build\generated\res\pngs\debug -net.micode.notes.app-resValues-1 D:\gitProjs\gitProject\app\build\generated\res\resValues\debug -net.micode.notes.app-rs-2 D:\gitProjs\gitProject\app\build\generated\res\rs\debug -net.micode.notes.app-mergeDebugResources-3 D:\gitProjs\gitProject\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir -net.micode.notes.app-mergeDebugResources-4 D:\gitProjs\gitProject\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir -net.micode.notes.app-merged_res-5 D:\gitProjs\gitProject\app\build\intermediates\merged_res\debug -net.micode.notes.app-debug-6 D:\gitProjs\gitProject\app\src\debug\res -net.micode.notes.app-main-7 D:\gitProjs\gitProject\app\src\main\res diff --git a/app/build/outputs/apk/debug/app-debug.apk b/app/build/outputs/apk/debug/app-debug.apk deleted file mode 100644 index b70b3fa..0000000 Binary files a/app/build/outputs/apk/debug/app-debug.apk and /dev/null differ diff --git a/app/build/outputs/apk/debug/output-metadata.json b/app/build/outputs/apk/debug/output-metadata.json deleted file mode 100644 index b2231b9..0000000 --- a/app/build/outputs/apk/debug/output-metadata.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 3, - "artifactType": { - "type": "APK", - "kind": "Directory" - }, - "applicationId": "net.micode.notes", - "variantName": "debug", - "elements": [ - { - "type": "SINGLE", - "filters": [], - "attributes": [], - "versionCode": 1, - "versionName": "0.1", - "outputFile": "app-debug.apk" - } - ], - "elementType": "File" -} \ No newline at end of file diff --git a/app/build/outputs/logs/manifest-merger-debug-report.txt b/app/build/outputs/logs/manifest-merger-debug-report.txt deleted file mode 100644 index 7f5f1db..0000000 --- a/app/build/outputs/logs/manifest-merger-debug-report.txt +++ /dev/null @@ -1,235 +0,0 @@ --- Merging decision tree log --- -manifest -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:18:1-150:12 - package - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:19:5-31 - INJECTED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml - INJECTED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml - android:versionName - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:21:5-30 - INJECTED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml - INJECTED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml - xmlns:android - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:18:11-69 - android:versionCode - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:20:5-28 - INJECTED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml - INJECTED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml -uses-sdk -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:23:5-44 - android:targetSdkVersion - INJECTED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:23:5-44 - INJECTED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml - android:minSdkVersion - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:23:15-41 - INJECTED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml - INJECTED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml -uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:25:5-81 - android:name - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:25:22-78 -uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:26:5-88 - android:name - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:26:22-85 -uses-permission#android.permission.INTERNET -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:27:5-67 - android:name - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:27:22-64 -uses-permission#android.permission.READ_CONTACTS -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:28:5-72 - android:name - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:28:22-69 -uses-permission#android.permission.MANAGE_ACCOUNTS -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:29:5-74 - android:name - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:29:22-71 -uses-permission#android.permission.AUTHENTICATE_ACCOUNTS -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:30:5-80 - android:name - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:30:22-77 -uses-permission#android.permission.GET_ACCOUNTS -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:31:5-71 - android:name - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:31:22-68 -uses-permission#android.permission.USE_CREDENTIALS -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:32:5-74 - android:name - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:32:22-71 -uses-permission#android.permission.RECEIVE_BOOT_COMPLETED -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:33:5-81 - android:name - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:33:22-78 -application -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:35:5-149:19 - android:label - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:37:9-41 - android:icon - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:36:9-42 -activity#net.micode.notes.ui.NotesListActivity -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:38:9-51:20 - android:label - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:41:13-45 - android:launchMode - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:42:13-43 - android:windowSoftInputMode - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:45:13-52 - android:uiOptions - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:44:13-57 - android:configChanges - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:40:13-74 - android:theme - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:43:13-45 - android:name - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:39:13-49 -intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:47:13-50:29 -action#android.intent.action.MAIN -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:48:17-69 - android:name - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:48:25-66 -category#android.intent.category.LAUNCHER -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:49:17-77 - android:name - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:49:27-74 -activity#net.micode.notes.ui.NoteEditActivity -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:53:9-81:20 - android:launchMode - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:56:13-43 - android:configChanges - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:55:13-74 - android:theme - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:57:13-45 - android:name - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:54:13-48 -intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:59:13-64:29 -action#android.intent.action.VIEW -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:60:17-69 - android:name - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:60:25-66 -category#android.intent.category.DEFAULT -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:61:17-76 - android:name - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:61:27-73 -data -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:62:17-78 - android:mimeType - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:62:23-75 -intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:66:13-71:29 -action#android.intent.action.INSERT_OR_EDIT -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:67:17-79 - android:name - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:67:25-76 -intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:73:13-76:29 -action#android.intent.action.SEARCH -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:74:17-71 - android:name - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:74:25-68 -meta-data#android.app.searchable -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:78:13-80:54 - android:resource - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:80:17-51 - android:name - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:79:17-54 -provider#net.micode.notes.data.NotesProvider -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:83:9-86:43 - android:authorities - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:85:13-47 - android:multiprocess - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:86:13-40 - android:name - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:84:13-63 -receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:88:9-100:20 - android:label - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:90:13-50 - android:name - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:89:13-57 -intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:91:13-95:29 -action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:92:17-84 - android:name - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:92:25-81 -action#android.appwidget.action.APPWIDGET_DELETED -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:93:17-85 - android:name - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:93:25-82 -action#android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:94:17-85 - android:name - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:94:25-82 -meta-data#android.appwidget.provider -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:97:13-99:58 - android:resource - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:99:17-55 - android:name - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:98:17-58 -receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:101:9-114:20 - android:label - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:103:13-50 - android:name - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:102:13-57 -receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:116:9-120:20 - android:name - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:116:19-55 -intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:117:13-119:29 -action#android.intent.action.BOOT_COMPLETED -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:118:17-79 - android:name - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:118:25-76 -receiver#net.micode.notes.ui.AlarmReceiver -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:122:9-125:20 - android:process - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:124:13-38 - android:name - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:123:13-61 -activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:127:9-132:20 - android:label - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:129:13-45 - android:launchMode - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:130:13-48 - android:theme - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:131:13-75 - android:name - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:128:13-50 -activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:134:9-139:20 - android:label - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:136:13-54 - android:launchMode - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:137:13-43 - android:theme - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:138:13-60 - android:name - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:135:13-71 -service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:141:9-144:19 - android:exported - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:143:13-37 - android:name - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:142:13-74 -meta-data#android.app.default_searchable -ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:146:9-148:52 - android:value - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:148:13-49 - android:name - ADDED from D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:147:13-58 diff --git a/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin deleted file mode 100644 index 29bdc51..0000000 Binary files a/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and /dev/null differ diff --git a/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java b/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java deleted file mode 100644 index 7eba2c2..0000000 --- a/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java +++ /dev/null @@ -1,138 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.micode.notes.widget; -import android.app.PendingIntent; -import android.appwidget.AppWidgetManager; -import android.appwidget.AppWidgetProvider; -import android.content.ContentValues; -import android.content.Context; -import android.content.Intent; -import android.database.Cursor; -import android.util.Log; -import android.widget.RemoteViews; - -import net.micode.notes.R; -import net.micode.notes.data.Notes; -import net.micode.notes.data.Notes.NoteColumns; -import net.micode.notes.tool.ResourceParser; -import net.micode.notes.ui.NoteEditActivity; -import net.micode.notes.ui.NotesListActivity; - -public abstract class NoteWidgetProvider extends AppWidgetProvider { - public static final String [] PROJECTION = new String [] { - NoteColumns.ID, - NoteColumns.BG_COLOR_ID, - NoteColumns.SNIPPET - }; - - public static final int COLUMN_ID = 0; - public static final int COLUMN_BG_COLOR_ID = 1; - public static final int COLUMN_SNIPPET = 2; - - private static final String TAG = "NoteWidgetProvider"; - - @Override - public void onDeleted(Context context, int[] appWidgetIds) { - ContentValues values = new ContentValues(); - values.put(NoteColumns.WIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID); - for (int i = 0; i < appWidgetIds.length; i++) { - context.getContentResolver().update(Notes.CONTENT_NOTE_URI, - values, - NoteColumns.WIDGET_ID + "=?", - new String[] { String.valueOf(appWidgetIds[i])}); - } - } - -/*在该方法中，首先创建了一个 ContentValues 对象 values，并将 NoteColumns.WIDGET_ID 的值设为 AppWidgetManager.INVALID_APPWIDGET_ID，表示小部件已被删除。 - -然后遍历传入的 appWidgetIds 数组，将每个小部件的 NoteColumns.WIDGET_ID 列更新为 AppWidgetManager.INVALID_APPWIDGET_ID，以便将小部件与笔记数据库中的记录解除绑定。 - -具体地，使用 getContentResolver() 获取一个 ContentResolver 对象，调用 update() 方法对笔记数据库中的记录进行更新。更新的条件为 NoteColumns.WIDGET_ID + "=?"，即 NoteColumns.WIDGET_ID 等于当前小部件 ID，更新的数据为 values 对象，其中 NoteColumns.WIDGET_ID 的值已经被设置为 AppWidgetManager.INVALID_APPWIDGET_ID。*/ - - private Cursor getNoteWidgetInfo(Context context, int widgetId) {// 使用 getContentResolver() 方法获取 ContentResolver 对象，通过该对象进行对笔记数据库的查询操作 - return context.getContentResolver().query(Notes.CONTENT_NOTE_URI, // 使用 query() 方法查询笔记数据库，返回一个 Cursor 对象查询的 URI，笔记数据库中笔记的内容保存在该 URI 下 - PROJECTION, - NoteColumns.WIDGET_ID + "=? AND " + NoteColumns.PARENT_ID + "<>?", - new String[] { String.valueOf(widgetId), String.valueOf(Notes.ID_TRASH_FOLER) }, - null); - } - - protected void update(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) { - update(context, appWidgetManager, appWidgetIds, false); - } - - private void update(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds, - boolean privacyMode) { - for (int i = 0; i < appWidgetIds.length; i++) { - if (appWidgetIds[i] != AppWidgetManager.INVALID_APPWIDGET_ID) { - int bgId = ResourceParser.getDefaultBgId(context); - String snippet = ""; - Intent intent = new Intent(context, NoteEditActivity.class); - intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP); - intent.putExtra(Notes.INTENT_EXTRA_WIDGET_ID, appWidgetIds[i]); - intent.putExtra(Notes.INTENT_EXTRA_WIDGET_TYPE, getWidgetType()); - - Cursor c = getNoteWidgetInfo(context, appWidgetIds[i]); - if (c != null && c.moveToFirst()) { - if (c.getCount() > 1) { - Log.e(TAG, "Multiple message with same widget id:" + appWidgetIds[i]); - c.close(); - return; - } - snippet = c.getString(COLUMN_SNIPPET); - bgId = c.getInt(COLUMN_BG_COLOR_ID); - intent.putExtra(Intent.EXTRA_UID, c.getLong(COLUMN_ID)); - intent.setAction(Intent.ACTION_VIEW); - } else { - snippet = context.getResources().getString(R.string.widget_havenot_content); - intent.setAction(Intent.ACTION_INSERT_OR_EDIT); - } - - if (c != null) { - c.close(); - } - - RemoteViews rv = new RemoteViews(context.getPackageName(), getLayoutId()); - rv.setImageViewResource(R.id.widget_bg_image, getBgResourceId(bgId)); - intent.putExtra(Notes.INTENT_EXTRA_BACKGROUND_ID, bgId); - /** - * Generate the pending intent to start host for the widget - */ - PendingIntent pendingIntent = null; - if (privacyMode) { - rv.setTextViewText(R.id.widget_text, - context.getString(R.string.widget_under_visit_mode)); - pendingIntent = PendingIntent.getActivity(context, appWidgetIds[i], new Intent( - context, NotesListActivity.class), PendingIntent.FLAG_UPDATE_CURRENT); - } else { - rv.setTextViewText(R.id.widget_text, snippet); - pendingIntent = PendingIntent.getActivity(context, appWidgetIds[i], intent, - PendingIntent.FLAG_UPDATE_CURRENT); - } - - rv.setOnClickPendingIntent(R.id.widget_text, pendingIntent); - appWidgetManager.updateAppWidget(appWidgetIds[i], rv); - } - } - } - - protected abstract int getBgResourceId(int bgId); - - protected abstract int getLayoutId(); - - protected abstract int getWidgetType(); -} diff --git a/.gradle/7.5/checksums/checksums.lock b/src/.gradle/7.5/checksums/checksums.lock similarity index 100% rename from .gradle/7.5/checksums/checksums.lock rename to src/.gradle/7.5/checksums/checksums.lock diff --git a/.gradle/7.5/checksums/md5-checksums.bin b/src/.gradle/7.5/checksums/md5-checksums.bin similarity index 100% rename from .gradle/7.5/checksums/md5-checksums.bin rename to src/.gradle/7.5/checksums/md5-checksums.bin diff --git a/.gradle/7.5/checksums/sha1-checksums.bin b/src/.gradle/7.5/checksums/sha1-checksums.bin similarity index 100% rename from .gradle/7.5/checksums/sha1-checksums.bin rename to src/.gradle/7.5/checksums/sha1-checksums.bin diff --git a/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock b/src/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock similarity index 100% rename from .gradle/7.5/dependencies-accessors/dependencies-accessors.lock rename to src/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock diff --git a/.gradle/7.4.2/dependencies-accessors/gc.properties b/src/.gradle/7.5/dependencies-accessors/gc.properties similarity index 100% rename from .gradle/7.4.2/dependencies-accessors/gc.properties rename to src/.gradle/7.5/dependencies-accessors/gc.properties diff --git a/src/.gradle/7.5/executionHistory/executionHistory.bin b/src/.gradle/7.5/executionHistory/executionHistory.bin index dfae0ba..dd8c75e 100644 Binary files a/src/.gradle/7.5/executionHistory/executionHistory.bin and b/src/.gradle/7.5/executionHistory/executionHistory.bin differ diff --git a/src/.gradle/7.5/executionHistory/executionHistory.lock b/src/.gradle/7.5/executionHistory/executionHistory.lock index 0a5eb02..bca4b22 100644 Binary files a/src/.gradle/7.5/executionHistory/executionHistory.lock and b/src/.gradle/7.5/executionHistory/executionHistory.lock differ diff --git a/.gradle/7.4.2/fileChanges/last-build.bin b/src/.gradle/7.5/fileChanges/last-build.bin similarity index 100% rename from .gradle/7.4.2/fileChanges/last-build.bin rename to src/.gradle/7.5/fileChanges/last-build.bin diff --git a/src/.gradle/7.5/fileHashes/fileHashes.bin b/src/.gradle/7.5/fileHashes/fileHashes.bin index 8003f14..eca541f 100644 Binary files a/src/.gradle/7.5/fileHashes/fileHashes.bin and b/src/.gradle/7.5/fileHashes/fileHashes.bin differ diff --git a/src/.gradle/7.5/fileHashes/fileHashes.lock b/src/.gradle/7.5/fileHashes/fileHashes.lock index 54d4320..a64102f 100644 Binary files a/src/.gradle/7.5/fileHashes/fileHashes.lock and b/src/.gradle/7.5/fileHashes/fileHashes.lock differ diff --git a/.gradle/7.5/fileHashes/resourceHashesCache.bin b/src/.gradle/7.5/fileHashes/resourceHashesCache.bin similarity index 75% rename from .gradle/7.5/fileHashes/resourceHashesCache.bin rename to src/.gradle/7.5/fileHashes/resourceHashesCache.bin index a893030..ef1b5df 100644 Binary files a/.gradle/7.5/fileHashes/resourceHashesCache.bin and b/src/.gradle/7.5/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/7.4.2/gc.properties b/src/.gradle/7.5/gc.properties similarity index 100% rename from .gradle/7.4.2/gc.properties rename to src/.gradle/7.5/gc.properties diff --git a/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock index a0aa15a..690c23b 100644 Binary files a/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/cache.properties b/src/.gradle/buildOutputCleanup/cache.properties similarity index 100% rename from .gradle/buildOutputCleanup/cache.properties rename to src/.gradle/buildOutputCleanup/cache.properties diff --git a/src/.gradle/buildOutputCleanup/outputFiles.bin b/src/.gradle/buildOutputCleanup/outputFiles.bin index bad072f..b097875 100644 Binary files a/src/.gradle/buildOutputCleanup/outputFiles.bin and b/src/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/src/.gradle/file-system.probe b/src/.gradle/file-system.probe index a0aa51c..5e83dcd 100644 Binary files a/src/.gradle/file-system.probe and b/src/.gradle/file-system.probe differ diff --git a/.gradle/7.5/dependencies-accessors/gc.properties b/src/.gradle/vcs-1/gc.properties similarity index 100% rename from .gradle/7.5/dependencies-accessors/gc.properties rename to src/.gradle/vcs-1/gc.properties diff --git a/.idea/.gitignore b/src/.idea/.gitignore similarity index 100% rename from .idea/.gitignore rename to src/.idea/.gitignore diff --git a/.idea/compiler.xml b/src/.idea/compiler.xml similarity index 100% rename from .idea/compiler.xml rename to src/.idea/compiler.xml diff --git a/.idea/deploymentTargetDropDown.xml b/src/.idea/deploymentTargetDropDown.xml similarity index 100% rename from .idea/deploymentTargetDropDown.xml rename to src/.idea/deploymentTargetDropDown.xml diff --git a/.idea/gradle.xml b/src/.idea/gradle.xml similarity index 100% rename from .idea/gradle.xml rename to src/.idea/gradle.xml diff --git a/.idea/jarRepositories.xml b/src/.idea/jarRepositories.xml similarity index 100% rename from .idea/jarRepositories.xml rename to src/.idea/jarRepositories.xml diff --git a/.idea/misc.xml b/src/.idea/misc.xml similarity index 57% rename from .idea/misc.xml rename to src/.idea/misc.xml index e9092cf..9b18c58 100644 --- a/.idea/misc.xml +++ b/src/.idea/misc.xml @@ -1,10 +1,6 @@ -<<<<<<< HEAD:.idea/misc.xml - -======= ->>>>>>> master:src/.idea/misc.xml \ No newline at end of file diff --git a/.idea/modules/app/minote.app.androidTest.iml b/src/.idea/modules/app/minote.app.androidTest.iml similarity index 100% rename from .idea/modules/app/minote.app.androidTest.iml rename to src/.idea/modules/app/minote.app.androidTest.iml diff --git a/.idea/modules/app/minote.app.iml b/src/.idea/modules/app/minote.app.iml similarity index 100% rename from .idea/modules/app/minote.app.iml rename to src/.idea/modules/app/minote.app.iml diff --git a/.idea/modules/app/minote.app.main.iml b/src/.idea/modules/app/minote.app.main.iml similarity index 100% rename from .idea/modules/app/minote.app.main.iml rename to src/.idea/modules/app/minote.app.main.iml diff --git a/.idea/modules/app/minote.app.unitTest.iml b/src/.idea/modules/app/minote.app.unitTest.iml similarity index 100% rename from .idea/modules/app/minote.app.unitTest.iml rename to src/.idea/modules/app/minote.app.unitTest.iml diff --git a/src/.idea/vcs.xml b/src/.idea/vcs.xml index 343e6f8..62bd7a0 100644 --- a/src/.idea/vcs.xml +++ b/src/.idea/vcs.xml @@ -1,10 +1,7 @@ -<<<<<<< HEAD -======= ->>>>>>> master \ No newline at end of file diff --git a/src/.idea/workspace.xml b/src/.idea/workspace.xml deleted file mode 100644 index 07928cf..0000000 --- a/src/.idea/workspace.xml +++ /dev/null @@ -1,569 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1686115529113 - - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/src/app/build.gradle similarity index 100% rename from app/build.gradle rename to src/app/build.gradle diff --git a/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java b/src/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java similarity index 100% rename from app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java rename to src/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java diff --git a/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json b/src/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json similarity index 100% rename from app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json rename to src/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json diff --git a/app/build/intermediates/apk/debug/app-debug.apk b/src/app/build/intermediates/apk/debug/app-debug.apk similarity index 87% rename from app/build/intermediates/apk/debug/app-debug.apk rename to src/app/build/intermediates/apk/debug/app-debug.apk index 89d19d4..5aed210 100644 Binary files a/app/build/intermediates/apk/debug/app-debug.apk and b/src/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/app/build/intermediates/apk/debug/output-metadata.json b/src/app/build/intermediates/apk/debug/output-metadata.json similarity index 100% rename from app/build/intermediates/apk/debug/output-metadata.json rename to src/app/build/intermediates/apk/debug/output-metadata.json diff --git a/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt b/src/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt similarity index 100% rename from app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt rename to src/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt diff --git a/app/build/intermediates/app_metadata/debug/app-metadata.properties b/src/app/build/intermediates/app_metadata/debug/app-metadata.properties similarity index 100% rename from app/build/intermediates/app_metadata/debug/app-metadata.properties rename to src/app/build/intermediates/app_metadata/debug/app-metadata.properties diff --git a/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json b/src/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json similarity index 100% rename from app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json rename to src/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json diff --git a/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar similarity index 63% rename from app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar rename to src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar index 7076011..31ebbbc 100644 Binary files a/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ diff --git a/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index 2102212..bdecd4b 100644 Binary files a/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index 039aa1c..79aa7d7 100644 Binary files a/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/src/app/build/intermediates/dex_number_of_buckets_file/debug/out b/src/app/build/intermediates/dex_number_of_buckets_file/debug/out new file mode 100644 index 0000000..bf0d87a --- /dev/null +++ b/src/app/build/intermediates/dex_number_of_buckets_file/debug/out @@ -0,0 +1 @@ +4 \ No newline at end of file diff --git a/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/src/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state similarity index 100% rename from app/build/intermediates/incremental/debug-mergeJavaRes/merge-state rename to src/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index 26a7a10..bdf5d45 100644 --- a/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,96 +1,96 @@ -#Wed Jun 07 10:58:20 CST 2023 -net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat -net.micode.notes.app-main-7\:/menu/sub_folder.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat -net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat -net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat -net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat -net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat -net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat -net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat -net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat -net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat -net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat -net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat -net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat -net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat -net.micode.notes.app-main-7\:/layout/settings_header.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat -net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat -net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat -net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat -net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat -net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat -net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat -net.micode.notes.app-main-7\:/raw/introduction=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat -net.micode.notes.app-main-7\:/menu/note_list_options.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat -net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat -net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat -net.micode.notes.app-main-7\:/layout/note_list_footer.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat -net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat -net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat -net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat -net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat -net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat +#Wed Jun 07 23:08:53 CST 2023 +net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat +net.micode.notes.app-main-7\:/menu/sub_folder.xml=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat +net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat +net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat +net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat +net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat +net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat +net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat +net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat +net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat +net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat +net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat +net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat +net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat +net.micode.notes.app-main-7\:/layout/settings_header.xml=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat +net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat +net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat +net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat +net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat +net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat +net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat +net.micode.notes.app-main-7\:/raw/introduction=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat +net.micode.notes.app-main-7\:/menu/note_list_options.xml=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat +net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat +net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat +net.micode.notes.app-main-7\:/layout/note_list_footer.xml=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat +net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat +net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat +net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat +net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat +net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml deleted file mode 100644 index a760c24..0000000 --- a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml +++ /dev/null @@ -1,109 +0,0 @@ - - - - 短信 - 邮件 - - - %1$s 条符合“%2$s”的搜索结果 - - 确认删除文件夹及所包含的便签吗？ - 确认要删除该条便签吗? - 确认要删除所选的 %d 条便签吗? - 删除 - 便签 - 便签2x2 - 便签4x4 - 删除 - 通话便签 - 取消 - 设置 - 成功删除提醒 - 不能为空便签设置闹钟提醒 - 不能将空便签发送到桌面 - 要查看的便签不存在 - 导出文本时发生错误，请检查SD卡 - SD卡被占用，不能操作 - 同步已取消 - 同步失败，发生内部错误 - 同步失败，请检查网络和帐号设置 - 导出失败 - 文件夹 %1$s 已存在，请重新命名 - yyyyMMdd - MM月dd日 kk:mm - 已将文本文件(%1$s)输出至SD卡(%2$s)目录 - 已将所选 %1$d 条便签移到 %2$s 文件夹 - 请输入名称 - 已添加到桌面 - 提醒我 - 新建文件夹 - 删除 - 取消全选 - 导出文本 - 修改文件夹名称 - 刪除文件夹 - 查看文件夹 - 大 - 正常 - 文字大小 - 小 - 超大 - 进入清单模式 - 移动到文件夹 - 上一级文件夹 - 退出清单模式 - 删除提醒 - 搜索 - 全选 - 没有选中项，操作无效 - 选中了 %d 项 - 发送到桌面 - 设置 - 分享 - 同步 - 取消同步 - 选择文件夹 - 已过期 - 字数 - 发送邮件 - 打开地图 - 呼叫电话 - 浏览网页 - 查看 - 知道了 - 新建便签 - ... - 与google task同步便签记录 - 同步账号 - 添加账号 - 新建便签背景颜色随机 - 取消同步 - 立即同步 - 当前帐号 %1$s - 如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复 - 请选择google帐号，便签将与该帐号的google task内容同步。 - 同步便签 - 上次同步于 %1$s - 取消 - 更换账号 - 删除账号 - 设置 - 正在同步中，不能修改同步帐号 - 同步帐号已设置为%1$s - 便签 - 搜索便签 - 正在搜索便签 - 便签中的文字 - 创建提醒 - 导出成功 - 与%1$s同步成功 - 正在获取服务器便签列表... - 登录%1$s... - 正在同步本地便签... - 同步已取消 - 同步失败 - 同步成功 - 同步便签... - 没有关联内容，点击新建便签。 - 访客模式下，便签内容不可见 - \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml deleted file mode 100644 index 437283a..0000000 --- a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml +++ /dev/null @@ -1,109 +0,0 @@ - - - - 短信 - 郵件 - - - %1$s 條符合”%2$s“的搜尋結果 - - 確認刪除檔夾及所包含的便簽嗎？ - 确认要删除該條便籤嗎? - 确认要刪除所選的 %d 條便籤嗎? - 刪除 - 便簽 - 便簽2x2 - 便簽4x4 - 刪除 - 通話便籤 - 取消 - 設置 - 成功刪除提醒 - 不能爲空便籤設置鬧鐘提醒 - 不能將空便籤發送到桌面 - 要查看的便籤不存在 - 導出TXT時發生錯誤，請檢查SD卡 - SD卡被佔用，不能操作 - 同步已取消 - 同步失敗，發生內部錯誤 - 同步失敗，請檢查網絡和帳號設置 - 導出失敗 - 文件夾 %1$s 已存在，請重新命名 - yyyyMMdd - MM月dd日 kk:mm - 已將文本文件(%1$s)導出至SD(%2$s)目錄 - 已將所選 %1$d 便籤移到 %2$s 文件夾 - 請輸入名稱 - 已添加到桌面 - 提醒我 - 新建文件夾 - 刪除 - 取消全選 - 導出文本 - 修改文件夾名稱 - 刪除文件夾 - 查看文件夾 - 大 - 正常 - 文字大小 - 小 - 超大 - 進入清單模式 - 移動到文件夾 - 上一級文件夾 - 退出清單模式 - 刪除提醒 - 搜尋 - 全選 - 沒有選中項，操作無效 - 選中了 %d 項 - 發送到桌面 - 設置 - 分享 - 同步 - 取消同步 - 選擇文件夾 - 已過期 - 字數 - 發送郵件 - 打開地圖 - 呼叫電話 - 浏覽網頁 - 查看 - 知道了 - 新建便簽 - ... - 与google task同步便簽記錄 - 同步賬號 - 添加賬號 - 新建便籤背景顏色隨機 - 取消同步 - 立即同步 - 當前帳號 %1$s - 如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復 - 請選擇google帳號，便簽將與該帳號的google task內容同步。 - 同步便簽 - 上次同步于 %1$s - 取消 - 更換賬號 - 刪除賬號 - 設置 - 正在同步中，不能修改同步帳號 - 同步帳號已設置為%1$s - 便籤 - 搜索便籤 - 正在搜索便籤 - 便籤中的文字 - 創建提醒 - 導出成功 - 與%1$s同步成功 - 正在獲取服務器便籤列表... - 登陸%1$s... - 正在同步本地便籤... - 同步已取消 - 同步失敗 - 同步成功 - 同步便簽... - 沒有關聯內容，點擊新建便簽。 - 訪客模式下，便籤內容不可見 - \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml deleted file mode 100644 index 4825bcf..0000000 --- a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - -%s - --%s - --%s - --%s - - - Messaging - Email - - #335b5b5b - 26sp - 20sp - 17sp - 14sp - 33sp - - %1$s result for \"%2$s\" - - %1$s results for \"%2$s\" - - Confirm to delete folder and its notes? - Confirm to delete this note? - Confirm to delete the selected %d notes? - Delete selected notes - Notes - Notes 2x2 - Notes 4x4 - Delete - Call notes - cancel - set - Delete reminder successfully - Sorry, can not set clock on empty note - Sorry, can not send and empty note to home - The note is not exist - Export failed, please check SD card - SD card busy, not available now - Sync is canceled - Sync failed, internal error occurs - Sync failed, please check network and account settings - Export fail - notes_%s.txt - /MIUI/notes/ - The folder %1$s exist, please rename - yyyyMMdd - MMMd kk:mm - Export text file (%1$s) to SD (%2$s) directory - (%d) - Have moved selected %1$d notes to %2$s folder - Input name - Note added to home - Remind me - New Folder - Delete - Deselect all - Export text - Change folder name - Delete folder - View folder - Large - Medium - Font size - Small - Super - Enter check list - Move to folder - Parent folder - Leave check list - Delete reminder - Search - Select all - Nothing selected, the operation is invalid - %d selected - Send to home - Settings - Share - Sync - Cancel syncing - Select folder - Expired - Length - Send email - Open map - Call - Browse web - Take a look - Got it - Add note - ... - Sync notes with google task - Sync account - Add account - New note background color random - Cancel syncing - Sync immediately - Current account %1$s - All sync related information will be deleted, which may result in duplicated items sometime - Please select a google account. Local notes will be synced with google task. - Sync notes - Last sync time %1$s - yyyy-MM-dd hh:mm:ss - Cancel - Change sync account - Remove sync account - Settings - Cannot change the account because sync is in progress - %1$s has been set as the sync account - Notes - Search notes - Searching Notes - Text in your notes - Set reminder - Export successful - Sync is successful with account %1$s - Getting remote note list... - Logging into %1$s... - Synchronize local notes with Google Task... - Sync is canceled - Sync is failed - Sync is successful - Syncing notes... - No associated note found, click to create associated note. - Privacy mode，can not see note content - - - - - - - - - - - - \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml index 750d281..ef33351 100644 --- a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml +++ b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml @@ -1,5 +1,5 @@ - + -%s --%s --%s @@ -7,11 +7,11 @@ 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 + #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\" - Length + 短信 邮件 - 便签便签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新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 + 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 %1$s 条符合“%2$s”的搜索结果 - 字数 + 字数 短信 郵件 - 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 + 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 %1$s 條符合”%2$s“的搜尋結果 - 字數 \ No newline at end of file + 字數 \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index 26942b7..1eb51e1 100644 --- a/src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index e0ce255..39049c5 100644 --- a/src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml index 92a3eab..7cdd1cc 100644 --- a/src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index fca1b35..5546908 100644 --- a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Wed Jun 07 11:22:27 CST 2023 -base.0=D\:\\softwareengineering\\minote\\src\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex +#Wed Jun 07 23:09:00 CST 2023 +base.0=D\:\\softwareengineering\\gitProject\\src\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex renamed.0=classes.dex path.0=classes.dex diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources similarity index 76% rename from app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources rename to src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index 08a5954..865389e 100644 Binary files a/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 similarity index 100% rename from app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 rename to src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class similarity index 88% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class index e0ad373..9467112 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class similarity index 97% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class index 0ee6693..7f5c020 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class similarity index 99% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class index afad37e..a1f6118 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class similarity index 99% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class index 51317a3..3d21f92 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class similarity index 99% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class index fa65b38..63c9d80 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class similarity index 93% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class index 5baff15..155e778 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class similarity index 80% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class index f7afcae..4a88fe8 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class similarity index 87% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class index 24c7362..78941b5 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class similarity index 88% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class index 1725d92..83e6cd6 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class similarity index 84% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class index 8e1f0bf..7011069 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class new file mode 100644 index 0000000..78e3a3f Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class similarity index 97% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class index 3a1b2fa..3f0427e 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class similarity index 98% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class index 66e5658..ee960d8 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class similarity index 96% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class index ff54289..74e924b 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class similarity index 97% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class index 78286ac..60ae598 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class similarity index 96% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class index f4635a1..1f37848 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class similarity index 95% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class index 135fd81..5df3561 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class similarity index 94% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class index aa8b488..18645bf 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class similarity index 97% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class index 3390db1..a84795d 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class similarity index 92% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class index b63717c..32f2d0e 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class similarity index 100% rename from app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class rename to src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class diff --git a/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index b63f522..6ba83a9 100644 --- a/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -20,254 +20,254 @@ 20 android:versionName="0.1" > 21 22 D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:23:5-44 +22-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:23:5-44 23 android:minSdkVersion="14" -23-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:23:15-41 +23-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:23:15-41 24 android:targetSdkVersion="14" /> -24-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:23:5-44 +24-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:23:5-44 25 26 -26-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:25:5-81 -26-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:25:22-78 +26-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:25:5-81 +26-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:25:22-78 27 -27-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:26:5-88 -27-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:26:22-85 +27-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:26:5-88 +27-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:26:22-85 28 -28-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:27:5-67 -28-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:27:22-64 +28-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:27:5-67 +28-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:27:22-64 29 -29-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:28:5-72 -29-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:28:22-69 +29-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:28:5-72 +29-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:28:22-69 30 -30-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:29:5-74 -30-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:29:22-71 +30-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:29:5-74 +30-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:29:22-71 31 -31-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:30:5-80 -31-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:30:22-77 +31-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:30:5-80 +31-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:30:22-77 32 -32-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:31:5-71 -32-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:31:22-68 +32-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:31:5-71 +32-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:31:22-68 33 -33-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:32:5-74 -33-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:32:22-71 +33-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:32:5-74 +33-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:32:22-71 34 -34-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:33:5-81 -34-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:33:22-78 +34-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:33:5-81 +34-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:33:22-78 35 36 D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:35:5-149:19 +36-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:35:5-149:19 37 android:debuggable="true" 38 android:icon="@drawable/icon_app" -38-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:36:9-42 +38-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:36:9-42 39 android:label="@string/app_name" -39-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:37:9-41 +39-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:37:9-41 40 android:testOnly="true" > 41 D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:38:9-51:20 +41-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:38:9-51:20 42 android:name="net.micode.notes.ui.NotesListActivity" -42-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:39:13-49 +42-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:39:13-49 43 android:configChanges="keyboardHidden|orientation|screenSize" -43-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:40:13-74 +43-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:40:13-74 44 android:label="@string/app_name" -44-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:41:13-45 +44-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:41:13-45 45 android:launchMode="singleTop" -45-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:42:13-43 +45-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:42:13-43 46 android:theme="@style/NoteTheme" -46-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:43:13-45 +46-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:43:13-45 47 android:uiOptions="splitActionBarWhenNarrow" -47-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:44:13-57 +47-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:44:13-57 48 android:windowSoftInputMode="adjustPan" > -48-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:45:13-52 +48-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:45:13-52 49 -49-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:47:13-50:29 +49-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:47:13-50:29 50 -50-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:48:17-69 -50-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:48:25-66 +50-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:48:17-69 +50-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:48:25-66 51 52 -52-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:49:17-77 -52-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:49:27-74 +52-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:49:17-77 +52-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:49:27-74 53 54 55 D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:53:9-81:20 +55-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:53:9-81:20 56 android:name="net.micode.notes.ui.NoteEditActivity" -56-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:54:13-48 +56-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:54:13-48 57 android:configChanges="keyboardHidden|orientation|screenSize" -57-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:55:13-74 +57-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:55:13-74 58 android:launchMode="singleTop" -58-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:56:13-43 +58-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:56:13-43 59 android:theme="@style/NoteTheme" > -59-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:57:13-45 +59-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:57:13-45 60 -60-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:59:13-64:29 +60-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:59:13-64:29 61 -61-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:60:17-69 -61-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:60:25-66 +61-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:60:17-69 +61-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:60:25-66 62 63 -63-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:61:17-76 -63-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:61:27-73 +63-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:61:17-76 +63-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:61:27-73 64 65 -65-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:62:17-78 -65-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:62:23-75 +65-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:62:17-78 +65-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:62:23-75 66 -66-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:62:17-78 -66-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:62:23-75 +66-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:62:17-78 +66-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:62:23-75 67 68 -68-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:66:13-71:29 +68-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:66:13-71:29 69 -69-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:67:17-79 -69-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:67:25-76 +69-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:67:17-79 +69-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:67:25-76 70 71 -71-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:61:17-76 -71-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:61:27-73 +71-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:61:17-76 +71-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:61:27-73 72 73 -73-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:62:17-78 -73-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:62:23-75 +73-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:62:17-78 +73-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:62:23-75 74 -74-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:62:17-78 -74-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:62:23-75 +74-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:62:17-78 +74-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:62:23-75 75 76 -76-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:73:13-76:29 +76-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:73:13-76:29 77 -77-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:74:17-71 -77-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:74:25-68 +77-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:74:17-71 +77-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:74:25-68 78 79 -79-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:61:17-76 -79-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:61:27-73 +79-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:61:17-76 +79-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:61:27-73 80 81 82 D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:78:13-80:54 +82-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:78:13-80:54 83 android:name="android.app.searchable" -83-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:79:17-54 +83-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:79:17-54 84 android:resource="@xml/searchable" /> -84-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:80:17-51 +84-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:80:17-51 85 86 87 D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:83:9-86:43 +87-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:83:9-86:43 88 android:name="net.micode.notes.data.NotesProvider" -88-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:84:13-63 +88-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:84:13-63 89 android:authorities="micode_notes" -89-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:85:13-47 +89-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:85:13-47 90 android:multiprocess="true" /> -90-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:86:13-40 +90-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:86:13-40 91 92 D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:88:9-100:20 +92-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:88:9-100:20 93 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -93-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:89:13-57 +93-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:89:13-57 94 android:label="@string/app_widget2x2" > -94-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:90:13-50 +94-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:90:13-50 95 -95-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:91:13-95:29 +95-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:91:13-95:29 96 -96-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:92:17-84 -96-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:92:25-81 +96-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:92:17-84 +96-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:92:25-81 97 -97-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:93:17-85 -97-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:93:25-82 +97-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:93:17-85 +97-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:93:25-82 98 -98-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:94:17-85 -98-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:94:25-82 +98-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:94:17-85 +98-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:94:25-82 99 100 101 D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:97:13-99:58 +101-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:97:13-99:58 102 android:name="android.appwidget.provider" -102-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:98:17-58 +102-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:98:17-58 103 android:resource="@xml/widget_2x_info" /> -103-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:99:17-55 +103-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:99:17-55 104 105 D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:101:9-114:20 +105-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:101:9-114:20 106 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -106-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:102:13-57 +106-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:102:13-57 107 android:label="@string/app_widget4x4" > -107-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:103:13-50 +107-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:103:13-50 108 -108-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:91:13-95:29 +108-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:91:13-95:29 109 -109-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:92:17-84 -109-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:92:25-81 +109-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:92:17-84 +109-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:92:25-81 110 -110-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:93:17-85 -110-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:93:25-82 +110-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:93:17-85 +110-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:93:25-82 111 -111-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:94:17-85 -111-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:94:25-82 +111-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:94:17-85 +111-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:94:25-82 112 113 114 D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:97:13-99:58 +114-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:97:13-99:58 115 android:name="android.appwidget.provider" -115-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:98:17-58 +115-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:98:17-58 116 android:resource="@xml/widget_4x_info" /> -116-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:99:17-55 +116-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:99:17-55 117 118 -118-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:116:9-120:20 -118-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:116:19-55 +118-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:116:9-120:20 +118-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:116:19-55 119 -119-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:117:13-119:29 +119-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:117:13-119:29 120 -120-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:118:17-79 -120-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:118:25-76 +120-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:118:17-79 +120-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:118:25-76 121 122 123 D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:122:9-125:20 +123-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:122:9-125:20 124 android:name="net.micode.notes.ui.AlarmReceiver" -124-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:123:13-61 +124-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:123:13-61 125 android:process=":remote" > -125-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:124:13-38 +125-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:124:13-38 126 127 128 D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:127:9-132:20 +128-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:127:9-132:20 129 android:name="net.micode.notes.ui.AlarmAlertActivity" -129-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:128:13-50 +129-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:128:13-50 130 android:label="@string/app_name" -130-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:129:13-45 +130-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:129:13-45 131 android:launchMode="singleInstance" -131-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:130:13-48 +131-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:130:13-48 132 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -132-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:131:13-75 +132-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:131:13-75 133 134 D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:134:9-139:20 +134-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:134:9-139:20 135 android:name="net.micode.notes.ui.NotesPreferenceActivity" -135-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:135:13-71 +135-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:135:13-71 136 android:label="@string/preferences_title" -136-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:136:13-54 +136-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:136:13-54 137 android:launchMode="singleTop" -137-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:137:13-43 +137-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:137:13-43 138 android:theme="@android:style/Theme.Holo.Light" > -138-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:138:13-60 +138-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:138:13-60 139 140 141 D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:141:9-144:19 +141-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:141:9-144:19 142 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -142-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:142:13-74 +142-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:142:13-74 143 android:exported="false" > -143-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:143:13-37 +143-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:143:13-37 144 145 146 D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:146:9-148:52 +146-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:146:9-148:52 147 android:name="android.app.default_searchable" -147-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:147:13-58 +147-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:147:13-58 148 android:value=".ui.NoteEditActivity" /> -148-->D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:148:13-49 +148-->D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:148:13-49 149 150 151 diff --git a/app/build/intermediates/merged_java_res/debug/base.jar b/src/app/build/intermediates/merged_java_res/debug/base.jar similarity index 100% rename from app/build/intermediates/merged_java_res/debug/base.jar rename to src/app/build/intermediates/merged_java_res/debug/base.jar diff --git a/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml similarity index 100% rename from app/build/intermediates/merged_manifest/debug/AndroidManifest.xml rename to src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml diff --git a/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml similarity index 100% rename from app/build/intermediates/merged_manifests/debug/AndroidManifest.xml rename to src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml diff --git a/app/build/intermediates/merged_manifests/debug/output-metadata.json b/src/app/build/intermediates/merged_manifests/debug/output-metadata.json similarity index 100% rename from app/build/intermediates/merged_manifests/debug/output-metadata.json rename to src/app/build/intermediates/merged_manifests/debug/output-metadata.json diff --git a/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat b/src/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat rename to src/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat diff --git a/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat b/src/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat rename to src/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat diff --git a/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat b/src/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat rename to src/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat diff --git a/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat rename to src/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat diff --git a/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat rename to src/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat diff --git a/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat rename to src/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat diff --git a/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat rename to src/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat diff --git a/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat rename to src/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat diff --git a/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat rename to src/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat diff --git a/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat rename to src/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat diff --git a/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/layout_note_item.xml.flat rename to src/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat diff --git a/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/layout_note_list.xml.flat rename to src/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat diff --git a/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat rename to src/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat diff --git a/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat rename to src/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat diff --git a/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat rename to src/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat diff --git a/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat rename to src/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat diff --git a/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat rename to src/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat diff --git a/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat b/src/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat rename to src/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat diff --git a/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat b/src/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat rename to src/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat diff --git a/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat b/src/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat rename to src/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat diff --git a/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat b/src/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat similarity index 55% rename from app/build/intermediates/merged_res/debug/menu_note_list.xml.flat rename to src/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat index d9fc2b5..7b31dce 100644 Binary files a/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat and b/src/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat b/src/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat rename to src/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat diff --git a/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat b/src/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat rename to src/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat diff --git a/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat b/src/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat rename to src/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat diff --git a/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat b/src/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat rename to src/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat diff --git a/app/build/intermediates/merged_res/debug/raw_introduction.flat b/src/app/build/intermediates/merged_res/debug/raw_introduction.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/raw_introduction.flat rename to src/app/build/intermediates/merged_res/debug/raw_introduction.flat diff --git a/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/src/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat similarity index 91% rename from app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat rename to src/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat index 035ddcd..e241cdb 100644 Binary files a/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat and b/src/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat differ diff --git a/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat b/src/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat similarity index 91% rename from app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat rename to src/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat index 1043ced..8c8534f 100644 Binary files a/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat and b/src/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat differ diff --git a/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/src/app/build/intermediates/merged_res/debug/values_values.arsc.flat similarity index 81% rename from app/build/intermediates/merged_res/debug/values_values.arsc.flat rename to src/app/build/intermediates/merged_res/debug/values_values.arsc.flat index c0e5804..4beb064 100644 Binary files a/app/build/intermediates/merged_res/debug/values_values.arsc.flat and b/src/app/build/intermediates/merged_res/debug/values_values.arsc.flat differ diff --git a/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat b/src/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/xml_preferences.xml.flat rename to src/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat diff --git a/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat b/src/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/xml_searchable.xml.flat rename to src/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat diff --git a/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat b/src/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat rename to src/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat diff --git a/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat b/src/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat similarity index 100% rename from app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat rename to src/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json new file mode 100644 index 0000000..531aa3b --- /dev/null +++ b/src/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": "D:\\softwareengineering\\gitProject\\src\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "from": { + "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,124,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,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,6833,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,124,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,42,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,6871,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,107", + "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", + "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,3547,3596,3645,3692,3739,3786,3831,3882,3935,4010,4069,4126,4200,4264,4333,4411,4521,4625,4698,4764,4819,4884,4949,4998,5081,5159,5197,5242,5290,5352,5409,5464,5523,5590,5648,5710,5758,5803,5851,5902,5968", + "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,107", + "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,42,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,3542,3591,3640,3687,3734,3781,3826,3877,3930,4005,4064,4121,4195,4259,4328,4406,4516,4620,4693,4759,4814,4879,4944,4993,5076,5154,5192,5237,5285,5347,5404,5459,5518,5585,5643,5705,5753,5798,5846,5897,5963,6029" + } + }, + { + "source": "D:\\softwareengineering\\gitProject\\src\\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" + } + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat", + "map": [ + { + "source": "D:\\softwareengineering\\gitProject\\src\\app\\src\\main\\res\\values\\dimens.xml", + "from": { + "startLines": "19,20,21,22,18", + "startColumns": "4,4,4,4,4", + "startOffsets": "783,836,890,944,730", + "endColumns": "51,52,52,51,51", + "endOffsets": "830,884,938,991,777" + }, + "to": { + "startLines": "13,14,15,16,17", + "startColumns": "4,4,4,4,4", + "startOffsets": "477,529,582,635,687", + "endColumns": "51,52,52,51,51", + "endOffsets": "524,577,630,682,734" + } + }, + { + "source": "D:\\softwareengineering\\gitProject\\src\\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": "D:\\softwareengineering\\gitProject\\src\\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,2920,2696,1098,1287,1476,1685,1897,911,2104" + }, + "to": { + "startLines": "126,130,134,138,141,145,149,153,157,161,165", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8171,8375,8586,8759,8919,9102,9287,9472,9675,9881,10064", + "endLines": "129,133,137,140,144,148,152,156,160,164,168", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "8370,8581,8754,8914,9097,9282,9467,9670,9876,10059,10260" + } + }, + { + "source": "D:\\softwareengineering\\gitProject\\src\\app\\src\\main\\res\\values\\colors.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endColumns": "56", + "endOffsets": "782" + }, + "to": { + "startLines": "12", + "startColumns": "4", + "startOffsets": "420", + "endColumns": "56", + "endOffsets": "472" + } + }, + { + "source": "D:\\softwareengineering\\gitProject\\src\\app\\src\\main\\res\\values\\strings.xml", + "from": { + "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,133,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,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,8550,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,133,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,46,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,8592,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,125", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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,5031,5086,5139,5186,5239,5295,5343,5398,5451,5535,5602,5666,5762,5836,5917,6006,6169,6313,6392,6467,6549,6608,6688,6768,6823,6945,7048,7089,7142,7199,7273,7338,7406,7492,7572,7641,7735,7794,7849,7911,7971,8081", + "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,125", + "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,46,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,5026,5081,5134,5181,5234,5290,5338,5393,5446,5530,5597,5661,5757,5831,5912,6001,6164,6308,6387,6462,6544,6603,6683,6763,6818,6940,7043,7084,7137,7194,7268,7333,7401,7487,7567,7636,7730,7789,7844,7906,7966,8076,8166" + } + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat", + "map": [ + { + "source": "D:\\softwareengineering\\gitProject\\src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "from": { + "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,125,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,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,6809,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,125,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,42,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,6847,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,107", + "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", + "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,3545,3594,3643,3690,3737,3784,3829,3880,3933,4008,4067,4124,4198,4262,4331,4409,4519,4623,4696,4762,4817,4882,4947,4996,5079,5157,5195,5240,5288,5350,5407,5462,5521,5588,5646,5708,5756,5801,5849,5900,5966", + "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,107", + "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,42,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,3540,3589,3638,3685,3732,3779,3824,3875,3928,4003,4062,4119,4193,4257,4326,4404,4514,4618,4691,4757,4812,4877,4942,4991,5074,5152,5190,5235,5283,5345,5402,5457,5516,5583,5641,5703,5751,5796,5844,5895,5961,6027" + } + }, + { + "source": "D:\\softwareengineering\\gitProject\\src\\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" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json new file mode 100644 index 0000000..7cea338 --- /dev/null +++ b/src/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": "D:\\softwareengineering\\gitProject\\src\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "from": { + "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,124,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,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,6833,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,124,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,42,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,6871,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,107", + "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", + "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,3547,3596,3645,3692,3739,3786,3831,3882,3935,4010,4069,4126,4200,4264,4333,4411,4521,4625,4698,4764,4819,4884,4949,4998,5081,5159,5197,5242,5290,5352,5409,5464,5523,5590,5648,5710,5758,5803,5851,5902,5968", + "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,107", + "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,42,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,3542,3591,3640,3687,3734,3781,3826,3877,3930,4005,4064,4121,4195,4259,4328,4406,4516,4620,4693,4759,4814,4879,4944,4993,5076,5154,5192,5237,5285,5347,5404,5459,5518,5585,5643,5705,5753,5798,5846,5897,5963,6029" + } + }, + { + "source": "D:\\softwareengineering\\gitProject\\src\\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" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json new file mode 100644 index 0000000..1eea0c5 --- /dev/null +++ b/src/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": "D:\\softwareengineering\\gitProject\\src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "from": { + "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,125,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,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,6809,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,125,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,42,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,6847,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,107", + "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", + "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,3545,3594,3643,3690,3737,3784,3829,3880,3933,4008,4067,4124,4198,4262,4331,4409,4519,4623,4696,4762,4817,4882,4947,4996,5079,5157,5195,5240,5288,5350,5407,5462,5521,5588,5646,5708,5756,5801,5849,5900,5966", + "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,107", + "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,42,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,3540,3589,3638,3685,3732,3779,3824,3875,3928,4003,4062,4119,4193,4257,4326,4404,4514,4618,4691,4757,4812,4877,4942,4991,5074,5152,5190,5235,5283,5345,5402,5457,5516,5583,5641,5703,5751,5796,5844,5895,5961,6027" + } + }, + { + "source": "D:\\softwareengineering\\gitProject\\src\\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" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json index f863400..cb14c5a 100644 --- a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -4,11 +4,13 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml", "map": [ { - "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values\\dimens.xml", + "source": "D:\\softwareengineering\\gitProject\\src\\app\\src\\main\\res\\values\\dimens.xml", "from": { - "startLines": "-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1" + "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", @@ -19,46 +21,14 @@ } }, { - "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values\\strings.xml", - "from": { - "startLines": "128,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,133,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "8136,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8550,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endLines": "132,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,133,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,46,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endOffsets": "8544,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8592,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" - }, - "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,125", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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,5031,5086,5139,5186,5239,5295,5343,5398,5451,5535,5602,5666,5762,5836,5917,6006,6169,6313,6392,6467,6549,6608,6688,6768,6823,6945,7048,7089,7142,7199,7273,7338,7406,7492,7572,7641,7735,7794,7849,7911,7971,8081", - "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,125", - "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,46,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,5026,5081,5134,5181,5234,5290,5338,5393,5446,5530,5597,5661,5757,5831,5912,6001,6164,6308,6387,6462,6544,6603,6683,6763,6818,6940,7043,7084,7137,7194,7268,7333,7401,7487,7567,7636,7730,7789,7844,7906,7966,8076,8166" - } - }, - { - "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values\\styles.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" - }, - "to": { - "startLines": "126,130,134,138,141,145,149,153,157,161,165", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8171,8375,8586,8759,8919,9102,9287,9472,9675,9881,10064", - "endLines": "129,133,137,140,144,148,152,156,160,164,168", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8370,8581,8754,8914,9097,9282,9467,9670,9876,10059,10260" - } - }, - { - "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values\\arrays.xml", + "source": "D:\\softwareengineering\\gitProject\\src\\app\\src\\main\\res\\values\\arrays.xml", "from": { - "startLines": "-1,-1", - "startColumns": "-1,-1", - "startOffsets": "-1,-1" + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "758,1073", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1065,1191" }, "to": { "startLines": "2,8", @@ -70,101 +40,26 @@ } }, { - "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values\\colors.xml", - "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" - }, - "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "420", - "endColumns": "56", - "endOffsets": "472" - } - } - ] - }, - { - "outputFile": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-3:\\values\\values.xml", - "map": [ - { - "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values\\dimens.xml", - "from": { - "startLines": "19,20,21,22,18", - "startColumns": "4,4,4,4,4", - "startOffsets": "783,836,890,944,730", - "endColumns": "51,52,52,51,51", - "endOffsets": "830,884,938,991,777" - }, - "to": { - "startLines": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "477,529,582,635,687", - "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" - } - }, - { - "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values\\strings.xml", - "from": { - "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107", - "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192" - }, - "to": { - "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", - "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" - } - }, - { - "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values\\styles.xml", + "source": "D:\\softwareengineering\\gitProject\\src\\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" + "endOffsets": "2314,2531,2920,2696,1098,1287,1476,1685,1897,911,2104" }, "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", + "startLines": "126,130,134,138,141,145,149,153,157,161,165", "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", + "startOffsets": "8171,8375,8586,8759,8919,9102,9287,9472,9675,9881,10064", + "endLines": "129,133,137,140,144,148,152,156,160,164,168", "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": "D:\\softwareengineering\\minote\\src\\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" + "endOffsets": "8370,8581,8754,8914,9097,9282,9467,9670,9876,10059,10260" } }, { - "source": "D:\\softwareengineering\\minote\\src\\app\\src\\main\\res\\values\\colors.xml", + "source": "D:\\softwareengineering\\gitProject\\src\\app\\src\\main\\res\\values\\colors.xml", "from": { "startLines": "18", "startColumns": "4", @@ -179,6 +74,25 @@ "endColumns": "56", "endOffsets": "472" } + }, + { + "source": "D:\\softwareengineering\\gitProject\\src\\app\\src\\main\\res\\values\\strings.xml", + "from": { + "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,133,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,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,8550,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,133,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,46,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,8592,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,125", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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,5031,5086,5139,5186,5239,5295,5343,5398,5451,5535,5602,5666,5762,5836,5917,6006,6169,6313,6392,6467,6549,6608,6688,6768,6823,6945,7048,7089,7142,7199,7273,7338,7406,7492,7572,7641,7735,7794,7849,7911,7971,8081", + "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,125", + "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,46,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,5026,5081,5134,5181,5234,5290,5338,5393,5446,5530,5597,5661,5757,5831,5912,6001,6164,6308,6387,6462,6544,6603,6683,6763,6818,6940,7043,7084,7137,7194,7268,7333,7401,7487,7567,7636,7730,7789,7844,7906,7966,8076,8166" + } } ] } diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json index 085d2de..089bc28 100644 --- a/src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json +++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json @@ -7,6 +7,10 @@ "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_delete.png.flat", "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\menu_delete.png" }, + { + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_folder.9.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_folder.9.png" + }, { "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_secondary_text_dark.xml.flat", "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\secondary_text_dark.xml" @@ -15,6 +19,10 @@ "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_down.9.png.flat", "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_down.9.png" }, + { + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_red.9.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_red.9.png" + }, { "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_widget_4x_info.xml.flat", "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\widget_4x_info.xml" @@ -27,6 +35,10 @@ "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\raw_introduction.flat", "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\raw\\introduction" }, + { + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_call_record_folder.xml.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\call_record_folder.xml" + }, { "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list_dropdown.xml.flat", "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list_dropdown.xml" @@ -35,6 +47,10 @@ "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list_footer.xml.flat", "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list_footer.xml" }, + { + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_red.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_red.png" + }, { "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_move.png.flat", "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\menu_move.png" @@ -44,341 +60,321 @@ "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_blue.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_normal.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_normal.png" - }, - { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_down.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_down.9.png" - }, - { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_single.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_single.9.png" - }, - { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_blue.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_blue.png" - }, - { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_green.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_green.png" - }, - { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_primary_text_dark.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\primary_text_dark.xml" - }, - { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_new_note.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\new_note.xml" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_sub_folder.xml.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\sub_folder.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_up.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_up.9.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_yellow.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_yellow.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_edit_list_item.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_edit_list_item.xml" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_normal.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_normal.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_call_record.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\call_record.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_edit.xml.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_edit.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_bar_bg.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_bar_bg.9.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_settings_header.xml.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\settings_header.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_pressed.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_pressed.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_blue.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_blue.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_green.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_green.9.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_single.9.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_single.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_red.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_red.9.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_down.9.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_down.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_searchable.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\searchable.xml" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_green.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_green.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_color_btn_mask.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_color_btn_mask.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list.xml.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_edit.xml" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\raw-zh-rCN_introduction.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\raw-zh-rCN\\introduction" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_single.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_single.9.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_middle.9.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_middle.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_yellow.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_yellow.9.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_white.9.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_white.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_middle.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_middle.9.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_primary_text_dark.xml.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\primary_text_dark.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_green.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_green.9.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_new_note.xml.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\new_note.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_clock.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\clock.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list_dropdown_menu.xml.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list_dropdown_menu.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_widget_2x.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\widget_2x.xml" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_small.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_small.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_yellow.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_yellow.9.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_white.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_white.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_large.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_large.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_btn_set_color.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_btn_set_color.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_dropdown_icon.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\dropdown_icon.9.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_up.9.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_up.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_down.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_down.9.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_preferences.xml.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\preferences.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_alert.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_alert.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_blue.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_blue.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_middle.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_middle.9.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_up.9.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_up.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_single.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_single.9.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_edit_list_item.xml.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_edit_list_item.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_edit.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_edit.xml" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_blue.9.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_blue.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_up.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_up.9.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_call_record.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\call_record.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list_options.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list_options.xml" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_down.9.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_down.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_single.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_single.9.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_bar_bg.9.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_bar_bg.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_middle.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_middle.9.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_pressed.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_pressed.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_up.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_up.9.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_green.9.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_green.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_widget_4x.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\widget_4x.xml" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_red.9.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_red.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_account_dialog_title.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\account_dialog_title.xml" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_searchable.xml.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\searchable.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_notification.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\notification.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_delete.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\delete.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_widget_2x_info.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\widget_2x_info.xml" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_footer_bg.9.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_footer_bg.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_size_selector_bg.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_size_selector_bg.9.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_white.9.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_white.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list.xml" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_background.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_background.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_folder.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_folder.9.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_call_note_edit.xml.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\call_note_edit.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_red.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_red.9.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_green.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_green.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_call_record_folder.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\call_record_folder.xml" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_up.9.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_up.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_red.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_red.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_color_btn_mask.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_color_btn_mask.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_sub_folder.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\sub_folder.xml" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_dialog_edit_text.xml.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\dialog_edit_text.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_yellow.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_yellow.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_search_result.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\search_result.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_edit.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_edit.xml" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_yellow.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_yellow.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_settings_header.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\settings_header.xml" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_single.9.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_single.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list.xml" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_white.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_white.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\raw-zh-rCN_introduction.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\raw-zh-rCN\\introduction" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_yellow.9.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_yellow.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_middle.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_middle.9.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_middle.9.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_middle.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_white.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_white.9.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_green.9.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_green.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list_dropdown_menu.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list_dropdown_menu.xml" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_clock.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\clock.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_small.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_small.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_widget_2x.xml.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\widget_2x.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_white.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_white.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_normal.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_normal.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_btn_set_color.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_btn_set_color.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_single.9.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_single.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_preferences.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\preferences.xml" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_folder_list_item.xml.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\folder_list_item.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_blue.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_blue.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_yellow.9.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_yellow.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_up.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_up.9.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_large.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_large.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_blue.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_blue.9.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_down.9.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_down.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_down.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_down.9.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_icon_app.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\icon_app.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_delete.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\delete.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_dropdown_icon.9.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\dropdown_icon.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_footer_bg.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_footer_bg.9.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_note_edit_color_selector_panel.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\note_edit_color_selector_panel.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_white.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_white.9.png" + "merged": "net.micode.notes.app-merged_res-5:/menu_note_list.xml.flat", + "source": "net.micode.notes.app-main-7:/menu/note_list.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_background.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_background.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_down.9.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_down.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_call_note_edit.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\call_note_edit.xml" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_add_account_text.xml.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\add_account_text.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_green.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_green.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_alert.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_alert.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_up.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_up.9.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_middle.9.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_middle.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_dialog_edit_text.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\dialog_edit_text.xml" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_single.9.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_single.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_search_result.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\search_result.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_edit.xml.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_edit.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_yellow.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_yellow.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_datetime_picker.xml.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\datetime_picker.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_white.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_white.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_up.9.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_up.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_normal.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_normal.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list_options.xml.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list_options.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_single.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_single.9.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_single.9.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_single.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_folder_list_item.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\folder_list_item.xml" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_middle.9.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_middle.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_down.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_down.9.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_middle.9.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_middle.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_icon_app.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\icon_app.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_up.9.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_up.9.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_note_edit_color_selector_panel.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\note_edit_color_selector_panel.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_widget_4x.xml.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\widget_4x.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_add_account_text.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\add_account_text.xml" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_account_dialog_title.xml.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\account_dialog_title.xml" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_datetime_picker.xml.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\datetime_picker.xml" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_notification.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\notification.png" }, { - "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_middle.9.png.flat", - "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_middle.9.png" + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_widget_2x_info.xml.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\widget_2x_info.xml" }, { "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_red.png.flat", "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_red.png" }, + { + "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_size_selector_bg.9.png.flat", + "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_size_selector_bg.9.png" + }, { "merged": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_item.xml.flat", "source": "C:\\Users\\庞浩的电脑\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_item.xml" diff --git a/app/build/intermediates/navigation_json/debug/navigation.json b/src/app/build/intermediates/navigation_json/debug/navigation.json similarity index 100% rename from app/build/intermediates/navigation_json/debug/navigation.json rename to src/app/build/intermediates/navigation_json/debug/navigation.json diff --git a/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml b/src/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml similarity index 100% rename from app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml rename to src/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml diff --git a/app/build/intermediates/packaged_manifests/debug/output-metadata.json b/src/app/build/intermediates/packaged_manifests/debug/output-metadata.json similarity index 100% rename from app/build/intermediates/packaged_manifests/debug/output-metadata.json rename to src/app/build/intermediates/packaged_manifests/debug/output-metadata.json diff --git a/app/build/intermediates/processed_res/debug/out/output-metadata.json b/src/app/build/intermediates/processed_res/debug/out/output-metadata.json similarity index 100% rename from app/build/intermediates/processed_res/debug/out/output-metadata.json rename to src/app/build/intermediates/processed_res/debug/out/output-metadata.json diff --git a/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ similarity index 96% rename from app/build/intermediates/processed_res/debug/out/resources-debug.ap_ rename to src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ index 828c39f..82b2e8f 100644 Binary files a/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex similarity index 82% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex index 1030957..c230dd9 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex similarity index 82% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex index c2dc1d7..69203fa 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex similarity index 92% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex index 2c8f09c..eb3b363 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex similarity index 94% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex index 7eb60d1..c6ba47f 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex similarity index 93% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex index b9cd64b..b9f86f0 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex similarity index 81% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex index 7eb610b..f3c79f9 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex similarity index 78% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex index c431e2b..fa31cfb 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex similarity index 83% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex index 067413b..363bc1a 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex similarity index 73% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex index 7b3bb0a..b7f7d96 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex new file mode 100644 index 0000000..d74767f Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex index ddd806d..2b23262 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex index 5421f6c..8f07492 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex similarity index 94% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex index 86ed78b..f3e35fe 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex similarity index 94% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex index 0dd371c..ba171f1 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex index 092ed94..e565d31 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex similarity index 94% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex index 468c044..663fcc1 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex similarity index 87% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex index a32fdb9..f3b906f 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex similarity index 77% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex index a5de83e..003b5a8 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex similarity index 92% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex index 5158f1d..ae6adc2 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex similarity index 86% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex index d63b1f0..d190c0e 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex similarity index 100% rename from app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex rename to src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex diff --git a/app/build/intermediates/runtime_symbol_list/debug/R.txt b/src/app/build/intermediates/runtime_symbol_list/debug/R.txt similarity index 65% rename from app/build/intermediates/runtime_symbol_list/debug/R.txt rename to src/app/build/intermediates/runtime_symbol_list/debug/R.txt index d44cfba..7c8b44d 100644 --- a/app/build/intermediates/runtime_symbol_list/debug/R.txt +++ b/src/app/build/intermediates/runtime_symbol_list/debug/R.txt @@ -109,70 +109,40 @@ int id ll_font_super 0x7f05001f int id menu_alert 0x7f050020 int id menu_delete 0x7f050021 int id menu_delete_remind 0x7f050022 -int id menu_export_text 0x7f050023 -int id menu_font_size 0x7f050024 -int id menu_list_mode 0x7f050025 -int id menu_new_folder 0x7f050026 -int id menu_new_note 0x7f050027 -<<<<<<< HEAD:app/build/intermediates/runtime_symbol_list/debug/R.txt -int id menu_restore 0x7f050028 -int id menu_search 0x7f050029 -int id menu_send_to_desktop 0x7f05002a -int id menu_setting 0x7f05002b -int id menu_share 0x7f05002c -int id menu_sync 0x7f05002d -int id minute 0x7f05002e -int id move 0x7f05002f -int id navigation_bar 0x7f050030 -int id note_bg_color_selector 0x7f050031 -int id note_edit_list 0x7f050032 -int id note_edit_view 0x7f050033 -int id note_item 0x7f050034 -int id note_title 0x7f050035 -int id notes_list 0x7f050036 -int id prefenerece_sync_status_textview 0x7f050037 -int id preference_sync_button 0x7f050038 -int id selection_menu 0x7f050039 -int id sv_note_edit 0x7f05003a -int id tv_alert_date 0x7f05003b -int id tv_folder_name 0x7f05003c -int id tv_modified_date 0x7f05003d -int id tv_name 0x7f05003e -int id tv_time 0x7f05003f -int id tv_title 0x7f050040 -int id tv_title_bar 0x7f050041 -int id widget_bg_image 0x7f050042 -int id widget_text 0x7f050043 -======= -int id menu_search 0x7f050028 -int id menu_send_to_desktop 0x7f050029 -int id menu_setting 0x7f05002a -int id menu_share 0x7f05002b -int id menu_sync 0x7f05002c -int id minute 0x7f05002d -int id move 0x7f05002e -int id navigation_bar 0x7f05002f -int id note_bg_color_selector 0x7f050030 -int id note_edit_list 0x7f050031 -int id note_edit_view 0x7f050032 -int id note_item 0x7f050033 -int id note_title 0x7f050034 -int id notes_list 0x7f050035 -int id prefenerece_sync_status_textview 0x7f050036 -int id preference_sync_button 0x7f050037 -int id selection_menu 0x7f050038 -int id sv_note_edit 0x7f050039 -int id text_num 0x7f050044 -int id tv_alert_date 0x7f05003a -int id tv_folder_name 0x7f05003b -int id tv_modified_date 0x7f05003c -int id tv_name 0x7f05003d -int id tv_time 0x7f05003e -int id tv_title 0x7f05003f -int id tv_title_bar 0x7f050040 -int id widget_bg_image 0x7f050041 -int id widget_text 0x7f050042 ->>>>>>> master:src/app/build/intermediates/runtime_symbol_list/debug/R.txt +int id menu_export_text 0x7f050040 +int id menu_font_size 0x7f050023 +int id menu_list_mode 0x7f050024 +int id menu_new_folder 0x7f050041 +int id menu_new_note 0x7f050025 +int id menu_restore 0x7f050042 +int id menu_search 0x7f050026 +int id menu_send_to_desktop 0x7f050027 +int id menu_setting 0x7f050043 +int id menu_share 0x7f050028 +int id menu_sync 0x7f050044 +int id minute 0x7f050029 +int id move 0x7f05002a +int id navigation_bar 0x7f05002b +int id note_bg_color_selector 0x7f05002c +int id note_edit_list 0x7f05002d +int id note_edit_view 0x7f05002e +int id note_item 0x7f05002f +int id note_title 0x7f050030 +int id notes_list 0x7f050031 +int id prefenerece_sync_status_textview 0x7f050032 +int id preference_sync_button 0x7f050033 +int id selection_menu 0x7f050034 +int id sv_note_edit 0x7f050035 +int id text_num 0x7f050036 +int id tv_alert_date 0x7f050037 +int id tv_folder_name 0x7f050038 +int id tv_modified_date 0x7f050039 +int id tv_name 0x7f05003a +int id tv_time 0x7f05003b +int id tv_title 0x7f05003c +int id tv_title_bar 0x7f05003d +int id widget_bg_image 0x7f05003e +int id widget_text 0x7f05003f int layout account_dialog_title 0x7f060000 int layout add_account_text 0x7f060001 int layout datetime_picker 0x7f060002 @@ -190,10 +160,10 @@ int layout widget_4x 0x7f06000d int menu call_note_edit 0x7f070000 int menu call_record_folder 0x7f070001 int menu note_edit 0x7f070002 -int menu note_list 0x7f070003 -int menu note_list_dropdown 0x7f070004 -int menu note_list_options 0x7f070005 -int menu sub_folder 0x7f070006 +int menu note_list 0x7f070006 +int menu note_list_dropdown 0x7f070003 +int menu note_list_options 0x7f070004 +int menu sub_folder 0x7f070005 int plurals search_results_title 0x7f080000 int raw introduction 0x7f090000 int string alert_message_delete_folder 0x7f0a0000 @@ -256,49 +226,49 @@ int string menu_sync 0x7f0a0038 int string menu_sync_cancel 0x7f0a0039 int string menu_title_select_folder 0x7f0a003a int string note_alert_expired 0x7f0a003b -int string note_length 0x7f0a0066 -int string note_link_email 0x7f0a003c -int string note_link_other 0x7f0a003d -int string note_link_tel 0x7f0a003e -int string note_link_web 0x7f0a003f -int string notealert_enter 0x7f0a0040 -int string notealert_ok 0x7f0a0041 -int string notelist_menu_new 0x7f0a0042 -int string notelist_string_info 0x7f0a0043 -int string preferences_account_summary 0x7f0a0044 -int string preferences_account_title 0x7f0a0045 -int string preferences_add_account 0x7f0a0046 -int string preferences_bg_random_appear_title 0x7f0a0047 -int string preferences_button_sync_cancel 0x7f0a0048 -int string preferences_button_sync_immediately 0x7f0a0049 -int string preferences_dialog_change_account_title 0x7f0a004a -int string preferences_dialog_change_account_warn_msg 0x7f0a004b -int string preferences_dialog_select_account_tips 0x7f0a004c -int string preferences_dialog_select_account_title 0x7f0a004d -int string preferences_last_sync_time 0x7f0a004e -int string preferences_last_sync_time_format 0x7f0a004f -int string preferences_menu_cancel 0x7f0a0050 -int string preferences_menu_change_account 0x7f0a0051 -int string preferences_menu_remove_account 0x7f0a0052 -int string preferences_title 0x7f0a0053 -int string preferences_toast_cannot_change_account 0x7f0a0054 -int string preferences_toast_success_set_accout 0x7f0a0055 -int string search 0x7f0a0056 -int string search_hint 0x7f0a0057 -int string search_label 0x7f0a0058 -int string search_setting_description 0x7f0a0059 -int string set_remind_time_message 0x7f0a005a -int string success_sdcard_export 0x7f0a005b -int string success_sync_account 0x7f0a005c -int string sync_progress_init_list 0x7f0a005d -int string sync_progress_login 0x7f0a005e -int string sync_progress_syncing 0x7f0a005f -int string ticker_cancel 0x7f0a0060 -int string ticker_fail 0x7f0a0061 -int string ticker_success 0x7f0a0062 -int string ticker_syncing 0x7f0a0063 -int string widget_havenot_content 0x7f0a0064 -int string widget_under_visit_mode 0x7f0a0065 +int string note_length 0x7f0a003c +int string note_link_email 0x7f0a003d +int string note_link_other 0x7f0a003e +int string note_link_tel 0x7f0a003f +int string note_link_web 0x7f0a0040 +int string notealert_enter 0x7f0a0041 +int string notealert_ok 0x7f0a0042 +int string notelist_menu_new 0x7f0a0043 +int string notelist_string_info 0x7f0a0044 +int string preferences_account_summary 0x7f0a0045 +int string preferences_account_title 0x7f0a0046 +int string preferences_add_account 0x7f0a0047 +int string preferences_bg_random_appear_title 0x7f0a0048 +int string preferences_button_sync_cancel 0x7f0a0049 +int string preferences_button_sync_immediately 0x7f0a004a +int string preferences_dialog_change_account_title 0x7f0a004b +int string preferences_dialog_change_account_warn_msg 0x7f0a004c +int string preferences_dialog_select_account_tips 0x7f0a004d +int string preferences_dialog_select_account_title 0x7f0a004e +int string preferences_last_sync_time 0x7f0a004f +int string preferences_last_sync_time_format 0x7f0a0050 +int string preferences_menu_cancel 0x7f0a0051 +int string preferences_menu_change_account 0x7f0a0052 +int string preferences_menu_remove_account 0x7f0a0053 +int string preferences_title 0x7f0a0054 +int string preferences_toast_cannot_change_account 0x7f0a0055 +int string preferences_toast_success_set_accout 0x7f0a0056 +int string search 0x7f0a0057 +int string search_hint 0x7f0a0058 +int string search_label 0x7f0a0059 +int string search_setting_description 0x7f0a005a +int string set_remind_time_message 0x7f0a005b +int string success_sdcard_export 0x7f0a005c +int string success_sync_account 0x7f0a005d +int string sync_progress_init_list 0x7f0a005e +int string sync_progress_login 0x7f0a005f +int string sync_progress_syncing 0x7f0a0060 +int string ticker_cancel 0x7f0a0061 +int string ticker_fail 0x7f0a0062 +int string ticker_success 0x7f0a0063 +int string ticker_syncing 0x7f0a0064 +int string widget_havenot_content 0x7f0a0065 +int string widget_under_visit_mode 0x7f0a0066 int style HighlightTextAppearancePrimary 0x7f0b0000 int style HighlightTextAppearanceSecondary 0x7f0b0001 int style NoteActionBarStyle 0x7f0b0002 diff --git a/src/app/build/intermediates/source_set_path_map/debug/file-map.txt b/src/app/build/intermediates/source_set_path_map/debug/file-map.txt index a3cd696..4ee14ee 100644 --- a/src/app/build/intermediates/source_set_path_map/debug/file-map.txt +++ b/src/app/build/intermediates/source_set_path_map/debug/file-map.txt @@ -1,8 +1,8 @@ -net.micode.notes.app-pngs-0 D:\softwareengineering\minote\src\app\build\generated\res\pngs\debug -net.micode.notes.app-resValues-1 D:\softwareengineering\minote\src\app\build\generated\res\resValues\debug -net.micode.notes.app-rs-2 D:\softwareengineering\minote\src\app\build\generated\res\rs\debug -net.micode.notes.app-mergeDebugResources-3 D:\softwareengineering\minote\src\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir -net.micode.notes.app-mergeDebugResources-4 D:\softwareengineering\minote\src\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir -net.micode.notes.app-merged_res-5 D:\softwareengineering\minote\src\app\build\intermediates\merged_res\debug -net.micode.notes.app-debug-6 D:\softwareengineering\minote\src\app\src\debug\res -net.micode.notes.app-main-7 D:\softwareengineering\minote\src\app\src\main\res +net.micode.notes.app-pngs-0 D:\softwareengineering\gitProject\src\app\build\generated\res\pngs\debug +net.micode.notes.app-resValues-1 D:\softwareengineering\gitProject\src\app\build\generated\res\resValues\debug +net.micode.notes.app-rs-2 D:\softwareengineering\gitProject\src\app\build\generated\res\rs\debug +net.micode.notes.app-mergeDebugResources-3 D:\softwareengineering\gitProject\src\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir +net.micode.notes.app-mergeDebugResources-4 D:\softwareengineering\gitProject\src\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir +net.micode.notes.app-merged_res-5 D:\softwareengineering\gitProject\src\app\build\intermediates\merged_res\debug +net.micode.notes.app-debug-6 D:\softwareengineering\gitProject\src\app\src\debug\res +net.micode.notes.app-main-7 D:\softwareengineering\gitProject\src\app\src\main\res diff --git a/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt similarity index 56% rename from app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt rename to src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt index f4168ba..fe7c2fe 100644 --- a/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt +++ b/src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt @@ -1,159 +1,111 @@ -<<<<<<< HEAD:app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt -======= -net.micode.notes:id/text_num = 0x7f050044 ->>>>>>> master:src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt -net.micode.notes:string/ticker_success = 0x7f0a0062 -net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0052 -net.micode.notes:string/preferences_account_summary = 0x7f0a0044 +net.micode.notes:menu/note_list = 0x7f070006 +net.micode.notes:id/menu_setting = 0x7f050043 +net.micode.notes:id/menu_new_folder = 0x7f050041 +net.micode.notes:string/ticker_success = 0x7f0a0063 +net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0053 +net.micode.notes:xml/widget_4x_info = 0x7f0c0003 +net.micode.notes:id/menu_search = 0x7f050026 +net.micode.notes:string/file_path = 0x7f0a0016 net.micode.notes:string/menu_export_text = 0x7f0a0023 -<<<<<<< HEAD:app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt +net.micode.notes:string/menu_search = 0x7f0a0031 net.micode.notes:layout/note_list = 0x7f060008 -======= ->>>>>>> master:src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt -net.micode.notes:string/file_path = 0x7f0a0016 -net.micode.notes:string/menu_folder_change_name = 0x7f0a0024 -net.micode.notes:string/note_link_other = 0x7f0a003d +net.micode.notes:string/search_label = 0x7f0a0059 +net.micode.notes:string/note_link_other = 0x7f0a003e net.micode.notes:string/note_alert_expired = 0x7f0a003b -<<<<<<< HEAD:app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt -net.micode.notes:id/tv_title_bar = 0x7f050041 -======= -net.micode.notes:id/tv_title_bar = 0x7f050040 ->>>>>>> master:src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt +net.micode.notes:string/menu_folder_change_name = 0x7f0a0024 +net.micode.notes:xml/preferences = 0x7f0c0000 net.micode.notes:string/menu_font_small = 0x7f0a002a -net.micode.notes:string/ticker_syncing = 0x7f0a0063 +net.micode.notes:id/tv_title_bar = 0x7f05003d +net.micode.notes:string/ticker_syncing = 0x7f0a0064 net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000 -net.micode.notes:xml/preferences = 0x7f0c0000 -net.micode.notes:string/sync_progress_syncing = 0x7f0a005f -<<<<<<< HEAD:app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt -net.micode.notes:menu/sub_folder = 0x7f070006 -net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0054 -net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002 -net.micode.notes:string/search_label = 0x7f0a0058 -net.micode.notes:id/selection_menu = 0x7f050039 -======= +net.micode.notes:string/preferences_title = 0x7f0a0054 +net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006 +net.micode.notes:string/sync_progress_syncing = 0x7f0a0060 +net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0055 net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002 -net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0054 -net.micode.notes:string/search_label = 0x7f0a0058 -net.micode.notes:id/selection_menu = 0x7f050038 ->>>>>>> master:src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt +net.micode.notes:id/note_title = 0x7f050030 +net.micode.notes:drawable/title_alert = 0x7f040036 net.micode.notes:style/NoteActionBarStyle = 0x7f0b0002 -net.micode.notes:string/preferences_menu_change_account = 0x7f0a0051 +net.micode.notes:string/preferences_menu_change_account = 0x7f0a0052 +net.micode.notes:id/selection_menu = 0x7f050034 +net.micode.notes:string/preferences_menu_cancel = 0x7f0a0051 +net.micode.notes:string/sync_progress_init_list = 0x7f0a005e net.micode.notes:string/menu_sync = 0x7f0a0038 -net.micode.notes:string/sync_progress_init_list = 0x7f0a005d -net.micode.notes:string/preferences_menu_cancel = 0x7f0a0050 -net.micode.notes:string/menu_normal_mode = 0x7f0a002f net.micode.notes:string/menu_sync_cancel = 0x7f0a0039 -net.micode.notes:drawable/title_alert = 0x7f040036 -<<<<<<< HEAD:app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt -net.micode.notes:id/note_title = 0x7f050035 -======= -net.micode.notes:id/note_title = 0x7f050034 ->>>>>>> master:src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt -net.micode.notes:string/menu_search = 0x7f0a0031 -net.micode.notes:string/preferences_last_sync_time = 0x7f0a004e +net.micode.notes:string/menu_normal_mode = 0x7f0a002f +net.micode.notes:string/preferences_last_sync_time = 0x7f0a004f net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009 -net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a004d -<<<<<<< HEAD:app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt -net.micode.notes:id/menu_search = 0x7f050029 -======= -net.micode.notes:id/menu_search = 0x7f050028 ->>>>>>> master:src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt -net.micode.notes:xml/widget_4x_info = 0x7f0c0003 -net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004b -net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006 -net.micode.notes:string/preferences_title = 0x7f0a0053 -net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a -<<<<<<< HEAD:app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt -net.micode.notes:id/notes_list = 0x7f050036 -======= -net.micode.notes:id/notes_list = 0x7f050035 ->>>>>>> master:src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt +net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a004e +net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004c +net.micode.notes:string/menu_select_none = 0x7f0a0033 +net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005 +net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a004a +net.micode.notes:string/widget_havenot_content = 0x7f0a0065 net.micode.notes:layout/note_edit = 0x7f060005 -net.micode.notes:string/widget_havenot_content = 0x7f0a0064 -net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a0049 -net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a0048 +net.micode.notes:id/notes_list = 0x7f050031 +net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a0049 +net.micode.notes:string/preferences_account_summary = 0x7f0a0045 +net.micode.notes:string/notelist_menu_new = 0x7f0a0043 net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008 -net.micode.notes:string/notelist_menu_new = 0x7f0a0042 -<<<<<<< HEAD:app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt +net.micode.notes:string/notealert_ok = 0x7f0a0042 +net.micode.notes:menu/sub_folder = 0x7f070005 net.micode.notes:string/menu_remove_remind = 0x7f0a0030 -======= -net.micode.notes:menu/sub_folder = 0x7f070006 -net.micode.notes:id/tv_text_num = 0x7f050043 -net.micode.notes:layout/note_list = 0x7f060008 ->>>>>>> master:src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt +net.micode.notes:string/notealert_enter = 0x7f0a0041 +net.micode.notes:drawable/new_note = 0x7f04002f +net.micode.notes:id/sv_note_edit = 0x7f050035 net.micode.notes:string/menu_share = 0x7f0a0037 net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001 -net.micode.notes:string/ticker_cancel = 0x7f0a0060 -net.micode.notes:string/notealert_ok = 0x7f0a0041 -net.micode.notes:string/note_link_web = 0x7f0a003f +net.micode.notes:string/ticker_cancel = 0x7f0a0061 +net.micode.notes:string/note_link_web = 0x7f0a0040 net.micode.notes:string/menu_title_select_folder = 0x7f0a003a net.micode.notes:string/menu_select_all = 0x7f0a0032 -<<<<<<< HEAD:app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt -net.micode.notes:layout/note_list_footer = 0x7f06000a -net.micode.notes:id/btn_new_note = 0x7f050004 -net.micode.notes:string/note_link_tel = 0x7f0a003e -net.micode.notes:id/widget_text = 0x7f050043 -======= ->>>>>>> master:src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt -net.micode.notes:string/note_link_email = 0x7f0a003c +net.micode.notes:string/note_link_tel = 0x7f0a003f +net.micode.notes:id/widget_text = 0x7f05003f +net.micode.notes:string/note_link_email = 0x7f0a003d net.micode.notes:string/menu_move_parent_folder = 0x7f0a002e -net.micode.notes:string/notelist_string_info = 0x7f0a0043 -net.micode.notes:string/success_sdcard_export = 0x7f0a005b -net.micode.notes:string/call_record_folder_name = 0x7f0a0008 -net.micode.notes:drawable/list_green_up = 0x7f040020 net.micode.notes:string/menu_move = 0x7f0a002d net.micode.notes:menu/note_edit = 0x7f070002 net.micode.notes:string/menu_list_mode = 0x7f0a002c -net.micode.notes:id/iv_bg_blue_select = 0x7f05000f net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c +net.micode.notes:id/iv_bg_blue_select = 0x7f05000f net.micode.notes:string/menu_font_super = 0x7f0a002b -net.micode.notes:string/menu_deselect_all = 0x7f0a0022 -net.micode.notes:string/menu_create_folder = 0x7f0a0020 -<<<<<<< HEAD:app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt -net.micode.notes:id/menu_share = 0x7f05002c -======= -net.micode.notes:id/menu_share = 0x7f05002b ->>>>>>> master:src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt -net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e -net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005 -net.micode.notes:string/menu_select_none = 0x7f0a0033 +net.micode.notes:drawable/list_folder = 0x7f04001b +net.micode.notes:string/menu_delete = 0x7f0a0021 net.micode.notes:string/hint_foler_name = 0x7f0a001d net.micode.notes:string/folder_exist = 0x7f0a0017 net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007 -net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0055 -net.micode.notes:string/widget_under_visit_mode = 0x7f0a0065 -<<<<<<< HEAD:app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt -net.micode.notes:id/menu_send_to_desktop = 0x7f05002a -======= -net.micode.notes:id/menu_send_to_desktop = 0x7f050029 ->>>>>>> master:src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt +net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0056 +net.micode.notes:string/widget_under_visit_mode = 0x7f0a0066 +net.micode.notes:id/menu_send_to_desktop = 0x7f050027 +net.micode.notes:id/tv_modified_date = 0x7f050039 +net.micode.notes:drawable/list_blue_middle = 0x7f040018 net.micode.notes:string/format_date_ymd = 0x7f0a0018 -net.micode.notes:string/set_remind_time_message = 0x7f0a005a +net.micode.notes:string/ticker_fail = 0x7f0a0062 +net.micode.notes:string/file_name_txt_format = 0x7f0a0015 +net.micode.notes:string/set_remind_time_message = 0x7f0a005b net.micode.notes:string/error_sync_network = 0x7f0a0013 +net.micode.notes:string/error_note_not_exist = 0x7f0a000e net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010 +net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a +net.micode.notes:string/menu_font_size = 0x7f0a0029 +net.micode.notes:drawable/edit_title_yellow = 0x7f04000d +net.micode.notes:string/menu_alert = 0x7f0a001f +net.micode.notes:id/menu_alert = 0x7f050020 +net.micode.notes:string/call_record_folder_name = 0x7f0a0008 +net.micode.notes:drawable/list_green_up = 0x7f040020 +net.micode.notes:string/notelist_string_info = 0x7f0a0044 +net.micode.notes:string/success_sdcard_export = 0x7f0a005c net.micode.notes:drawable/new_note_normal = 0x7f040030 net.micode.notes:string/button_delete = 0x7f0a0007 net.micode.notes:string/app_widget2x2 = 0x7f0a0005 net.micode.notes:string/menu_select_title = 0x7f0a0034 +net.micode.notes:string/menu_font_normal = 0x7f0a0028 net.micode.notes:raw/introduction = 0x7f090000 net.micode.notes:string/format_exported_file_location = 0x7f0a001a -net.micode.notes:string/menu_font_normal = 0x7f0a0028 -net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000 -net.micode.notes:layout/datetime_picker = 0x7f060002 -net.micode.notes:xml/widget_2x_info = 0x7f0c0002 -net.micode.notes:string/notealert_enter = 0x7f0a0040 -<<<<<<< HEAD:app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt -net.micode.notes:drawable/new_note = 0x7f04002f -net.micode.notes:id/sv_note_edit = 0x7f05003a -======= -net.micode.notes:id/sv_note_edit = 0x7f050039 -net.micode.notes:drawable/new_note = 0x7f04002f -net.micode.notes:string/menu_remove_remind = 0x7f0a0030 ->>>>>>> master:src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt -net.micode.notes:string/delete_remind_time_message = 0x7f0a000b -net.micode.notes:drawable/selected = 0x7f040035 -net.micode.notes:plurals/search_results_title = 0x7f080000 net.micode.notes:dimen/text_font_size_super = 0x7f030004 +net.micode.notes:plurals/search_results_title = 0x7f080000 +net.micode.notes:drawable/selected = 0x7f040035 +net.micode.notes:string/delete_remind_time_message = 0x7f0a000b net.micode.notes:layout/widget_4x = 0x7f06000d net.micode.notes:id/et_foler_name = 0x7f05000a net.micode.notes:drawable/edit_green = 0x7f040007 @@ -161,154 +113,103 @@ net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004 net.micode.notes:id/iv_bg_blue = 0x7f05000e net.micode.notes:layout/settings_header = 0x7f06000b net.micode.notes:drawable/new_note_pressed = 0x7f040031 -net.micode.notes:id/iv_bg_yellow_select = 0x7f050017 -<<<<<<< HEAD:app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt -net.micode.notes:id/move = 0x7f05002f -======= -net.micode.notes:id/move = 0x7f05002e ->>>>>>> master:src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt net.micode.notes:menu/call_note_edit = 0x7f070000 net.micode.notes:color/secondary_text_dark = 0x7f020001 net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009 +net.micode.notes:id/iv_bg_yellow_select = 0x7f050017 +net.micode.notes:id/move = 0x7f05002a net.micode.notes:drawable/list_white_single = 0x7f040027 net.micode.notes:layout/note_item = 0x7f060007 -<<<<<<< HEAD:app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt -net.micode.notes:drawable/widget_2x_blue = 0x7f040038 -net.micode.notes:id/tv_time = 0x7f05003f -net.micode.notes:id/tv_name = 0x7f05003e -net.micode.notes:string/error_sdcard_export = 0x7f0a000f -net.micode.notes:id/preference_sync_button = 0x7f050038 -net.micode.notes:id/note_edit_view = 0x7f050033 -net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f -net.micode.notes:id/navigation_bar = 0x7f050030 -net.micode.notes:string/app_widget4x4 = 0x7f0a0006 -net.micode.notes:id/minute = 0x7f05002e -net.micode.notes:drawable/font_normal = 0x7f040011 -net.micode.notes:drawable/font_super = 0x7f040014 -net.micode.notes:id/menu_sync = 0x7f05002d -net.micode.notes:id/menu_setting = 0x7f05002b -net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a -net.micode.notes:id/delete = 0x7f050008 -net.micode.notes:id/menu_restore = 0x7f050028 -======= -net.micode.notes:string/note_link_tel = 0x7f0a003e -net.micode.notes:id/widget_text = 0x7f050042 +net.micode.notes:drawable/edit_blue = 0x7f040006 +net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050032 +net.micode.notes:xml/widget_2x_info = 0x7f0c0002 +net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000 +net.micode.notes:layout/datetime_picker = 0x7f060002 net.micode.notes:id/btn_new_note = 0x7f050004 net.micode.notes:layout/note_list_footer = 0x7f06000a net.micode.notes:drawable/widget_2x_blue = 0x7f040038 -net.micode.notes:id/tv_time = 0x7f05003e -net.micode.notes:id/tv_name = 0x7f05003d +net.micode.notes:id/tv_time = 0x7f05003b +net.micode.notes:id/tv_name = 0x7f05003a net.micode.notes:string/error_sdcard_export = 0x7f0a000f -net.micode.notes:id/preference_sync_button = 0x7f050037 -net.micode.notes:id/note_edit_view = 0x7f050032 -net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f -net.micode.notes:id/navigation_bar = 0x7f05002f +net.micode.notes:id/preference_sync_button = 0x7f050033 +net.micode.notes:id/note_edit_view = 0x7f05002e +net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a0050 +net.micode.notes:id/navigation_bar = 0x7f05002b net.micode.notes:string/app_widget4x4 = 0x7f0a0006 -net.micode.notes:id/minute = 0x7f05002d +net.micode.notes:id/minute = 0x7f050029 net.micode.notes:drawable/font_normal = 0x7f040011 -net.micode.notes:drawable/font_super = 0x7f040014 -net.micode.notes:id/menu_sync = 0x7f05002c -net.micode.notes:id/menu_setting = 0x7f05002a ->>>>>>> master:src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt +net.micode.notes:string/menu_create_folder = 0x7f0a0020 +net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e +net.micode.notes:id/menu_share = 0x7f050028 net.micode.notes:drawable/list_green_down = 0x7f04001d -net.micode.notes:id/menu_new_note = 0x7f050027 -net.micode.notes:string/error_note_not_exist = 0x7f0a000e -net.micode.notes:id/menu_new_folder = 0x7f050026 -net.micode.notes:id/menu_list_mode = 0x7f050025 -net.micode.notes:id/iv_medium_select = 0x7f050019 -net.micode.notes:id/menu_export_text = 0x7f050023 +net.micode.notes:id/menu_new_note = 0x7f050025 +net.micode.notes:id/menu_list_mode = 0x7f050024 net.micode.notes:string/menu_folder_view = 0x7f0a0026 net.micode.notes:id/menu_delete = 0x7f050021 -net.micode.notes:string/file_name_txt_format = 0x7f0a0015 -net.micode.notes:string/ticker_fail = 0x7f0a0061 -<<<<<<< HEAD:app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt -net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050037 -======= -net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050036 ->>>>>>> master:src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt -net.micode.notes:drawable/edit_blue = 0x7f040006 -net.micode.notes:id/menu_alert = 0x7f050020 -net.micode.notes:string/menu_font_size = 0x7f0a0029 -net.micode.notes:drawable/edit_title_yellow = 0x7f04000d -net.micode.notes:string/menu_alert = 0x7f0a001f -net.micode.notes:string/success_sync_account = 0x7f0a005c +net.micode.notes:string/success_sync_account = 0x7f0a005d net.micode.notes:id/ll_font_super = 0x7f05001f net.micode.notes:id/ll_font_small = 0x7f05001e net.micode.notes:menu/call_record_folder = 0x7f070001 net.micode.notes:id/ll_font_normal = 0x7f05001d net.micode.notes:id/ll_font_large = 0x7f05001c -<<<<<<< HEAD:app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt -net.micode.notes:id/note_bg_color_selector = 0x7f050031 -======= -net.micode.notes:id/note_bg_color_selector = 0x7f050030 ->>>>>>> master:src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt +net.micode.notes:id/note_bg_color_selector = 0x7f05002c net.micode.notes:id/iv_super_select = 0x7f05001b net.micode.notes:drawable/search_result = 0x7f040034 +net.micode.notes:id/menu_export_text = 0x7f050040 +net.micode.notes:id/iv_medium_select = 0x7f050019 net.micode.notes:id/iv_bg_yellow = 0x7f050016 net.micode.notes:drawable/widget_2x_green = 0x7f040039 -net.micode.notes:string/error_sync_cancelled = 0x7f0a0011 net.micode.notes:id/iv_bg_white_select = 0x7f050015 +net.micode.notes:string/error_sync_cancelled = 0x7f0a0011 net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c net.micode.notes:drawable/widget_2x_red = 0x7f04003a -<<<<<<< HEAD:app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt -net.micode.notes:id/tv_alert_date = 0x7f05003b -======= -net.micode.notes:id/tv_alert_date = 0x7f05003a ->>>>>>> master:src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt net.micode.notes:dimen/text_font_size_large = 0x7f030000 +net.micode.notes:id/tv_alert_date = 0x7f050037 net.micode.notes:drawable/notification = 0x7f040033 net.micode.notes:id/iv_bg_red = 0x7f050012 net.micode.notes:id/iv_large_select = 0x7f050018 net.micode.notes:string/menu_font_large = 0x7f0a0027 net.micode.notes:drawable/widget_4x_blue = 0x7f04003d net.micode.notes:id/iv_bg_green_select = 0x7f050011 -<<<<<<< HEAD:app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt -net.micode.notes:id/widget_bg_image = 0x7f050042 -======= -net.micode.notes:id/widget_bg_image = 0x7f050041 ->>>>>>> master:src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt -net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004a +net.micode.notes:id/widget_bg_image = 0x7f05003e +net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004b net.micode.notes:drawable/menu_move = 0x7f04002e net.micode.notes:drawable/widget_4x_white = 0x7f040040 net.micode.notes:id/font_size_selector = 0x7f05000b -net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004c +net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004d net.micode.notes:id/et_edit_text = 0x7f050009 -net.micode.notes:string/search = 0x7f0a0056 +net.micode.notes:string/search = 0x7f0a0057 net.micode.notes:id/cb_edit_item = 0x7f050006 net.micode.notes:id/btn_set_bg_color = 0x7f050005 net.micode.notes:id/account_dialog_subtitle = 0x7f050000 -net.micode.notes:menu/note_list = 0x7f070003 net.micode.notes:id/account_dialog_title = 0x7f050001 net.micode.notes:id/amPm = 0x7f050003 net.micode.notes:id/iv_bg_green = 0x7f050010 net.micode.notes:drawable/widget_4x_green = 0x7f04003e -net.micode.notes:id/hour = 0x7f05000c +net.micode.notes:menu/note_list_options = 0x7f070004 +net.micode.notes:id/iv_small_select = 0x7f05001a net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040032 +net.micode.notes:id/hour = 0x7f05000c net.micode.notes:style/NoteTheme = 0x7f0b0003 net.micode.notes:drawable/widget_2x_yellow = 0x7f04003c -<<<<<<< HEAD:app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt -======= +net.micode.notes:id/menu_restore = 0x7f050042 net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a net.micode.notes:id/delete = 0x7f050008 ->>>>>>> master:src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt net.micode.notes:drawable/title_bar_bg = 0x7f040037 net.micode.notes:drawable/menu_delete = 0x7f04002d net.micode.notes:string/error_sync_internal = 0x7f0a0012 net.micode.notes:drawable/list_green_single = 0x7f04001f net.micode.notes:string/alert_message_delete_note = 0x7f0a0001 -net.micode.notes:id/tv_modified_date = 0x7f05003d -net.micode.notes:drawable/list_blue_middle = 0x7f040018 -net.micode.notes:id/iv_small_select = 0x7f05001a -net.micode.notes:menu/note_list_options = 0x7f070005 net.micode.notes:xml/searchable = 0x7f0c0001 net.micode.notes:string/menu_folder_delete = 0x7f0a0025 net.micode.notes:drawable/dropdown_icon = 0x7f040005 +net.micode.notes:string/menu_deselect_all = 0x7f0a0022 net.micode.notes:id/date = 0x7f050007 net.micode.notes:drawable/list_yellow_single = 0x7f04002b net.micode.notes:drawable/list_red_up = 0x7f040024 net.micode.notes:drawable/widget_4x_yellow = 0x7f040041 net.micode.notes:drawable/list_yellow_middle = 0x7f04002a -net.micode.notes:id/tv_folder_name = 0x7f05003c +net.micode.notes:id/tv_folder_name = 0x7f050038 net.micode.notes:drawable/list_yellow_down = 0x7f040029 net.micode.notes:string/format_folder_files_count = 0x7f0a001b net.micode.notes:drawable/clock = 0x7f040003 @@ -317,14 +218,14 @@ net.micode.notes:drawable/edit_title_blue = 0x7f040009 net.micode.notes:drawable/edit_red = 0x7f040008 net.micode.notes:id/iv_alert_icon = 0x7f05000d net.micode.notes:layout/dialog_edit_text = 0x7f060003 -net.micode.notes:string/preferences_account_title = 0x7f0a0045 +net.micode.notes:string/preferences_account_title = 0x7f0a0046 net.micode.notes:drawable/edit_white = 0x7f04000e net.micode.notes:drawable/list_white_middle = 0x7f040026 net.micode.notes:color/user_query_highlight = 0x7f020002 net.micode.notes:drawable/list_white_down = 0x7f040025 -net.micode.notes:string/preferences_add_account = 0x7f0a0046 +net.micode.notes:string/preferences_add_account = 0x7f0a0047 net.micode.notes:drawable/bg_btn_set_color = 0x7f040000 -net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a0047 +net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a0048 net.micode.notes:layout/widget_2x = 0x7f06000c net.micode.notes:drawable/list_footer_bg = 0x7f04001c net.micode.notes:string/alert_title_delete = 0x7f0a0003 @@ -343,31 +244,32 @@ net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000d net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009 net.micode.notes:drawable/list_blue_down = 0x7f040017 net.micode.notes:id/action_select_all = 0x7f050002 +net.micode.notes:id/menu_sync = 0x7f050044 +net.micode.notes:drawable/font_super = 0x7f040014 net.micode.notes:string/format_datetime_mdhm = 0x7f0a0019 net.micode.notes:drawable/font_small = 0x7f040013 -net.micode.notes:string/sync_progress_login = 0x7f0a005e +net.micode.notes:string/sync_progress_login = 0x7f0a005f net.micode.notes:array/menu_share_ways = 0x7f010001 net.micode.notes:drawable/widget_2x_white = 0x7f04003b net.micode.notes:layout/folder_list_item = 0x7f060004 net.micode.notes:layout/add_account_text = 0x7f060001 -net.micode.notes:id/tv_title = 0x7f050040 +net.micode.notes:id/tv_title = 0x7f05003c net.micode.notes:color/primary_text_dark = 0x7f020000 net.micode.notes:drawable/font_size_selector_bg = 0x7f040012 net.micode.notes:drawable/list_blue_up = 0x7f04001a -net.micode.notes:string/search_setting_description = 0x7f0a0059 +net.micode.notes:string/search_setting_description = 0x7f0a005a net.micode.notes:drawable/list_blue_single = 0x7f040019 net.micode.notes:drawable/font_large = 0x7f040010 net.micode.notes:drawable/delete = 0x7f040004 net.micode.notes:drawable/edit_yellow = 0x7f04000f -net.micode.notes:id/note_item = 0x7f050034 +net.micode.notes:id/note_item = 0x7f05002f net.micode.notes:drawable/edit_title_white = 0x7f04000c -net.micode.notes:id/note_edit_list = 0x7f050032 +net.micode.notes:id/note_edit_list = 0x7f05002d net.micode.notes:drawable/edit_title_red = 0x7f04000b -net.micode.notes:string/menu_delete = 0x7f0a0021 -net.micode.notes:drawable/list_folder = 0x7f04001b net.micode.notes:drawable/call_record = 0x7f040002 -net.micode.notes:string/search_hint = 0x7f0a0057 -net.micode.notes:id/menu_font_size = 0x7f050024 +net.micode.notes:id/text_num = 0x7f050036 +net.micode.notes:string/search_hint = 0x7f0a0058 +net.micode.notes:id/menu_font_size = 0x7f050023 net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001 net.micode.notes:drawable/list_yellow_up = 0x7f04002c net.micode.notes:dimen/text_font_size_small = 0x7f030003 @@ -375,10 +277,10 @@ net.micode.notes:dimen/text_font_size_normal = 0x7f030002 net.micode.notes:drawable/list_green_middle = 0x7f04001e net.micode.notes:drawable/list_background = 0x7f040016 net.micode.notes:string/app_name = 0x7f0a0004 -net.micode.notes:menu/note_list_dropdown = 0x7f070004 +net.micode.notes:menu/note_list_dropdown = 0x7f070003 net.micode.notes:string/menu_setting = 0x7f0a0036 net.micode.notes:dimen/text_font_size_medium = 0x7f030001 net.micode.notes:layout/note_edit_list_item = 0x7f060006 -net.micode.notes:string/note_length = 0x7f0a0066 +net.micode.notes:string/note_length = 0x7f0a003c net.micode.notes:layout/account_dialog_title = 0x7f060000 net.micode.notes:array/format_for_exported_note = 0x7f010000 diff --git a/app/build/intermediates/variant_model/debug/variant_model.json b/src/app/build/intermediates/variant_model/debug/variant_model.json similarity index 100% rename from app/build/intermediates/variant_model/debug/variant_model.json rename to src/app/build/intermediates/variant_model/debug/variant_model.json diff --git a/src/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/app/build/outputs/logs/manifest-merger-debug-report.txt index cd271db..d370983 100644 --- a/src/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/src/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,235 +1,235 @@ -- Merging decision tree log --- manifest -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:18:1-150:12 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:18:1-150:12 package - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:19:5-31 - INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml - INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:19:5-31 + INJECTED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml + INJECTED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml android:versionName - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:21:5-30 - INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml - INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:21:5-30 + INJECTED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml + INJECTED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml xmlns:android - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:18:11-69 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:18:11-69 android:versionCode - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:20:5-28 - INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml - INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:20:5-28 + INJECTED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml + INJECTED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml uses-sdk -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:23:5-44 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:23:5-44 android:targetSdkVersion - INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:23:5-44 - INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml + INJECTED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:23:5-44 + INJECTED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml android:minSdkVersion - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:23:15-41 - INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml - INJECTED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:23:15-41 + INJECTED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml + INJECTED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:25:5-81 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:25:5-81 android:name - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:25:22-78 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:25:22-78 uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:26:5-88 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:26:5-88 android:name - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:26:22-85 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:26:22-85 uses-permission#android.permission.INTERNET -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:27:5-67 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:27:5-67 android:name - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:27:22-64 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:27:22-64 uses-permission#android.permission.READ_CONTACTS -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:28:5-72 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:28:5-72 android:name - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:28:22-69 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:28:22-69 uses-permission#android.permission.MANAGE_ACCOUNTS -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:29:5-74 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:29:5-74 android:name - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:29:22-71 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:29:22-71 uses-permission#android.permission.AUTHENTICATE_ACCOUNTS -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:30:5-80 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:30:5-80 android:name - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:30:22-77 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:30:22-77 uses-permission#android.permission.GET_ACCOUNTS -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:31:5-71 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:31:5-71 android:name - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:31:22-68 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:31:22-68 uses-permission#android.permission.USE_CREDENTIALS -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:32:5-74 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:32:5-74 android:name - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:32:22-71 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:32:22-71 uses-permission#android.permission.RECEIVE_BOOT_COMPLETED -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:33:5-81 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:33:5-81 android:name - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:33:22-78 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:33:22-78 application -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:35:5-149:19 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:35:5-149:19 android:label - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:37:9-41 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:37:9-41 android:icon - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:36:9-42 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:36:9-42 activity#net.micode.notes.ui.NotesListActivity -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:38:9-51:20 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:38:9-51:20 android:label - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:41:13-45 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:41:13-45 android:launchMode - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:42:13-43 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:42:13-43 android:windowSoftInputMode - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:45:13-52 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:45:13-52 android:uiOptions - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:44:13-57 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:44:13-57 android:configChanges - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:40:13-74 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:40:13-74 android:theme - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:43:13-45 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:43:13-45 android:name - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:39:13-49 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:39:13-49 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:47:13-50:29 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:47:13-50:29 action#android.intent.action.MAIN -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:48:17-69 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:48:17-69 android:name - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:48:25-66 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:48:25-66 category#android.intent.category.LAUNCHER -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:49:17-77 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:49:17-77 android:name - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:49:27-74 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:49:27-74 activity#net.micode.notes.ui.NoteEditActivity -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:53:9-81:20 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:53:9-81:20 android:launchMode - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:56:13-43 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:56:13-43 android:configChanges - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:55:13-74 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:55:13-74 android:theme - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:57:13-45 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:57:13-45 android:name - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:54:13-48 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:54:13-48 intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:59:13-64:29 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:59:13-64:29 action#android.intent.action.VIEW -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:60:17-69 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:60:17-69 android:name - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:60:25-66 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:60:25-66 category#android.intent.category.DEFAULT -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:61:17-76 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:61:17-76 android:name - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:61:27-73 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:61:27-73 data -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:62:17-78 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:62:17-78 android:mimeType - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:62:23-75 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:62:23-75 intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:66:13-71:29 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:66:13-71:29 action#android.intent.action.INSERT_OR_EDIT -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:67:17-79 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:67:17-79 android:name - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:67:25-76 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:67:25-76 intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:73:13-76:29 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:73:13-76:29 action#android.intent.action.SEARCH -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:74:17-71 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:74:17-71 android:name - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:74:25-68 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:74:25-68 meta-data#android.app.searchable -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:78:13-80:54 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:78:13-80:54 android:resource - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:80:17-51 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:80:17-51 android:name - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:79:17-54 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:79:17-54 provider#net.micode.notes.data.NotesProvider -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:83:9-86:43 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:83:9-86:43 android:authorities - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:85:13-47 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:85:13-47 android:multiprocess - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:86:13-40 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:86:13-40 android:name - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:84:13-63 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:84:13-63 receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:88:9-100:20 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:88:9-100:20 android:label - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:90:13-50 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:90:13-50 android:name - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:89:13-57 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:89:13-57 intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:91:13-95:29 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:91:13-95:29 action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:92:17-84 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:92:17-84 android:name - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:92:25-81 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:92:25-81 action#android.appwidget.action.APPWIDGET_DELETED -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:93:17-85 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:93:17-85 android:name - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:93:25-82 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:93:25-82 action#android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:94:17-85 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:94:17-85 android:name - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:94:25-82 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:94:25-82 meta-data#android.appwidget.provider -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:97:13-99:58 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:97:13-99:58 android:resource - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:99:17-55 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:99:17-55 android:name - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:98:17-58 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:98:17-58 receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:101:9-114:20 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:101:9-114:20 android:label - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:103:13-50 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:103:13-50 android:name - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:102:13-57 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:102:13-57 receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:116:9-120:20 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:116:9-120:20 android:name - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:116:19-55 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:116:19-55 intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:117:13-119:29 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:117:13-119:29 action#android.intent.action.BOOT_COMPLETED -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:118:17-79 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:118:17-79 android:name - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:118:25-76 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:118:25-76 receiver#net.micode.notes.ui.AlarmReceiver -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:122:9-125:20 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:122:9-125:20 android:process - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:124:13-38 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:124:13-38 android:name - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:123:13-61 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:123:13-61 activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:127:9-132:20 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:127:9-132:20 android:label - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:129:13-45 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:129:13-45 android:launchMode - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:130:13-48 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:130:13-48 android:theme - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:131:13-75 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:131:13-75 android:name - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:128:13-50 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:128:13-50 activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:134:9-139:20 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:134:9-139:20 android:label - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:136:13-54 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:136:13-54 android:launchMode - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:137:13-43 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:137:13-43 android:theme - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:138:13-60 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:138:13-60 android:name - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:135:13-71 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:135:13-71 service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:141:9-144:19 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:141:9-144:19 android:exported - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:143:13-37 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:143:13-37 android:name - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:142:13-74 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:142:13-74 meta-data#android.app.default_searchable -ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:146:9-148:52 +ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:146:9-148:52 android:value - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:148:13-49 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:148:13-49 android:name - ADDED from D:\softwareengineering\minote\src\app\src\main\AndroidManifest.xml:147:13-58 + ADDED from D:\softwareengineering\gitProject\src\app\src\main\AndroidManifest.xml:147:13-58 diff --git a/src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin new file mode 100644 index 0000000..c03a779 Binary files /dev/null and b/src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ diff --git a/app/src/main/AndroidManifest.xml b/src/app/src/main/AndroidManifest.xml similarity index 100% rename from app/src/main/AndroidManifest.xml rename to src/app/src/main/AndroidManifest.xml diff --git a/app/src/main/java/net/micode/notes/data/Contact.java b/src/app/src/main/java/net/micode/notes/data/Contact.java similarity index 100% rename from app/src/main/java/net/micode/notes/data/Contact.java rename to src/app/src/main/java/net/micode/notes/data/Contact.java diff --git a/app/src/main/java/net/micode/notes/data/Notes.java b/src/app/src/main/java/net/micode/notes/data/Notes.java similarity index 100% rename from app/src/main/java/net/micode/notes/data/Notes.java rename to src/app/src/main/java/net/micode/notes/data/Notes.java diff --git a/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/src/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java similarity index 100% rename from app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java rename to src/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java diff --git a/app/src/main/java/net/micode/notes/data/NotesProvider.java b/src/app/src/main/java/net/micode/notes/data/NotesProvider.java similarity index 100% rename from app/src/main/java/net/micode/notes/data/NotesProvider.java rename to src/app/src/main/java/net/micode/notes/data/NotesProvider.java diff --git a/app/src/main/java/net/micode/notes/gtask/data/MetaData.java b/src/app/src/main/java/net/micode/notes/gtask/data/MetaData.java similarity index 100% rename from app/src/main/java/net/micode/notes/gtask/data/MetaData.java rename to src/app/src/main/java/net/micode/notes/gtask/data/MetaData.java diff --git a/app/src/main/java/net/micode/notes/gtask/data/Node.java b/src/app/src/main/java/net/micode/notes/gtask/data/Node.java similarity index 100% rename from app/src/main/java/net/micode/notes/gtask/data/Node.java rename to src/app/src/main/java/net/micode/notes/gtask/data/Node.java diff --git a/app/src/main/java/net/micode/notes/gtask/data/SqlData.java b/src/app/src/main/java/net/micode/notes/gtask/data/SqlData.java similarity index 94% rename from app/src/main/java/net/micode/notes/gtask/data/SqlData.java rename to src/app/src/main/java/net/micode/notes/gtask/data/SqlData.java index 1923709..e989f50 100644 --- a/app/src/main/java/net/micode/notes/gtask/data/SqlData.java +++ b/src/app/src/main/java/net/micode/notes/gtask/data/SqlData.java @@ -50,26 +50,17 @@ public class SqlData { 第二行定义了一个名为INVALID_ID的私有静态常量整数，用于表示无效的ID。该值被设置为-99999。 第三行定义了一个名为PROJECTION_DATA的公共静态常量字符串数组，用于定义一个查询所需返回的列。这些列包括DataColumns类中定义的ID、MIME_TYPE、CONTENT、DATA1和DATA3。 这些变量和常量都被声明为静态的，这意味着它们属于类本身，而不是类的实例。因此，它们可以在类的所有实例之间共享和访问。 -<<<<<<< HEAD:app/src/main/java/net/micode/notes/gtask/data/SqlData.java -这些变量和常量的使用可以提高代码的可读性和可维护性，并避免在代码中多次重复相同的值。 -第一行定义了一个名为TAG的静态常量字符串，用于在日志中标识该类。这个字符串的值是SqlData类的简单名称。 -======= 这些变量和常量的使用可以提高代码的可读性和可维护性，并避免在代码中多次重复相同的值。*/ //======= //第一行定义了一个名为TAG的静态常量字符串，用于在日志中标识该类。这个字符串的值是SqlData类的简单名称。 ->>>>>>> master:src/app/src/main/java/net/micode/notes/gtask/data/SqlData.java //第二行定义了一个名为INVALID_ID的私有静态常量整数，用于表示无效的ID。该值被设置为-99999。 //第三行定义了一个名为PROJECTION_DATA的公共静态常量字符串数组，用于定义一个查询所需返回的列。这些列包括DataColumns类中定义的ID、MIME_TYPE、CONTENT、DATA1和DATA3。 -<<<<<<< HEAD:app/src/main/java/net/micode/notes/gtask/data/SqlData.java -这些变量和常量都被声明为静态的，这意味着它们属于类本身，而不是类的实例。因此，它们可以在类的所有实例之间共享和访问。这些变量和常量的使用可以提高代码的可读性和可维护性，并避免在代码中多次重复相同的值。*/ -======= //这些变量和常量都被声明为静态的，这意味着它们属于类本身，而不是类的实例。因此，它们可以在类的所有实例之间共享和访问。这些变量和常量的使用可以提高代码的可读性和可维护性，并避免在代码中多次重复相同的值。*/ //>>>>>>> 25eb5a04c09307c5edd9569e8d491a90234c9d82 ->>>>>>> master:src/app/src/main/java/net/micode/notes/gtask/data/SqlData.java public static final int DATA_ID_COLUMN = 0; public static final int DATA_MIME_TYPE_COLUMN = 1; diff --git a/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java b/src/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java similarity index 100% rename from app/src/main/java/net/micode/notes/gtask/data/SqlNote.java rename to src/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java diff --git a/app/src/main/java/net/micode/notes/gtask/data/Task.java b/src/app/src/main/java/net/micode/notes/gtask/data/Task.java similarity index 100% rename from app/src/main/java/net/micode/notes/gtask/data/Task.java rename to src/app/src/main/java/net/micode/notes/gtask/data/Task.java diff --git a/app/src/main/java/net/micode/notes/gtask/data/TaskList.java b/src/app/src/main/java/net/micode/notes/gtask/data/TaskList.java similarity index 100% rename from app/src/main/java/net/micode/notes/gtask/data/TaskList.java rename to src/app/src/main/java/net/micode/notes/gtask/data/TaskList.java diff --git a/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java b/src/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java similarity index 100% rename from app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java rename to src/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java diff --git a/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java b/src/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java similarity index 100% rename from app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java rename to src/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java diff --git a/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java b/src/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java similarity index 100% rename from app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java rename to src/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java diff --git a/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java b/src/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java similarity index 100% rename from app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java rename to src/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java diff --git a/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java b/src/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java similarity index 100% rename from app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java rename to src/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java diff --git a/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java b/src/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java similarity index 100% rename from app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java rename to src/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java diff --git a/app/src/main/java/net/micode/notes/model/Note.java b/src/app/src/main/java/net/micode/notes/model/Note.java similarity index 100% rename from app/src/main/java/net/micode/notes/model/Note.java rename to src/app/src/main/java/net/micode/notes/model/Note.java diff --git a/app/src/main/java/net/micode/notes/model/WorkingNote.java b/src/app/src/main/java/net/micode/notes/model/WorkingNote.java similarity index 100% rename from app/src/main/java/net/micode/notes/model/WorkingNote.java rename to src/app/src/main/java/net/micode/notes/model/WorkingNote.java diff --git a/app/src/main/java/net/micode/notes/tool/BackupUtils.java b/src/app/src/main/java/net/micode/notes/tool/BackupUtils.java similarity index 100% rename from app/src/main/java/net/micode/notes/tool/BackupUtils.java rename to src/app/src/main/java/net/micode/notes/tool/BackupUtils.java diff --git a/app/src/main/java/net/micode/notes/tool/DataUtils.java b/src/app/src/main/java/net/micode/notes/tool/DataUtils.java similarity index 100% rename from app/src/main/java/net/micode/notes/tool/DataUtils.java rename to src/app/src/main/java/net/micode/notes/tool/DataUtils.java diff --git a/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java b/src/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java similarity index 100% rename from app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java rename to src/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java diff --git a/app/src/main/java/net/micode/notes/tool/ResourceParser.java b/src/app/src/main/java/net/micode/notes/tool/ResourceParser.java similarity index 100% rename from app/src/main/java/net/micode/notes/tool/ResourceParser.java rename to src/app/src/main/java/net/micode/notes/tool/ResourceParser.java diff --git a/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java b/src/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java rename to src/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java diff --git a/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java b/src/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java rename to src/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java diff --git a/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java b/src/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/AlarmReceiver.java rename to src/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java diff --git a/app/src/main/java/net/micode/notes/ui/DateTimePicker.java b/src/app/src/main/java/net/micode/notes/ui/DateTimePicker.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/DateTimePicker.java rename to src/app/src/main/java/net/micode/notes/ui/DateTimePicker.java diff --git a/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java b/src/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java rename to src/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java diff --git a/app/src/main/java/net/micode/notes/ui/DropdownMenu.java b/src/app/src/main/java/net/micode/notes/ui/DropdownMenu.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/DropdownMenu.java rename to src/app/src/main/java/net/micode/notes/ui/DropdownMenu.java diff --git a/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java b/src/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java rename to src/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java diff --git a/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java similarity index 99% rename from app/src/main/java/net/micode/notes/ui/NoteEditActivity.java rename to src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java index 033569c..4c7fe66 100644 --- a/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java +++ b/src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java @@ -433,7 +433,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, if (id == R.id.btn_set_bg_color) { mNoteBgColorSelector.setVisibility(View.VISIBLE); findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility( - View.VISIBLE); + - View.VISIBLE); } else if (sBgSelectorBtnsMap.containsKey(id)) { findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility( View.GONE); diff --git a/app/src/main/java/net/micode/notes/ui/NoteEditText.java b/src/app/src/main/java/net/micode/notes/ui/NoteEditText.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/NoteEditText.java rename to src/app/src/main/java/net/micode/notes/ui/NoteEditText.java diff --git a/app/src/main/java/net/micode/notes/ui/NoteItemData.java b/src/app/src/main/java/net/micode/notes/ui/NoteItemData.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/NoteItemData.java rename to src/app/src/main/java/net/micode/notes/ui/NoteItemData.java diff --git a/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/NotesListActivity.java rename to src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java diff --git a/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java b/src/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/NotesListAdapter.java rename to src/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java diff --git a/app/src/main/java/net/micode/notes/ui/NotesListItem.java b/src/app/src/main/java/net/micode/notes/ui/NotesListItem.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/NotesListItem.java rename to src/app/src/main/java/net/micode/notes/ui/NotesListItem.java diff --git a/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java b/src/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java similarity index 100% rename from app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java rename to src/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java diff --git a/src/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java b/src/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java index 0c824f0..ec6f819 100644 --- a/src/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java +++ b/src/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java @@ -57,19 +57,8 @@ public abstract class NoteWidgetProvider extends AppWidgetProvider { } } -<<<<<<<<< Temporary merge branch 1 private Cursor getNoteWidgetInfo(Context context, int widgetId) { return context.getContentResolver().query(Notes.CONTENT_NOTE_URI, -========= -在该方法中，首先创建了一个 ContentValues 对象 values，并将 NoteColumns.WIDGET_ID 的值设为 AppWidgetManager.INVALID_APPWIDGET_ID，表示小部件已被删除。 - -然后遍历传入的 appWidgetIds 数组，将每个小部件的 NoteColumns.WIDGET_ID 列更新为 AppWidgetManager.INVALID_APPWIDGET_ID，以便将小部件与笔记数据库中的记录解除绑定。 - -具体地，使用 getContentResolver() 获取一个 ContentResolver 对象，调用 update() 方法对笔记数据库中的记录进行更新。更新的条件为 NoteColumns.WIDGET_ID + "=?"，即 NoteColumns.WIDGET_ID 等于当前小部件 ID，更新的数据为 values 对象，其中 NoteColumns.WIDGET_ID 的值已经被设置为 AppWidgetManager.INVALID_APPWIDGET_ID。*/ - - private Cursor getNoteWidgetInfo(Context context, int widgetId) {// 使用 getContentResolver() 方法获取 ContentResolver 对象，通过该对象进行对笔记数据库的查询操作 - return context.getContentResolver().query(Notes.CONTENT_NOTE_URI, // 使用 query() 方法查询笔记数据库，返回一个 Cursor 对象查询的 URI，笔记数据库中笔记的内容保存在该 URI 下 ->>>>>>>>> Temporary merge branch 2 PROJECTION, NoteColumns.WIDGET_ID + "=? AND " + NoteColumns.PARENT_ID + "<>?", new String[] { String.valueOf(widgetId), String.valueOf(Notes.ID_TRASH_FOLER) }, diff --git a/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java b/src/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java similarity index 100% rename from app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java rename to src/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java diff --git a/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java b/src/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java similarity index 100% rename from app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java rename to src/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java diff --git a/app/src/main/res/color/primary_text_dark.xml b/src/app/src/main/res/color/primary_text_dark.xml similarity index 100% rename from app/src/main/res/color/primary_text_dark.xml rename to src/app/src/main/res/color/primary_text_dark.xml diff --git a/app/src/main/res/color/secondary_text_dark.xml b/src/app/src/main/res/color/secondary_text_dark.xml similarity index 100% rename from app/src/main/res/color/secondary_text_dark.xml rename to src/app/src/main/res/color/secondary_text_dark.xml diff --git a/app/src/main/res/drawable-hdpi/bg_btn_set_color.png b/src/app/src/main/res/drawable-hdpi/bg_btn_set_color.png similarity index 100% rename from app/src/main/res/drawable-hdpi/bg_btn_set_color.png rename to src/app/src/main/res/drawable-hdpi/bg_btn_set_color.png diff --git a/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png b/src/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png similarity index 100% rename from app/src/main/res/drawable-hdpi/bg_color_btn_mask.png rename to src/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png diff --git a/app/src/main/res/drawable-hdpi/call_record.png b/src/app/src/main/res/drawable-hdpi/call_record.png similarity index 100% rename from app/src/main/res/drawable-hdpi/call_record.png rename to src/app/src/main/res/drawable-hdpi/call_record.png diff --git a/app/src/main/res/drawable-hdpi/clock.png b/src/app/src/main/res/drawable-hdpi/clock.png similarity index 100% rename from app/src/main/res/drawable-hdpi/clock.png rename to src/app/src/main/res/drawable-hdpi/clock.png diff --git a/app/src/main/res/drawable-hdpi/delete.png b/src/app/src/main/res/drawable-hdpi/delete.png similarity index 100% rename from app/src/main/res/drawable-hdpi/delete.png rename to src/app/src/main/res/drawable-hdpi/delete.png diff --git a/app/src/main/res/drawable-hdpi/dropdown_icon.9.png b/src/app/src/main/res/drawable-hdpi/dropdown_icon.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/dropdown_icon.9.png rename to src/app/src/main/res/drawable-hdpi/dropdown_icon.9.png diff --git a/app/src/main/res/drawable-hdpi/edit_blue.9.png b/src/app/src/main/res/drawable-hdpi/edit_blue.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/edit_blue.9.png rename to src/app/src/main/res/drawable-hdpi/edit_blue.9.png diff --git a/app/src/main/res/drawable-hdpi/edit_green.9.png b/src/app/src/main/res/drawable-hdpi/edit_green.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/edit_green.9.png rename to src/app/src/main/res/drawable-hdpi/edit_green.9.png diff --git a/app/src/main/res/drawable-hdpi/edit_red.9.png b/src/app/src/main/res/drawable-hdpi/edit_red.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/edit_red.9.png rename to src/app/src/main/res/drawable-hdpi/edit_red.9.png diff --git a/app/src/main/res/drawable-hdpi/edit_title_blue.9.png b/src/app/src/main/res/drawable-hdpi/edit_title_blue.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/edit_title_blue.9.png rename to src/app/src/main/res/drawable-hdpi/edit_title_blue.9.png diff --git a/app/src/main/res/drawable-hdpi/edit_title_green.9.png b/src/app/src/main/res/drawable-hdpi/edit_title_green.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/edit_title_green.9.png rename to src/app/src/main/res/drawable-hdpi/edit_title_green.9.png diff --git a/app/src/main/res/drawable-hdpi/edit_title_red.9.png b/src/app/src/main/res/drawable-hdpi/edit_title_red.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/edit_title_red.9.png rename to src/app/src/main/res/drawable-hdpi/edit_title_red.9.png diff --git a/app/src/main/res/drawable-hdpi/edit_title_white.9.png b/src/app/src/main/res/drawable-hdpi/edit_title_white.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/edit_title_white.9.png rename to src/app/src/main/res/drawable-hdpi/edit_title_white.9.png diff --git a/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png b/src/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/edit_title_yellow.9.png rename to src/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png diff --git a/app/src/main/res/drawable-hdpi/edit_white.9.png b/src/app/src/main/res/drawable-hdpi/edit_white.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/edit_white.9.png rename to src/app/src/main/res/drawable-hdpi/edit_white.9.png diff --git a/app/src/main/res/drawable-hdpi/edit_yellow.9.png b/src/app/src/main/res/drawable-hdpi/edit_yellow.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/edit_yellow.9.png rename to src/app/src/main/res/drawable-hdpi/edit_yellow.9.png diff --git a/app/src/main/res/drawable-hdpi/font_large.png b/src/app/src/main/res/drawable-hdpi/font_large.png similarity index 100% rename from app/src/main/res/drawable-hdpi/font_large.png rename to src/app/src/main/res/drawable-hdpi/font_large.png diff --git a/app/src/main/res/drawable-hdpi/font_normal.png b/src/app/src/main/res/drawable-hdpi/font_normal.png similarity index 100% rename from app/src/main/res/drawable-hdpi/font_normal.png rename to src/app/src/main/res/drawable-hdpi/font_normal.png diff --git a/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png b/src/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png rename to src/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png diff --git a/app/src/main/res/drawable-hdpi/font_small.png b/src/app/src/main/res/drawable-hdpi/font_small.png similarity index 100% rename from app/src/main/res/drawable-hdpi/font_small.png rename to src/app/src/main/res/drawable-hdpi/font_small.png diff --git a/app/src/main/res/drawable-hdpi/font_super.png b/src/app/src/main/res/drawable-hdpi/font_super.png similarity index 100% rename from app/src/main/res/drawable-hdpi/font_super.png rename to src/app/src/main/res/drawable-hdpi/font_super.png diff --git a/app/src/main/res/drawable-hdpi/icon_app.png b/src/app/src/main/res/drawable-hdpi/icon_app.png similarity index 100% rename from app/src/main/res/drawable-hdpi/icon_app.png rename to src/app/src/main/res/drawable-hdpi/icon_app.png diff --git a/app/src/main/res/drawable-hdpi/list_background.png b/src/app/src/main/res/drawable-hdpi/list_background.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_background.png rename to src/app/src/main/res/drawable-hdpi/list_background.png diff --git a/app/src/main/res/drawable-hdpi/list_blue_down.9.png b/src/app/src/main/res/drawable-hdpi/list_blue_down.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_blue_down.9.png rename to src/app/src/main/res/drawable-hdpi/list_blue_down.9.png diff --git a/app/src/main/res/drawable-hdpi/list_blue_middle.9.png b/src/app/src/main/res/drawable-hdpi/list_blue_middle.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_blue_middle.9.png rename to src/app/src/main/res/drawable-hdpi/list_blue_middle.9.png diff --git a/app/src/main/res/drawable-hdpi/list_blue_single.9.png b/src/app/src/main/res/drawable-hdpi/list_blue_single.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_blue_single.9.png rename to src/app/src/main/res/drawable-hdpi/list_blue_single.9.png diff --git a/app/src/main/res/drawable-hdpi/list_blue_up.9.png b/src/app/src/main/res/drawable-hdpi/list_blue_up.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_blue_up.9.png rename to src/app/src/main/res/drawable-hdpi/list_blue_up.9.png diff --git a/app/src/main/res/drawable-hdpi/list_folder.9.png b/src/app/src/main/res/drawable-hdpi/list_folder.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_folder.9.png rename to src/app/src/main/res/drawable-hdpi/list_folder.9.png diff --git a/app/src/main/res/drawable-hdpi/list_footer_bg.9.png b/src/app/src/main/res/drawable-hdpi/list_footer_bg.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_footer_bg.9.png rename to src/app/src/main/res/drawable-hdpi/list_footer_bg.9.png diff --git a/app/src/main/res/drawable-hdpi/list_green_down.9.png b/src/app/src/main/res/drawable-hdpi/list_green_down.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_green_down.9.png rename to src/app/src/main/res/drawable-hdpi/list_green_down.9.png diff --git a/app/src/main/res/drawable-hdpi/list_green_middle.9.png b/src/app/src/main/res/drawable-hdpi/list_green_middle.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_green_middle.9.png rename to src/app/src/main/res/drawable-hdpi/list_green_middle.9.png diff --git a/app/src/main/res/drawable-hdpi/list_green_single.9.png b/src/app/src/main/res/drawable-hdpi/list_green_single.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_green_single.9.png rename to src/app/src/main/res/drawable-hdpi/list_green_single.9.png diff --git a/app/src/main/res/drawable-hdpi/list_green_up.9.png b/src/app/src/main/res/drawable-hdpi/list_green_up.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_green_up.9.png rename to src/app/src/main/res/drawable-hdpi/list_green_up.9.png diff --git a/app/src/main/res/drawable-hdpi/list_red_down.9.png b/src/app/src/main/res/drawable-hdpi/list_red_down.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_red_down.9.png rename to src/app/src/main/res/drawable-hdpi/list_red_down.9.png diff --git a/app/src/main/res/drawable-hdpi/list_red_middle.9.png b/src/app/src/main/res/drawable-hdpi/list_red_middle.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_red_middle.9.png rename to src/app/src/main/res/drawable-hdpi/list_red_middle.9.png diff --git a/app/src/main/res/drawable-hdpi/list_red_single.9.png b/src/app/src/main/res/drawable-hdpi/list_red_single.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_red_single.9.png rename to src/app/src/main/res/drawable-hdpi/list_red_single.9.png diff --git a/app/src/main/res/drawable-hdpi/list_red_up.9.png b/src/app/src/main/res/drawable-hdpi/list_red_up.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_red_up.9.png rename to src/app/src/main/res/drawable-hdpi/list_red_up.9.png diff --git a/app/src/main/res/drawable-hdpi/list_white_down.9.png b/src/app/src/main/res/drawable-hdpi/list_white_down.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_white_down.9.png rename to src/app/src/main/res/drawable-hdpi/list_white_down.9.png diff --git a/app/src/main/res/drawable-hdpi/list_white_middle.9.png b/src/app/src/main/res/drawable-hdpi/list_white_middle.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_white_middle.9.png rename to src/app/src/main/res/drawable-hdpi/list_white_middle.9.png diff --git a/app/src/main/res/drawable-hdpi/list_white_single.9.png b/src/app/src/main/res/drawable-hdpi/list_white_single.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_white_single.9.png rename to src/app/src/main/res/drawable-hdpi/list_white_single.9.png diff --git a/app/src/main/res/drawable-hdpi/list_white_up.9.png b/src/app/src/main/res/drawable-hdpi/list_white_up.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_white_up.9.png rename to src/app/src/main/res/drawable-hdpi/list_white_up.9.png diff --git a/app/src/main/res/drawable-hdpi/list_yellow_down.9.png b/src/app/src/main/res/drawable-hdpi/list_yellow_down.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_yellow_down.9.png rename to src/app/src/main/res/drawable-hdpi/list_yellow_down.9.png diff --git a/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png b/src/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_yellow_middle.9.png rename to src/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png diff --git a/app/src/main/res/drawable-hdpi/list_yellow_single.9.png b/src/app/src/main/res/drawable-hdpi/list_yellow_single.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_yellow_single.9.png rename to src/app/src/main/res/drawable-hdpi/list_yellow_single.9.png diff --git a/app/src/main/res/drawable-hdpi/list_yellow_up.9.png b/src/app/src/main/res/drawable-hdpi/list_yellow_up.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/list_yellow_up.9.png rename to src/app/src/main/res/drawable-hdpi/list_yellow_up.9.png diff --git a/app/src/main/res/drawable-hdpi/menu_delete.png b/src/app/src/main/res/drawable-hdpi/menu_delete.png similarity index 100% rename from app/src/main/res/drawable-hdpi/menu_delete.png rename to src/app/src/main/res/drawable-hdpi/menu_delete.png diff --git a/app/src/main/res/drawable-hdpi/menu_move.png b/src/app/src/main/res/drawable-hdpi/menu_move.png similarity index 100% rename from app/src/main/res/drawable-hdpi/menu_move.png rename to src/app/src/main/res/drawable-hdpi/menu_move.png diff --git a/app/src/main/res/drawable-hdpi/new_note_normal.png b/src/app/src/main/res/drawable-hdpi/new_note_normal.png similarity index 100% rename from app/src/main/res/drawable-hdpi/new_note_normal.png rename to src/app/src/main/res/drawable-hdpi/new_note_normal.png diff --git a/app/src/main/res/drawable-hdpi/new_note_pressed.png b/src/app/src/main/res/drawable-hdpi/new_note_pressed.png similarity index 100% rename from app/src/main/res/drawable-hdpi/new_note_pressed.png rename to src/app/src/main/res/drawable-hdpi/new_note_pressed.png diff --git a/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png b/src/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png similarity index 100% rename from app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png rename to src/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png diff --git a/app/src/main/res/drawable-hdpi/notification.png b/src/app/src/main/res/drawable-hdpi/notification.png similarity index 100% rename from app/src/main/res/drawable-hdpi/notification.png rename to src/app/src/main/res/drawable-hdpi/notification.png diff --git a/app/src/main/res/drawable-hdpi/search_result.png b/src/app/src/main/res/drawable-hdpi/search_result.png similarity index 100% rename from app/src/main/res/drawable-hdpi/search_result.png rename to src/app/src/main/res/drawable-hdpi/search_result.png diff --git a/app/src/main/res/drawable-hdpi/selected.png b/src/app/src/main/res/drawable-hdpi/selected.png similarity index 100% rename from app/src/main/res/drawable-hdpi/selected.png rename to src/app/src/main/res/drawable-hdpi/selected.png diff --git a/app/src/main/res/drawable-hdpi/title_alert.png b/src/app/src/main/res/drawable-hdpi/title_alert.png similarity index 100% rename from app/src/main/res/drawable-hdpi/title_alert.png rename to src/app/src/main/res/drawable-hdpi/title_alert.png diff --git a/app/src/main/res/drawable-hdpi/title_bar_bg.9.png b/src/app/src/main/res/drawable-hdpi/title_bar_bg.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/title_bar_bg.9.png rename to src/app/src/main/res/drawable-hdpi/title_bar_bg.9.png diff --git a/app/src/main/res/drawable-hdpi/widget_2x_blue.png b/src/app/src/main/res/drawable-hdpi/widget_2x_blue.png similarity index 100% rename from app/src/main/res/drawable-hdpi/widget_2x_blue.png rename to src/app/src/main/res/drawable-hdpi/widget_2x_blue.png diff --git a/app/src/main/res/drawable-hdpi/widget_2x_green.png b/src/app/src/main/res/drawable-hdpi/widget_2x_green.png similarity index 100% rename from app/src/main/res/drawable-hdpi/widget_2x_green.png rename to src/app/src/main/res/drawable-hdpi/widget_2x_green.png diff --git a/app/src/main/res/drawable-hdpi/widget_2x_red.png b/src/app/src/main/res/drawable-hdpi/widget_2x_red.png similarity index 100% rename from app/src/main/res/drawable-hdpi/widget_2x_red.png rename to src/app/src/main/res/drawable-hdpi/widget_2x_red.png diff --git a/app/src/main/res/drawable-hdpi/widget_2x_white.png b/src/app/src/main/res/drawable-hdpi/widget_2x_white.png similarity index 100% rename from app/src/main/res/drawable-hdpi/widget_2x_white.png rename to src/app/src/main/res/drawable-hdpi/widget_2x_white.png diff --git a/app/src/main/res/drawable-hdpi/widget_2x_yellow.png b/src/app/src/main/res/drawable-hdpi/widget_2x_yellow.png similarity index 100% rename from app/src/main/res/drawable-hdpi/widget_2x_yellow.png rename to src/app/src/main/res/drawable-hdpi/widget_2x_yellow.png diff --git a/app/src/main/res/drawable-hdpi/widget_4x_blue.png b/src/app/src/main/res/drawable-hdpi/widget_4x_blue.png similarity index 100% rename from app/src/main/res/drawable-hdpi/widget_4x_blue.png rename to src/app/src/main/res/drawable-hdpi/widget_4x_blue.png diff --git a/app/src/main/res/drawable-hdpi/widget_4x_green.png b/src/app/src/main/res/drawable-hdpi/widget_4x_green.png similarity index 100% rename from app/src/main/res/drawable-hdpi/widget_4x_green.png rename to src/app/src/main/res/drawable-hdpi/widget_4x_green.png diff --git a/app/src/main/res/drawable-hdpi/widget_4x_red.png b/src/app/src/main/res/drawable-hdpi/widget_4x_red.png similarity index 100% rename from app/src/main/res/drawable-hdpi/widget_4x_red.png rename to src/app/src/main/res/drawable-hdpi/widget_4x_red.png diff --git a/app/src/main/res/drawable-hdpi/widget_4x_white.png b/src/app/src/main/res/drawable-hdpi/widget_4x_white.png similarity index 100% rename from app/src/main/res/drawable-hdpi/widget_4x_white.png rename to src/app/src/main/res/drawable-hdpi/widget_4x_white.png diff --git a/app/src/main/res/drawable-hdpi/widget_4x_yellow.png b/src/app/src/main/res/drawable-hdpi/widget_4x_yellow.png similarity index 100% rename from app/src/main/res/drawable-hdpi/widget_4x_yellow.png rename to src/app/src/main/res/drawable-hdpi/widget_4x_yellow.png diff --git a/app/src/main/res/drawable/new_note.xml b/src/app/src/main/res/drawable/new_note.xml similarity index 100% rename from app/src/main/res/drawable/new_note.xml rename to src/app/src/main/res/drawable/new_note.xml diff --git a/app/src/main/res/layout/account_dialog_title.xml b/src/app/src/main/res/layout/account_dialog_title.xml similarity index 100% rename from app/src/main/res/layout/account_dialog_title.xml rename to src/app/src/main/res/layout/account_dialog_title.xml diff --git a/app/src/main/res/layout/add_account_text.xml b/src/app/src/main/res/layout/add_account_text.xml similarity index 100% rename from app/src/main/res/layout/add_account_text.xml rename to src/app/src/main/res/layout/add_account_text.xml diff --git a/app/src/main/res/layout/datetime_picker.xml b/src/app/src/main/res/layout/datetime_picker.xml similarity index 100% rename from app/src/main/res/layout/datetime_picker.xml rename to src/app/src/main/res/layout/datetime_picker.xml diff --git a/app/src/main/res/layout/dialog_edit_text.xml b/src/app/src/main/res/layout/dialog_edit_text.xml similarity index 100% rename from app/src/main/res/layout/dialog_edit_text.xml rename to src/app/src/main/res/layout/dialog_edit_text.xml diff --git a/app/src/main/res/layout/folder_list_item.xml b/src/app/src/main/res/layout/folder_list_item.xml similarity index 100% rename from app/src/main/res/layout/folder_list_item.xml rename to src/app/src/main/res/layout/folder_list_item.xml diff --git a/app/src/main/res/layout/note_edit.xml b/src/app/src/main/res/layout/note_edit.xml similarity index 100% rename from app/src/main/res/layout/note_edit.xml rename to src/app/src/main/res/layout/note_edit.xml diff --git a/app/src/main/res/layout/note_edit_list_item.xml b/src/app/src/main/res/layout/note_edit_list_item.xml similarity index 100% rename from app/src/main/res/layout/note_edit_list_item.xml rename to src/app/src/main/res/layout/note_edit_list_item.xml diff --git a/app/src/main/res/layout/note_item.xml b/src/app/src/main/res/layout/note_item.xml similarity index 100% rename from app/src/main/res/layout/note_item.xml rename to src/app/src/main/res/layout/note_item.xml diff --git a/app/src/main/res/layout/note_list.xml b/src/app/src/main/res/layout/note_list.xml similarity index 100% rename from app/src/main/res/layout/note_list.xml rename to src/app/src/main/res/layout/note_list.xml diff --git a/app/src/main/res/layout/note_list_dropdown_menu.xml b/src/app/src/main/res/layout/note_list_dropdown_menu.xml similarity index 100% rename from app/src/main/res/layout/note_list_dropdown_menu.xml rename to src/app/src/main/res/layout/note_list_dropdown_menu.xml diff --git a/app/src/main/res/layout/note_list_footer.xml b/src/app/src/main/res/layout/note_list_footer.xml similarity index 100% rename from app/src/main/res/layout/note_list_footer.xml rename to src/app/src/main/res/layout/note_list_footer.xml diff --git a/app/src/main/res/layout/settings_header.xml b/src/app/src/main/res/layout/settings_header.xml similarity index 100% rename from app/src/main/res/layout/settings_header.xml rename to src/app/src/main/res/layout/settings_header.xml diff --git a/app/src/main/res/layout/widget_2x.xml b/src/app/src/main/res/layout/widget_2x.xml similarity index 100% rename from app/src/main/res/layout/widget_2x.xml rename to src/app/src/main/res/layout/widget_2x.xml diff --git a/app/src/main/res/layout/widget_4x.xml b/src/app/src/main/res/layout/widget_4x.xml similarity index 100% rename from app/src/main/res/layout/widget_4x.xml rename to src/app/src/main/res/layout/widget_4x.xml diff --git a/app/src/main/res/menu/call_note_edit.xml b/src/app/src/main/res/menu/call_note_edit.xml similarity index 100% rename from app/src/main/res/menu/call_note_edit.xml rename to src/app/src/main/res/menu/call_note_edit.xml diff --git a/app/src/main/res/menu/call_record_folder.xml b/src/app/src/main/res/menu/call_record_folder.xml similarity index 100% rename from app/src/main/res/menu/call_record_folder.xml rename to src/app/src/main/res/menu/call_record_folder.xml diff --git a/app/src/main/res/menu/note_edit.xml b/src/app/src/main/res/menu/note_edit.xml similarity index 100% rename from app/src/main/res/menu/note_edit.xml rename to src/app/src/main/res/menu/note_edit.xml diff --git a/app/src/main/res/menu/note_list.xml b/src/app/src/main/res/menu/note_list.xml similarity index 100% rename from app/src/main/res/menu/note_list.xml rename to src/app/src/main/res/menu/note_list.xml diff --git a/app/src/main/res/menu/note_list_dropdown.xml b/src/app/src/main/res/menu/note_list_dropdown.xml similarity index 100% rename from app/src/main/res/menu/note_list_dropdown.xml rename to src/app/src/main/res/menu/note_list_dropdown.xml diff --git a/app/src/main/res/menu/note_list_options.xml b/src/app/src/main/res/menu/note_list_options.xml similarity index 100% rename from app/src/main/res/menu/note_list_options.xml rename to src/app/src/main/res/menu/note_list_options.xml diff --git a/app/src/main/res/menu/sub_folder.xml b/src/app/src/main/res/menu/sub_folder.xml similarity index 100% rename from app/src/main/res/menu/sub_folder.xml rename to src/app/src/main/res/menu/sub_folder.xml diff --git a/app/src/main/res/raw-zh-rCN/introduction b/src/app/src/main/res/raw-zh-rCN/introduction similarity index 100% rename from app/src/main/res/raw-zh-rCN/introduction rename to src/app/src/main/res/raw-zh-rCN/introduction diff --git a/app/src/main/res/raw/introduction b/src/app/src/main/res/raw/introduction similarity index 100% rename from app/src/main/res/raw/introduction rename to src/app/src/main/res/raw/introduction diff --git a/app/src/main/res/values-zh-rCN/arrays.xml b/src/app/src/main/res/values-zh-rCN/arrays.xml similarity index 100% rename from app/src/main/res/values-zh-rCN/arrays.xml rename to src/app/src/main/res/values-zh-rCN/arrays.xml diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/src/app/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from app/src/main/res/values-zh-rCN/strings.xml rename to src/app/src/main/res/values-zh-rCN/strings.xml diff --git a/app/src/main/res/values-zh-rTW/arrays.xml b/src/app/src/main/res/values-zh-rTW/arrays.xml similarity index 100% rename from app/src/main/res/values-zh-rTW/arrays.xml rename to src/app/src/main/res/values-zh-rTW/arrays.xml diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/src/app/src/main/res/values-zh-rTW/strings.xml similarity index 100% rename from app/src/main/res/values-zh-rTW/strings.xml rename to src/app/src/main/res/values-zh-rTW/strings.xml diff --git a/app/src/main/res/values/arrays.xml b/src/app/src/main/res/values/arrays.xml similarity index 100% rename from app/src/main/res/values/arrays.xml rename to src/app/src/main/res/values/arrays.xml diff --git a/app/src/main/res/values/colors.xml b/src/app/src/main/res/values/colors.xml similarity index 100% rename from app/src/main/res/values/colors.xml rename to src/app/src/main/res/values/colors.xml diff --git a/app/src/main/res/values/dimens.xml b/src/app/src/main/res/values/dimens.xml similarity index 100% rename from app/src/main/res/values/dimens.xml rename to src/app/src/main/res/values/dimens.xml diff --git a/app/src/main/res/values/strings.xml b/src/app/src/main/res/values/strings.xml similarity index 100% rename from app/src/main/res/values/strings.xml rename to src/app/src/main/res/values/strings.xml diff --git a/app/src/main/res/values/styles.xml b/src/app/src/main/res/values/styles.xml similarity index 100% rename from app/src/main/res/values/styles.xml rename to src/app/src/main/res/values/styles.xml diff --git a/app/src/main/res/xml/preferences.xml b/src/app/src/main/res/xml/preferences.xml similarity index 100% rename from app/src/main/res/xml/preferences.xml rename to src/app/src/main/res/xml/preferences.xml diff --git a/app/src/main/res/xml/searchable.xml b/src/app/src/main/res/xml/searchable.xml similarity index 100% rename from app/src/main/res/xml/searchable.xml rename to src/app/src/main/res/xml/searchable.xml diff --git a/app/src/main/res/xml/widget_2x_info.xml b/src/app/src/main/res/xml/widget_2x_info.xml similarity index 100% rename from app/src/main/res/xml/widget_2x_info.xml rename to src/app/src/main/res/xml/widget_2x_info.xml diff --git a/app/src/main/res/xml/widget_4x_info.xml b/src/app/src/main/res/xml/widget_4x_info.xml similarity index 100% rename from app/src/main/res/xml/widget_4x_info.xml rename to src/app/src/main/res/xml/widget_4x_info.xml diff --git a/build.gradle b/src/build.gradle similarity index 100% rename from build.gradle rename to src/build.gradle diff --git a/gradle/wrapper/gradle-wrapper.jar b/src/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from gradle/wrapper/gradle-wrapper.jar rename to src/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/wrapper/gradle-wrapper.properties b/src/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from gradle/wrapper/gradle-wrapper.properties rename to src/gradle/wrapper/gradle-wrapper.properties diff --git a/gradlew b/src/gradlew similarity index 100% rename from gradlew rename to src/gradlew diff --git a/gradlew.bat b/src/gradlew.bat similarity index 100% rename from gradlew.bat rename to src/gradlew.bat diff --git a/import-summary.txt b/src/import-summary.txt similarity index 100% rename from import-summary.txt rename to src/import-summary.txt diff --git a/local.properties b/src/local.properties similarity index 71% rename from local.properties rename to src/local.properties index 2e49918..ab20bc0 100644 --- a/local.properties +++ b/src/local.properties @@ -4,10 +4,5 @@ # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -<<<<<<< HEAD:local.properties -#Wed Jun 07 13:25:38 CST 2023 -sdk.dir=D\:\\Android\\SDK -======= #Thu Apr 27 00:30:42 CST 2023 sdk.dir=D\:\\Androidsdk ->>>>>>> master:src/local.properties diff --git a/minote.iml b/src/minote.iml similarity index 100% rename from minote.iml rename to src/minote.iml diff --git a/settings.gradle b/src/settings.gradle similarity index 100% rename from settings.gradle rename to src/settings.gradle diff --git a/存放源程序代码.txt b/src/存放源程序代码.txt similarity index 100% rename from 存放源程序代码.txt rename to src/存放源程序代码.txt