Compare commits
2 Commits
5a1d50dfd0
...
d8cc8a6571
| Author | SHA1 | Date |
|---|---|---|
 beitingnanxu
|
d8cc8a6571 | 2 years ago |
|
beitingnanxu
|
c066bac3ad | 2 years ago |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,12 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectModuleManager">
|
||||
<modules>
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/modules/gitProject.iml" filepath="$PROJECT_DIR$/.idea/modules/gitProject.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/modules/app/gitProject.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/gitProject.app.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/modules/app/gitProject.app.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/app/gitProject.app.androidTest.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/modules/app/gitProject.app.main.iml" filepath="$PROJECT_DIR$/.idea/modules/app/gitProject.app.main.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/modules/app/gitProject.app.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/app/gitProject.app.unitTest.iml" />
|
||||
</modules>
|
||||
</component>
|
||||
</project>
|
||||
@ -1,33 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module external.linked.project.id=":app:androidTest" external.linked.project.path="$MODULE_DIR$/../../../app" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.type="sourceSet" type="JAVA_MODULE" version="4">
|
||||
<component name="FacetManager">
|
||||
<facet type="android" name="Android">
|
||||
<configuration>
|
||||
<option name="SELECTED_BUILD_VARIANT" value="debug" />
|
||||
<option name="ALLOW_USER_CONFIGURATION" value="false" />
|
||||
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
|
||||
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
|
||||
<option name="RES_FOLDERS_RELATIVE_PATH" value="" />
|
||||
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/androidTest/res;file://$MODULE_DIR$/../../../app/src/androidTestDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/debug" />
|
||||
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
|
||||
</configuration>
|
||||
</facet>
|
||||
</component>
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
|
||||
<output url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debug/classes" />
|
||||
<output-test url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debugUnitTest/classes" />
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debugAndroidTest/out" />
|
||||
<content url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debugAndroidTest/out" />
|
||||
<content url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debugAndroidTest/out" />
|
||||
<content url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/debug" />
|
||||
<content url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug" />
|
||||
<content url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/androidTest/debug" />
|
||||
<content url="file://$MODULE_DIR$/../../../app/src/androidTest" />
|
||||
<content url="file://$MODULE_DIR$/../../../app/src/androidTestDebug" />
|
||||
<orderEntry type="jdk" jdkName="Android API 33, extension level 3 Platform" jdkType="Android SDK" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="module" module-name="gitProject.app.main" scope="TEST" />
|
||||
</component>
|
||||
<component name="TestModuleProperties" production-module="gitProject.app.main" />
|
||||
</module>
|
||||
@ -1,34 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$/../../../app" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="gitProject" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
|
||||
<component name="FacetManager">
|
||||
<facet type="android-gradle" name="Android-Gradle">
|
||||
<configuration>
|
||||
<option name="GRADLE_PROJECT_PATH" value=":app" />
|
||||
<option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" />
|
||||
<option name="LAST_KNOWN_AGP_VERSION" value="7.4.2" />
|
||||
</configuration>
|
||||
</facet>
|
||||
<facet type="android" name="Android">
|
||||
<configuration>
|
||||
<option name="SELECTED_BUILD_VARIANT" value="debug" />
|
||||
<option name="ALLOW_USER_CONFIGURATION" value="false" />
|
||||
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
|
||||
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
|
||||
<option name="RES_FOLDERS_RELATIVE_PATH" value="" />
|
||||
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
|
||||
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
|
||||
</configuration>
|
||||
</facet>
|
||||
</component>
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
|
||||
<output url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debug/classes" />
|
||||
<output-test url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debugUnitTest/classes" />
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$/../../../app">
|
||||
<excludeFolder url="file://$MODULE_DIR$/../../../app/.gradle" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/../../../app/build" />
|
||||
</content>
|
||||
<orderEntry type="jdk" jdkName="Android API 33, extension level 3 Platform" jdkType="Android SDK" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
</module>
|
||||
@ -1,40 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module external.linked.project.id=":app:main" external.linked.project.path="$MODULE_DIR$/../../../app" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.type="sourceSet" type="JAVA_MODULE" version="4">
|
||||
<component name="FacetManager">
|
||||
<facet type="android" name="Android">
|
||||
<configuration>
|
||||
<option name="SELECTED_BUILD_VARIANT" value="debug" />
|
||||
<option name="ALLOW_USER_CONFIGURATION" value="false" />
|
||||
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
|
||||
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
|
||||
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/main/res;file://$MODULE_DIR$/../../../app/src/debug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" />
|
||||
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
|
||||
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
|
||||
</configuration>
|
||||
</facet>
|
||||
</component>
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
|
||||
<output url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debug/classes" />
|
||||
<output-test url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debugUnitTest/classes" />
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/out" />
|
||||
<content url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debug/out">
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
|
||||
</content>
|
||||
<content url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debug/out" />
|
||||
<content url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug">
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" type="java-resource" />
|
||||
</content>
|
||||
<content url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug" />
|
||||
<content url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug">
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
|
||||
</content>
|
||||
<content url="file://$MODULE_DIR$/../../../app/src/debug" />
|
||||
<content url="file://$MODULE_DIR$/../../../app/src/main">
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/java" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/res" type="java-resource" />
|
||||
</content>
|
||||
<orderEntry type="jdk" jdkName="Android API 33, extension level 3 Platform" jdkType="Android SDK" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
</module>
|
||||
@ -1,28 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module external.linked.project.id=":app:unitTest" external.linked.project.path="$MODULE_DIR$/../../../app" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.type="sourceSet" type="JAVA_MODULE" version="4">
|
||||
<component name="FacetManager">
|
||||
<facet type="android" name="Android">
|
||||
<configuration>
|
||||
<option name="SELECTED_BUILD_VARIANT" value="debug" />
|
||||
<option name="ALLOW_USER_CONFIGURATION" value="false" />
|
||||
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
|
||||
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
|
||||
<option name="RES_FOLDERS_RELATIVE_PATH" value="" />
|
||||
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
|
||||
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
|
||||
</configuration>
|
||||
</facet>
|
||||
</component>
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
|
||||
<output url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debug/classes" />
|
||||
<output-test url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debugUnitTest/classes" />
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debugUnitTest/out" />
|
||||
<content url="file://$MODULE_DIR$/../../../app/src/test" />
|
||||
<content url="file://$MODULE_DIR$/../../../app/src/testDebug" />
|
||||
<orderEntry type="jdk" jdkName="Android API 33, extension level 3 Platform" jdkType="Android SDK" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="module" module-name="gitProject.app.main" scope="TEST" />
|
||||
</component>
|
||||
<component name="TestModuleProperties" production-module="gitProject.app.main" />
|
||||
</module>
|
||||
@ -1,12 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module external.linked.project.id="gitProject" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
|
||||
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$/../..">
|
||||
<excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/../../build" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
</module>
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="" vcs="Git" />
|
||||
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
|
||||
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -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
|
||||
File diff suppressed because one or more lines are too long
@ -1,2 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\gitProjs\gitProject\app\src\main\assets"/><source path="D:\gitProjs\gitProject\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\gitProjs\gitProject\app\src\debug\assets"/></dataSet></merger>
|
||||
@ -1,2 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\gitProjs\gitProject\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\gitProjs\gitProject\app\src\debug\jniLibs"/></dataSet></merger>
|
||||
@ -1,2 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\gitProjs\gitProject\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\gitProjs\gitProject\app\src\debug\shaders"/></dataSet></merger>
|
||||
@ -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
|
||||
File diff suppressed because one or more lines are too long
Binary file not shown.
@ -1,273 +0,0 @@
|
||||
1<?xml version="1.0" encoding="utf-8"?>
|
||||
2<!--
|
||||
3 Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
|
||||
4
|
||||
5 Licensed under the Apache License, Version 2.0 (the "License");
|
||||
6 you may not use this file except in compliance with the License.
|
||||
7 You may obtain a copy of the License at
|
||||
8
|
||||
9 http://www.apache.org/licenses/LICENSE-2.0
|
||||
10
|
||||
11 Unless required by applicable law or agreed to in writing, software
|
||||
12 distributed under the License is distributed on an "AS IS" BASIS,
|
||||
13 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
14 See the License for the specific language governing permissions and
|
||||
15 limitations under the License.
|
||||
16-->
|
||||
17<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
18 package="net.micode.notes"
|
||||
19 android:versionCode="1"
|
||||
20 android:versionName="0.1" >
|
||||
21
|
||||
22 <uses-sdk
|
||||
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 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
||||
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 <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
|
||||
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 <uses-permission android:name="android.permission.INTERNET" />
|
||||
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 <uses-permission android:name="android.permission.READ_CONTACTS" />
|
||||
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 <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
|
||||
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 <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
|
||||
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 <uses-permission android:name="android.permission.GET_ACCOUNTS" />
|
||||
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 <uses-permission android:name="android.permission.USE_CREDENTIALS" />
|
||||
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 <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
|
||||
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 <application
|
||||
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 <activity
|
||||
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 <intent-filter>
|
||||
49-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:47:13-50:29
|
||||
50 <action android:name="android.intent.action.MAIN" />
|
||||
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 <category android:name="android.intent.category.LAUNCHER" />
|
||||
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 </intent-filter>
|
||||
54 </activity>
|
||||
55 <activity
|
||||
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 <intent-filter>
|
||||
60-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:59:13-64:29
|
||||
61 <action android:name="android.intent.action.VIEW" />
|
||||
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 <category android:name="android.intent.category.DEFAULT" />
|
||||
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 <data android:mimeType="vnd.android.cursor.item/text_note" />
|
||||
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 <data android:mimeType="vnd.android.cursor.item/call_note" />
|
||||
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 </intent-filter>
|
||||
68 <intent-filter>
|
||||
68-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:66:13-71:29
|
||||
69 <action android:name="android.intent.action.INSERT_OR_EDIT" />
|
||||
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 <category android:name="android.intent.category.DEFAULT" />
|
||||
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 <data android:mimeType="vnd.android.cursor.item/text_note" />
|
||||
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 <data android:mimeType="vnd.android.cursor.item/call_note" />
|
||||
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 </intent-filter>
|
||||
76 <intent-filter>
|
||||
76-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:73:13-76:29
|
||||
77 <action android:name="android.intent.action.SEARCH" />
|
||||
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 <category android:name="android.intent.category.DEFAULT" />
|
||||
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 </intent-filter>
|
||||
81
|
||||
82 <meta-data
|
||||
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 </activity>
|
||||
86
|
||||
87 <provider
|
||||
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 <receiver
|
||||
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 <intent-filter>
|
||||
95-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:91:13-95:29
|
||||
96 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
|
||||
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 <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
|
||||
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 <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
|
||||
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 </intent-filter>
|
||||
100
|
||||
101 <meta-data
|
||||
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 </receiver>
|
||||
105 <receiver
|
||||
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 <intent-filter>
|
||||
108-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:91:13-95:29
|
||||
109 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
|
||||
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 <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
|
||||
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 <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
|
||||
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 </intent-filter>
|
||||
113
|
||||
114 <meta-data
|
||||
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 </receiver>
|
||||
118 <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
|
||||
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 <intent-filter>
|
||||
119-->D:\gitProjs\gitProject\app\src\main\AndroidManifest.xml:117:13-119:29
|
||||
120 <action android:name="android.intent.action.BOOT_COMPLETED" />
|
||||
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 </intent-filter>
|
||||
122 </receiver>
|
||||
123 <receiver
|
||||
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 </receiver>
|
||||
127
|
||||
128 <activity
|
||||
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 </activity>
|
||||
134 <activity
|
||||
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 </activity>
|
||||
140
|
||||
141 <service
|
||||
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 </service>
|
||||
145
|
||||
146 <meta-data
|
||||
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 </application>
|
||||
150
|
||||
151</manifest>
|
||||
@ -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"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
@ -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"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
@ -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"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
@ -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"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
@ -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"
|
||||
}
|
||||
]
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1 +0,0 @@
|
||||
{"enableV1Signing":false,"enableV2Signing":true,"enableV3Signing":false,"enableV4Signing":false}
|
||||
@ -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
|
||||
Binary file not shown.
@ -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"
|
||||
}
|
||||
@ -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
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue