src

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

@@ -1,4 +1,4 @@
-#Thu Jun 08 13:20:36 CST 2023
+#Thu Jun 08 13:40:15 CST 2023
 net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat

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

@@ -1,4 +1,4 @@
-#Thu Jun 08 13:20:48 CST 2023
+#Thu Jun 08 13:40:27 CST 2023
 base.0=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
 renamed.0=classes.dex
 path.0=classes.dex

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

@@ -76,43 +76,6 @@
                 }
             ]
         },
-        {
-            "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat",
-            "map": [
-                {
-                    "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
-                    "from": {
-                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
-                    },
-                    "to": {
-                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118",
-                        "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,4,4,4,4,4,4",
-                        "startOffsets": "215,384,457,523,596,667,717,757,805,853,898,955,1009,1059,1121,1189,1266,1325,1390,1453,1508,1568,1631,1685,1747,1798,1858,1911,1973,2058,2117,2198,2248,2307,2350,2403,2450,2493,2544,2594,2654,2707,2758,2804,2852,2900,2946,2993,3037,3087,3129,3174,3233,3285,3339,3391,3452,3495,3542,3598,3653,3708,3752,3794,3835,3885,3944,3989,4033,4084,4133,4182,4229,4276,4323,4368,4419,4472,4547,4606,4663,4737,4801,4870,4948,5058,5162,5235,5301,5383,5438,5503,5568,5617,5700,5778,5816,5861,5909,5971,6028,6083,6142,6209,6267,6329,6377,6422,6470,6521,6587",
-                        "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,109,110,111,112,113,114,115,116,117,118",
-                        "endColumns": "14,72,65,72,70,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,61,50,59,52,61,84,58,80,49,58,42,52,46,42,50,49,59,52,50,45,47,47,45,46,43,49,41,44,58,51,53,51,60,42,46,55,54,54,43,41,40,49,58,44,43,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,81,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,662,712,752,800,848,893,950,1004,1054,1116,1184,1261,1320,1385,1448,1503,1563,1626,1680,1742,1793,1853,1906,1968,2053,2112,2193,2243,2302,2345,2398,2445,2488,2539,2589,2649,2702,2753,2799,2847,2895,2941,2988,3032,3082,3124,3169,3228,3280,3334,3386,3447,3490,3537,3593,3648,3703,3747,3789,3830,3880,3939,3984,4028,4079,4128,4177,4224,4271,4318,4363,4414,4467,4542,4601,4658,4732,4796,4865,4943,5053,5157,5230,5296,5378,5433,5498,5563,5612,5695,5773,5811,5856,5904,5966,6023,6078,6137,6204,6262,6324,6372,6417,6465,6516,6582,6648"
-                    }
-                },
-                {
-                    "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
-                    "from": {
-                        "startLines": "-1",
-                        "startColumns": "-1",
-                        "startOffsets": "-1"
-                    },
-                    "to": {
-                        "startLines": "2",
-                        "startColumns": "4",
-                        "startOffsets": "105",
-                        "endLines": "5",
-                        "endColumns": "19",
-                        "endOffsets": "210"
-                    }
-                }
-            ]
-        },
         {
             "outputFile": "C:\\Users\\hw\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values_values.arsc.flat",
             "map": [
@@ -252,92 +215,6 @@
                 }
             ]
         },
-        {
-            "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat",
-            "map": [
-                {
-                    "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
-                    "from": {
-                        "startLines": "139,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startOffsets": "8657,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endLines": "143,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endOffsets": "9065,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
-                    },
-                    "to": {
-                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132",
-                        "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,4,4,4,4,4,4",
-                        "startOffsets": "739,1092,1188,1271,1367,1470,1539,1582,1634,1686,1735,1798,1856,1907,1991,2085,2193,2264,2348,2431,2497,2580,2682,2743,2805,2856,2934,2987,3047,3152,3211,3313,3368,3439,3488,3546,3598,3645,3704,3761,3832,3893,3950,4000,4052,4105,4155,4205,4254,4314,4361,4414,4480,4542,4615,4678,4761,4808,4863,4951,5009,5071,5121,5166,5209,5269,5336,5381,5433,5488,5543,5596,5643,5696,5752,5800,5855,5908,5992,6059,6123,6219,6293,6374,6463,6626,6770,6849,6924,7006,7065,7145,7225,7280,7402,7505,7546,7599,7656,7730,7795,7863,7949,8029,8098,8192,8251,8306,8368,8428,8538",
-                        "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,127,128,129,130,131,132",
-                        "endColumns": "14,95,82,95,102,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,51,46,58,56,70,60,56,49,51,52,49,49,48,59,46,52,65,61,72,62,82,46,54,87,57,61,49,44,42,59,66,44,51,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "1087,1183,1266,1362,1465,1534,1577,1629,1681,1730,1793,1851,1902,1986,2080,2188,2259,2343,2426,2492,2575,2677,2738,2800,2851,2929,2982,3042,3147,3206,3308,3363,3434,3483,3541,3593,3640,3699,3756,3827,3888,3945,3995,4047,4100,4150,4200,4249,4309,4356,4409,4475,4537,4610,4673,4756,4803,4858,4946,5004,5066,5116,5161,5204,5264,5331,5376,5428,5483,5538,5591,5638,5691,5747,5795,5850,5903,5987,6054,6118,6214,6288,6369,6458,6621,6765,6844,6919,7001,7060,7140,7220,7275,7397,7500,7541,7594,7651,7725,7790,7858,7944,8024,8093,8187,8246,8301,8363,8423,8533,8623"
-                    }
-                },
-                {
-                    "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
-                    "from": {
-                        "startLines": "-1,-1",
-                        "startColumns": "-1,-1",
-                        "startOffsets": "-1,-1"
-                    },
-                    "to": {
-                        "startLines": "2,8",
-                        "startColumns": "4,4",
-                        "startOffsets": "105,300",
-                        "endLines": "7,11",
-                        "endColumns": "19,19",
-                        "endOffsets": "295,415"
-                    }
-                },
-                {
-                    "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.xml",
-                    "from": {
-                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
-                    },
-                    "to": {
-                        "startLines": "133,137,141,145,148,152,156,160,164,168,172",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8628,8832,9043,9210,9370,9553,9738,9923,10126,10332,10515",
-                        "endLines": "136,140,144,147,151,155,159,163,167,171,175",
-                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8827,9038,9205,9365,9548,9733,9918,10121,10327,10510,10711"
-                    }
-                },
-                {
-                    "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values\\colors.xml",
-                    "from": {
-                        "startLines": "-1",
-                        "startColumns": "-1",
-                        "startOffsets": "-1"
-                    },
-                    "to": {
-                        "startLines": "12",
-                        "startColumns": "4",
-                        "startOffsets": "420",
-                        "endColumns": "56",
-                        "endOffsets": "472"
-                    }
-                },
-                {
-                    "source": "D:\\programming\\gitProject1\\src\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml",
-                    "from": {
-                        "startLines": "-1,-1,-1,-1,-1",
-                        "startColumns": "-1,-1,-1,-1,-1",
-                        "startOffsets": "-1,-1,-1,-1,-1"
-                    },
-                    "to": {
-                        "startLines": "13,14,15,16,17",
-                        "startColumns": "4,4,4,4,4",
-                        "startOffsets": "477,529,582,635,687",
-                        "endColumns": "51,52,52,51,51",
-                        "endOffsets": "524,577,630,682,734"
-                    }
-                }
-            ]
-        },
         {
             "outputFile": "D:\\programming\\androidstudio\\Sdk\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rCN_values-zh-rCN.arsc.flat",
             "map": [

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

@@ -347,14 +347,14 @@
         "merged": "C:\\Users\\hw\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_dropdown_icon.9.png.flat",
         "source": "C:\\Users\\hw\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\dropdown_icon.9.png"
     },
-    {
-        "merged": "net.micode.notes.app-merged_res-5:/menu_trash_folder.xml.flat",
-        "source": "net.micode.notes.app-main-7:/menu/trash_folder.xml"
-    },
     {
         "merged": "C:\\Users\\hw\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_red.9.png.flat",
         "source": "C:\\Users\\hw\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_red.9.png"
     },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/layout_dialog_pwd.xml.flat",
+        "source": "net.micode.notes.app-main-7:/layout/dialog_pwd.xml"
+    },
     {
         "merged": "C:\\Users\\hw\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_green.9.png.flat",
         "source": "C:\\Users\\hw\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_green.9.png"

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

@@ -65,23 +65,22 @@ int drawable note_edit_color_selector_panel 0x7f040035
 int drawable notification 0x7f040036
 int drawable password_lock_background 0x7f040037
 int drawable password_lock_note 0x7f040038
-int drawable password_lock_note1 0x7f040039
-int drawable search_result 0x7f04003a
-int drawable selected 0x7f04003b
-int drawable title_alert 0x7f04003c
-int drawable title_bar_bg 0x7f04003d
-int drawable unlock 0x7f04003e
-int drawable unlock_button_background 0x7f04003f
-int drawable widget_2x_blue 0x7f040040
-int drawable widget_2x_green 0x7f040041
-int drawable widget_2x_red 0x7f040042
-int drawable widget_2x_white 0x7f040043
-int drawable widget_2x_yellow 0x7f040044
-int drawable widget_4x_blue 0x7f040045
-int drawable widget_4x_green 0x7f040046
-int drawable widget_4x_red 0x7f040047
-int drawable widget_4x_white 0x7f040048
-int drawable widget_4x_yellow 0x7f040049
+int drawable search_result 0x7f040039
+int drawable selected 0x7f04003a
+int drawable title_alert 0x7f04003b
+int drawable title_bar_bg 0x7f04003c
+int drawable unlock 0x7f04003d
+int drawable unlock_button_background 0x7f04003e
+int drawable widget_2x_blue 0x7f04003f
+int drawable widget_2x_green 0x7f040040
+int drawable widget_2x_red 0x7f040041
+int drawable widget_2x_white 0x7f040042
+int drawable widget_2x_yellow 0x7f040043
+int drawable widget_4x_blue 0x7f040044
+int drawable widget_4x_green 0x7f040045
+int drawable widget_4x_red 0x7f040046
+int drawable widget_4x_white 0x7f040047
+int drawable widget_4x_yellow 0x7f040048
 int id account_dialog_subtitle 0x7f050000
 int id account_dialog_title 0x7f050001
 int id action_select_all 0x7f050002

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

@@ -81,7 +81,6 @@ net.micode.notes:string/datetime_dialog_cancel = 0x7f0a000a
 net.micode.notes:string/app_widget4x4 = 0x7f0a0007
 net.micode.notes:string/app_widget2x2 = 0x7f0a0006
 net.micode.notes:string/app_name = 0x7f0a0005
-net.micode.notes:string/alert_title_delete = 0x7f0a0004
 net.micode.notes:menu/trash_folder = 0x7f070007
 net.micode.notes:drawable/list_blue_middle = 0x7f040018
 net.micode.notes:string/alert_message_go_back_notes = 0x7f0a0003
@@ -89,7 +88,7 @@ net.micode.notes:string/menu_font_normal = 0x7f0a002a
 net.micode.notes:string/format_exported_file_location = 0x7f0a001b
 net.micode.notes:raw/introduction = 0x7f090000
 net.micode.notes:dimen/text_font_size_super = 0x7f030004
-net.micode.notes:drawable/selected = 0x7f04003b
+net.micode.notes:drawable/selected = 0x7f04003a
 net.micode.notes:plurals/search_results_title = 0x7f080000
 net.micode.notes:menu/sub_folder = 0x7f070006
 net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009
@@ -111,7 +110,7 @@ net.micode.notes:id/widget_text = 0x7f050051
 net.micode.notes:layout/note_edit_list_item = 0x7f060007
 net.micode.notes:id/unlock = 0x7f05004f
 net.micode.notes:id/tv_title_bar = 0x7f05004e
-net.micode.notes:drawable/widget_2x_blue = 0x7f040040
+net.micode.notes:drawable/widget_2x_blue = 0x7f04003f
 net.micode.notes:id/tv_time = 0x7f05004c
 net.micode.notes:id/tv_name = 0x7f05004b
 net.micode.notes:drawable/new_note = 0x7f040032
@@ -122,11 +121,12 @@ net.micode.notes:layout/note_edit = 0x7f060006
 net.micode.notes:id/notes_list = 0x7f05003f
 net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002
 net.micode.notes:id/menu_lock = 0x7f05002b
-net.micode.notes:drawable/title_alert = 0x7f04003c
+net.micode.notes:drawable/title_alert = 0x7f04003b
 net.micode.notes:id/note_title = 0x7f05003e
 net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a0057
 net.micode.notes:id/note_edit_view = 0x7f05003c
 net.micode.notes:id/navigation_bar = 0x7f050039
+net.micode.notes:id/menu_unlock = 0x7f050036
 net.micode.notes:drawable/font_normal = 0x7f040011
 net.micode.notes:id/minute = 0x7f050037
 net.micode.notes:drawable/font_super = 0x7f040014
@@ -165,14 +165,14 @@ net.micode.notes:menu/call_record_folder = 0x7f070001
 net.micode.notes:id/ll_font_normal = 0x7f05001f
 net.micode.notes:id/ll_font_large = 0x7f05001e
 net.micode.notes:id/note_bg_color_selector = 0x7f05003a
-net.micode.notes:drawable/search_result = 0x7f04003a
+net.micode.notes:drawable/search_result = 0x7f040039
 net.micode.notes:id/iv_super_select = 0x7f05001d
 net.micode.notes:id/iv_bg_yellow = 0x7f050018
 net.micode.notes:string/error_sync_cancelled = 0x7f0a0012
 net.micode.notes:id/iv_bg_white_select = 0x7f050017
 net.micode.notes:id/iv_bg_white = 0x7f050016
 net.micode.notes:string/menu_font_large = 0x7f0a0029
-net.micode.notes:drawable/widget_4x_blue = 0x7f040045
+net.micode.notes:drawable/widget_4x_blue = 0x7f040044
 net.micode.notes:id/iv_large_select = 0x7f05001a
 net.micode.notes:id/widget_bg_image = 0x7f050050
 net.micode.notes:id/iv_bg_green_select = 0x7f050013
@@ -192,22 +192,22 @@ net.micode.notes:id/account_dialog_subtitle = 0x7f050000
 net.micode.notes:id/iv_bg_blue_select = 0x7f050011
 net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a0052
 net.micode.notes:drawable/menu_move = 0x7f040030
-net.micode.notes:drawable/widget_4x_white = 0x7f040048
+net.micode.notes:drawable/widget_4x_white = 0x7f040047
 net.micode.notes:menu/note_list = 0x7f070003
 net.micode.notes:id/account_dialog_title = 0x7f050001
-net.micode.notes:drawable/widget_4x_green = 0x7f040046
-net.micode.notes:drawable/widget_2x_yellow = 0x7f040044
+net.micode.notes:drawable/widget_4x_green = 0x7f040045
+net.micode.notes:drawable/widget_2x_yellow = 0x7f040043
 net.micode.notes:dimen/text_font_size_large = 0x7f030000
 net.micode.notes:id/tv_alert_date = 0x7f050048
-net.micode.notes:drawable/widget_2x_red = 0x7f040042
+net.micode.notes:drawable/widget_2x_red = 0x7f040041
 net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a
 net.micode.notes:id/delete = 0x7f05000a
-net.micode.notes:drawable/widget_2x_green = 0x7f040041
+net.micode.notes:drawable/widget_2x_green = 0x7f040040
 net.micode.notes:drawable/list_red_up = 0x7f040024
-net.micode.notes:drawable/unlock_button_background = 0x7f04003f
+net.micode.notes:drawable/unlock_button_background = 0x7f04003e
 net.micode.notes:id/action_select_all = 0x7f050002
-net.micode.notes:drawable/unlock = 0x7f04003e
-net.micode.notes:drawable/title_bar_bg = 0x7f04003d
+net.micode.notes:drawable/unlock = 0x7f04003d
+net.micode.notes:drawable/title_bar_bg = 0x7f04003c
 net.micode.notes:drawable/password_lock_note = 0x7f040038
 net.micode.notes:drawable/list_blue_up = 0x7f04001a
 net.micode.notes:drawable/password_lock_background = 0x7f040037
@@ -232,13 +232,11 @@ net.micode.notes:menu/note_edit = 0x7f070002
 net.micode.notes:drawable/menu_lock = 0x7f04002f
 net.micode.notes:id/password_visible_toggle_button = 0x7f050042
 net.micode.notes:drawable/list_yellow_single = 0x7f04002b
-net.micode.notes:drawable/widget_4x_yellow = 0x7f040049
+net.micode.notes:drawable/widget_4x_yellow = 0x7f040048
 net.micode.notes:id/tv_folder_name = 0x7f050049
 net.micode.notes:drawable/list_yellow_down = 0x7f040029
 net.micode.notes:drawable/clock = 0x7f040003
 net.micode.notes:drawable/list_white_up = 0x7f040028
-net.micode.notes:id/menu_unlock = 0x7f050036
-net.micode.notes:drawable/password_lock_note1 = 0x7f040039
 net.micode.notes:layout/dialog_edit_text = 0x7f060003
 net.micode.notes:string/preferences_account_title = 0x7f0a004d
 net.micode.notes:drawable/edit_white = 0x7f04000e
@@ -250,11 +248,12 @@ net.micode.notes:drawable/bg_btn_set_color = 0x7f040000
 net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a004f
 net.micode.notes:layout/widget_2x = 0x7f06000e
 net.micode.notes:drawable/list_footer_bg = 0x7f04001c
+net.micode.notes:string/alert_title_delete = 0x7f0a0004
 net.micode.notes:drawable/edit_title_green = 0x7f04000a
 net.micode.notes:drawable/icon_app = 0x7f040015
 net.micode.notes:string/menu_send_to_desktop = 0x7f0a003b
 net.micode.notes:drawable/list_red_single = 0x7f040023
-net.micode.notes:drawable/widget_4x_red = 0x7f040047
+net.micode.notes:drawable/widget_4x_red = 0x7f040046
 net.micode.notes:string/call_record_folder_name = 0x7f0a0009
 net.micode.notes:drawable/list_green_up = 0x7f040020
 net.micode.notes:id/menu_delete_remind = 0x7f050026
@@ -265,7 +264,7 @@ net.micode.notes:drawable/list_blue_down = 0x7f040017
 net.micode.notes:drawable/font_small = 0x7f040013
 net.micode.notes:string/sync_progress_login = 0x7f0a0066
 net.micode.notes:array/menu_share_ways = 0x7f010001
-net.micode.notes:drawable/widget_2x_white = 0x7f040043
+net.micode.notes:drawable/widget_2x_white = 0x7f040042
 net.micode.notes:layout/folder_list_item = 0x7f060005
 net.micode.notes:layout/add_account_text = 0x7f060001
 net.micode.notes:id/tv_title = 0x7f05004d

src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java

@@ -1012,7 +1012,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
                     mWorkingNote.setmPwd(Password);
                 }
             } else {
-                Toast.makeText(getApplicationContext(),"密码设置错误，字母或数字5-8位",Toast.LENGTH_LONG).show();
+                Toast.makeText(getApplicationContext(),"密码格式错误，要求5-8位字母或数字",Toast.LENGTH_LONG).show();
             }
             dialog.dismiss();
             onPause();

src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java

@@ -366,7 +366,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                             builder.setNegativeButton(android.R.string.cancel, null);
                             builder.show();
                         } else {
-                            Toast.makeText(getApplicationContext(), "私密便签不能在此删除", Toast.LENGTH_LONG).show();
+                            Toast.makeText(getApplicationContext(), "加密便签不能在此删除", Toast.LENGTH_LONG).show();
                         }
                     } else {
                         AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this);
@@ -585,7 +585,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
             return;
         }
         if (!folderNoPwd(folderId)) {
-            Toast.makeText(getApplicationContext(), "包含私密便签，不能删除此文件夹", Toast.LENGTH_LONG).show();
+            Toast.makeText(getApplicationContext(), "该文件夹包含加密便签，不能删除", Toast.LENGTH_LONG).show();
             return;
         }
 

src/Notes-master/app/src/main/res/layout/dialog_pwd.xml

@@ -9,7 +9,7 @@
         android:id="@+id/set_private_pwd"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="请输入密码，5-8位，字母或数字"
+        android:hint="请输入密码，要求5-8位字母或数字"
         android:inputType="textPassword"
         android:maxLength="20" />