diff --git a/.gradle/5.4.1/executionHistory/executionHistory.bin b/.gradle/5.4.1/executionHistory/executionHistory.bin
index 585d2f6..932c841 100644
Binary files a/.gradle/5.4.1/executionHistory/executionHistory.bin and b/.gradle/5.4.1/executionHistory/executionHistory.bin differ
diff --git a/.gradle/5.4.1/executionHistory/executionHistory.lock b/.gradle/5.4.1/executionHistory/executionHistory.lock
index 2d492fc..61529e1 100644
Binary files a/.gradle/5.4.1/executionHistory/executionHistory.lock and b/.gradle/5.4.1/executionHistory/executionHistory.lock differ
diff --git a/.gradle/5.4.1/fileHashes/fileHashes.bin b/.gradle/5.4.1/fileHashes/fileHashes.bin
index b2cd5ab..3b62ada 100644
Binary files a/.gradle/5.4.1/fileHashes/fileHashes.bin and b/.gradle/5.4.1/fileHashes/fileHashes.bin differ
diff --git a/.gradle/5.4.1/fileHashes/fileHashes.lock b/.gradle/5.4.1/fileHashes/fileHashes.lock
index deba817..47f0a80 100644
Binary files a/.gradle/5.4.1/fileHashes/fileHashes.lock and b/.gradle/5.4.1/fileHashes/fileHashes.lock differ
diff --git a/.gradle/5.4.1/javaCompile/javaCompile.lock b/.gradle/5.4.1/javaCompile/javaCompile.lock
index 98b0215..994732c 100644
Binary files a/.gradle/5.4.1/javaCompile/javaCompile.lock and b/.gradle/5.4.1/javaCompile/javaCompile.lock differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index ff775df..b90a58d 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/app/build/generated/not_namespaced_r_class_sources/debug/r/net/micode/notes/R.java b/app/build/generated/not_namespaced_r_class_sources/debug/r/net/micode/notes/R.java
index 3781701..32fac5d 100644
--- a/app/build/generated/not_namespaced_r_class_sources/debug/r/net/micode/notes/R.java
+++ b/app/build/generated/not_namespaced_r_class_sources/debug/r/net/micode/notes/R.java
@@ -91,6 +91,8 @@ public final class R {
public static final int widget_4x_red=0x7f04003f;
public static final int widget_4x_white=0x7f040040;
public static final int widget_4x_yellow=0x7f040041;
+ public static final int xiaomi1=0x7f040042;
+ public static final int xiaomi2=0x7f040043;
}
public static final class id {
public static final int account_dialog_subtitle=0x7f050000;
@@ -126,40 +128,42 @@ public final class R {
public static final int ll_font_small=0x7f05001e;
public static final int ll_font_super=0x7f05001f;
public static final int menu_alert=0x7f050020;
- public static final int menu_delete=0x7f050021;
- public static final int menu_delete_remind=0x7f050022;
- public static final int menu_export_text=0x7f050023;
- public static final int menu_font_size=0x7f050024;
- public static final int menu_list_mode=0x7f050025;
- public static final int menu_new_folder=0x7f050026;
- public static final int menu_new_note=0x7f050027;
- public static final int menu_search=0x7f050028;
- public static final int menu_send_to_desktop=0x7f050029;
- public static final int menu_setting=0x7f05002a;
- public static final int menu_share=0x7f05002b;
- public static final int menu_sync=0x7f05002c;
- public static final int minute=0x7f05002d;
- public static final int move=0x7f05002e;
- public static final int navigation_bar=0x7f05002f;
- public static final int note_bg_color_selector=0x7f050030;
- public static final int note_edit_list=0x7f050031;
- public static final int note_edit_view=0x7f050032;
- public static final int note_item=0x7f050033;
- public static final int note_title=0x7f050034;
- public static final int notes_list=0x7f050035;
- public static final int prefenerece_sync_status_textview=0x7f050036;
- public static final int preference_sync_button=0x7f050037;
- public static final int selection_menu=0x7f050038;
- public static final int sv_note_edit=0x7f050039;
- public static final int tv_alert_date=0x7f05003a;
- public static final int tv_folder_name=0x7f05003b;
- public static final int tv_modified_date=0x7f05003c;
- public static final int tv_name=0x7f05003d;
- public static final int tv_time=0x7f05003e;
- public static final int tv_title=0x7f05003f;
- public static final int tv_title_bar=0x7f050040;
- public static final int widget_bg_image=0x7f050041;
- public static final int widget_text=0x7f050042;
+ public static final int menu_day=0x7f050021;
+ public static final int menu_delete=0x7f050022;
+ public static final int menu_delete_remind=0x7f050023;
+ public static final int menu_export_text=0x7f050024;
+ public static final int menu_font_size=0x7f050025;
+ public static final int menu_list_mode=0x7f050026;
+ public static final int menu_new_folder=0x7f050027;
+ public static final int menu_new_note=0x7f050028;
+ public static final int menu_night=0x7f050029;
+ public static final int menu_search=0x7f05002a;
+ public static final int menu_send_to_desktop=0x7f05002b;
+ public static final int menu_setting=0x7f05002c;
+ public static final int menu_share=0x7f05002d;
+ public static final int menu_sync=0x7f05002e;
+ public static final int minute=0x7f05002f;
+ public static final int move=0x7f050030;
+ public static final int navigation_bar=0x7f050031;
+ public static final int note_bg_color_selector=0x7f050032;
+ public static final int note_edit_list=0x7f050033;
+ public static final int note_edit_view=0x7f050034;
+ public static final int note_item=0x7f050035;
+ public static final int note_title=0x7f050036;
+ public static final int notes_list=0x7f050037;
+ public static final int prefenerece_sync_status_textview=0x7f050038;
+ public static final int preference_sync_button=0x7f050039;
+ public static final int selection_menu=0x7f05003a;
+ public static final int sv_note_edit=0x7f05003b;
+ public static final int tv_alert_date=0x7f05003c;
+ public static final int tv_folder_name=0x7f05003d;
+ public static final int tv_modified_date=0x7f05003e;
+ public static final int tv_name=0x7f05003f;
+ public static final int tv_time=0x7f050040;
+ public static final int tv_title=0x7f050041;
+ public static final int tv_title_bar=0x7f050042;
+ public static final int widget_bg_image=0x7f050043;
+ public static final int widget_text=0x7f050044;
}
public static final class layout {
public static final int account_dialog_title=0x7f060000;
@@ -226,75 +230,77 @@ public final class R {
public static final int info_note_enter_desktop=0x7f0a001e;
public static final int menu_alert=0x7f0a001f;
public static final int menu_create_folder=0x7f0a0020;
- public static final int menu_delete=0x7f0a0021;
- public static final int menu_deselect_all=0x7f0a0022;
- public static final int menu_export_text=0x7f0a0023;
- public static final int menu_folder_change_name=0x7f0a0024;
- public static final int menu_folder_delete=0x7f0a0025;
- public static final int menu_folder_view=0x7f0a0026;
- public static final int menu_font_large=0x7f0a0027;
- public static final int menu_font_normal=0x7f0a0028;
- public static final int menu_font_size=0x7f0a0029;
- public static final int menu_font_small=0x7f0a002a;
- public static final int menu_font_super=0x7f0a002b;
- public static final int menu_list_mode=0x7f0a002c;
- public static final int menu_move=0x7f0a002d;
- public static final int menu_move_parent_folder=0x7f0a002e;
- public static final int menu_normal_mode=0x7f0a002f;
- public static final int menu_remove_remind=0x7f0a0030;
- public static final int menu_search=0x7f0a0031;
- public static final int menu_select_all=0x7f0a0032;
- public static final int menu_select_none=0x7f0a0033;
- public static final int menu_select_title=0x7f0a0034;
- public static final int menu_send_to_desktop=0x7f0a0035;
- public static final int menu_setting=0x7f0a0036;
- public static final int menu_share=0x7f0a0037;
- public static final int menu_sync=0x7f0a0038;
- public static final int menu_sync_cancel=0x7f0a0039;
- public static final int menu_title_select_folder=0x7f0a003a;
- public static final int note_alert_expired=0x7f0a003b;
- public static final int note_link_email=0x7f0a003c;
- public static final int note_link_other=0x7f0a003d;
- public static final int note_link_tel=0x7f0a003e;
- public static final int note_link_web=0x7f0a003f;
- public static final int notealert_enter=0x7f0a0040;
- public static final int notealert_ok=0x7f0a0041;
- public static final int notelist_menu_new=0x7f0a0042;
- public static final int notelist_string_info=0x7f0a0043;
- public static final int preferences_account_summary=0x7f0a0044;
- public static final int preferences_account_title=0x7f0a0045;
- public static final int preferences_add_account=0x7f0a0046;
- public static final int preferences_bg_random_appear_title=0x7f0a0047;
- public static final int preferences_button_sync_cancel=0x7f0a0048;
- public static final int preferences_button_sync_immediately=0x7f0a0049;
- public static final int preferences_dialog_change_account_title=0x7f0a004a;
- public static final int preferences_dialog_change_account_warn_msg=0x7f0a004b;
- public static final int preferences_dialog_select_account_tips=0x7f0a004c;
- public static final int preferences_dialog_select_account_title=0x7f0a004d;
- public static final int preferences_last_sync_time=0x7f0a004e;
- public static final int preferences_last_sync_time_format=0x7f0a004f;
- public static final int preferences_menu_cancel=0x7f0a0050;
- public static final int preferences_menu_change_account=0x7f0a0051;
- public static final int preferences_menu_remove_account=0x7f0a0052;
- public static final int preferences_title=0x7f0a0053;
- public static final int preferences_toast_cannot_change_account=0x7f0a0054;
- public static final int preferences_toast_success_set_accout=0x7f0a0055;
- public static final int search=0x7f0a0056;
- public static final int search_hint=0x7f0a0057;
- public static final int search_label=0x7f0a0058;
- public static final int search_setting_description=0x7f0a0059;
- public static final int set_remind_time_message=0x7f0a005a;
- public static final int success_sdcard_export=0x7f0a005b;
- public static final int success_sync_account=0x7f0a005c;
- public static final int sync_progress_init_list=0x7f0a005d;
- public static final int sync_progress_login=0x7f0a005e;
- public static final int sync_progress_syncing=0x7f0a005f;
- public static final int ticker_cancel=0x7f0a0060;
- public static final int ticker_fail=0x7f0a0061;
- public static final int ticker_success=0x7f0a0062;
- public static final int ticker_syncing=0x7f0a0063;
- public static final int widget_havenot_content=0x7f0a0064;
- public static final int widget_under_visit_mode=0x7f0a0065;
+ public static final int menu_day=0x7f0a0021;
+ public static final int menu_delete=0x7f0a0022;
+ public static final int menu_deselect_all=0x7f0a0023;
+ public static final int menu_export_text=0x7f0a0024;
+ public static final int menu_folder_change_name=0x7f0a0025;
+ public static final int menu_folder_delete=0x7f0a0026;
+ public static final int menu_folder_view=0x7f0a0027;
+ public static final int menu_font_large=0x7f0a0028;
+ public static final int menu_font_normal=0x7f0a0029;
+ public static final int menu_font_size=0x7f0a002a;
+ public static final int menu_font_small=0x7f0a002b;
+ public static final int menu_font_super=0x7f0a002c;
+ public static final int menu_list_mode=0x7f0a002d;
+ public static final int menu_move=0x7f0a002e;
+ public static final int menu_move_parent_folder=0x7f0a002f;
+ public static final int menu_night=0x7f0a0030;
+ public static final int menu_normal_mode=0x7f0a0031;
+ public static final int menu_remove_remind=0x7f0a0032;
+ public static final int menu_search=0x7f0a0033;
+ public static final int menu_select_all=0x7f0a0034;
+ public static final int menu_select_none=0x7f0a0035;
+ public static final int menu_select_title=0x7f0a0036;
+ public static final int menu_send_to_desktop=0x7f0a0037;
+ public static final int menu_setting=0x7f0a0038;
+ public static final int menu_share=0x7f0a0039;
+ public static final int menu_sync=0x7f0a003a;
+ public static final int menu_sync_cancel=0x7f0a003b;
+ public static final int menu_title_select_folder=0x7f0a003c;
+ public static final int note_alert_expired=0x7f0a003d;
+ public static final int note_link_email=0x7f0a003e;
+ public static final int note_link_other=0x7f0a003f;
+ public static final int note_link_tel=0x7f0a0040;
+ public static final int note_link_web=0x7f0a0041;
+ public static final int notealert_enter=0x7f0a0042;
+ public static final int notealert_ok=0x7f0a0043;
+ public static final int notelist_menu_new=0x7f0a0044;
+ public static final int notelist_string_info=0x7f0a0045;
+ public static final int preferences_account_summary=0x7f0a0046;
+ public static final int preferences_account_title=0x7f0a0047;
+ public static final int preferences_add_account=0x7f0a0048;
+ public static final int preferences_bg_random_appear_title=0x7f0a0049;
+ public static final int preferences_button_sync_cancel=0x7f0a004a;
+ public static final int preferences_button_sync_immediately=0x7f0a004b;
+ public static final int preferences_dialog_change_account_title=0x7f0a004c;
+ public static final int preferences_dialog_change_account_warn_msg=0x7f0a004d;
+ public static final int preferences_dialog_select_account_tips=0x7f0a004e;
+ public static final int preferences_dialog_select_account_title=0x7f0a004f;
+ public static final int preferences_last_sync_time=0x7f0a0050;
+ public static final int preferences_last_sync_time_format=0x7f0a0051;
+ public static final int preferences_menu_cancel=0x7f0a0052;
+ public static final int preferences_menu_change_account=0x7f0a0053;
+ public static final int preferences_menu_remove_account=0x7f0a0054;
+ public static final int preferences_title=0x7f0a0055;
+ public static final int preferences_toast_cannot_change_account=0x7f0a0056;
+ public static final int preferences_toast_success_set_accout=0x7f0a0057;
+ public static final int search=0x7f0a0058;
+ public static final int search_hint=0x7f0a0059;
+ public static final int search_label=0x7f0a005a;
+ public static final int search_setting_description=0x7f0a005b;
+ public static final int set_remind_time_message=0x7f0a005c;
+ public static final int success_sdcard_export=0x7f0a005d;
+ public static final int success_sync_account=0x7f0a005e;
+ public static final int sync_progress_init_list=0x7f0a005f;
+ public static final int sync_progress_login=0x7f0a0060;
+ public static final int sync_progress_syncing=0x7f0a0061;
+ public static final int ticker_cancel=0x7f0a0062;
+ public static final int ticker_fail=0x7f0a0063;
+ public static final int ticker_success=0x7f0a0064;
+ public static final int ticker_syncing=0x7f0a0065;
+ public static final int widget_havenot_content=0x7f0a0066;
+ public static final int widget_under_visit_mode=0x7f0a0067;
}
public static final class style {
public static final int HighlightTextAppearancePrimary=0x7f0b0000;
diff --git a/app/build/intermediates/blame/res/debug/multi-v2/debug.json b/app/build/intermediates/blame/res/debug/multi-v2/debug.json
index 949df04..7c62af5 100644
--- a/app/build/intermediates/blame/res/debug/multi-v2/debug.json
+++ b/app/build/intermediates/blame/res/debug/multi-v2/debug.json
@@ -6,92 +6,82 @@
{
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml",
"from": {
- "startLines": "18",
- "startColumns": "4",
- "startOffsets": "712",
- "endColumns": "56",
- "endOffsets": "764"
+ "startLines": "-1",
+ "startColumns": "-1",
+ "startOffsets": "-1"
},
"to": {
"startLines": "12",
"startColumns": "4",
- "startOffsets": "532",
+ "startOffsets": "420",
"endColumns": "56",
- "endOffsets": "584"
+ "endOffsets": "472"
}
},
{
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml",
"from": {
- "startLines": "50,55,64,60,22,26,30,35,40,18,45",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
- "endLines": "53,58,67,62,25,29,33,38,43,21,48",
- "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056"
+ "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": "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": "8276,8480,8691,8898,9058,9241,9426,9611,9814,10020,10203",
- "endLines": "128,132,136,139,143,147,151,155,159,163,167",
+ "startOffsets": "8356,8560,8771,8978,9138,9321,9506,9691,9894,10100,10283",
+ "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": "8475,8686,8893,9053,9236,9421,9606,9809,10015,10198,10399"
+ "endOffsets": "8555,8766,8973,9133,9316,9501,9686,9889,10095,10278,10479"
}
},
{
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml",
"from": {
- "startLines": "19,26",
- "startColumns": "4,4",
- "startOffsets": "739,1047",
- "endLines": "24,29",
- "endColumns": "19,19",
- "endOffsets": "1041,1162"
+ "startLines": "-1,-1",
+ "startColumns": "-1,-1",
+ "startOffsets": "-1,-1"
},
"to": {
"startLines": "2,8",
"startColumns": "4,4",
- "startOffsets": "105,412",
+ "startOffsets": "105,300",
"endLines": "7,11",
"endColumns": "19,19",
- "endOffsets": "407,527"
+ "endOffsets": "295,415"
}
},
{
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml",
"from": {
- "startLines": "19,20,21,22,18",
- "startColumns": "4,4,4,4,4",
- "startOffsets": "764,816,869,922,712",
- "endColumns": "51,52,52,51,51",
- "endOffsets": "811,864,917,969,759"
+ "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": "589,641,694,747,799",
+ "startOffsets": "477,529,582,635,687",
"endColumns": "51,52,52,51,51",
- "endOffsets": "636,689,742,794,846"
+ "endOffsets": "524,577,630,682,734"
}
},
{
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml",
"from": {
- "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084",
- "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
- "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
- "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169"
+ "startLines": "132,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,39,38,-1,-1,-1,-1,45,-1,-1,-1,-1,-1,41,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,107,-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,4,4,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+ "startOffsets": "8202,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2025,1953,-1,-1,-1,-1,2249,-1,-1,-1,-1,-1,2139,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2191,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6362,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+ "endLines": "136,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,39,38,-1,-1,-1,-1,45,-1,-1,-1,-1,-1,41,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,107,-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,82,71,-1,-1,-1,-1,79,-1,-1,-1,-1,-1,51,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,55,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,102,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+ "endOffsets": "8606,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2103,2020,-1,-1,-1,-1,2324,-1,-1,-1,-1,-1,2186,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2242,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6460,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
},
"to": {
- "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "851,1244,1340,1423,1519,1588,1631,1683,1735,1784,1847,1905,1956,2040,2134,2242,2313,2397,2480,2546,2629,2731,2792,2854,2905,2983,3036,3096,3201,3260,3362,3417,3488,3537,3595,3642,3701,3758,3829,3890,3947,3997,4049,4102,4152,4202,4262,4315,4381,4443,4506,4553,4608,4696,4754,4816,4866,4911,4954,5014,5081,5136,5191,5244,5291,5344,5400,5448,5503,5556,5640,5707,5771,5867,5941,6022,6111,6274,6418,6497,6572,6654,6713,6793,6873,6928,7050,7153,7194,7247,7304,7378,7443,7511,7597,7677,7746,7840,7899,7954,8016,8076,8186",
- "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
- "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
- "endOffsets": "1239,1335,1418,1514,1583,1626,1678,1730,1779,1842,1900,1951,2035,2129,2237,2308,2392,2475,2541,2624,2726,2787,2849,2900,2978,3031,3091,3196,3255,3357,3412,3483,3532,3590,3637,3696,3753,3824,3885,3942,3992,4044,4097,4147,4197,4257,4310,4376,4438,4501,4548,4603,4691,4749,4811,4861,4906,4949,5009,5076,5131,5186,5239,5286,5339,5395,5443,5498,5551,5635,5702,5766,5862,5936,6017,6106,6269,6413,6492,6567,6649,6708,6788,6868,6923,7045,7148,7189,7242,7299,7373,7438,7506,7592,7672,7741,7835,7894,7949,8011,8071,8181,8271"
+ "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,4,4",
+ "startOffsets": "739,1132,1228,1311,1407,1476,1519,1571,1623,1672,1735,1793,1844,1928,2022,2130,2201,2285,2368,2434,2517,2619,2680,2763,2835,2913,2966,3026,3131,3211,3313,3368,3439,3488,3546,3598,3645,3704,3761,3832,3893,3950,4000,4052,4105,4155,4205,4265,4318,4384,4440,4502,4565,4612,4667,4755,4813,4875,4925,4970,5013,5073,5140,5195,5250,5303,5350,5403,5459,5507,5562,5615,5699,5766,5830,5926,6000,6081,6170,6333,6477,6556,6631,6734,6793,6873,6953,7008,7130,7233,7274,7327,7384,7458,7523,7591,7677,7757,7826,7920,7979,8034,8096,8156,8266",
+ "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,82,71,77,52,59,104,79,101,54,70,48,57,51,46,58,56,70,60,56,49,51,52,49,49,59,52,65,55,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,102,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+ "endOffsets": "1127,1223,1306,1402,1471,1514,1566,1618,1667,1730,1788,1839,1923,2017,2125,2196,2280,2363,2429,2512,2614,2675,2758,2830,2908,2961,3021,3126,3206,3308,3363,3434,3483,3541,3593,3640,3699,3756,3827,3888,3945,3995,4047,4100,4150,4200,4260,4313,4379,4435,4497,4560,4607,4662,4750,4808,4870,4920,4965,5008,5068,5135,5190,5245,5298,5345,5398,5454,5502,5557,5610,5694,5761,5825,5921,5995,6076,6165,6328,6472,6551,6626,6729,6788,6868,6948,7003,7125,7228,7269,7322,7379,7453,7518,7586,7672,7752,7821,7915,7974,8029,8091,8151,8261,8351"
}
}
]
diff --git a/app/build/intermediates/blame/res/debug/multi-v2/values.json b/app/build/intermediates/blame/res/debug/multi-v2/values.json
index 5da910b..7292012 100644
--- a/app/build/intermediates/blame/res/debug/multi-v2/values.json
+++ b/app/build/intermediates/blame/res/debug/multi-v2/values.json
@@ -6,92 +6,82 @@
{
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml",
"from": {
- "startLines": "18",
- "startColumns": "4",
- "startOffsets": "712",
- "endColumns": "56",
- "endOffsets": "764"
+ "startLines": "-1",
+ "startColumns": "-1",
+ "startOffsets": "-1"
},
"to": {
"startLines": "12",
"startColumns": "4",
- "startOffsets": "532",
+ "startOffsets": "420",
"endColumns": "56",
- "endOffsets": "584"
+ "endOffsets": "472"
}
},
{
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml",
"from": {
- "startLines": "50,55,64,60,22,26,30,35,40,18,45",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
- "endLines": "53,58,67,62,25,29,33,38,43,21,48",
- "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056"
+ "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": "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": "8276,8480,8691,8898,9058,9241,9426,9611,9814,10020,10203",
- "endLines": "128,132,136,139,143,147,151,155,159,163,167",
+ "startOffsets": "8356,8560,8771,8978,9138,9321,9506,9691,9894,10100,10283",
+ "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": "8475,8686,8893,9053,9236,9421,9606,9809,10015,10198,10399"
+ "endOffsets": "8555,8766,8973,9133,9316,9501,9686,9889,10095,10278,10479"
}
},
{
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml",
"from": {
- "startLines": "19,26",
- "startColumns": "4,4",
- "startOffsets": "739,1047",
- "endLines": "24,29",
- "endColumns": "19,19",
- "endOffsets": "1041,1162"
+ "startLines": "-1,-1",
+ "startColumns": "-1,-1",
+ "startOffsets": "-1,-1"
},
"to": {
"startLines": "2,8",
"startColumns": "4,4",
- "startOffsets": "105,412",
+ "startOffsets": "105,300",
"endLines": "7,11",
"endColumns": "19,19",
- "endOffsets": "407,527"
+ "endOffsets": "295,415"
}
},
{
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml",
"from": {
- "startLines": "19,20,21,22,18",
- "startColumns": "4,4,4,4,4",
- "startOffsets": "764,816,869,922,712",
- "endColumns": "51,52,52,51,51",
- "endOffsets": "811,864,917,969,759"
+ "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": "589,641,694,747,799",
+ "startOffsets": "477,529,582,635,687",
"endColumns": "51,52,52,51,51",
- "endOffsets": "636,689,742,794,846"
+ "endOffsets": "524,577,630,682,734"
}
},
{
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml",
"from": {
- "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084",
- "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
- "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
- "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169"
+ "startLines": "132,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,39,38,-1,-1,-1,-1,45,-1,-1,-1,-1,-1,41,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,107,-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,4,4,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+ "startOffsets": "8202,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2025,1953,-1,-1,-1,-1,2249,-1,-1,-1,-1,-1,2139,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2191,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6362,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+ "endLines": "136,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,39,38,-1,-1,-1,-1,45,-1,-1,-1,-1,-1,41,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,107,-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,82,71,-1,-1,-1,-1,79,-1,-1,-1,-1,-1,51,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,55,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,102,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+ "endOffsets": "8606,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2103,2020,-1,-1,-1,-1,2324,-1,-1,-1,-1,-1,2186,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2242,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6460,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
},
"to": {
- "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "851,1244,1340,1423,1519,1588,1631,1683,1735,1784,1847,1905,1956,2040,2134,2242,2313,2397,2480,2546,2629,2731,2792,2854,2905,2983,3036,3096,3201,3260,3362,3417,3488,3537,3595,3642,3701,3758,3829,3890,3947,3997,4049,4102,4152,4202,4262,4315,4381,4443,4506,4553,4608,4696,4754,4816,4866,4911,4954,5014,5081,5136,5191,5244,5291,5344,5400,5448,5503,5556,5640,5707,5771,5867,5941,6022,6111,6274,6418,6497,6572,6654,6713,6793,6873,6928,7050,7153,7194,7247,7304,7378,7443,7511,7597,7677,7746,7840,7899,7954,8016,8076,8186",
- "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
- "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
- "endOffsets": "1239,1335,1418,1514,1583,1626,1678,1730,1779,1842,1900,1951,2035,2129,2237,2308,2392,2475,2541,2624,2726,2787,2849,2900,2978,3031,3091,3196,3255,3357,3412,3483,3532,3590,3637,3696,3753,3824,3885,3942,3992,4044,4097,4147,4197,4257,4310,4376,4438,4501,4548,4603,4691,4749,4811,4861,4906,4949,5009,5076,5131,5186,5239,5286,5339,5395,5443,5498,5551,5635,5702,5766,5862,5936,6017,6106,6269,6413,6492,6567,6649,6708,6788,6868,6923,7045,7148,7189,7242,7299,7373,7438,7506,7592,7672,7741,7835,7894,7949,8011,8071,8181,8271"
+ "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,4,4",
+ "startOffsets": "739,1132,1228,1311,1407,1476,1519,1571,1623,1672,1735,1793,1844,1928,2022,2130,2201,2285,2368,2434,2517,2619,2680,2763,2835,2913,2966,3026,3131,3211,3313,3368,3439,3488,3546,3598,3645,3704,3761,3832,3893,3950,4000,4052,4105,4155,4205,4265,4318,4384,4440,4502,4565,4612,4667,4755,4813,4875,4925,4970,5013,5073,5140,5195,5250,5303,5350,5403,5459,5507,5562,5615,5699,5766,5830,5926,6000,6081,6170,6333,6477,6556,6631,6734,6793,6873,6953,7008,7130,7233,7274,7327,7384,7458,7523,7591,7677,7757,7826,7920,7979,8034,8096,8156,8266",
+ "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,82,71,77,52,59,104,79,101,54,70,48,57,51,46,58,56,70,60,56,49,51,52,49,49,59,52,65,55,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,102,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+ "endOffsets": "1127,1223,1306,1402,1471,1514,1566,1618,1667,1730,1788,1839,1923,2017,2125,2196,2280,2363,2429,2512,2614,2675,2758,2830,2908,2961,3021,3126,3206,3308,3363,3434,3483,3541,3593,3640,3699,3756,3827,3888,3945,3995,4047,4100,4150,4200,4260,4313,4379,4435,4497,4560,4607,4662,4750,4808,4870,4920,4965,5008,5068,5135,5190,5245,5298,5345,5398,5454,5502,5557,5610,5694,5761,5825,5921,5995,6076,6165,6328,6472,6551,6626,6729,6788,6868,6948,7003,7125,7228,7269,7322,7379,7453,7518,7586,7672,7752,7821,7915,7974,8029,8091,8151,8261,8351"
}
}
]
diff --git a/app/build/intermediates/blame/res/debug/single/debug.json b/app/build/intermediates/blame/res/debug/single/debug.json
index fdfe40c..fc0d631 100644
--- a/app/build/intermediates/blame/res/debug/single/debug.json
+++ b/app/build/intermediates/blame/res/debug/single/debug.json
@@ -1,8 +1,4 @@
[
- {
- "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_search_result.png.flat",
- "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\search_result.png"
- },
{
"merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_2x_info.xml.flat",
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\xml\\widget_2x_info.xml"
@@ -15,6 +11,142 @@
"merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_bar_bg.9.png.flat",
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png"
},
+ {
+ "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_clock.png.flat",
+ "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\clock.png"
+ },
+ {
+ "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_down.9.png.flat",
+ "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png"
+ },
+ {
+ "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\xml_searchable.xml.flat",
+ "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\xml\\searchable.xml"
+ },
+ {
+ "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_note_edit.xml.flat",
+ "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\menu\\call_note_edit.xml"
+ },
+ {
+ "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_alert.png.flat",
+ "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png"
+ },
+ {
+ "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit_list_item.xml.flat",
+ "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit_list_item.xml"
+ },
+ {
+ "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_datetime_picker.xml.flat",
+ "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\layout\\datetime_picker.xml"
+ },
+ {
+ "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat",
+ "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_small.png"
+ },
+ {
+ "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_2x.xml.flat",
+ "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\layout\\widget_2x.xml"
+ },
+ {
+ "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_green.9.png.flat",
+ "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png"
+ },
+ {
+ "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_up.9.png.flat",
+ "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png"
+ },
+ {
+ "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_blue.png.flat",
+ "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png"
+ },
+ {
+ "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\raw_introduction.flat",
+ "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\raw\\introduction"
+ },
+ {
+ "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_single.9.png.flat",
+ "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png"
+ },
+ {
+ "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\menu_sub_folder.xml.flat",
+ "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\menu\\sub_folder.xml"
+ },
+ {
+ "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_folder.9.png.flat",
+ "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png"
+ },
+ {
+ "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable_new_note.xml.flat",
+ "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable\\new_note.xml"
+ },
+ {
+ "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_record_folder.xml.flat",
+ "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\menu\\call_record_folder.xml"
+ },
+ {
+ "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_red.9.png.flat",
+ "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png"
+ },
+ {
+ "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_single.9.png.flat",
+ "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png"
+ },
+ {
+ "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_middle.9.png.flat",
+ "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png"
+ },
+ {
+ "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_down.9.png.flat",
+ "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png"
+ },
+ {
+ "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_normal.png.flat",
+ "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png"
+ },
+ {
+ "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_up.9.png.flat",
+ "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png"
+ },
+ {
+ "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_white.png.flat",
+ "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png"
+ },
+ {
+ "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_middle.9.png.flat",
+ "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png"
+ },
+ {
+ "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_red.png.flat",
+ "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png"
+ },
+ {
+ "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_white.9.png.flat",
+ "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png"
+ },
+ {
+ "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_dropdown_menu.xml.flat",
+ "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml"
+ },
+ {
+ "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat",
+ "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png"
+ },
+ {
+ "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_red.png.flat",
+ "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png"
+ },
+ {
+ "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_dropdown_icon.9.png.flat",
+ "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png"
+ },
+ {
+ "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_pressed.png.flat",
+ "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png"
+ },
+ {
+ "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_search_result.png.flat",
+ "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\search_result.png"
+ },
{
"merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_delete.png.flat",
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\delete.png"
@@ -28,8 +160,8 @@
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_edit_text.xml"
},
{
- "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_clock.png.flat",
- "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\clock.png"
+ "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_xiaomi2.jpg.flat",
+ "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\xiaomi2.jpg"
},
{
"merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_super.png.flat",
@@ -47,10 +179,6 @@
"merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_blue.9.png.flat",
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png"
},
- {
- "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_down.9.png.flat",
- "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png"
- },
{
"merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_yellow.png.flat",
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png"
@@ -71,10 +199,6 @@
"merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_folder_list_item.xml.flat",
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\layout\\folder_list_item.xml"
},
- {
- "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\xml_searchable.xml.flat",
- "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\xml\\searchable.xml"
- },
{
"merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\raw-zh-rCN_introduction.flat",
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\raw-zh-rCN\\introduction"
@@ -83,37 +207,17 @@
"merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_item.xml.flat",
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\layout\\note_item.xml"
},
- {
- "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_note_edit.xml.flat",
- "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\menu\\call_note_edit.xml"
- },
- {
- "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_alert.png.flat",
- "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png"
- },
- {
- "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit_list_item.xml.flat",
- "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit_list_item.xml"
- },
- {
- "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_datetime_picker.xml.flat",
- "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\layout\\datetime_picker.xml"
- },
- {
- "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\color_primary_text_dark.xml.flat",
- "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\color\\primary_text_dark.xml"
- },
{
"merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_options.xml.flat",
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_options.xml"
},
{
- "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat",
- "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_small.png"
+ "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\color_primary_text_dark.xml.flat",
+ "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\color\\primary_text_dark.xml"
},
{
- "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_2x.xml.flat",
- "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\layout\\widget_2x.xml"
+ "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_xiaomi1.jpg.flat",
+ "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\xiaomi1.jpg"
},
{
"merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_blue.png.flat",
@@ -123,14 +227,6 @@
"merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_up.9.png.flat",
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png"
},
- {
- "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_green.9.png.flat",
- "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png"
- },
- {
- "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_up.9.png.flat",
- "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png"
- },
{
"merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_down.9.png.flat",
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png"
@@ -139,14 +235,6 @@
"merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_4x_info.xml.flat",
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\xml\\widget_4x_info.xml"
},
- {
- "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_blue.png.flat",
- "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png"
- },
- {
- "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\raw_introduction.flat",
- "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\raw\\introduction"
- },
{
"merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_dropdown.xml.flat",
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_dropdown.xml"
@@ -171,22 +259,6 @@
"merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_red.9.png.flat",
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png"
},
- {
- "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_single.9.png.flat",
- "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png"
- },
- {
- "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\menu_sub_folder.xml.flat",
- "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\menu\\sub_folder.xml"
- },
- {
- "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable_new_note.xml.flat",
- "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable\\new_note.xml"
- },
- {
- "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_folder.9.png.flat",
- "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png"
- },
{
"merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_large.png.flat",
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_large.png"
@@ -199,10 +271,6 @@
"merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_settings_header.xml.flat",
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\layout\\settings_header.xml"
},
- {
- "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_record_folder.xml.flat",
- "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\menu\\call_record_folder.xml"
- },
{
"merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_up.9.png.flat",
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png"
@@ -227,54 +295,26 @@
"merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_up.9.png.flat",
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png"
},
- {
- "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_red.9.png.flat",
- "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png"
- },
{
"merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit.xml.flat",
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit.xml"
},
- {
- "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_single.9.png.flat",
- "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png"
- },
{
"merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_down.9.png.flat",
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png"
},
- {
- "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_middle.9.png.flat",
- "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png"
- },
{
"merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list.xml.flat",
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\layout\\note_list.xml"
},
- {
- "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_down.9.png.flat",
- "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png"
- },
- {
- "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_normal.png.flat",
- "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png"
- },
{
"merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_single.9.png.flat",
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png"
},
- {
- "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_up.9.png.flat",
- "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png"
- },
{
"merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_add_account_text.xml.flat",
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\layout\\add_account_text.xml"
},
- {
- "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_white.png.flat",
- "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png"
- },
{
"merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\xml_preferences.xml.flat",
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\xml\\preferences.xml"
@@ -295,18 +335,10 @@
"merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_move.png.flat",
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png"
},
- {
- "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_middle.9.png.flat",
- "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png"
- },
{
"merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat",
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png"
},
- {
- "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_red.png.flat",
- "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png"
- },
{
"merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_green.png.flat",
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png"
@@ -315,10 +347,6 @@
"merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_down.9.png.flat",
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png"
},
- {
- "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_white.9.png.flat",
- "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png"
- },
{
"merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_notification.png.flat",
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\notification.png"
@@ -331,18 +359,6 @@
"merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_btn_set_color.png.flat",
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png"
},
- {
- "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_dropdown_menu.xml.flat",
- "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml"
- },
- {
- "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat",
- "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png"
- },
- {
- "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_red.png.flat",
- "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png"
- },
{
"merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_account_dialog_title.xml.flat",
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\layout\\account_dialog_title.xml"
@@ -351,10 +367,6 @@
"merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_middle.9.png.flat",
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png"
},
- {
- "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_dropdown_icon.9.png.flat",
- "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png"
- },
{
"merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_white.png.flat",
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png"
@@ -367,10 +379,6 @@
"merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_normal.png.flat",
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png"
},
- {
- "merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_pressed.png.flat",
- "source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png"
- },
{
"merged": "D:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat",
"source": "D:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png"
diff --git a/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex b/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex
index d371ae2..be8353c 100644
Binary files a/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex and b/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex differ
diff --git a/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
index d1ac076..67fd72c 100644
--- a/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
+++ b/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Fri Oct 14 23:33:33 CST 2022
+#Tue Nov 22 17:25:39 CST 2022
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\delete.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_delete.png.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\color\\primary_text_dark.xml=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\color_primary_text_dark.xml.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_delete.png.flat
@@ -6,8 +6,8 @@ D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\layout\\note_lis
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\color\\secondary_text_dark.xml=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\color_secondary_text_dark.xml.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_single.9.png.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit_list_item.xml=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit_list_item.xml.flat
-D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\layout\\account_dialog_title.xml=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_account_dialog_title.xml.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_super.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_super.png.flat
+D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\layout\\account_dialog_title.xml=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_account_dialog_title.xml.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_green.png.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\selected.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_selected.png.flat
@@ -20,13 +20,13 @@ D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\t
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_down.9.png.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_normal.png.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_blue.png.flat
-D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_white.png.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
+D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_white.png.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_middle.9.png.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_down.9.png.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
-D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_small.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
+D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_small.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\layout\\widget_2x.xml=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_2x.xml.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\menu\\call_record_folder.xml=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_record_folder.xml.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_edit_text.xml=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_dialog_edit_text.xml.flat
@@ -49,11 +49,12 @@ D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\layout\\folder_l
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\menu\\call_note_edit.xml=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_note_edit.xml.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_green.png.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_app.png.flat
-D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\layout\\widget_4x.xml=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_4x.xml.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_red.9.png.flat
+D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\layout\\widget_4x.xml=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_4x.xml.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_blue.9.png.flat
-D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_down.9.png.flat
+D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
+D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\xiaomi2.jpg=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_xiaomi2.jpg.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\menu\\note_list.xml=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list.xml.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\raw\\introduction=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\raw_introduction.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\layout\\datetime_picker.xml=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_datetime_picker.xml.flat
@@ -65,28 +66,29 @@ D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\b
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_white.png.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\xml\\widget_4x_info.xml=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_4x_info.xml.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable\\new_note.xml=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable_new_note.xml.flat
-D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\layout\\note_list.xml=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list.xml.flat
+D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_options.xml=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_options.xml.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\notification.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_notification.png.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_white.9.png.flat
+D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\xiaomi1.jpg=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_xiaomi1.jpg.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_background.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_background.png.flat
-D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
-D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\call_record.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_call_record.png.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_up.9.png.flat
-D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_alert.png.flat
+D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\call_record.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_call_record.png.flat
+D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_single.9.png.flat
+D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_alert.png.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_search_result.png.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_red.9.png.flat
-D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_middle.9.png.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
+D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_middle.9.png.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit.xml=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit.xml.flat
-D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\layout\\add_account_text.xml=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_add_account_text.xml.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_up.9.png.flat
-D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_dropdown.xml=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_dropdown.xml.flat
+D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\layout\\add_account_text.xml=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_add_account_text.xml.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\xml\\preferences.xml=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\xml_preferences.xml.flat
-D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_red.png.flat
+D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_dropdown.xml=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_dropdown.xml.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_large.png.flat
+D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_red.png.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_middle.9.png.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_blue.png.flat
D\:\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\xml\\widget_2x_info.xml=D\:\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_2x_info.xml.flat
diff --git a/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
deleted file mode 100644
index d65e0cc..0000000
--- a/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
- - 短信
- - 邮件
-
-
- - %1$s 条符合“%2$s”的搜索结果
-
- 确认删除文件夹及所包含的便签吗?
- 确认要删除该条便签吗?
- 确认要删除所选的 %d 条便签吗?
- 删除
- 便签
- 便签2x2
- 便签4x4
- 删除
- 通话便签
- 取消
- 设置
- 成功删除提醒
- 不能为空便签设置闹钟提醒
- 不能将空便签发送到桌面
- 要查看的便签不存在
- 导出文本时发生错误,请检查SD卡
- SD卡被占用,不能操作
- 同步已取消
- 同步失败,发生内部错误
- 同步失败,请检查网络和帐号设置
- 导出失败
- 文件夹 %1$s 已存在,请重新命名
- yyyyMMdd
- MM月dd日 kk:mm
- 已将文本文件(%1$s)输出至SD卡(%2$s)目录
- 已将所选 %1$d 条便签移到 %2$s 文件夹
- 请输入名称
- 已添加到桌面
- 提醒我
- 新建文件夹
- 删除
- 取消全选
- 导出文本
- 修改文件夹名称
- 刪除文件夹
- 查看文件夹
- 大
- 正常
- 文字大小
- 小
- 超大
- 进入清单模式
- 移动到文件夹
- 上一级文件夹
- 退出清单模式
- 删除提醒
- 搜索
- 全选
- 没有选中项,操作无效
- 选中了 %d 项
- 发送到桌面
- 设置
- 分享
- 同步
- 取消同步
- 选择文件夹
- 已过期
- 发送邮件
- 打开地图
- 呼叫电话
- 浏览网页
- 查看
- 知道了
- 新建便签
- ...
- 与google task同步便签记录
- 同步账号
- 添加账号
- 新建便签背景颜色随机
- 取消同步
- 立即同步
- 当前帐号 %1$s
- 如更换同步帐号,过去的帐号同步信息将被清空,再次切换的同时可能会造成数据重复
- 请选择google帐号,便签将与该帐号的google task内容同步。
- 同步便签
- 上次同步于 %1$s
- 取消
- 更换账号
- 删除账号
- 设置
- 正在同步中,不能修改同步帐号
- 同步帐号已设置为%1$s
- 便签
- 搜索便签
- 正在搜索便签
- 便签中的文字
- 创建提醒
- 导出成功
- 与%1$s同步成功
- 正在获取服务器便签列表...
- 登录%1$s...
- 正在同步本地便签...
- 同步已取消
- 同步失败
- 同步成功
- 同步便签...
- 没有关联内容,点击新建便签。
- 访客模式下,便签内容不可见
-
\ No newline at end of file
diff --git a/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
deleted file mode 100644
index 226b5bc..0000000
--- a/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
- - 短信
- - 郵件
-
-
- - %1$s 條符合”%2$s“的搜尋結果
-
- 確認刪除檔夾及所包含的便簽嗎?
- 确认要删除該條便籤嗎?
- 确认要刪除所選的 %d 條便籤嗎?
- 刪除
- 便簽
- 便簽2x2
- 便簽4x4
- 刪除
- 通話便籤
- 取消
- 設置
- 成功刪除提醒
- 不能爲空便籤設置鬧鐘提醒
- 不能將空便籤發送到桌面
- 要查看的便籤不存在
- 導出TXT時發生錯誤,請檢查SD卡
- SD卡被佔用,不能操作
- 同步已取消
- 同步失敗,發生內部錯誤
- 同步失敗,請檢查網絡和帳號設置
- 導出失敗
- 文件夾 %1$s 已存在,請重新命名
- yyyyMMdd
- MM月dd日 kk:mm
- 已將文本文件(%1$s)導出至SD(%2$s)目錄
- 已將所選 %1$d 便籤移到 %2$s 文件夾
- 請輸入名稱
- 已添加到桌面
- 提醒我
- 新建文件夾
- 刪除
- 取消全選
- 導出文本
- 修改文件夾名稱
- 刪除文件夾
- 查看文件夾
- 大
- 正常
- 文字大小
- 小
- 超大
- 進入清單模式
- 移動到文件夾
- 上一級文件夾
- 退出清單模式
- 刪除提醒
- 搜尋
- 全選
- 沒有選中項,操作無效
- 選中了 %d 項
- 發送到桌面
- 設置
- 分享
- 同步
- 取消同步
- 選擇文件夾
- 已過期
- 發送郵件
- 打開地圖
- 呼叫電話
- 浏覽網頁
- 查看
- 知道了
- 新建便簽
- ...
- 与google task同步便簽記錄
- 同步賬號
- 添加賬號
- 新建便籤背景顏色隨機
- 取消同步
- 立即同步
- 當前帳號 %1$s
- 如更換同步帳號,過去的帳號同步信息將被清空,再次切換的同時可能會造成數據重復
- 請選擇google帳號,便簽將與該帳號的google task內容同步。
- 同步便簽
- 上次同步于 %1$s
- 取消
- 更換賬號
- 刪除賬號
- 設置
- 正在同步中,不能修改同步帳號
- 同步帳號已設置為%1$s
- 便籤
- 搜索便籤
- 正在搜索便籤
- 便籤中的文字
- 創建提醒
- 導出成功
- 與%1$s同步成功
- 正在獲取服務器便籤列表...
- 登陸%1$s...
- 正在同步本地便籤...
- 同步已取消
- 同步失敗
- 同步成功
- 同步便簽...
- 沒有關聯內容,點擊新建便簽。
- 訪客模式下,便籤內容不可見
-
\ No newline at end of file
diff --git a/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml b/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml
index dfa7135..511059c 100644
--- a/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml
+++ b/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml
@@ -1,10 +1,10 @@
- - -%s
- - --%s
- - --%s
- - --%s
+ - -%s
+ - --%s
+ - --%s
+ - --%s
- Messaging
@@ -42,18 +42,19 @@
Sync failed, internal error occurs
Sync failed, please check network and account settings
Export fail
- notes_%s.txt
- /MIUI/notes/
+ notes_%s.txt
+ /MIUI/notes/
The folder %1$s exist, please rename
yyyyMMdd
MMMd kk:mm
Export text file (%1$s) to SD (%2$s) directory
- (%d)
+ (%d)
Have moved selected %1$d notes to %2$s folder
Input name
Note added to home
Remind me
New Folder
+ Background:day
Delete
Deselect all
Export text
@@ -68,6 +69,7 @@
Enter check list
Move to folder
Parent folder
+ Background:night
Leave check list
Delete reminder
Search
@@ -100,7 +102,7 @@
Please select a google account. Local notes will be synced with google task.
Sync notes
Last sync time %1$s
- yyyy-MM-dd hh:mm:ss
+ yyyy-MM-dd hh:mm:ss
Cancel
Change sync account
Remove sync account
diff --git a/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/app/build/intermediates/incremental/mergeDebugResources/merger.xml
index c092d95..e332992 100644
--- a/app/build/intermediates/incremental/mergeDebugResources/merger.xml
+++ b/app/build/intermediates/incremental/mergeDebugResources/merger.xml
@@ -7,11 +7,11 @@
- Messaging
- Email
- #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode,can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel
+ #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode,can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel
- %1$s result for \"%2$s\"
- %1$s results for \"%2$s\"
-