2

src/Notes-master/.idea/encodings.xml

@@ -2,5 +2,6 @@
 <project version="4">
   <component name="Encoding">
     <file url="file://$PROJECT_DIR$/app/src/main/res/font/FORTE.ttf" charset="ISO-8859-1" />
+    <file url="file://$PROJECT_DIR$/app/src/main/res/font/sylfaen.ttf" charset="ISO-8859-1" />
   </component>
 </project>

src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Thu Dec 21 01:11:46 CST 2023
+#Mon Jan 15 21:01:04 CST 2024
 net.micode.notes.app-main-6\:/color/primary_text_dark.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
 net.micode.notes.app-main-6\:/color/secondary_text_dark.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
 net.micode.notes.app-main-6\:/drawable-hdpi/bg_btn_set_color.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
@@ -67,6 +67,7 @@ net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_red.png=C\:\\Users\\lenovo
 net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_white.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
 net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_yellow.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
 net.micode.notes.app-main-6\:/drawable/new_note.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
+net.micode.notes.app-main-6\:/font/simhei.ttf=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\font_simhei.ttf.flat
 net.micode.notes.app-main-6\:/layout/account_dialog_title.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
 net.micode.notes.app-main-6\:/layout/add_account_text.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
 net.micode.notes.app-main-6\:/layout/datetime_picker.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat

src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml

@@ -47,6 +47,7 @@
     <string name="menu_font_normal">正常</string>
     <string name="menu_font_size">文字大小</string>
     <string name="menu_font_small">小</string>
+    <string name="menu_font_style">选择字体</string>
     <string name="menu_font_super">超大</string>
     <string name="menu_list_mode">进入清单模式</string>
     <string name="menu_move">移动到文件夹</string>
@@ -64,6 +65,7 @@
     <string name="menu_sync_cancel">取消同步</string>
     <string name="menu_title_select_folder">选择文件夹</string>
     <string name="note_alert_expired">已过期</string>
+    <string name="note_length">字符数</string>
     <string name="note_link_email">发送邮件</string>
     <string name="note_link_other">打开地图</string>
     <string name="note_link_tel">呼叫电话</string>

src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml

@@ -64,6 +64,7 @@
     <string name="menu_sync_cancel">取消同步</string>
     <string name="menu_title_select_folder">選擇文件夾</string>
     <string name="note_alert_expired">已過期</string>
+    <string name="note_length">字符数</string>
     <string name="note_link_email">發送郵件</string>
     <string name="note_link_other">打開地圖</string>
     <string name="note_link_tel">呼叫電話</string>

src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml

@@ -64,6 +64,7 @@
     <string name="menu_font_normal">Medium</string>
     <string name="menu_font_size">Font size</string>
     <string name="menu_font_small">Small</string>
+    <string name="menu_font_style">Select font</string>
     <string name="menu_font_super">Super</string>
     <string name="menu_list_mode">Enter check list</string>
     <string name="menu_move">Move to folder</string>
@@ -81,6 +82,7 @@
     <string name="menu_sync_cancel">Cancel syncing</string>
     <string name="menu_title_select_folder">Select folder</string>
     <string name="note_alert_expired">Expired</string>
+    <string name="note_length">Length</string>
     <string name="note_link_email">Send email</string>
     <string name="note_link_other">Open map</string>
     <string name="note_link_tel">Call</string>

src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Thu Dec 21 01:11:49 CST 2023
+#Mon Jan 15 21:01:05 CST 2024
 net.micode.notes.app-main-5\:/color/primary_text_dark.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml
 net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml
 net.micode.notes.app-main-5\:/drawable-hdpi/bg_btn_set_color.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_btn_set_color.png
@@ -67,6 +67,7 @@ net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_red.png=C\:\\Users\\lenovo
 net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_white.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_white.png
 net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_yellow.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_yellow.png
 net.micode.notes.app-main-5\:/drawable/new_note.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\new_note.xml
+net.micode.notes.app-main-5\:/font/simhei.ttf=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\font\\simhei.ttf
 net.micode.notes.app-main-5\:/layout/account_dialog_title.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\account_dialog_title.xml
 net.micode.notes.app-main-5\:/layout/add_account_text.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\add_account_text.xml
 net.micode.notes.app-main-5\:/layout/datetime_picker.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\datetime_picker.xml

src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml

@@ -47,6 +47,7 @@
     <string name="menu_font_normal">正常</string>
     <string name="menu_font_size">文字大小</string>
     <string name="menu_font_small">小</string>
+    <string name="menu_font_style">选择字体</string>
     <string name="menu_font_super">超大</string>
     <string name="menu_list_mode">进入清单模式</string>
     <string name="menu_move">移动到文件夹</string>
@@ -64,6 +65,7 @@
     <string name="menu_sync_cancel">取消同步</string>
     <string name="menu_title_select_folder">选择文件夹</string>
     <string name="note_alert_expired">已过期</string>
+    <string name="note_length">字符数</string>
     <string name="note_link_email">发送邮件</string>
     <string name="note_link_other">打开地图</string>
     <string name="note_link_tel">呼叫电话</string>

src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml

@@ -64,6 +64,7 @@
     <string name="menu_sync_cancel">取消同步</string>
     <string name="menu_title_select_folder">選擇文件夾</string>
     <string name="note_alert_expired">已過期</string>
+    <string name="note_length">字符数</string>
     <string name="note_link_email">發送郵件</string>
     <string name="note_link_other">打開地圖</string>
     <string name="note_link_tel">呼叫電話</string>

src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml

@@ -64,6 +64,7 @@
     <string name="menu_font_normal">Medium</string>
     <string name="menu_font_size">Font size</string>
     <string name="menu_font_small">Small</string>
+    <string name="menu_font_style">Select font</string>
     <string name="menu_font_super">Super</string>
     <string name="menu_list_mode">Enter check list</string>
     <string name="menu_move">Move to folder</string>
@@ -81,6 +82,7 @@
     <string name="menu_sync_cancel">Cancel syncing</string>
     <string name="menu_title_select_folder">Select folder</string>
     <string name="note_alert_expired">Expired</string>
+    <string name="note_length">Length</string>
     <string name="note_link_email">Send email</string>
     <string name="note_link_other">Open map</string>
     <string name="note_link_tel">Call</string>

src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt

@@ -1,4 +1,4 @@
-#Tue Dec 26 23:16:26 CST 2023
+#Mon Jan 15 21:01:11 CST 2024
 base.0=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
 path.0=classes.dex
 renamed.0=classes.dex

src/Notes-master/app/build/intermediates/local_only_symbol_list/debug/R-def.txt

@@ -76,6 +76,7 @@ drawable widget_4x_green
 drawable widget_4x_red
 drawable widget_4x_white
 drawable widget_4x_yellow
+font simhei
 id account_dialog_subtitle
 id account_dialog_title
 id action_select_all
@@ -112,6 +113,7 @@ id menu_alert
 id menu_delete
 id menu_delete_remind
 id menu_export_text
+id menu_font_select
 id menu_font_size
 id menu_list_mode
 id menu_new_folder
@@ -209,6 +211,7 @@ string menu_font_large
 string menu_font_normal
 string menu_font_size
 string menu_font_small
+string menu_font_style
 string menu_font_super
 string menu_list_mode
 string menu_move
@@ -226,6 +229,7 @@ string menu_sync
 string menu_sync_cancel
 string menu_title_select_folder
 string note_alert_expired
+string note_length
 string note_link_email
 string note_link_other
 string note_link_tel

src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json

@@ -25,20 +25,20 @@
                 {
                     "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
                     "from": {
-                        "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
+                        "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,125,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,124,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "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",
-                        "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",
+                        "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,6878,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,6833,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052",
-                        "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,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",
+                        "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,125,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,124,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
-                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,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",
+                        "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,48,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,43,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"
+                        "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,6922,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,6872,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",
+                        "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,108",
-                        "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",
+                        "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",
-                        "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",
+                        "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,2705,2752,2802,2847,2906,2958,3010,3053,3100,3156,3211,3266,3310,3352,3393,3443,3502,3553,3597,3646,3695,3742,3789,3836,3881,3932,3985,4060,4119,4176,4250,4314,4383,4461,4571,4675,4748,4814,4869,4934,4999,5048,5131,5209,5247,5292,5340,5402,5459,5514,5573,5640,5698,5760,5808,5853,5901,5952,6018",
-                        "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",
+                        "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,108",
-                        "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",
+                        "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,48,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,43,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"
+                        "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,2700,2747,2797,2842,2901,2953,3005,3048,3095,3151,3206,3261,3305,3347,3388,3438,3497,3548,3592,3641,3690,3737,3784,3831,3876,3927,3980,4055,4114,4171,4245,4309,4378,4456,4566,4670,4743,4809,4864,4929,4994,5043,5126,5204,5242,5287,5335,5397,5454,5509,5568,5635,5693,5755,5803,5848,5896,5947,6013,6079"
                     }
                 }
             ]
@@ -83,20 +83,20 @@
                 {
                     "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
                     "from": {
-                        "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
+                        "startLines": "130,72,75,74,73,19,20,21,118,119,129,128,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,122,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,135,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,127,125,124,126,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",
+                        "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,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",
+                        "startOffsets": "8195,3970,4234,4137,4067,846,890,943,7624,7674,8136,8084,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,7796,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,8609,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,8042,7913,7855,7967,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",
+                        "endLines": "134,72,75,74,73,19,20,21,118,119,129,128,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,122,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,135,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,127,125,124,126,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",
+                        "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,55,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,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"
+                        "endOffsets": "8603,4061,4312,4228,4131,884,937,990,7668,7732,8189,8130,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,7847,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,8651,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,8078,7961,7907,8036,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",
+                        "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,126",
-                        "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",
+                        "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,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",
+                        "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,4056,4106,4166,4219,4285,4347,4410,4457,4512,4600,4658,4720,4770,4815,4858,4918,4985,5040,5087,5142,5195,5242,5295,5351,5399,5454,5507,5591,5658,5722,5818,5892,5973,6062,6225,6369,6448,6523,6605,6664,6744,6824,6879,7001,7104,7145,7198,7255,7329,7394,7462,7548,7628,7697,7791,7850,7905,7967,8027,8137",
-                        "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",
+                        "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,126",
-                        "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",
+                        "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,55,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,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"
+                        "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,4051,4101,4161,4214,4280,4342,4405,4452,4507,4595,4653,4715,4765,4810,4853,4913,4980,5035,5082,5137,5190,5237,5290,5346,5394,5449,5502,5586,5653,5717,5813,5887,5968,6057,6220,6364,6443,6518,6600,6659,6739,6819,6874,6996,7099,7140,7193,7250,7324,7389,7457,7543,7623,7692,7786,7845,7900,7962,8022,8132,8222"
                     }
                 },
                 {
@@ -129,12 +129,12 @@
                         "endOffsets": "2314,2531,2913,2696,1098,1287,1476,1685,1897,911,2104"
                     },
                     "to": {
-                        "startLines": "125,129,133,137,140,144,148,152,156,160,164",
+                        "startLines": "127,131,135,139,142,146,150,154,158,162,166",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8124,8328,8539,8749,8909,9092,9277,9462,9665,9871,10054",
+                        "startOffsets": "8227,8431,8642,8852,9012,9195,9380,9565,9768,9974,10157",
-                        "endLines": "128,132,136,139,143,147,151,155,159,163,167",
+                        "endLines": "130,134,138,141,145,149,153,157,161,165,169",
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8323,8534,8744,8904,9087,9272,9457,9660,9866,10049,10250"
+                        "endOffsets": "8426,8637,8847,9007,9190,9375,9560,9763,9969,10152,10353"
                     }
                 }
             ]
@@ -164,20 +164,20 @@
                 {
                     "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\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",
+                        "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,125,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,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",
+                        "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,6809,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052",
-                        "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,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",
+                        "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,125,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
-                        "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,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",
+                        "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,43,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"
+                        "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,6848,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",
+                        "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",
+                        "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,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",
+                        "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,3546,3595,3644,3691,3738,3785,3830,3881,3934,4009,4068,4125,4199,4263,4332,4410,4520,4624,4697,4763,4818,4883,4948,4997,5080,5158,5196,5241,5289,5351,5408,5463,5522,5589,5647,5709,5757,5802,5850,5901,5967",
-                        "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",
+                        "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,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",
+                        "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,43,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"
+                        "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,3541,3590,3639,3686,3733,3780,3825,3876,3929,4004,4063,4120,4194,4258,4327,4405,4515,4619,4692,4758,4813,4878,4943,4992,5075,5153,5191,5236,5284,5346,5403,5458,5517,5584,5642,5704,5752,5797,5845,5896,5962,6028"
                     }
                 }
             ]

src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json

@@ -25,20 +25,20 @@
                 {
                     "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
                     "from": {
-                        "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
+                        "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,125,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,124,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "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",
-                        "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",
+                        "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,6878,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,6833,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052",
-                        "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,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",
+                        "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,125,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,124,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
-                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,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",
+                        "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,48,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,43,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"
+                        "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,6922,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,6872,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",
+                        "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,108",
-                        "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",
+                        "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",
-                        "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",
+                        "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,2705,2752,2802,2847,2906,2958,3010,3053,3100,3156,3211,3266,3310,3352,3393,3443,3502,3553,3597,3646,3695,3742,3789,3836,3881,3932,3985,4060,4119,4176,4250,4314,4383,4461,4571,4675,4748,4814,4869,4934,4999,5048,5131,5209,5247,5292,5340,5402,5459,5514,5573,5640,5698,5760,5808,5853,5901,5952,6018",
-                        "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",
+                        "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,108",
-                        "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",
+                        "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,48,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,43,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"
+                        "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,2700,2747,2797,2842,2901,2953,3005,3048,3095,3151,3206,3261,3305,3347,3388,3438,3497,3548,3592,3641,3690,3737,3784,3831,3876,3927,3980,4055,4114,4171,4245,4309,4378,4456,4566,4670,4743,4809,4864,4929,4994,5043,5126,5204,5242,5287,5335,5397,5454,5509,5568,5635,5693,5755,5803,5848,5896,5947,6013,6079"
                     }
                 }
             ]

src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json

@@ -25,20 +25,20 @@
                 {
                     "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\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",
+                        "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,125,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,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",
+                        "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,6809,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052",
-                        "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,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",
+                        "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,125,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
-                        "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,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",
+                        "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,43,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"
+                        "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,6848,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",
+                        "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",
+                        "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,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",
+                        "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,3546,3595,3644,3691,3738,3785,3830,3881,3934,4009,4068,4125,4199,4263,4332,4410,4520,4624,4697,4763,4818,4883,4948,4997,5080,5158,5196,5241,5289,5351,5408,5463,5522,5589,5647,5709,5757,5802,5850,5901,5967",
-                        "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",
+                        "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,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",
+                        "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,43,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"
+                        "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,3541,3590,3639,3686,3733,3780,3825,3876,3929,4004,4063,4120,4194,4258,4327,4405,4515,4619,4692,4758,4813,4878,4943,4992,5075,5153,5191,5236,5284,5346,5403,5458,5517,5584,5642,5704,5752,5797,5845,5896,5962,6028"
                     }
                 }
             ]

src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json

@@ -40,20 +40,20 @@
                 {
                     "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
                     "from": {
-                        "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
+                        "startLines": "130,72,75,74,73,19,20,21,118,119,129,128,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,122,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,135,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,127,125,124,126,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",
+                        "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,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",
+                        "startOffsets": "8195,3970,4234,4137,4067,846,890,943,7624,7674,8136,8084,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,7796,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,8609,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,8042,7913,7855,7967,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",
+                        "endLines": "134,72,75,74,73,19,20,21,118,119,129,128,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,122,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,135,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,127,125,124,126,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",
+                        "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,55,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,46,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,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"
+                        "endOffsets": "8603,4061,4312,4228,4131,884,937,990,7668,7732,8189,8130,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,7847,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,8651,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,8078,7961,7907,8036,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",
+                        "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,126",
-                        "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",
+                        "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,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",
+                        "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,4056,4106,4166,4219,4285,4347,4410,4457,4512,4600,4658,4720,4770,4815,4858,4918,4985,5040,5087,5142,5195,5242,5295,5351,5399,5454,5507,5591,5658,5722,5818,5892,5973,6062,6225,6369,6448,6523,6605,6664,6744,6824,6879,7001,7104,7145,7198,7255,7329,7394,7462,7548,7628,7697,7791,7850,7905,7967,8027,8137",
-                        "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",
+                        "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,126",
-                        "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",
+                        "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,55,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,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"
+                        "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,4051,4101,4161,4214,4280,4342,4405,4452,4507,4595,4653,4715,4765,4810,4853,4913,4980,5035,5082,5137,5190,5237,5290,5346,5394,5449,5502,5586,5653,5717,5813,5887,5968,6057,6220,6364,6443,6518,6600,6659,6739,6819,6874,6996,7099,7140,7193,7250,7324,7389,7457,7543,7623,7692,7786,7845,7900,7962,8022,8132,8222"
                     }
                 },
                 {
@@ -86,12 +86,12 @@
                         "endOffsets": "2314,2531,2913,2696,1098,1287,1476,1685,1897,911,2104"
                     },
                     "to": {
-                        "startLines": "125,129,133,137,140,144,148,152,156,160,164",
+                        "startLines": "127,131,135,139,142,146,150,154,158,162,166",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8124,8328,8539,8749,8909,9092,9277,9462,9665,9871,10054",
+                        "startOffsets": "8227,8431,8642,8852,9012,9195,9380,9565,9768,9974,10157",
-                        "endLines": "128,132,136,139,143,147,151,155,159,163,167",
+                        "endLines": "130,134,138,141,145,149,153,157,161,165,169",
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8323,8534,8744,8904,9087,9272,9457,9660,9866,10049,10250"
+                        "endOffsets": "8426,8637,8847,9007,9190,9375,9560,9763,9969,10152,10353"
                     }
                 }
             ]

src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json

@@ -1,8 +1,4 @@
 [
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_yellow_middle.9.png.flat",
-        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_yellow_middle.9.png"
-    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_normal.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_normal.png"
@@ -11,6 +7,194 @@
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_yellow_single.9.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_yellow_single.9.png"
     },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_blue.png.flat",
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_blue.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_new_note_pressed.png.flat",
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/new_note_pressed.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/color_secondary_text_dark.xml.flat",
+        "source": "net.micode.notes.app-main-6:/color/secondary_text_dark.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/color_primary_text_dark.xml.flat",
+        "source": "net.micode.notes.app-main-6:/color/primary_text_dark.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_green_single.9.png.flat",
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_green_single.9.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_white_middle.9.png.flat",
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_white_middle.9.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_new_note_normal.png.flat",
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/new_note_normal.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/layout_dialog_edit_text.xml.flat",
+        "source": "net.micode.notes.app-main-6:/layout/dialog_edit_text.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/layout_note_edit.xml.flat",
+        "source": "net.micode.notes.app-main-6:/layout/note_edit.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_white_up.9.png.flat",
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_white_up.9.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_white_down.9.png.flat",
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_white_down.9.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/layout_folder_list_item.xml.flat",
+        "source": "net.micode.notes.app-main-6:/layout/folder_list_item.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_small.png.flat",
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_small.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_red_down.9.png.flat",
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_red_down.9.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_red_single.9.png.flat",
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_red_single.9.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_note_edit_color_selector_panel.png.flat",
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/note_edit_color_selector_panel.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_yellow_up.9.png.flat",
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_yellow_up.9.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_clock.png.flat",
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/clock.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/layout_note_list.xml.flat",
+        "source": "net.micode.notes.app-main-6:/layout/note_list.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/menu_note_list_dropdown.xml.flat",
+        "source": "net.micode.notes.app-main-6:/menu/note_list_dropdown.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/font_simhei.ttf.flat",
+        "source": "net.micode.notes.app-main-6:/font/simhei.ttf"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_bg_btn_set_color.png.flat",
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/bg_btn_set_color.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_green_down.9.png.flat",
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_green_down.9.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/menu_note_edit.xml.flat",
+        "source": "net.micode.notes.app-main-6:/menu/note_edit.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_blue_middle.9.png.flat",
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_blue_middle.9.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_blue.png.flat",
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_blue.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_title_alert.png.flat",
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/title_alert.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/menu_note_list.xml.flat",
+        "source": "net.micode.notes.app-main-6:/menu/note_list.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_blue_single.9.png.flat",
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_blue_single.9.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/menu_note_list_options.xml.flat",
+        "source": "net.micode.notes.app-main-6:/menu/note_list_options.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_white.png.flat",
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_white.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/layout_widget_2x.xml.flat",
+        "source": "net.micode.notes.app-main-6:/layout/widget_2x.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/menu_call_record_folder.xml.flat",
+        "source": "net.micode.notes.app-main-6:/menu/call_record_folder.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_large.png.flat",
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_large.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_yellow.9.png.flat",
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_yellow.9.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_call_record.png.flat",
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/call_record.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/xml_widget_4x_info.xml.flat",
+        "source": "net.micode.notes.app-main-6:/xml/widget_4x_info.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_menu_delete.png.flat",
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/menu_delete.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_selected.png.flat",
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/selected.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_yellow.png.flat",
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_yellow.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/layout_settings_header.xml.flat",
+        "source": "net.micode.notes.app-main-6:/layout/settings_header.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_blue.9.png.flat",
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_blue.9.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/layout_widget_4x.xml.flat",
+        "source": "net.micode.notes.app-main-6:/layout/widget_4x.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable_new_note.xml.flat",
+        "source": "net.micode.notes.app-main-6:/drawable/new_note.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_white_single.9.png.flat",
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_white_single.9.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/layout_account_dialog_title.xml.flat",
+        "source": "net.micode.notes.app-main-6:/layout/account_dialog_title.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_yellow_middle.9.png.flat",
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_yellow_middle.9.png"
+    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_green.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_green.png"
@@ -27,10 +211,6 @@
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_super.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_super.png"
     },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_blue.png.flat",
-        "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_blue.png"
-    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/menu_sub_folder.xml.flat",
         "source": "net.micode.notes.app-main-6:/menu/sub_folder.xml"
@@ -39,14 +219,6 @@
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_yellow.9.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_yellow.9.png"
     },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_new_note_pressed.png.flat",
-        "source": "net.micode.notes.app-main-6:/drawable-hdpi/new_note_pressed.png"
-    },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/color_secondary_text_dark.xml.flat",
-        "source": "net.micode.notes.app-main-6:/color/secondary_text_dark.xml"
-    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_dropdown_icon.9.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/dropdown_icon.9.png"
@@ -55,38 +227,14 @@
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_red_middle.9.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_red_middle.9.png"
     },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/color_primary_text_dark.xml.flat",
-        "source": "net.micode.notes.app-main-6:/color/primary_text_dark.xml"
-    },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_green_single.9.png.flat",
-        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_green_single.9.png"
-    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_delete.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/delete.png"
     },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_white_middle.9.png.flat",
-        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_white_middle.9.png"
-    },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_new_note_normal.png.flat",
-        "source": "net.micode.notes.app-main-6:/drawable-hdpi/new_note_normal.png"
-    },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/layout_dialog_edit_text.xml.flat",
-        "source": "net.micode.notes.app-main-6:/layout/dialog_edit_text.xml"
-    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_background.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_background.png"
     },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/layout_note_edit.xml.flat",
-        "source": "net.micode.notes.app-main-6:/layout/note_edit.xml"
-    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_yellow_down.9.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_yellow_down.9.png"
@@ -103,10 +251,6 @@
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_title_bar_bg.9.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/title_bar_bg.9.png"
     },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_white_up.9.png.flat",
-        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_white_up.9.png"
-    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_yellow.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_yellow.png"
@@ -115,18 +259,6 @@
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_footer_bg.9.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_footer_bg.9.png"
     },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_white_down.9.png.flat",
-        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_white_down.9.png"
-    },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/layout_folder_list_item.xml.flat",
-        "source": "net.micode.notes.app-main-6:/layout/folder_list_item.xml"
-    },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_small.png.flat",
-        "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_small.png"
-    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_green.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_green.png"
@@ -135,50 +267,22 @@
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_bg_color_btn_mask.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/bg_color_btn_mask.png"
     },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_red_down.9.png.flat",
-        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_red_down.9.png"
-    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_red_up.9.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_red_up.9.png"
     },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_red_single.9.png.flat",
-        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_red_single.9.png"
-    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_green.9.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_green.9.png"
     },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_note_edit_color_selector_panel.png.flat",
-        "source": "net.micode.notes.app-main-6:/drawable-hdpi/note_edit_color_selector_panel.png"
-    },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_yellow_up.9.png.flat",
-        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_yellow_up.9.png"
-    },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_clock.png.flat",
-        "source": "net.micode.notes.app-main-6:/drawable-hdpi/clock.png"
-    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_white.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_white.png"
     },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/layout_note_list.xml.flat",
-        "source": "net.micode.notes.app-main-6:/layout/note_list.xml"
-    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_red.9.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_red.9.png"
     },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/menu_note_list_dropdown.xml.flat",
-        "source": "net.micode.notes.app-main-6:/menu/note_list_dropdown.xml"
-    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/layout_note_item.xml.flat",
         "source": "net.micode.notes.app-main-6:/layout/note_item.xml"
@@ -195,14 +299,6 @@
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_menu_move.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/menu_move.png"
     },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_bg_btn_set_color.png.flat",
-        "source": "net.micode.notes.app-main-6:/drawable-hdpi/bg_btn_set_color.png"
-    },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_green_down.9.png.flat",
-        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_green_down.9.png"
-    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/layout_note_list_footer.xml.flat",
         "source": "net.micode.notes.app-main-6:/layout/note_list_footer.xml"
@@ -211,54 +307,22 @@
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_green.9.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_green.9.png"
     },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/menu_note_edit.xml.flat",
-        "source": "net.micode.notes.app-main-6:/menu/note_edit.xml"
-    },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_blue_middle.9.png.flat",
-        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_blue_middle.9.png"
-    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/raw-zh-rCN_introduction.flat",
         "source": "net.micode.notes.app-main-6:/raw-zh-rCN/introduction"
     },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_blue.png.flat",
-        "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_blue.png"
-    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/layout_add_account_text.xml.flat",
         "source": "net.micode.notes.app-main-6:/layout/add_account_text.xml"
     },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_title_alert.png.flat",
-        "source": "net.micode.notes.app-main-6:/drawable-hdpi/title_alert.png"
-    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_notification.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/notification.png"
     },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/menu_note_list.xml.flat",
-        "source": "net.micode.notes.app-main-6:/menu/note_list.xml"
-    },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_blue_single.9.png.flat",
-        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_blue_single.9.png"
-    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_white.9.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_white.9.png"
     },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/menu_note_list_options.xml.flat",
-        "source": "net.micode.notes.app-main-6:/menu/note_list_options.xml"
-    },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_white.png.flat",
-        "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_white.png"
-    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_red.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_red.png"
@@ -271,18 +335,6 @@
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_white.9.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_white.9.png"
     },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/layout_widget_2x.xml.flat",
-        "source": "net.micode.notes.app-main-6:/layout/widget_2x.xml"
-    },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/menu_call_record_folder.xml.flat",
-        "source": "net.micode.notes.app-main-6:/menu/call_record_folder.xml"
-    },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_large.png.flat",
-        "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_large.png"
-    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/menu_call_note_edit.xml.flat",
         "source": "net.micode.notes.app-main-6:/menu/call_note_edit.xml"
@@ -291,30 +343,14 @@
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_blue.9.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_blue.9.png"
     },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_yellow.9.png.flat",
-        "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_yellow.9.png"
-    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_blue_up.9.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_blue_up.9.png"
     },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_call_record.png.flat",
-        "source": "net.micode.notes.app-main-6:/drawable-hdpi/call_record.png"
-    },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/xml_widget_4x_info.xml.flat",
-        "source": "net.micode.notes.app-main-6:/xml/widget_4x_info.xml"
-    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_blue_down.9.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_blue_down.9.png"
     },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_menu_delete.png.flat",
-        "source": "net.micode.notes.app-main-6:/drawable-hdpi/menu_delete.png"
-    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_red.9.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_red.9.png"
@@ -323,14 +359,6 @@
         "merged": "net.micode.notes.app-merged_res-4:/xml_preferences.xml.flat",
         "source": "net.micode.notes.app-main-6:/xml/preferences.xml"
     },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_selected.png.flat",
-        "source": "net.micode.notes.app-main-6:/drawable-hdpi/selected.png"
-    },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_yellow.png.flat",
-        "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_yellow.png"
-    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_green_up.9.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_green_up.9.png"
@@ -343,40 +371,16 @@
         "merged": "net.micode.notes.app-merged_res-4:/raw_introduction.flat",
         "source": "net.micode.notes.app-main-6:/raw/introduction"
     },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/layout_settings_header.xml.flat",
-        "source": "net.micode.notes.app-main-6:/layout/settings_header.xml"
-    },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_blue.9.png.flat",
-        "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_blue.9.png"
-    },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/layout_widget_4x.xml.flat",
-        "source": "net.micode.notes.app-main-6:/layout/widget_4x.xml"
-    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_green_middle.9.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_green_middle.9.png"
     },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/drawable_new_note.xml.flat",
-        "source": "net.micode.notes.app-main-6:/drawable/new_note.xml"
-    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_red.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_red.png"
     },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_white_single.9.png.flat",
-        "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_white_single.9.png"
-    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_folder.9.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_folder.9.png"
-    },
-    {
-        "merged": "net.micode.notes.app-merged_res-4:/layout_account_dialog_title.xml.flat",
-        "source": "net.micode.notes.app-main-6:/layout/account_dialog_title.xml"
     }
 ]

src/Notes-master/app/build/intermediates/packaged_res/debug/menu/note_edit.xml

@@ -49,4 +49,8 @@
     <item
         android:id="@+id/menu_delete_remind"
         android:title="@string/menu_remove_remind" />
+
+    <item
+        android:id="@+id/menu_font_select"
+        android:title="@string/menu_font_style" />
 </menu>

src/Notes-master/app/build/intermediates/packaged_res/debug/values-zh-rCN/values-zh-rCN.xml

@@ -47,6 +47,7 @@
     <string name="menu_font_normal">正常</string>
     <string name="menu_font_size">文字大小</string>
     <string name="menu_font_small">小</string>
+    <string name="menu_font_style">选择字体</string>
     <string name="menu_font_super">超大</string>
     <string name="menu_list_mode">进入清单模式</string>
     <string name="menu_move">移动到文件夹</string>
@@ -64,6 +65,7 @@
     <string name="menu_sync_cancel">取消同步</string>
     <string name="menu_title_select_folder">选择文件夹</string>
     <string name="note_alert_expired">已过期</string>
+    <string name="note_length">字符数</string>
     <string name="note_link_email">发送邮件</string>
     <string name="note_link_other">打开地图</string>
     <string name="note_link_tel">呼叫电话</string>

src/Notes-master/app/build/intermediates/packaged_res/debug/values-zh-rTW/values-zh-rTW.xml

@@ -64,6 +64,7 @@
     <string name="menu_sync_cancel">取消同步</string>
     <string name="menu_title_select_folder">選擇文件夾</string>
     <string name="note_alert_expired">已過期</string>
+    <string name="note_length">字符数</string>
     <string name="note_link_email">發送郵件</string>
     <string name="note_link_other">打開地圖</string>
     <string name="note_link_tel">呼叫電話</string>

src/Notes-master/app/build/intermediates/packaged_res/debug/values/values.xml

@@ -64,6 +64,7 @@
     <string name="menu_font_normal">Medium</string>
     <string name="menu_font_size">Font size</string>
     <string name="menu_font_small">Small</string>
+    <string name="menu_font_style">Select font</string>
     <string name="menu_font_super">Super</string>
     <string name="menu_list_mode">Enter check list</string>
     <string name="menu_move">Move to folder</string>
@@ -81,6 +82,7 @@
     <string name="menu_sync_cancel">Cancel syncing</string>
     <string name="menu_title_select_folder">Select folder</string>
     <string name="note_alert_expired">Expired</string>
+    <string name="note_length">Length</string>
     <string name="note_link_email">Send email</string>
     <string name="note_link_other">Open map</string>
     <string name="note_link_tel">Call</string>

src/Notes-master/app/build/intermediates/runtime_symbol_list/debug/R.txt

@@ -74,6 +74,7 @@ int drawable widget_4x_green 0x7f04003e
 int drawable widget_4x_red 0x7f04003f
 int drawable widget_4x_white 0x7f040040
 int drawable widget_4x_yellow 0x7f040041
+int font simhei 0x7f0d0000
 int id account_dialog_subtitle 0x7f050000
 int id account_dialog_title 0x7f050001
 int id action_select_all 0x7f050002
@@ -110,6 +111,7 @@ int id menu_alert 0x7f050020
 int id menu_delete 0x7f050021
 int id menu_delete_remind 0x7f050022
 int id menu_export_text 0x7f050023
+int id menu_font_select 0x7f050044
 int id menu_font_size 0x7f050024
 int id menu_list_mode 0x7f050025
 int id menu_new_folder 0x7f050026
@@ -132,15 +134,15 @@ int id prefenerece_sync_status_textview 0x7f050036
 int id preference_sync_button 0x7f050037
 int id selection_menu 0x7f050038
 int id sv_note_edit 0x7f050039
-int id tv_alert_date 0x7f05003a
+int id tv_alert_date 0x7f05003b
-int id tv_folder_name 0x7f05003b
+int id tv_folder_name 0x7f05003c
-int id tv_modified_date 0x7f05003c
+int id tv_modified_date 0x7f05003d
-int id tv_name 0x7f05003d
+int id tv_name 0x7f05003e
-int id tv_time 0x7f05003e
+int id tv_time 0x7f05003f
-int id tv_title 0x7f05003f
+int id tv_title 0x7f050040
-int id tv_title_bar 0x7f050040
+int id tv_title_bar 0x7f050041
-int id widget_bg_image 0x7f050041
+int id widget_bg_image 0x7f050042
-int id widget_text 0x7f050042
+int id widget_text 0x7f050043
 int layout account_dialog_title 0x7f060000
 int layout add_account_text 0x7f060001
 int layout datetime_picker 0x7f060002
@@ -207,6 +209,7 @@ int string menu_font_large 0x7f0a0027
 int string menu_font_normal 0x7f0a0028
 int string menu_font_size 0x7f0a0029
 int string menu_font_small 0x7f0a002a
+int string menu_font_style 0x7f0a0067
 int string menu_font_super 0x7f0a002b
 int string menu_list_mode 0x7f0a002c
 int string menu_move 0x7f0a002d
@@ -224,48 +227,49 @@ int string menu_sync 0x7f0a0038
 int string menu_sync_cancel 0x7f0a0039
 int string menu_title_select_folder 0x7f0a003a
 int string note_alert_expired 0x7f0a003b
-int string note_link_email 0x7f0a003c
+int string note_length 0x7f0a003c
-int string note_link_other 0x7f0a003d
+int string note_link_email 0x7f0a003d
-int string note_link_tel 0x7f0a003e
+int string note_link_other 0x7f0a003e
-int string note_link_web 0x7f0a003f
+int string note_link_tel 0x7f0a003f
-int string notealert_enter 0x7f0a0040
+int string note_link_web 0x7f0a0040
-int string notealert_ok 0x7f0a0041
+int string notealert_enter 0x7f0a0041
-int string notelist_menu_new 0x7f0a0042
+int string notealert_ok 0x7f0a0042
-int string notelist_string_info 0x7f0a0043
+int string notelist_menu_new 0x7f0a0043
-int string preferences_account_summary 0x7f0a0044
+int string notelist_string_info 0x7f0a0044
-int string preferences_account_title 0x7f0a0045
+int string preferences_account_summary 0x7f0a0045
-int string preferences_add_account 0x7f0a0046
+int string preferences_account_title 0x7f0a0046
-int string preferences_bg_random_appear_title 0x7f0a0047
+int string preferences_add_account 0x7f0a0047
-int string preferences_button_sync_cancel 0x7f0a0048
+int string preferences_bg_random_appear_title 0x7f0a0048
-int string preferences_button_sync_immediately 0x7f0a0049
+int string preferences_button_sync_cancel 0x7f0a0049
-int string preferences_dialog_change_account_title 0x7f0a004a
+int string preferences_button_sync_immediately 0x7f0a004a
-int string preferences_dialog_change_account_warn_msg 0x7f0a004b
+int string preferences_dialog_change_account_title 0x7f0a004b
-int string preferences_dialog_select_account_tips 0x7f0a004c
+int string preferences_dialog_change_account_warn_msg 0x7f0a004c
-int string preferences_dialog_select_account_title 0x7f0a004d
+int string preferences_dialog_select_account_tips 0x7f0a004d
-int string preferences_last_sync_time 0x7f0a004e
+int string preferences_dialog_select_account_title 0x7f0a004e
-int string preferences_last_sync_time_format 0x7f0a004f
+int string preferences_last_sync_time 0x7f0a004f
-int string preferences_menu_cancel 0x7f0a0050
+int string preferences_last_sync_time_format 0x7f0a0050
-int string preferences_menu_change_account 0x7f0a0051
+int string preferences_menu_cancel 0x7f0a0051
-int string preferences_menu_remove_account 0x7f0a0052
+int string preferences_menu_change_account 0x7f0a0052
-int string preferences_title 0x7f0a0053
+int string preferences_menu_remove_account 0x7f0a0053
-int string preferences_toast_cannot_change_account 0x7f0a0054
+int string preferences_title 0x7f0a0054
-int string preferences_toast_success_set_accout 0x7f0a0055
+int string preferences_toast_cannot_change_account 0x7f0a0055
-int string search 0x7f0a0056
+int string preferences_toast_success_set_accout 0x7f0a0056
-int string search_hint 0x7f0a0057
+int string search 0x7f0a0057
-int string search_label 0x7f0a0058
+int string search_hint 0x7f0a0058
-int string search_setting_description 0x7f0a0059
+int string search_label 0x7f0a0059
-int string set_remind_time_message 0x7f0a005a
+int string search_setting_description 0x7f0a005a
-int string success_sdcard_export 0x7f0a005b
+int string set_remind_time_message 0x7f0a005b
-int string success_sync_account 0x7f0a005c
+int string success_sdcard_export 0x7f0a005c
-int string sync_progress_init_list 0x7f0a005d
+int string success_sync_account 0x7f0a005d
-int string sync_progress_login 0x7f0a005e
+int string sync_progress_init_list 0x7f0a005e
-int string sync_progress_syncing 0x7f0a005f
+int string sync_progress_login 0x7f0a005f
-int string ticker_cancel 0x7f0a0060
+int string sync_progress_syncing 0x7f0a0060
-int string ticker_fail 0x7f0a0061
+int string ticker_cancel 0x7f0a0061
-int string ticker_success 0x7f0a0062
+int string ticker_fail 0x7f0a0062
-int string ticker_syncing 0x7f0a0063
+int string ticker_success 0x7f0a0063
-int string widget_havenot_content 0x7f0a0064
+int string ticker_syncing 0x7f0a0064
-int string widget_under_visit_mode 0x7f0a0065
+int string widget_havenot_content 0x7f0a0065
+int string widget_under_visit_mode 0x7f0a0066
 int style HighlightTextAppearancePrimary 0x7f0b0000
 int style HighlightTextAppearanceSecondary 0x7f0b0001
 int style NoteActionBarStyle 0x7f0b0002

src/Notes-master/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt

@@ -1,109 +1,129 @@
-net.micode.notes:xml/searchable = 0x7f0c0001
+net.micode.notes:string/menu_font_style = 0x7f0a0067
-net.micode.notes:xml/preferences = 0x7f0c0000
+net.micode.notes:id/menu_font_select = 0x7f050044
-net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a
+net.micode.notes:font/simhei = 0x7f0d0000
 net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009
-net.micode.notes:xml/widget_2x_info = 0x7f0c0002
+net.micode.notes:string/preferences_menu_change_account = 0x7f0a0052
-net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007
+net.micode.notes:string/menu_deselect_all = 0x7f0a0022
-net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005
+net.micode.notes:string/preferences_title = 0x7f0a0054
-net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001
+net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010
-net.micode.notes:string/widget_under_visit_mode = 0x7f0a0065
+net.micode.notes:xml/preferences = 0x7f0c0000
-net.micode.notes:string/sync_progress_login = 0x7f0a005e
+net.micode.notes:string/preferences_last_sync_time = 0x7f0a004f
-net.micode.notes:string/success_sync_account = 0x7f0a005c
+net.micode.notes:menu/note_list = 0x7f070003
-net.micode.notes:string/search_setting_description = 0x7f0a0059
+net.micode.notes:string/note_link_other = 0x7f0a003e
-net.micode.notes:string/search_hint = 0x7f0a0057
+net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0056
-net.micode.notes:string/search = 0x7f0a0056
+net.micode.notes:string/notealert_enter = 0x7f0a0041
-net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0055
+net.micode.notes:string/set_remind_time_message = 0x7f0a005b
-net.micode.notes:string/preferences_title = 0x7f0a0053
-net.micode.notes:string/preferences_menu_change_account = 0x7f0a0051
-net.micode.notes:string/preferences_last_sync_time = 0x7f0a004e
-net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004a
-net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a0047
-net.micode.notes:string/preferences_add_account = 0x7f0a0046
-net.micode.notes:string/preferences_account_title = 0x7f0a0045
 net.micode.notes:xml/widget_4x_info = 0x7f0c0003
-net.micode.notes:string/set_remind_time_message = 0x7f0a005a
+net.micode.notes:string/search_hint = 0x7f0a0058
-net.micode.notes:string/notealert_enter = 0x7f0a0040
+net.micode.notes:string/search_setting_description = 0x7f0a005a
-net.micode.notes:string/note_link_web = 0x7f0a003f
+net.micode.notes:string/menu_normal_mode = 0x7f0a002f
-net.micode.notes:string/note_link_tel = 0x7f0a003e
+net.micode.notes:string/menu_send_to_desktop = 0x7f0a0035
-net.micode.notes:string/note_link_other = 0x7f0a003d
+net.micode.notes:id/account_dialog_subtitle = 0x7f050000
-net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004b
+net.micode.notes:string/note_length = 0x7f0a003c
-net.micode.notes:string/note_link_email = 0x7f0a003c
+net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001
+net.micode.notes:string/search = 0x7f0a0057
+net.micode.notes:string/widget_under_visit_mode = 0x7f0a0066
+net.micode.notes:id/ll_font_super = 0x7f05001f
+net.micode.notes:dimen/text_font_size_large = 0x7f030000
 net.micode.notes:string/note_alert_expired = 0x7f0a003b
-net.micode.notes:string/menu_sync_cancel = 0x7f0a0039
+net.micode.notes:string/error_sync_network = 0x7f0a0013
-net.micode.notes:string/menu_sync = 0x7f0a0038
 net.micode.notes:string/menu_share = 0x7f0a0037
-net.micode.notes:string/menu_setting = 0x7f0a0036
+net.micode.notes:id/notes_list = 0x7f050035
-net.micode.notes:string/menu_send_to_desktop = 0x7f0a0035
+net.micode.notes:string/sync_progress_login = 0x7f0a005f
+net.micode.notes:string/note_link_tel = 0x7f0a003f
+net.micode.notes:string/menu_font_small = 0x7f0a002a
+net.micode.notes:string/menu_font_normal = 0x7f0a0028
 net.micode.notes:string/menu_select_title = 0x7f0a0034
-net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004
+net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005
-net.micode.notes:string/menu_select_all = 0x7f0a0032
+net.micode.notes:id/menu_send_to_desktop = 0x7f050029
+net.micode.notes:id/preference_sync_button = 0x7f050037
+net.micode.notes:menu/call_note_edit = 0x7f070000
+net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a0050
+net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a
+net.micode.notes:id/navigation_bar = 0x7f05002f
+net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004b
+net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a0048
+net.micode.notes:string/menu_setting = 0x7f0a0036
 net.micode.notes:string/menu_search = 0x7f0a0031
-net.micode.notes:string/menu_normal_mode = 0x7f0a002f
 net.micode.notes:string/menu_font_size = 0x7f0a0029
-net.micode.notes:string/menu_font_small = 0x7f0a002a
+net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e
-net.micode.notes:string/menu_font_normal = 0x7f0a0028
+net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004
-net.micode.notes:string/menu_remove_remind = 0x7f0a0030
+net.micode.notes:string/menu_select_all = 0x7f0a0032
-net.micode.notes:string/menu_font_large = 0x7f0a0027
+net.micode.notes:xml/searchable = 0x7f0c0001
+net.micode.notes:string/note_link_email = 0x7f0a003d
+net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004c
 net.micode.notes:string/menu_folder_change_name = 0x7f0a0024
+net.micode.notes:string/menu_sync_cancel = 0x7f0a0039
 net.micode.notes:string/menu_export_text = 0x7f0a0023
-net.micode.notes:string/menu_deselect_all = 0x7f0a0022
+net.micode.notes:menu/sub_folder = 0x7f070006
+net.micode.notes:layout/note_item = 0x7f060007
+net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009
+net.micode.notes:string/menu_remove_remind = 0x7f0a0030
+net.micode.notes:string/menu_font_large = 0x7f0a0027
 net.micode.notes:string/menu_create_folder = 0x7f0a0020
-net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e
+net.micode.notes:string/delete_remind_time_message = 0x7f0a000b
-net.micode.notes:string/success_sdcard_export = 0x7f0a005b
+net.micode.notes:drawable/widget_4x_yellow = 0x7f040041
-net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c
+net.micode.notes:drawable/widget_2x_red = 0x7f04003a
-net.micode.notes:string/preferences_account_summary = 0x7f0a0044
 net.micode.notes:string/format_date_ymd = 0x7f0a0018
+net.micode.notes:string/preferences_account_summary = 0x7f0a0045
+net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c
+net.micode.notes:string/success_sdcard_export = 0x7f0a005c
 net.micode.notes:string/file_name_txt_format = 0x7f0a0015
-net.micode.notes:id/note_edit_list = 0x7f050031
 net.micode.notes:drawable/new_note = 0x7f04002f
 net.micode.notes:string/folder_exist = 0x7f0a0017
-net.micode.notes:string/menu_select_none = 0x7f0a0033
+net.micode.notes:id/note_edit_list = 0x7f050031
 net.micode.notes:string/failed_sdcard_export = 0x7f0a0014
-net.micode.notes:string/ticker_cancel = 0x7f0a0060
+net.micode.notes:string/menu_select_none = 0x7f0a0033
-net.micode.notes:drawable/list_red_single = 0x7f040023
+net.micode.notes:layout/widget_4x = 0x7f06000d
 net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009
 net.micode.notes:string/error_sync_cancelled = 0x7f0a0011
-net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010
+net.micode.notes:drawable/list_red_single = 0x7f040023
+net.micode.notes:string/ticker_cancel = 0x7f0a0061
 net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008
 net.micode.notes:drawable/widget_4x_green = 0x7f04003e
 net.micode.notes:string/error_sdcard_export = 0x7f0a000f
-net.micode.notes:string/notealert_ok = 0x7f0a0041
+net.micode.notes:id/iv_bg_yellow_select = 0x7f050017
+net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007
+net.micode.notes:xml/widget_2x_info = 0x7f0c0002
 net.micode.notes:string/menu_move_parent_folder = 0x7f0a002e
-net.micode.notes:id/tv_title = 0x7f05003f
+net.micode.notes:id/tv_title = 0x7f050040
 net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c
-net.micode.notes:string/delete_remind_time_message = 0x7f0a000b
+net.micode.notes:string/notealert_ok = 0x7f0a0042
+net.micode.notes:string/note_link_web = 0x7f0a0040
+net.micode.notes:id/menu_sync = 0x7f05002c
 net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006
-net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0052
+net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0053
 net.micode.notes:string/button_delete = 0x7f0a0007
-net.micode.notes:string/ticker_fail = 0x7f0a0061
+net.micode.notes:string/success_sync_account = 0x7f0a005d
-net.micode.notes:string/search_label = 0x7f0a0058
+net.micode.notes:drawable/widget_2x_yellow = 0x7f04003c
-net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004c
+net.micode.notes:id/amPm = 0x7f050003
+net.micode.notes:string/ticker_fail = 0x7f0a0062
 net.micode.notes:string/app_widget2x2 = 0x7f0a0005
 net.micode.notes:string/app_name = 0x7f0a0004
-net.micode.notes:string/menu_title_select_folder = 0x7f0a003a
+net.micode.notes:string/search_label = 0x7f0a0059
+net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004d
+net.micode.notes:id/menu_list_mode = 0x7f050025
+net.micode.notes:string/preferences_account_title = 0x7f0a0046
+net.micode.notes:string/alert_title_delete = 0x7f0a0003
+net.micode.notes:string/widget_havenot_content = 0x7f0a0065
 net.micode.notes:drawable/list_red_down = 0x7f040021
-net.micode.notes:id/menu_delete = 0x7f050021
+net.micode.notes:string/menu_title_select_folder = 0x7f0a003a
 net.micode.notes:string/hint_foler_name = 0x7f0a001d
-net.micode.notes:string/widget_havenot_content = 0x7f0a0064
+net.micode.notes:id/menu_delete = 0x7f050021
-net.micode.notes:string/alert_title_delete = 0x7f0a0003
 net.micode.notes:string/alert_message_delete_note = 0x7f0a0001
 net.micode.notes:string/format_datetime_mdhm = 0x7f0a0019
 net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000
-net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009
+net.micode.notes:string/preferences_add_account = 0x7f0a0047
-net.micode.notes:layout/note_item = 0x7f060007
+net.micode.notes:string/menu_sync = 0x7f0a0038
-net.micode.notes:menu/sub_folder = 0x7f070006
+net.micode.notes:id/move = 0x7f05002e
-net.micode.notes:menu/note_list = 0x7f070003
+net.micode.notes:string/ticker_syncing = 0x7f0a0064
-net.micode.notes:string/ticker_syncing = 0x7f0a0063
 net.micode.notes:drawable/menu_move = 0x7f04002e
-net.micode.notes:id/menu_search = 0x7f050028
 net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a
+net.micode.notes:id/menu_search = 0x7f050028
 net.micode.notes:raw/introduction = 0x7f090000
 net.micode.notes:menu/call_record_folder = 0x7f070001
-net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f
-net.micode.notes:menu/call_note_edit = 0x7f070000
 net.micode.notes:drawable/list_red_middle = 0x7f040022
 net.micode.notes:layout/widget_2x = 0x7f06000c
-net.micode.notes:layout/widget_4x = 0x7f06000d
 net.micode.notes:drawable/icon_app = 0x7f040015
 net.micode.notes:layout/note_list = 0x7f060008
 net.micode.notes:layout/note_edit = 0x7f060005
@@ -111,62 +131,51 @@ net.micode.notes:drawable/list_background = 0x7f040016
 net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002
 net.micode.notes:drawable/widget_2x_blue = 0x7f040038
 net.micode.notes:layout/folder_list_item = 0x7f060004
-net.micode.notes:string/sync_progress_init_list = 0x7f0a005d
+net.micode.notes:string/sync_progress_init_list = 0x7f0a005e
-net.micode.notes:id/btn_new_note = 0x7f050004
 net.micode.notes:layout/add_account_text = 0x7f060001
-net.micode.notes:id/widget_text = 0x7f050042
+net.micode.notes:id/btn_new_note = 0x7f050004
-net.micode.notes:id/widget_bg_image = 0x7f050041
+net.micode.notes:id/widget_text = 0x7f050043
+net.micode.notes:id/widget_bg_image = 0x7f050042
 net.micode.notes:string/menu_folder_delete = 0x7f0a0025
-net.micode.notes:id/tv_name = 0x7f05003d
+net.micode.notes:id/tv_name = 0x7f05003e
 net.micode.notes:id/account_dialog_title = 0x7f050001
-net.micode.notes:id/tv_folder_name = 0x7f05003b
+net.micode.notes:id/tv_folder_name = 0x7f05003c
-net.micode.notes:id/tv_alert_date = 0x7f05003a
+net.micode.notes:id/tv_alert_date = 0x7f05003b
 net.micode.notes:color/primary_text_dark = 0x7f020000
-net.micode.notes:id/tv_time = 0x7f05003e
+net.micode.notes:id/tv_time = 0x7f05003f
 net.micode.notes:id/selection_menu = 0x7f050038
-net.micode.notes:id/preference_sync_button = 0x7f050037
+net.micode.notes:id/ll_font_small = 0x7f05001e
-net.micode.notes:string/error_sync_network = 0x7f0a0013
-net.micode.notes:id/notes_list = 0x7f050035
 net.micode.notes:id/note_title = 0x7f050034
 net.micode.notes:string/format_exported_file_location = 0x7f0a001a
 net.micode.notes:id/note_bg_color_selector = 0x7f050030
-net.micode.notes:id/navigation_bar = 0x7f05002f
-net.micode.notes:id/move = 0x7f05002e
-net.micode.notes:id/menu_sync = 0x7f05002c
 net.micode.notes:id/menu_share = 0x7f05002b
 net.micode.notes:string/format_folder_files_count = 0x7f0a001b
+net.micode.notes:id/menu_setting = 0x7f05002a
+net.micode.notes:id/note_item = 0x7f050033
 net.micode.notes:string/menu_move = 0x7f0a002d
 net.micode.notes:id/date = 0x7f050007
-net.micode.notes:id/note_item = 0x7f050033
-net.micode.notes:id/menu_setting = 0x7f05002a
-net.micode.notes:id/menu_send_to_desktop = 0x7f050029
-net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000
 net.micode.notes:drawable/font_size_selector_bg = 0x7f040012
 net.micode.notes:id/note_edit_view = 0x7f050032
-net.micode.notes:id/menu_list_mode = 0x7f050025
+net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000
-net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a004d
+net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a004e
 net.micode.notes:id/menu_font_size = 0x7f050024
-net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a0048
+net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a0049
 net.micode.notes:id/menu_alert = 0x7f050020
-net.micode.notes:dimen/text_font_size_large = 0x7f030000
-net.micode.notes:id/ll_font_super = 0x7f05001f
-net.micode.notes:id/ll_font_small = 0x7f05001e
 net.micode.notes:string/error_note_not_exist = 0x7f0a000e
 net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000d
 net.micode.notes:id/minute = 0x7f05002d
 net.micode.notes:id/ll_font_normal = 0x7f05001d
 net.micode.notes:id/ll_font_large = 0x7f05001c
-net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a0049
 net.micode.notes:id/iv_super_select = 0x7f05001b
-net.micode.notes:string/ticker_success = 0x7f0a0062
+net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a004a
+net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001
+net.micode.notes:drawable/list_yellow_up = 0x7f04002c
+net.micode.notes:id/iv_bg_white = 0x7f050014
+net.micode.notes:string/ticker_success = 0x7f0a0063
 net.micode.notes:id/iv_medium_select = 0x7f050019
 net.micode.notes:id/iv_large_select = 0x7f050018
-net.micode.notes:id/iv_bg_yellow_select = 0x7f050017
 net.micode.notes:drawable/bg_btn_set_color = 0x7f040000
 net.micode.notes:id/iv_bg_yellow = 0x7f050016
-net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001
-net.micode.notes:drawable/list_yellow_up = 0x7f04002c
-net.micode.notes:id/iv_bg_white = 0x7f050014
 net.micode.notes:menu/note_edit = 0x7f070002
 net.micode.notes:drawable/list_white_down = 0x7f040025
 net.micode.notes:drawable/list_white_up = 0x7f040028
@@ -177,23 +186,18 @@ net.micode.notes:drawable/list_green_single = 0x7f04001f
 net.micode.notes:id/iv_alert_icon = 0x7f05000d
 net.micode.notes:drawable/list_yellow_single = 0x7f04002b
 net.micode.notes:id/cb_edit_item = 0x7f050006
-net.micode.notes:drawable/font_super = 0x7f040014
-net.micode.notes:drawable/edit_title_blue = 0x7f040009
-net.micode.notes:color/user_query_highlight = 0x7f020002
 net.micode.notes:id/font_size_selector = 0x7f05000b
-net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0054
+net.micode.notes:color/user_query_highlight = 0x7f020002
+net.micode.notes:drawable/edit_title_blue = 0x7f040009
+net.micode.notes:drawable/font_super = 0x7f040014
 net.micode.notes:id/et_edit_text = 0x7f050009
-net.micode.notes:drawable/widget_2x_yellow = 0x7f04003c
+net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0055
-net.micode.notes:id/amPm = 0x7f050003
-net.micode.notes:id/account_dialog_subtitle = 0x7f050000
-net.micode.notes:id/menu_new_note = 0x7f050027
 net.micode.notes:id/iv_bg_green_select = 0x7f050011
-net.micode.notes:drawable/widget_2x_red = 0x7f04003a
+net.micode.notes:id/menu_new_note = 0x7f050027
-net.micode.notes:drawable/widget_4x_yellow = 0x7f040041
 net.micode.notes:drawable/clock = 0x7f040003
+net.micode.notes:array/menu_share_ways = 0x7f010001
 net.micode.notes:drawable/font_small = 0x7f040013
 net.micode.notes:id/btn_set_bg_color = 0x7f050005
-net.micode.notes:array/menu_share_ways = 0x7f010001
 net.micode.notes:style/NoteTheme = 0x7f0b0003
 net.micode.notes:drawable/notification = 0x7f040033
 net.micode.notes:id/iv_bg_blue_select = 0x7f05000f
@@ -202,7 +206,7 @@ net.micode.notes:drawable/edit_title_white = 0x7f04000c
 net.micode.notes:string/menu_delete = 0x7f0a0021
 net.micode.notes:drawable/list_footer_bg = 0x7f04001c
 net.micode.notes:drawable/edit_red = 0x7f040008
-net.micode.notes:string/preferences_menu_cancel = 0x7f0a0050
+net.micode.notes:string/preferences_menu_cancel = 0x7f0a0051
 net.micode.notes:drawable/widget_2x_white = 0x7f04003b
 net.micode.notes:drawable/font_large = 0x7f040010
 net.micode.notes:string/file_path = 0x7f0a0016
@@ -233,17 +237,19 @@ net.micode.notes:id/menu_export_text = 0x7f050023
 net.micode.notes:id/hour = 0x7f05000c
 net.micode.notes:string/menu_folder_view = 0x7f0a0026
 net.micode.notes:drawable/dropdown_icon = 0x7f040005
-net.micode.notes:string/notelist_string_info = 0x7f0a0043
+net.micode.notes:string/notelist_string_info = 0x7f0a0044
 net.micode.notes:drawable/list_blue_single = 0x7f040019
 net.micode.notes:drawable/list_white_middle = 0x7f040026
-net.micode.notes:id/tv_title_bar = 0x7f050040
+net.micode.notes:drawable/call_record = 0x7f040002
+net.micode.notes:id/text_num = 0x7f05003a
+net.micode.notes:id/tv_title_bar = 0x7f050041
 net.micode.notes:drawable/edit_title_red = 0x7f04000b
 net.micode.notes:dimen/text_font_size_normal = 0x7f030002
 net.micode.notes:layout/dialog_edit_text = 0x7f060003
 net.micode.notes:color/secondary_text_dark = 0x7f020001
 net.micode.notes:drawable/list_folder = 0x7f04001b
 net.micode.notes:drawable/list_green_middle = 0x7f04001e
-net.micode.notes:string/sync_progress_syncing = 0x7f0a005f
+net.micode.notes:string/sync_progress_syncing = 0x7f0a0060
 net.micode.notes:drawable/font_normal = 0x7f040011
 net.micode.notes:drawable/list_blue_up = 0x7f04001a
 net.micode.notes:id/iv_small_select = 0x7f05001a
@@ -260,17 +266,16 @@ net.micode.notes:dimen/text_font_size_medium = 0x7f030001
 net.micode.notes:drawable/new_note_pressed = 0x7f040031
 net.micode.notes:id/menu_new_folder = 0x7f050026
 net.micode.notes:id/sv_note_edit = 0x7f050039
-net.micode.notes:drawable/call_record = 0x7f040002
 net.micode.notes:drawable/edit_green = 0x7f040007
 net.micode.notes:id/action_select_all = 0x7f050002
-net.micode.notes:id/tv_modified_date = 0x7f05003c
+net.micode.notes:id/tv_modified_date = 0x7f05003d
 net.micode.notes:id/iv_bg_white_select = 0x7f050015
 net.micode.notes:drawable/edit_title_yellow = 0x7f04000d
 net.micode.notes:layout/note_list_footer = 0x7f06000a
 net.micode.notes:string/menu_font_super = 0x7f0a002b
 net.micode.notes:drawable/widget_4x_red = 0x7f04003f
 net.micode.notes:layout/account_dialog_title = 0x7f060000
-net.micode.notes:string/notelist_menu_new = 0x7f0a0042
+net.micode.notes:string/notelist_menu_new = 0x7f0a0043
 net.micode.notes:drawable/menu_delete = 0x7f04002d
 net.micode.notes:id/iv_bg_red_select = 0x7f050013
 net.micode.notes:menu/note_list_dropdown = 0x7f070004