diff --git a/README.md b/README.md
index f220621..5bc682d 100644
--- a/README.md
+++ b/README.md
@@ -13,11 +13,12 @@
 - 2023/5/26 久违的更新了readme文件
 - 2023/5/26 完成了回收站的雏形
 - 2023/6/04 完成回收站所有功能
+- 2023/6/05 完成背景切换所有功能
 
 ## TODO
 - [x] 回收站
 - [ ] BUG修复
-- [ ] 背景切换
+- [x] 背景切换
 - [ ] 代码质量分析报告
 - [ ] 需求与设计方案
 - [ ] 汇报PPT
\ No newline at end of file
diff --git a/src/.gradle/7.5/executionHistory/executionHistory.bin b/src/.gradle/7.5/executionHistory/executionHistory.bin
index 7b877e0..4755651 100644
Binary files a/src/.gradle/7.5/executionHistory/executionHistory.bin and b/src/.gradle/7.5/executionHistory/executionHistory.bin differ
diff --git a/src/.gradle/7.5/executionHistory/executionHistory.lock b/src/.gradle/7.5/executionHistory/executionHistory.lock
index e26231e..03fd383 100644
Binary files a/src/.gradle/7.5/executionHistory/executionHistory.lock and b/src/.gradle/7.5/executionHistory/executionHistory.lock differ
diff --git a/src/.gradle/7.5/fileHashes/fileHashes.bin b/src/.gradle/7.5/fileHashes/fileHashes.bin
index 0304a5b..0dd2a93 100644
Binary files a/src/.gradle/7.5/fileHashes/fileHashes.bin and b/src/.gradle/7.5/fileHashes/fileHashes.bin differ
diff --git a/src/.gradle/7.5/fileHashes/fileHashes.lock b/src/.gradle/7.5/fileHashes/fileHashes.lock
index e9c2e24..15fdd9f 100644
Binary files a/src/.gradle/7.5/fileHashes/fileHashes.lock and b/src/.gradle/7.5/fileHashes/fileHashes.lock differ
diff --git a/src/.gradle/7.5/fileHashes/resourceHashesCache.bin b/src/.gradle/7.5/fileHashes/resourceHashesCache.bin
index 117066d..e476a58 100644
Binary files a/src/.gradle/7.5/fileHashes/resourceHashesCache.bin and b/src/.gradle/7.5/fileHashes/resourceHashesCache.bin differ
diff --git a/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index f37dc89..1c9d5cc 100644
Binary files a/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/src/.gradle/file-system.probe b/src/.gradle/file-system.probe
index 40fc029..ee8d250 100644
Binary files a/src/.gradle/file-system.probe and b/src/.gradle/file-system.probe differ
diff --git a/src/app/build/intermediates/apk/debug/app-debug.apk b/src/app/build/intermediates/apk/debug/app-debug.apk
index bf95074..2e0d454 100644
Binary files a/src/app/build/intermediates/apk/debug/app-debug.apk and b/src/app/build/intermediates/apk/debug/app-debug.apk differ
diff --git a/src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
index 9d0d56a..64d57a9 100644
Binary files a/src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ
diff --git a/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
index 48065f7..3c77966 100644
Binary files a/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ
diff --git a/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
index 1cefbd3..858fdee 100644
Binary files a/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ
diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
index b7a208c..855d0bf 100644
--- a/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
+++ b/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Mon Jun 05 21:39:15 CST 2023
+#Tue Jun 06 12:10:41 CST 2023
 net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
@@ -10,6 +10,7 @@ net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=E\:\\Homework\\Softw
 net.micode.notes.app-main-7\:/layout/widget_4x.xml=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/add_bg.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_add_bg.png.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
new file mode 100644
index 0000000..68abc74
--- /dev/null
+++ b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
+    <string-array name="menu_share_ways">
+        <item>短信</item>
+        <item>邮件</item>
+    </string-array>
+    <plurals name="search_results_title">
+        <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 条符合“<ns1:g id="SEARCH">%2$s</ns1:g>”的搜索结果</item>
+    </plurals>
+    <string name="alert_message_delete_folder">确认删除文件夹及所包含的便签吗？</string>
+    <string name="alert_message_delete_note">确认要删除该条便签吗?</string>
+    <string name="alert_message_delete_notes">确认要删除所选的 %d 条便签吗?</string>
+    <string name="alert_message_realdelete">确认要永久删除所选的便签吗?</string>
+    <string name="alert_message_recover">确认要还原所选的便签吗?</string>
+    <string name="alert_title_delete">删除</string>
+    <string name="app_name">便签</string>
+    <string name="app_widget2x2">便签2x2</string>
+    <string name="app_widget4x4">便签4x4</string>
+    <string name="background_description">这是一个背景</string>
+    <string name="button_delete">删除</string>
+    <string name="call_record_folder_name">通话便签</string>
+    <string name="change_bg">背景切换</string>
+    <string name="datetime_dialog_cancel">取消</string>
+    <string name="datetime_dialog_ok">设置</string>
+    <string name="delete_remind_time_message">成功删除提醒</string>
+    <string name="error_delete_or_recover">没有选中任何项目!</string>
+    <string name="error_note_empty_for_clock">不能为空便签设置闹钟提醒</string>
+    <string name="error_note_empty_for_send_to_desktop">不能将空便签发送到桌面</string>
+    <string name="error_note_not_exist">要查看的便签不存在</string>
+    <string name="error_sdcard_export">导出文本时发生错误，请检查SD卡</string>
+    <string name="error_sdcard_unmounted">SD卡被占用，不能操作</string>
+    <string name="error_sync_cancelled">同步已取消</string>
+    <string name="error_sync_internal">同步失败，发生内部错误</string>
+    <string name="error_sync_network">同步失败，请检查网络和帐号设置</string>
+    <string name="failed_sdcard_export">导出失败</string>
+    <string name="folder_exist">文件夹 %1$s 已存在，请重新命名</string>
+    <string name="format_date_ymd">yyyyMMdd</string>
+    <string name="format_datetime_mdhm">MM月dd日 kk:mm</string>
+    <string name="format_exported_file_location">已将文本文件(%1$s)输出至SD卡(%2$s)目录</string>
+    <string name="format_move_notes_to_folder">已将所选 %1$d 条便签移到 %2$s 文件夹</string>
+    <string name="hint_foler_name">请输入名称</string>
+    <string name="info_note_enter_desktop">已添加到桌面</string>
+    <string name="menu_alert">提醒我</string>
+    <string name="menu_create_folder">新建文件夹</string>
+    <string name="menu_delete">删除</string>
+    <string name="menu_deselect_all">取消全选</string>
+    <string name="menu_export_text">导出文本</string>
+    <string name="menu_folder_change_name">修改文件夹名称</string>
+    <string name="menu_folder_delete">刪除文件夹</string>
+    <string name="menu_folder_view">查看文件夹</string>
+    <string name="menu_font_large">大</string>
+    <string name="menu_font_normal">正常</string>
+    <string name="menu_font_size">文字大小</string>
+    <string name="menu_font_small">小</string>
+    <string name="menu_font_super">超大</string>
+    <string name="menu_list_mode">进入清单模式</string>
+    <string name="menu_move">移动到文件夹</string>
+    <string name="menu_move_parent_folder">上一级文件夹</string>
+    <string name="menu_normal_mode">退出清单模式</string>
+    <string name="menu_remove_remind">删除提醒</string>
+    <string name="menu_search">搜索</string>
+    <string name="menu_select_all">全选</string>
+    <string name="menu_select_none">没有选中项，操作无效</string>
+    <string name="menu_select_title">选中了 %d 项</string>
+    <string name="menu_send_to_desktop">发送到桌面</string>
+    <string name="menu_setting">设置</string>
+    <string name="menu_share">分享</string>
+    <string name="menu_sync">同步</string>
+    <string name="menu_sync_cancel">取消同步</string>
+    <string name="menu_title_select_folder">选择文件夹</string>
+    <string name="note_alert_expired">已过期</string>
+    <string name="note_link_email">发送邮件</string>
+    <string name="note_link_other">打开地图</string>
+    <string name="note_link_tel">呼叫电话</string>
+    <string name="note_link_web">浏览网页</string>
+    <string name="notealert_enter">查看</string>
+    <string name="notealert_ok">知道了</string>
+    <string name="notelist_menu_new">新建便签</string>
+    <string name="notelist_string_info">...</string>
+    <string name="preferences_account_summary">与google task同步便签记录</string>
+    <string name="preferences_account_title">同步账号</string>
+    <string name="preferences_add_account">添加账号</string>
+    <string name="preferences_bg_random_appear_title">新建便签背景颜色随机</string>
+    <string name="preferences_button_sync_cancel">取消同步</string>
+    <string name="preferences_button_sync_immediately">立即同步</string>
+    <string name="preferences_dialog_change_account_title">当前帐号 %1$s</string>
+    <string name="preferences_dialog_change_account_warn_msg">如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复</string>
+    <string name="preferences_dialog_select_account_tips">请选择google帐号，便签将与该帐号的google task内容同步。</string>
+    <string name="preferences_dialog_select_account_title">同步便签</string>
+    <string name="preferences_last_sync_time">上次同步于 %1$s</string>
+    <string name="preferences_menu_cancel">取消</string>
+    <string name="preferences_menu_change_account">更换账号</string>
+    <string name="preferences_menu_remove_account">删除账号</string>
+    <string name="preferences_title">设置</string>
+    <string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帐号</string>
+    <string name="preferences_toast_success_set_accout">同步帐号已设置为%1$s</string>
+    <string name="realdelete">永久删除</string>
+    <string name="recover">恢复便签</string>
+    <string name="recyclebin">回收站</string>
+    <string name="reset_bg">恢复预设</string>
+    <string name="search">便签</string>
+    <string name="search_hint">搜索便签</string>
+    <string name="search_label">正在搜索便签</string>
+    <string name="search_setting_description">便签中的文字</string>
+    <string name="set_remind_time_message">创建提醒</string>
+    <string name="success_sdcard_export">导出成功</string>
+    <string name="success_sync_account">与%1$s同步成功</string>
+    <string name="switch_bg">切换背景</string>
+    <string name="sync_progress_init_list">正在获取服务器便签列表...</string>
+    <string name="sync_progress_login">登录%1$s...</string>
+    <string name="sync_progress_syncing">正在同步本地便签...</string>
+    <string name="ticker_cancel">同步已取消</string>
+    <string name="ticker_fail">同步失败</string>
+    <string name="ticker_success">同步成功</string>
+    <string name="ticker_syncing">同步便签...</string>
+    <string name="widget_havenot_content">没有关联内容，点击新建便签。</string>
+    <string name="widget_under_visit_mode">访客模式下，便签内容不可见</string>
+</resources>
\ No newline at end of file
diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
new file mode 100644
index 0000000..48f712d
--- /dev/null
+++ b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
+    <string-array name="menu_share_ways">
+        <item>短信</item>
+        <item>郵件</item>
+    </string-array>
+    <plurals name="search_results_title">
+        <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 條符合”<ns1:g id="SEARCH">%2$s</ns1:g>“的搜尋結果</item>
+    </plurals>
+    <string name="alert_message_delete_folder">確認刪除檔夾及所包含的便簽嗎？</string>
+    <string name="alert_message_delete_note">确认要删除該條便籤嗎?</string>
+    <string name="alert_message_delete_notes">确认要刪除所選的 %d 條便籤嗎?</string>
+    <string name="alert_message_realdelete">確認要永久刪除所選的便簽嗎?</string>
+    <string name="alert_message_recover">確認要還原所選的便簽嗎?</string>
+    <string name="alert_title_delete">刪除</string>
+    <string name="app_name">便簽</string>
+    <string name="app_widget2x2">便簽2x2</string>
+    <string name="app_widget4x4">便簽4x4</string>
+    <string name="background_description">這是一個背景</string>
+    <string name="button_delete">刪除</string>
+    <string name="call_record_folder_name">通話便籤</string>
+    <string name="change_bg">背景切換</string>
+    <string name="datetime_dialog_cancel">取消</string>
+    <string name="datetime_dialog_ok">設置</string>
+    <string name="delete_remind_time_message">成功刪除提醒</string>
+    <string name="error_delete_or_recover">沒有選中任何項目!</string>
+    <string name="error_note_empty_for_clock">不能爲空便籤設置鬧鐘提醒</string>
+    <string name="error_note_empty_for_send_to_desktop">不能將空便籤發送到桌面</string>
+    <string name="error_note_not_exist">要查看的便籤不存在</string>
+    <string name="error_sdcard_export">導出TXT時發生錯誤，請檢查SD卡</string>
+    <string name="error_sdcard_unmounted">SD卡被佔用，不能操作</string>
+    <string name="error_sync_cancelled">同步已取消</string>
+    <string name="error_sync_internal">同步失敗，發生內部錯誤</string>
+    <string name="error_sync_network">同步失敗，請檢查網絡和帳號設置</string>
+    <string name="failed_sdcard_export">導出失敗</string>
+    <string name="folder_exist">文件夾 %1$s 已存在，請重新命名</string>
+    <string name="format_date_ymd">yyyyMMdd</string>
+    <string name="format_datetime_mdhm">MM月dd日 kk:mm</string>
+    <string name="format_exported_file_location">已將文本文件(%1$s)導出至SD(%2$s)目錄</string>
+    <string name="format_move_notes_to_folder">已將所選 %1$d 便籤移到 %2$s 文件夾</string>
+    <string name="hint_foler_name">請輸入名稱</string>
+    <string name="info_note_enter_desktop">已添加到桌面</string>
+    <string name="menu_alert">提醒我</string>
+    <string name="menu_create_folder">新建文件夾</string>
+    <string name="menu_delete">刪除</string>
+    <string name="menu_deselect_all">取消全選</string>
+    <string name="menu_export_text">導出文本</string>
+    <string name="menu_folder_change_name">修改文件夾名稱</string>
+    <string name="menu_folder_delete">刪除文件夾</string>
+    <string name="menu_folder_view">查看文件夾</string>
+    <string name="menu_font_large">大</string>
+    <string name="menu_font_normal">正常</string>
+    <string name="menu_font_size">文字大小</string>
+    <string name="menu_font_small">小</string>
+    <string name="menu_font_super">超大</string>
+    <string name="menu_list_mode">進入清單模式</string>
+    <string name="menu_move">移動到文件夾</string>
+    <string name="menu_move_parent_folder">上一級文件夾</string>
+    <string name="menu_normal_mode">退出清單模式</string>
+    <string name="menu_remove_remind">刪除提醒</string>
+    <string name="menu_search">搜尋</string>
+    <string name="menu_select_all">全選</string>
+    <string name="menu_select_none">沒有選中項，操作無效</string>
+    <string name="menu_select_title">選中了 %d 項</string>
+    <string name="menu_send_to_desktop">發送到桌面</string>
+    <string name="menu_setting">設置</string>
+    <string name="menu_share">分享</string>
+    <string name="menu_sync">同步</string>
+    <string name="menu_sync_cancel">取消同步</string>
+    <string name="menu_title_select_folder">選擇文件夾</string>
+    <string name="note_alert_expired">已過期</string>
+    <string name="note_link_email">發送郵件</string>
+    <string name="note_link_other">打開地圖</string>
+    <string name="note_link_tel">呼叫電話</string>
+    <string name="note_link_web">浏覽網頁</string>
+    <string name="notealert_enter">查看</string>
+    <string name="notealert_ok">知道了</string>
+    <string name="notelist_menu_new">新建便簽</string>
+    <string name="notelist_string_info">...</string>
+    <string name="preferences_account_summary">与google task同步便簽記錄</string>
+    <string name="preferences_account_title">同步賬號</string>
+    <string name="preferences_add_account">添加賬號</string>
+    <string name="preferences_bg_random_appear_title">新建便籤背景顏色隨機</string>
+    <string name="preferences_button_sync_cancel">取消同步</string>
+    <string name="preferences_button_sync_immediately">立即同步</string>
+    <string name="preferences_dialog_change_account_title">當前帳號 %1$s</string>
+    <string name="preferences_dialog_change_account_warn_msg">如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復</string>
+    <string name="preferences_dialog_select_account_tips">請選擇google帳號，便簽將與該帳號的google task內容同步。</string>
+    <string name="preferences_dialog_select_account_title">同步便簽</string>
+    <string name="preferences_last_sync_time">上次同步于 %1$s</string>
+    <string name="preferences_menu_cancel">取消</string>
+    <string name="preferences_menu_change_account">更換賬號</string>
+    <string name="preferences_menu_remove_account">刪除賬號</string>
+    <string name="preferences_title">設置</string>
+    <string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帳號</string>
+    <string name="preferences_toast_success_set_accout">同步帳號已設置為%1$s</string>
+    <string name="realdelete">永久刪除</string>
+    <string name="recover">恢復便簽</string>
+    <string name="recyclebin">回收站</string>
+    <string name="reset_bg">恢復預設</string>
+    <string name="search">便籤</string>
+    <string name="search_hint">搜索便籤</string>
+    <string name="search_label">正在搜索便籤</string>
+    <string name="search_setting_description">便籤中的文字</string>
+    <string name="set_remind_time_message">創建提醒</string>
+    <string name="success_sdcard_export">導出成功</string>
+    <string name="success_sync_account">與%1$s同步成功</string>
+    <string name="switch_bg">切換背景</string>
+    <string name="sync_progress_init_list">正在獲取服務器便籤列表...</string>
+    <string name="sync_progress_login">登陸%1$s...</string>
+    <string name="sync_progress_syncing">正在同步本地便籤...</string>
+    <string name="ticker_cancel">同步已取消</string>
+    <string name="ticker_fail">同步失敗</string>
+    <string name="ticker_success">同步成功</string>
+    <string name="ticker_syncing">同步便簽...</string>
+    <string name="widget_havenot_content">沒有關聯內容，點擊新建便簽。</string>
+    <string name="widget_under_visit_mode">訪客模式下，便籤內容不可見</string>
+</resources>
\ No newline at end of file
diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
new file mode 100644
index 0000000..0fd31fa
--- /dev/null
+++ b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
+    <string-array name="format_for_exported_note">
+        <item>-%s</item>      
+        <item>--%s</item>     
+        <item>--%s</item>     
+        <item>--%s</item>     
+    </string-array>
+    <string-array name="menu_share_ways">
+        <item>Messaging</item>
+        <item>Email</item>
+    </string-array>
+    <color name="user_query_highlight">#335b5b5b</color>
+    <dimen name="text_font_size_large">26sp</dimen>
+    <dimen name="text_font_size_medium">20sp</dimen>
+    <dimen name="text_font_size_normal">17sp</dimen>
+    <dimen name="text_font_size_small">14sp</dimen>
+    <dimen name="text_font_size_super">33sp</dimen>
+    <plurals name="search_results_title">
+         <item quantity="one"><ns1:g example="1" id="number">%1$s</ns1:g> result for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
+        
+        <item quantity="other"><ns1:g example="15" id="number">%1$s</ns1:g> results for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
+    </plurals>
+    <string name="alert_message_delete_folder">Confirm to delete folder and its notes?</string>
+    <string name="alert_message_delete_note">Confirm to delete this note?</string>
+    <string name="alert_message_delete_notes">Confirm to delete the selected %d notes?</string>
+    <string name="alert_message_realdelete">confirm to delete?</string>
+    <string name="alert_message_recover">confirm to recover?</string>
+    <string name="alert_title_delete">Delete selected notes</string>
+    <string name="app_name">Notes</string>
+    <string name="app_widget2x2">Notes 2x2</string>
+    <string name="app_widget4x4">Notes 4x4</string>
+    <string name="background_description">This is a background</string>
+    <string name="button_delete">Delete</string>
+    <string name="call_record_folder_name">Call notes</string>
+    <string name="change_bg">SwithBackground</string>
+    <string name="datetime_dialog_cancel">cancel</string>
+    <string name="datetime_dialog_ok">set</string>
+    <string name="delete_remind_time_message">Delete reminder successfully</string>
+    <string name="error_delete_or_recover">Nothing selected!</string>
+    <string name="error_note_empty_for_clock">Sorry, can not set clock on empty note</string>
+    <string name="error_note_empty_for_send_to_desktop">Sorry, can not send and empty note to home</string>
+    <string name="error_note_not_exist">The note is not exist</string>
+    <string name="error_sdcard_export">Export failed, please check SD card</string>
+    <string name="error_sdcard_unmounted">SD card busy, not available now</string>
+    <string name="error_sync_cancelled">Sync is canceled</string>
+    <string name="error_sync_internal">Sync failed, internal error occurs</string>
+    <string name="error_sync_network">Sync failed, please check network and account settings</string>
+    <string name="failed_sdcard_export">Export fail</string>
+    <string name="file_name_txt_format">notes_%s.txt</string>
+    <string name="file_path">/MIUI/notes/</string>
+    <string name="folder_exist">The folder %1$s exist, please rename</string>
+    <string name="format_date_ymd">yyyyMMdd</string>
+    <string name="format_datetime_mdhm">MMMd kk:mm</string>
+    <string name="format_exported_file_location">Export text file (%1$s) to SD (%2$s) directory</string>
+    <string name="format_folder_files_count">(%d)</string>
+    <string name="format_move_notes_to_folder">Have moved selected %1$d notes to %2$s folder</string>
+    <string name="hint_foler_name">Input name</string>
+    <string name="info_note_enter_desktop">Note added to home</string>
+    <string name="menu_alert">Remind me</string>
+    <string name="menu_create_folder">New Folder</string>
+    <string name="menu_delete">Delete</string>
+    <string name="menu_deselect_all">Deselect all</string>
+    <string name="menu_export_text">Export text</string>
+    <string name="menu_folder_change_name">Change folder name</string>
+    <string name="menu_folder_delete">Delete folder</string>
+    <string name="menu_folder_view">View folder</string>
+    <string name="menu_font_large">Large</string>
+    <string name="menu_font_normal">Medium</string>
+    <string name="menu_font_size">Font size</string>
+    <string name="menu_font_small">Small</string>
+    <string name="menu_font_super">Super</string>
+    <string name="menu_list_mode">Enter check list</string>
+    <string name="menu_move">Move to folder</string>
+    <string name="menu_move_parent_folder">Parent folder</string>
+    <string name="menu_normal_mode">Leave check list</string>
+    <string name="menu_remove_remind">Delete reminder</string>
+    <string name="menu_search">Search</string>
+    <string name="menu_select_all">Select all</string>
+    <string name="menu_select_none">Nothing selected, the operation is invalid</string>
+    <string name="menu_select_title">%d selected</string>
+    <string name="menu_send_to_desktop">Send to home</string>
+    <string name="menu_setting">Settings</string>
+    <string name="menu_share">Share</string>
+    <string name="menu_sync">Sync</string>
+    <string name="menu_sync_cancel">Cancel syncing</string>
+    <string name="menu_title_select_folder">Select folder</string>
+    <string name="note_alert_expired">Expired</string>
+    <string name="note_link_email">Send email</string>
+    <string name="note_link_other">Open map</string>
+    <string name="note_link_tel">Call</string>
+    <string name="note_link_web">Browse web</string>
+    <string name="notealert_enter">Take a look</string>
+    <string name="notealert_ok">Got it</string>
+    <string name="notelist_menu_new">Add note</string>
+    <string name="notelist_string_info">...</string>
+    <string name="preferences_account_summary">Sync notes with google task</string>
+    <string name="preferences_account_title">Sync account</string>
+    <string name="preferences_add_account">Add account</string>
+    <string name="preferences_bg_random_appear_title">New note background color random</string>
+    <string name="preferences_button_sync_cancel">Cancel syncing</string>
+    <string name="preferences_button_sync_immediately">Sync immediately</string>
+    <string name="preferences_dialog_change_account_title">Current account %1$s</string>
+    <string name="preferences_dialog_change_account_warn_msg">All sync related information will be deleted, which may result in duplicated items sometime</string>
+    <string name="preferences_dialog_select_account_tips">Please select a google account. Local notes will be synced with google task.</string>
+    <string name="preferences_dialog_select_account_title">Sync notes</string>
+    <string name="preferences_last_sync_time">Last sync time %1$s</string>
+    <string name="preferences_last_sync_time_format">yyyy-MM-dd hh:mm:ss</string>
+    <string name="preferences_menu_cancel">Cancel</string>
+    <string name="preferences_menu_change_account">Change sync account</string>
+    <string name="preferences_menu_remove_account">Remove sync account</string>
+    <string name="preferences_title">Settings</string>
+    <string name="preferences_toast_cannot_change_account">Cannot change the account because sync is in progress</string>
+    <string name="preferences_toast_success_set_accout">%1$s has been set as the sync account</string>
+    <string name="realdelete">realdelete</string>
+    <string name="recover">recover</string>
+    <string name="recyclebin">Recycle Bin</string>
+    <string name="reset_bg">reset</string>
+    <string name="search">Notes</string>
+    <string name="search_hint">Search notes</string>
+    <string name="search_label">Searching Notes</string>
+    <string name="search_setting_description">Text in your notes</string>
+    <string name="set_remind_time_message">Set reminder</string>
+    <string name="success_sdcard_export">Export successful</string>
+    <string name="success_sync_account">Sync is successful with account %1$s</string>
+    <string name="switch_bg">Switch Background</string>
+    <string name="sync_progress_init_list">Getting remote note list...</string>
+    <string name="sync_progress_login">Logging into %1$s...</string>
+    <string name="sync_progress_syncing">Synchronize local notes with Google Task...</string>
+    <string name="ticker_cancel">Sync is canceled</string>
+    <string name="ticker_fail">Sync is failed</string>
+    <string name="ticker_success">Sync is successful</string>
+    <string name="ticker_syncing">Syncing notes...</string>
+    <string name="widget_havenot_content">No associated note found, click to create associated note.</string>
+    <string name="widget_under_visit_mode">Privacy mode，can not see note content</string>
+    <style name="HighlightTextAppearancePrimary">
+    <item name="android:textSize">@dimen/text_font_size_normal</item>
+        <item name="android:textColor">@color/primary_text_dark</item>
+    </style>
+    <style name="HighlightTextAppearanceSecondary">
+        <item name="android:textSize">@dimen/text_font_size_small</item>
+        <item name="android:textColor">@color/secondary_text_dark</item>
+    </style>
+    <style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
+
+        <item name="android:visibility">visible</item>
+    </style>
+    <style name="NoteTheme" parent="@android:style/Theme.Holo.Light">
+        <item name="android:actionBarStyle">@style/NoteActionBarStyle</item>
+    </style>
+    <style name="TextAppearanceLarge">
+        <item name="android:textSize">@dimen/text_font_size_large</item>
+        <item name="android:textColorLink">#0000ff</item>
+    </style>
+    <style name="TextAppearanceMedium">
+        <item name="android:textSize">@dimen/text_font_size_medium</item>
+        <item name="android:textColorLink">#0000ff</item>
+    </style>
+    <style name="TextAppearanceNormal">
+        <item name="android:textSize">@dimen/text_font_size_normal</item>
+        <item name="android:textColorLink">#0000ff</item>
+    </style>
+    <style name="TextAppearancePrimaryItem">
+        <item name="android:textSize">@dimen/text_font_size_normal</item>
+        <item name="android:textColor">@color/primary_text_dark</item>
+    </style>
+    <style name="TextAppearanceSecondaryItem">
+        <item name="android:textSize">@dimen/text_font_size_small</item>
+        <item name="android:textColor">@color/secondary_text_dark</item>
+    </style>
+    <style name="TextAppearanceSuper">
+        <item name="android:textSize">@dimen/text_font_size_super</item>
+        <item name="android:textColorLink">#0000ff</item>
+    </style>
+    <style name="TextAppearanceUnderMenuIcon">
+        <item name="android:textSize">@dimen/text_font_size_normal</item>
+        <item name="android:textColor">@android:color/black</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
index 5983f07..7cb5912 100644
--- a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
+++ b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
@@ -11,7 +11,7 @@
          <item quantity="one"><ns1:g example="1" id="number">%1$s</ns1:g> result for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
         
         <item quantity="other"><ns1:g example="15" id="number">%1$s</ns1:g> results for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
-    </plurals><string name="change_bg">SwithBackground</string><string name="reset_bg">reset</string><string name="background_description">This is a background</string><string name="switch_bg">Switch Background</string></file><file path="E:\Homework\SoftwareProject\TeamProject\src\app\src\main\res\values\styles.xml" qualifiers=""><style name="TextAppearanceSuper">
+    </plurals><string name="change_bg">SwithBackground</string><string name="reset_bg">reset</string><string name="background_description">This is a background</string><string name="switch_bg">Switch Background</string><string name="error_delete_or_recover">Nothing selected!</string></file><file path="E:\Homework\SoftwareProject\TeamProject\src\app\src\main\res\values\styles.xml" qualifiers=""><style name="TextAppearanceSuper">
         <item name="android:textSize">@dimen/text_font_size_super</item>
         <item name="android:textColorLink">#0000ff</item>
     </style><style name="TextAppearanceLarge">
@@ -48,9 +48,9 @@
         <item>邮件</item>
     </string-array></file><file path="E:\Homework\SoftwareProject\TeamProject\src\app\src\main\res\values-zh-rCN\strings.xml" qualifiers="zh-rCN"><string name="app_name">便签</string><string name="app_widget2x2">便签2x2</string><string name="app_widget4x4">便签4x4</string><string name="widget_havenot_content">没有关联内容，点击新建便签。</string><string name="widget_under_visit_mode">访客模式下，便签内容不可见</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">新建便签</string><string name="delete_remind_time_message">成功删除提醒</string><string name="set_remind_time_message">创建提醒</string><string name="note_alert_expired">已过期</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MM月dd日 kk:mm</string><string name="notealert_ok">知道了</string><string name="notealert_enter">查看</string><string name="note_link_tel">呼叫电话</string><string name="note_link_email">发送邮件</string><string name="note_link_web">浏览网页</string><string name="note_link_other">打开地图</string><string name="menu_create_folder">新建文件夹</string><string name="menu_export_text">导出文本</string><string name="menu_sync">同步</string><string name="menu_sync_cancel">取消同步</string><string name="menu_setting">设置</string><string name="menu_search">搜索</string><string name="menu_delete">删除</string><string name="menu_move">移动到文件夹</string><string name="menu_select_title">选中了 %d 项</string><string name="menu_select_none">没有选中项，操作无效</string><string name="menu_select_all">全选</string><string name="menu_deselect_all">取消全选</string><string name="menu_font_size">文字大小</string><string name="menu_font_small">小</string><string name="menu_font_normal">正常</string><string name="menu_font_large">大</string><string name="menu_font_super">超大</string><string name="menu_list_mode">进入清单模式</string><string name="menu_normal_mode">退出清单模式</string><string name="menu_folder_view">查看文件夹</string><string name="menu_folder_delete">刪除文件夹</string><string name="menu_folder_change_name">修改文件夹名称</string><string name="folder_exist">文件夹 %1$s 已存在，请重新命名</string><string name="menu_share">分享</string><string name="menu_send_to_desktop">发送到桌面</string><string name="menu_alert">提醒我</string><string name="menu_remove_remind">删除提醒</string><string name="menu_title_select_folder">选择文件夹</string><string name="menu_move_parent_folder">上一级文件夹</string><string name="info_note_enter_desktop">已添加到桌面</string><string name="alert_title_delete">删除</string><string name="alert_message_delete_notes">确认要删除所选的 %d 条便签吗?</string><string name="alert_message_delete_note">确认要删除该条便签吗?</string><string name="alert_message_delete_folder">确认删除文件夹及所包含的便签吗？</string><string name="format_move_notes_to_folder">已将所选 %1$d 条便签移到 %2$s 文件夹</string><string name="error_sdcard_unmounted">SD卡被占用，不能操作</string><string name="error_sdcard_export">导出文本时发生错误，请检查SD卡</string><string name="error_note_not_exist">要查看的便签不存在</string><string name="error_note_empty_for_clock">不能为空便签设置闹钟提醒</string><string name="error_note_empty_for_send_to_desktop">不能将空便签发送到桌面</string><string name="success_sdcard_export">导出成功</string><string name="failed_sdcard_export">导出失败</string><string name="format_exported_file_location">已将文本文件(%1$s)输出至SD卡(%2$s)目录</string><string name="ticker_syncing">同步便签...</string><string name="ticker_success">同步成功</string><string name="ticker_fail">同步失败</string><string name="ticker_cancel">同步已取消</string><string name="success_sync_account">与%1$s同步成功</string><string name="error_sync_network">同步失败，请检查网络和帐号设置</string><string name="error_sync_internal">同步失败，发生内部错误</string><string name="error_sync_cancelled">同步已取消</string><string name="sync_progress_login">登录%1$s...</string><string name="sync_progress_init_list">正在获取服务器便签列表...</string><string name="sync_progress_syncing">正在同步本地便签...</string><string name="preferences_title">设置</string><string name="preferences_account_title">同步账号</string><string name="preferences_account_summary">与google task同步便签记录</string><string name="preferences_last_sync_time">上次同步于 %1$s</string><string name="preferences_add_account">添加账号</string><string name="preferences_menu_change_account">更换账号</string><string name="preferences_menu_remove_account">删除账号</string><string name="preferences_menu_cancel">取消</string><string name="preferences_button_sync_immediately">立即同步</string><string name="preferences_button_sync_cancel">取消同步</string><string name="preferences_dialog_change_account_title">当前帐号 %1$s</string><string name="preferences_dialog_change_account_warn_msg">如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复</string><string name="preferences_dialog_select_account_title">同步便签</string><string name="preferences_dialog_select_account_tips">请选择google帐号，便签将与该帐号的google task内容同步。</string><string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帐号</string><string name="preferences_toast_success_set_accout">同步帐号已设置为%1$s</string><string name="preferences_bg_random_appear_title">新建便签背景颜色随机</string><string name="button_delete">删除</string><string name="call_record_folder_name">通话便签</string><string name="hint_foler_name">请输入名称</string><string name="search_label">正在搜索便签</string><string name="search_hint">搜索便签</string><string name="search_setting_description">便签中的文字</string><string name="search">便签</string><string name="datetime_dialog_ok">设置</string><string name="datetime_dialog_cancel">取消</string><plurals name="search_results_title">
         <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 条符合“<ns1:g id="SEARCH">%2$s</ns1:g>”的搜索结果</item>
-    </plurals><string name="recover">恢复便签</string><string name="realdelete">永久删除</string><string name="recyclebin">回收站</string><string name="alert_message_recover">确认要还原所选的便签吗?</string><string name="alert_message_realdelete">确认要永久删除所选的便签吗?</string><string name="change_bg">背景切换</string><string name="reset_bg">恢复预设</string><string name="background_description">这是一个背景</string><string name="switch_bg">切换背景</string></file><file path="E:\Homework\SoftwareProject\TeamProject\src\app\src\main\res\values-zh-rTW\arrays.xml" qualifiers="zh-rTW"><string-array name="menu_share_ways">
+    </plurals><string name="recover">恢复便签</string><string name="realdelete">永久删除</string><string name="recyclebin">回收站</string><string name="alert_message_recover">确认要还原所选的便签吗?</string><string name="alert_message_realdelete">确认要永久删除所选的便签吗?</string><string name="change_bg">背景切换</string><string name="reset_bg">恢复预设</string><string name="background_description">这是一个背景</string><string name="switch_bg">切换背景</string><string name="error_delete_or_recover">没有选中任何项目!</string></file><file path="E:\Homework\SoftwareProject\TeamProject\src\app\src\main\res\values-zh-rTW\arrays.xml" qualifiers="zh-rTW"><string-array name="menu_share_ways">
         <item>短信</item>
         <item>郵件</item>
     </string-array></file><file path="E:\Homework\SoftwareProject\TeamProject\src\app\src\main\res\values-zh-rTW\strings.xml" qualifiers="zh-rTW"><string name="app_name">便簽</string><string name="app_widget2x2">便簽2x2</string><string name="app_widget4x4">便簽4x4</string><string name="widget_havenot_content">沒有關聯內容，點擊新建便簽。</string><string name="widget_under_visit_mode">訪客模式下，便籤內容不可見</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">新建便簽</string><string name="delete_remind_time_message">成功刪除提醒</string><string name="set_remind_time_message">創建提醒</string><string name="note_alert_expired">已過期</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MM月dd日 kk:mm</string><string name="notealert_ok">知道了</string><string name="notealert_enter">查看</string><string name="note_link_tel">呼叫電話</string><string name="note_link_email">發送郵件</string><string name="note_link_web">浏覽網頁</string><string name="note_link_other">打開地圖</string><string name="format_move_notes_to_folder">已將所選 %1$d 便籤移到 %2$s 文件夾</string><string name="menu_create_folder">新建文件夾</string><string name="menu_export_text">導出文本</string><string name="menu_sync">同步</string><string name="menu_sync_cancel">取消同步</string><string name="menu_setting">設置</string><string name="menu_search">搜尋</string><string name="menu_delete">刪除</string><string name="menu_move">移動到文件夾</string><string name="menu_select_title">選中了 %d 項</string><string name="menu_select_none">沒有選中項，操作無效</string><string name="menu_select_all">全選</string><string name="menu_deselect_all">取消全選</string><string name="menu_font_size">文字大小</string><string name="menu_font_small">小</string><string name="menu_font_normal">正常</string><string name="menu_font_large">大</string><string name="menu_font_super">超大</string><string name="menu_list_mode">進入清單模式</string><string name="menu_normal_mode">退出清單模式</string><string name="menu_folder_view">查看文件夾</string><string name="menu_folder_delete">刪除文件夾</string><string name="menu_folder_change_name">修改文件夾名稱</string><string name="folder_exist">文件夾 %1$s 已存在，請重新命名</string><string name="menu_share">分享</string><string name="menu_send_to_desktop">發送到桌面</string><string name="menu_alert">提醒我</string><string name="menu_remove_remind">刪除提醒</string><string name="menu_title_select_folder">選擇文件夾</string><string name="menu_move_parent_folder">上一級文件夾</string><string name="info_note_enter_desktop">已添加到桌面</string><string name="alert_title_delete">刪除</string><string name="alert_message_delete_notes">确认要刪除所選的 %d 條便籤嗎?</string><string name="alert_message_delete_note">确认要删除該條便籤嗎?</string><string name="alert_message_delete_folder">確認刪除檔夾及所包含的便簽嗎？</string><string name="error_sdcard_unmounted">SD卡被佔用，不能操作</string><string name="error_sdcard_export">導出TXT時發生錯誤，請檢查SD卡</string><string name="error_note_not_exist">要查看的便籤不存在</string><string name="error_note_empty_for_clock">不能爲空便籤設置鬧鐘提醒</string><string name="error_note_empty_for_send_to_desktop">不能將空便籤發送到桌面</string><string name="success_sdcard_export">導出成功</string><string name="failed_sdcard_export">導出失敗</string><string name="format_exported_file_location">已將文本文件(%1$s)導出至SD(%2$s)目錄</string><string name="ticker_syncing">同步便簽...</string><string name="ticker_success">同步成功</string><string name="ticker_fail">同步失敗</string><string name="ticker_cancel">同步已取消</string><string name="success_sync_account">與%1$s同步成功</string><string name="error_sync_network">同步失敗，請檢查網絡和帳號設置</string><string name="error_sync_internal">同步失敗，發生內部錯誤</string><string name="error_sync_cancelled">同步已取消</string><string name="sync_progress_login">登陸%1$s...</string><string name="sync_progress_init_list">正在獲取服務器便籤列表...</string><string name="sync_progress_syncing">正在同步本地便籤...</string><string name="preferences_title">設置</string><string name="preferences_account_title">同步賬號</string><string name="preferences_account_summary">与google task同步便簽記錄</string><string name="preferences_last_sync_time">上次同步于 %1$s</string><string name="preferences_add_account">添加賬號</string><string name="preferences_menu_change_account">更換賬號</string><string name="preferences_menu_remove_account">刪除賬號</string><string name="preferences_menu_cancel">取消</string><string name="preferences_button_sync_immediately">立即同步</string><string name="preferences_button_sync_cancel">取消同步</string><string name="preferences_dialog_change_account_title">當前帳號 %1$s</string><string name="preferences_dialog_change_account_warn_msg">如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復</string><string name="preferences_dialog_select_account_title">同步便簽</string><string name="preferences_dialog_select_account_tips">請選擇google帳號，便簽將與該帳號的google task內容同步。</string><string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帳號</string><string name="preferences_toast_success_set_accout">同步帳號已設置為%1$s</string><string name="preferences_bg_random_appear_title">新建便籤背景顏色隨機</string><string name="button_delete">刪除</string><string name="call_record_folder_name">通話便籤</string><string name="hint_foler_name">請輸入名稱</string><string name="search_label">正在搜索便籤</string><string name="search_hint">搜索便籤</string><string name="search_setting_description">便籤中的文字</string><string name="search">便籤</string><string name="datetime_dialog_ok">設置</string><string name="datetime_dialog_cancel">取消</string><plurals name="search_results_title">
         <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 條符合”<ns1:g id="SEARCH">%2$s</ns1:g>“的搜尋結果</item>
-    </plurals><string name="recover">恢復便簽</string><string name="realdelete">永久刪除</string><string name="recyclebin">回收站</string><string name="alert_message_recover">確認要還原所選的便簽嗎?</string><string name="alert_message_realdelete">確認要永久刪除所選的便簽嗎?</string><string name="change_bg">背景切換</string><string name="reset_bg">恢复预设</string><string name="background_description">这是一个背景</string><string name="switch_bg">切换背景</string></file><file name="preferences" path="E:\Homework\SoftwareProject\TeamProject\src\app\src\main\res\xml\preferences.xml" qualifiers="" type="xml"/><file name="searchable" path="E:\Homework\SoftwareProject\TeamProject\src\app\src\main\res\xml\searchable.xml" qualifiers="" type="xml"/><file name="widget_2x_info" path="E:\Homework\SoftwareProject\TeamProject\src\app\src\main\res\xml\widget_2x_info.xml" qualifiers="" type="xml"/><file name="widget_4x_info" path="E:\Homework\SoftwareProject\TeamProject\src\app\src\main\res\xml\widget_4x_info.xml" qualifiers="" type="xml"/><file name="swith_bg" path="E:\Homework\SoftwareProject\TeamProject\src\app\src\main\res\layout\swith_bg.xml" qualifiers="" type="layout"/><file name="bg_icon" path="E:\Homework\SoftwareProject\TeamProject\src\app\src\main\res\layout\bg_icon.xml" qualifiers="" type="layout"/><file name="cloude" path="E:\Homework\SoftwareProject\TeamProject\src\app\src\main\res\drawable-hdpi\cloude.png" qualifiers="hdpi-v4" type="drawable"/><file name="dream" path="E:\Homework\SoftwareProject\TeamProject\src\app\src\main\res\drawable-hdpi\dream.png" qualifiers="hdpi-v4" type="drawable"/><file name="dusk" path="E:\Homework\SoftwareProject\TeamProject\src\app\src\main\res\drawable-hdpi\dusk.png" qualifiers="hdpi-v4" type="drawable"/></source><source path="E:\Homework\SoftwareProject\TeamProject\src\app\build\generated\res\rs\debug"/><source path="E:\Homework\SoftwareProject\TeamProject\src\app\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\Homework\SoftwareProject\TeamProject\src\app\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\Homework\SoftwareProject\TeamProject\src\app\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><mergedItems/></merger>
\ No newline at end of file
+    </plurals><string name="recover">恢復便簽</string><string name="realdelete">永久刪除</string><string name="recyclebin">回收站</string><string name="alert_message_recover">確認要還原所選的便簽嗎?</string><string name="alert_message_realdelete">確認要永久刪除所選的便簽嗎?</string><string name="change_bg">背景切換</string><string name="reset_bg">恢復預設</string><string name="background_description">這是一個背景</string><string name="switch_bg">切換背景</string><string name="error_delete_or_recover">沒有選中任何項目!</string></file><file name="preferences" path="E:\Homework\SoftwareProject\TeamProject\src\app\src\main\res\xml\preferences.xml" qualifiers="" type="xml"/><file name="searchable" path="E:\Homework\SoftwareProject\TeamProject\src\app\src\main\res\xml\searchable.xml" qualifiers="" type="xml"/><file name="widget_2x_info" path="E:\Homework\SoftwareProject\TeamProject\src\app\src\main\res\xml\widget_2x_info.xml" qualifiers="" type="xml"/><file name="widget_4x_info" path="E:\Homework\SoftwareProject\TeamProject\src\app\src\main\res\xml\widget_4x_info.xml" qualifiers="" type="xml"/><file name="swith_bg" path="E:\Homework\SoftwareProject\TeamProject\src\app\src\main\res\layout\swith_bg.xml" qualifiers="" type="layout"/><file name="bg_icon" path="E:\Homework\SoftwareProject\TeamProject\src\app\src\main\res\layout\bg_icon.xml" qualifiers="" type="layout"/><file name="cloude" path="E:\Homework\SoftwareProject\TeamProject\src\app\src\main\res\drawable-hdpi\cloude.png" qualifiers="hdpi-v4" type="drawable"/><file name="dream" path="E:\Homework\SoftwareProject\TeamProject\src\app\src\main\res\drawable-hdpi\dream.png" qualifiers="hdpi-v4" type="drawable"/><file name="dusk" path="E:\Homework\SoftwareProject\TeamProject\src\app\src\main\res\drawable-hdpi\dusk.png" qualifiers="hdpi-v4" type="drawable"/><file name="add_bg" path="E:\Homework\SoftwareProject\TeamProject\src\app\src\main\res\drawable-hdpi\add_bg.png" qualifiers="hdpi-v4" type="drawable"/></source><source path="E:\Homework\SoftwareProject\TeamProject\src\app\build\generated\res\rs\debug"/><source path="E:\Homework\SoftwareProject\TeamProject\src\app\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\Homework\SoftwareProject\TeamProject\src\app\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\Homework\SoftwareProject\TeamProject\src\app\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><mergedItems/></merger>
\ No newline at end of file
diff --git a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
index 895e59e..5f8cf83 100644
--- a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Mon Jun 05 23:49:51 CST 2023
+#Tue Jun 06 12:12:53 CST 2023
 base.0=E\:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
 renamed.0=classes.dex
 path.0=classes.dex
diff --git a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
index 12ce6a4..17eb437 100644
Binary files a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
index c680773..36c7890 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RecycleBinActivity$BackgroundQueryHandler.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RecycleBinActivity$BackgroundQueryHandler.class
index 1524d82..f8713c6 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RecycleBinActivity$BackgroundQueryHandler.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RecycleBinActivity$BackgroundQueryHandler.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RecycleBinActivity$OnListItemClickListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RecycleBinActivity$OnListItemClickListener.class
index 11ce570..26308fc 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RecycleBinActivity$OnListItemClickListener.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RecycleBinActivity$OnListItemClickListener.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RecycleBinActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RecycleBinActivity.class
index d8445a5..638b98e 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RecycleBinActivity.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RecycleBinActivity.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SwithBgActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SwithBgActivity.class
index 247ffb0..0103cbd 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SwithBgActivity.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SwithBgActivity.class differ
diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_add_bg.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_add_bg.png.flat
new file mode 100644
index 0000000..0d44430
Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_add_bg.png.flat differ
diff --git a/src/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/src/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat
index 8f135ec..3f3033d 100644
Binary files a/src/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat and b/src/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat differ
diff --git a/src/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat b/src/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat
index cc56d09..6abc62a 100644
Binary files a/src/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat and b/src/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat differ
diff --git a/src/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/src/app/build/intermediates/merged_res/debug/values_values.arsc.flat
index 21c4cc6..0218c36 100644
Binary files a/src/app/build/intermediates/merged_res/debug/values_values.arsc.flat and b/src/app/build/intermediates/merged_res/debug/values_values.arsc.flat differ
diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
index cf3dfb8..9d10eae 100644
--- a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
+++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
@@ -6,19 +6,19 @@
                 {
                     "source": "E:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
                     "from": {
-                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,132,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7028,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,57,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7081,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,133,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7086,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7124,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                     },
                     "to": {
-                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "215,384,456,522,595,663,726,776,816,864,912,970,1015,1072,1115,1169,1219,1281,1349,1426,1485,1551,1614,1669,1729,1792,1846,1906,1959,2021,2105,2185,2235,2294,2337,2390,2433,2484,2534,2594,2647,2698,2744,2792,2840,2886,2933,2983,3028,3087,3139,3191,3234,3281,3337,3392,3447,3491,3533,3574,3624,3683,3734,3783,3832,3879,3926,3973,4018,4069,4122,4197,4256,4313,4387,4451,4520,4598,4708,4812,4885,4951,5006,5071,5136,5185,5268,5346,5390,5431,5474,5516,5554,5599,5647,5709,5766,5821,5880,5947,6005,6067,6115,6160,6208,6259,6325",
-                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114",
-                        "endColumns": "14,71,65,72,67,62,49,39,47,47,57,44,56,42,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,43,40,42,41,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "379,451,517,590,658,721,771,811,859,907,965,1010,1067,1110,1164,1214,1276,1344,1421,1480,1546,1609,1664,1724,1787,1841,1901,1954,2016,2100,2180,2230,2289,2332,2385,2428,2479,2529,2589,2642,2693,2739,2787,2835,2881,2928,2978,3023,3082,3134,3186,3229,3276,3332,3387,3442,3486,3528,3569,3619,3678,3729,3778,3827,3874,3921,3968,4013,4064,4117,4192,4251,4308,4382,4446,4515,4593,4703,4807,4880,4946,5001,5066,5131,5180,5263,5341,5385,5426,5469,5511,5549,5594,5642,5704,5761,5816,5875,5942,6000,6062,6110,6155,6203,6254,6320,6386"
+                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "215,384,456,522,595,663,726,776,816,864,912,970,1015,1072,1115,1169,1219,1281,1349,1426,1485,1551,1614,1669,1729,1792,1846,1906,1959,2021,2105,2185,2235,2294,2337,2390,2433,2484,2534,2594,2647,2698,2744,2792,2840,2886,2933,2983,3028,3087,3139,3191,3234,3281,3337,3392,3447,3491,3533,3574,3624,3683,3734,3783,3832,3879,3926,3973,4018,4069,4122,4197,4256,4313,4387,4451,4520,4598,4708,4812,4885,4951,5006,5071,5136,5185,5268,5346,5390,5431,5474,5516,5554,5599,5647,5709,5766,5821,5880,5923,5990,6048,6110,6158,6203,6251,6302,6368",
+                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115",
+                        "endColumns": "14,71,65,72,67,62,49,39,47,47,57,44,56,42,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,43,40,42,41,37,44,47,61,56,54,58,42,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "379,451,517,590,658,721,771,811,859,907,965,1010,1067,1110,1164,1214,1276,1344,1421,1480,1546,1609,1664,1724,1787,1841,1901,1954,2016,2100,2180,2230,2289,2332,2385,2428,2479,2529,2589,2642,2693,2739,2787,2835,2881,2928,2978,3023,3082,3134,3186,3229,3276,3332,3387,3442,3486,3528,3569,3619,3678,3729,3778,3827,3874,3921,3968,4013,4064,4117,4192,4251,4308,4382,4446,4515,4593,4703,4807,4880,4946,5001,5066,5131,5180,5263,5341,5385,5426,5469,5511,5549,5594,5642,5704,5761,5816,5875,5918,5985,6043,6105,6153,6198,6246,6297,6363,6429"
                     }
                 },
                 {
@@ -61,19 +61,19 @@
                 {
                     "source": "E:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
                     "from": {
-                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,132,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7111,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7149,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,133,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7154,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,61,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7211,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                     },
                     "to": {
-                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "215,384,457,523,596,664,727,777,817,865,913,971,1016,1073,1116,1170,1220,1282,1350,1427,1486,1551,1614,1669,1729,1792,1846,1906,1959,2021,2106,2187,2237,2296,2339,2392,2435,2486,2536,2596,2649,2700,2746,2794,2842,2888,2935,2985,3030,3089,3141,3193,3236,3283,3339,3394,3449,3493,3535,3576,3626,3685,3736,3785,3834,3881,3928,3975,4020,4071,4124,4199,4258,4315,4389,4453,4522,4600,4710,4814,4887,4953,5008,5073,5138,5187,5270,5348,5392,5433,5476,5518,5556,5601,5649,5711,5768,5823,5882,5925,5992,6050,6112,6160,6205,6253,6304,6370",
-                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115",
-                        "endColumns": "14,72,65,72,67,62,49,39,47,47,57,44,56,42,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,43,40,42,41,37,44,47,61,56,54,58,42,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "379,452,518,591,659,722,772,812,860,908,966,1011,1068,1111,1165,1215,1277,1345,1422,1481,1546,1609,1664,1724,1787,1841,1901,1954,2016,2101,2182,2232,2291,2334,2387,2430,2481,2531,2591,2644,2695,2741,2789,2837,2883,2930,2980,3025,3084,3136,3188,3231,3278,3334,3389,3444,3488,3530,3571,3621,3680,3731,3780,3829,3876,3923,3970,4015,4066,4119,4194,4253,4310,4384,4448,4517,4595,4705,4809,4882,4948,5003,5068,5133,5182,5265,5343,5387,5428,5471,5513,5551,5596,5644,5706,5763,5818,5877,5920,5987,6045,6107,6155,6200,6248,6299,6365,6431"
+                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "215,384,457,523,596,664,727,777,817,865,913,971,1016,1073,1116,1170,1220,1282,1344,1412,1489,1548,1613,1676,1731,1791,1854,1908,1968,2021,2083,2168,2249,2299,2358,2401,2454,2497,2548,2598,2658,2711,2762,2808,2856,2904,2950,2997,3047,3092,3151,3203,3255,3298,3345,3401,3456,3511,3555,3597,3638,3688,3747,3798,3847,3896,3943,3990,4037,4082,4133,4186,4261,4320,4377,4451,4515,4584,4662,4772,4876,4949,5015,5070,5135,5200,5249,5332,5410,5454,5495,5538,5580,5618,5663,5711,5773,5830,5885,5944,5987,6054,6112,6174,6222,6267,6315,6366,6432",
+                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116",
+                        "endColumns": "14,72,65,72,67,62,49,39,47,47,57,44,56,42,53,49,61,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,43,40,42,41,37,44,47,61,56,54,58,42,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "379,452,518,591,659,722,772,812,860,908,966,1011,1068,1111,1165,1215,1277,1339,1407,1484,1543,1608,1671,1726,1786,1849,1903,1963,2016,2078,2163,2244,2294,2353,2396,2449,2492,2543,2593,2653,2706,2757,2803,2851,2899,2945,2992,3042,3087,3146,3198,3250,3293,3340,3396,3451,3506,3550,3592,3633,3683,3742,3793,3842,3891,3938,3985,4032,4077,4128,4181,4256,4315,4372,4446,4510,4579,4657,4767,4871,4944,5010,5065,5130,5195,5244,5327,5405,5449,5490,5533,5575,5613,5658,5706,5768,5825,5880,5939,5982,6049,6107,6169,6217,6262,6310,6361,6427,6493"
                     }
                 }
             ]
@@ -104,12 +104,12 @@
                         "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                     },
                     "to": {
-                        "startLines": "134,138,142,146,149,153,157,161,165,169,173",
+                        "startLines": "135,139,143,147,150,154,158,162,166,170,174",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8636,8840,9051,9216,9376,9559,9744,9929,10132,10338,10521",
-                        "endLines": "137,141,145,148,152,156,160,164,168,172,176",
+                        "startOffsets": "8706,8910,9121,9286,9446,9629,9814,9999,10202,10408,10591",
+                        "endLines": "138,142,146,149,153,157,161,165,169,173,177",
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8835,9046,9211,9371,9554,9739,9924,10127,10333,10516,10717"
+                        "endOffsets": "8905,9116,9281,9441,9624,9809,9994,10197,10403,10586,10787"
                     }
                 },
                 {
@@ -146,20 +146,20 @@
                 {
                     "source": "E:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\src\\main\\res\\values\\strings.xml",
                     "from": {
-                        "startLines": "137,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,136,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startOffsets": "8520,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8464,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endLines": "141,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,136,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,55,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endOffsets": "8924,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8515,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                        "startLines": "138,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,137,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "8590,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8520,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endLines": "142,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,137,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,69,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "8994,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8585,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                     },
                     "to": {
-                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "739,1092,1188,1271,1367,1439,1509,1578,1621,1673,1725,1797,1846,1909,1963,2021,2072,2156,2250,2358,2429,2513,2596,2662,2745,2847,2908,2970,3021,3099,3152,3212,3317,3376,3478,3533,3604,3653,3711,3758,3817,3874,3945,4006,4063,4113,4165,4218,4268,4318,4378,4431,4497,4559,4622,4669,4724,4812,4870,4932,4982,5027,5070,5130,5197,5252,5307,5360,5407,5460,5516,5564,5619,5672,5756,5823,5887,5983,6057,6138,6227,6390,6534,6613,6688,6770,6829,6909,6989,7044,7166,7269,7319,7363,7414,7457,7498,7551,7608,7682,7747,7815,7901,7957,8037,8106,8200,8259,8314,8376,8436,8546",
-                        "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133",
-                        "endColumns": "14,95,82,95,71,69,68,42,51,51,71,48,62,53,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,49,43,50,42,40,52,56,73,64,67,85,55,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "1087,1183,1266,1362,1434,1504,1573,1616,1668,1720,1792,1841,1904,1958,2016,2067,2151,2245,2353,2424,2508,2591,2657,2740,2842,2903,2965,3016,3094,3147,3207,3312,3371,3473,3528,3599,3648,3706,3753,3812,3869,3940,4001,4058,4108,4160,4213,4263,4313,4373,4426,4492,4554,4617,4664,4719,4807,4865,4927,4977,5022,5065,5125,5192,5247,5302,5355,5402,5455,5511,5559,5614,5667,5751,5818,5882,5978,6052,6133,6222,6385,6529,6608,6683,6765,6824,6904,6984,7039,7161,7264,7314,7358,7409,7452,7493,7546,7603,7677,7742,7810,7896,7952,8032,8101,8195,8254,8309,8371,8431,8541,8631"
+                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "739,1092,1188,1271,1367,1439,1509,1578,1621,1673,1725,1797,1846,1909,1963,2021,2072,2156,2226,2320,2428,2499,2583,2666,2732,2815,2917,2978,3040,3091,3169,3222,3282,3387,3446,3548,3603,3674,3723,3781,3828,3887,3944,4015,4076,4133,4183,4235,4288,4338,4388,4448,4501,4567,4629,4692,4739,4794,4882,4940,5002,5052,5097,5140,5200,5267,5322,5377,5430,5477,5530,5586,5634,5689,5742,5826,5893,5957,6053,6127,6208,6297,6460,6604,6683,6758,6840,6899,6979,7059,7114,7236,7339,7389,7433,7484,7527,7568,7621,7678,7752,7817,7885,7971,8027,8107,8176,8270,8329,8384,8446,8506,8616",
+                        "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134",
+                        "endColumns": "14,95,82,95,71,69,68,42,51,51,71,48,62,53,57,50,83,69,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,49,43,50,42,40,52,56,73,64,67,85,55,79,68,93,58,54,61,59,109,89",
+                        "endOffsets": "1087,1183,1266,1362,1434,1504,1573,1616,1668,1720,1792,1841,1904,1958,2016,2067,2151,2221,2315,2423,2494,2578,2661,2727,2810,2912,2973,3035,3086,3164,3217,3277,3382,3441,3543,3598,3669,3718,3776,3823,3882,3939,4010,4071,4128,4178,4230,4283,4333,4383,4443,4496,4562,4624,4687,4734,4789,4877,4935,4997,5047,5092,5135,5195,5262,5317,5372,5425,5472,5525,5581,5629,5684,5737,5821,5888,5952,6048,6122,6203,6292,6455,6599,6678,6753,6835,6894,6974,7054,7109,7231,7334,7384,7428,7479,7522,7563,7616,7673,7747,7812,7880,7966,8022,8102,8171,8265,8324,8379,8441,8501,8611,8701"
                     }
                 }
             ]
@@ -213,19 +213,19 @@
                 {
                     "source": "E:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
                     "from": {
-                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,133,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7086,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7124,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,132,-1,-1,-1,-1,-1,-1,134,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,131,-1,-1,-1,-1,-1,-1,-1,133,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,4,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7028,-1,-1,-1,-1,-1,-1,7129,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6986,-1,-1,-1,-1,-1,-1,-1,7086,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,57,-1,-1,-1,-1,-1,-1,61,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,41,-1,-1,-1,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7081,-1,-1,-1,-1,-1,-1,7186,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7023,-1,-1,-1,-1,-1,-1,-1,7124,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                     },
                     "to": {
-                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "215,384,456,522,595,663,726,776,816,864,912,970,1015,1072,1115,1169,1219,1281,1349,1426,1485,1551,1614,1669,1729,1792,1846,1906,1959,2021,2105,2185,2235,2294,2337,2390,2433,2484,2534,2594,2647,2698,2744,2792,2840,2886,2933,2983,3028,3087,3139,3191,3234,3281,3337,3392,3447,3491,3533,3574,3624,3683,3734,3783,3832,3879,3926,3973,4018,4069,4122,4197,4256,4313,4387,4451,4520,4598,4708,4812,4885,4951,5006,5071,5136,5185,5268,5346,5390,5431,5474,5516,5554,5599,5647,5709,5766,5821,5880,5923,5990,6048,6110,6158,6203,6251,6302,6368",
-                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115",
-                        "endColumns": "14,71,65,72,67,62,49,39,47,47,57,44,56,42,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,43,40,42,41,37,44,47,61,56,54,58,42,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "379,451,517,590,658,721,771,811,859,907,965,1010,1067,1110,1164,1214,1276,1344,1421,1480,1546,1609,1664,1724,1787,1841,1901,1954,2016,2100,2180,2230,2289,2332,2385,2428,2479,2529,2589,2642,2693,2739,2787,2835,2881,2928,2978,3023,3082,3134,3186,3229,3276,3332,3387,3442,3486,3528,3569,3619,3678,3729,3778,3827,3874,3921,3968,4013,4064,4117,4192,4251,4308,4382,4446,4515,4593,4703,4807,4880,4946,5001,5066,5131,5180,5263,5341,5385,5426,5469,5511,5549,5594,5642,5704,5761,5816,5875,5918,5985,6043,6105,6153,6198,6246,6297,6363,6429"
+                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "215,384,456,522,595,663,726,776,816,864,912,970,1015,1072,1115,1169,1219,1281,1343,1411,1488,1547,1613,1676,1731,1791,1854,1908,1968,2021,2083,2167,2247,2297,2356,2399,2452,2495,2546,2596,2656,2709,2760,2806,2854,2902,2948,2995,3045,3090,3149,3201,3253,3296,3343,3399,3454,3509,3553,3595,3636,3686,3745,3796,3845,3894,3941,3988,4035,4080,4131,4184,4259,4318,4375,4449,4513,4582,4660,4770,4874,4947,5013,5068,5133,5198,5247,5330,5408,5452,5493,5536,5578,5616,5661,5709,5771,5828,5883,5942,5985,6052,6110,6172,6220,6265,6313,6364,6430",
+                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116",
+                        "endColumns": "14,71,65,72,67,62,49,39,47,47,57,44,56,42,53,49,61,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,43,40,42,41,37,44,47,61,56,54,58,42,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "379,451,517,590,658,721,771,811,859,907,965,1010,1067,1110,1164,1214,1276,1338,1406,1483,1542,1608,1671,1726,1786,1849,1903,1963,2016,2078,2162,2242,2292,2351,2394,2447,2490,2541,2591,2651,2704,2755,2801,2849,2897,2943,2990,3040,3085,3144,3196,3248,3291,3338,3394,3449,3504,3548,3590,3631,3681,3740,3791,3840,3889,3936,3983,4030,4075,4126,4179,4254,4313,4370,4444,4508,4577,4655,4765,4869,4942,5008,5063,5128,5193,5242,5325,5403,5447,5488,5531,5573,5611,5656,5704,5766,5823,5878,5937,5980,6047,6105,6167,6215,6260,6308,6359,6425,6491"
                     }
                 },
                 {
diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
index 68b4a8c..d8f4042 100644
--- a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
+++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
@@ -22,19 +22,19 @@
                 {
                     "source": "E:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
                     "from": {
-                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,132,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7111,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7149,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,133,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7154,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,61,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7211,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                     },
                     "to": {
-                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "215,384,457,523,596,664,727,777,817,865,913,971,1016,1073,1116,1170,1220,1282,1350,1427,1486,1551,1614,1669,1729,1792,1846,1906,1959,2021,2106,2187,2237,2296,2339,2392,2435,2486,2536,2596,2649,2700,2746,2794,2842,2888,2935,2985,3030,3089,3141,3193,3236,3283,3339,3394,3449,3493,3535,3576,3626,3685,3736,3785,3834,3881,3928,3975,4020,4071,4124,4199,4258,4315,4389,4453,4522,4600,4710,4814,4887,4953,5008,5073,5138,5187,5270,5348,5392,5433,5476,5518,5556,5601,5649,5711,5768,5823,5882,5925,5992,6050,6112,6160,6205,6253,6304,6370",
-                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115",
-                        "endColumns": "14,72,65,72,67,62,49,39,47,47,57,44,56,42,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,43,40,42,41,37,44,47,61,56,54,58,42,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "379,452,518,591,659,722,772,812,860,908,966,1011,1068,1111,1165,1215,1277,1345,1422,1481,1546,1609,1664,1724,1787,1841,1901,1954,2016,2101,2182,2232,2291,2334,2387,2430,2481,2531,2591,2644,2695,2741,2789,2837,2883,2930,2980,3025,3084,3136,3188,3231,3278,3334,3389,3444,3488,3530,3571,3621,3680,3731,3780,3829,3876,3923,3970,4015,4066,4119,4194,4253,4310,4384,4448,4517,4595,4705,4809,4882,4948,5003,5068,5133,5182,5265,5343,5387,5428,5471,5513,5551,5596,5644,5706,5763,5818,5877,5920,5987,6045,6107,6155,6200,6248,6299,6365,6431"
+                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "215,384,457,523,596,664,727,777,817,865,913,971,1016,1073,1116,1170,1220,1282,1344,1412,1489,1548,1613,1676,1731,1791,1854,1908,1968,2021,2083,2168,2249,2299,2358,2401,2454,2497,2548,2598,2658,2711,2762,2808,2856,2904,2950,2997,3047,3092,3151,3203,3255,3298,3345,3401,3456,3511,3555,3597,3638,3688,3747,3798,3847,3896,3943,3990,4037,4082,4133,4186,4261,4320,4377,4451,4515,4584,4662,4772,4876,4949,5015,5070,5135,5200,5249,5332,5410,5454,5495,5538,5580,5618,5663,5711,5773,5830,5885,5944,5987,6054,6112,6174,6222,6267,6315,6366,6432",
+                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116",
+                        "endColumns": "14,72,65,72,67,62,49,39,47,47,57,44,56,42,53,49,61,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,43,40,42,41,37,44,47,61,56,54,58,42,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "379,452,518,591,659,722,772,812,860,908,966,1011,1068,1111,1165,1215,1277,1339,1407,1484,1543,1608,1671,1726,1786,1849,1903,1963,2016,2078,2163,2244,2294,2353,2396,2449,2492,2543,2593,2653,2706,2757,2803,2851,2899,2945,2992,3042,3087,3146,3198,3250,3293,3340,3396,3451,3506,3550,3592,3633,3683,3742,3793,3842,3891,3938,3985,4032,4077,4128,4181,4256,4315,4372,4446,4510,4579,4657,4767,4871,4944,5010,5065,5130,5195,5244,5327,5405,5449,5490,5533,5575,5613,5658,5706,5768,5825,5880,5939,5982,6049,6107,6169,6217,6262,6310,6361,6427,6493"
                     }
                 }
             ]
diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
index 9a862ce..1017d64 100644
--- a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
+++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
@@ -6,19 +6,19 @@
                 {
                     "source": "E:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
                     "from": {
-                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,133,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7086,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7124,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,132,-1,-1,-1,-1,-1,-1,134,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,131,-1,-1,-1,-1,-1,-1,-1,133,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,4,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7028,-1,-1,-1,-1,-1,-1,7129,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6986,-1,-1,-1,-1,-1,-1,-1,7086,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,57,-1,-1,-1,-1,-1,-1,61,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,41,-1,-1,-1,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7081,-1,-1,-1,-1,-1,-1,7186,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7023,-1,-1,-1,-1,-1,-1,-1,7124,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                     },
                     "to": {
-                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "215,384,456,522,595,663,726,776,816,864,912,970,1015,1072,1115,1169,1219,1281,1349,1426,1485,1551,1614,1669,1729,1792,1846,1906,1959,2021,2105,2185,2235,2294,2337,2390,2433,2484,2534,2594,2647,2698,2744,2792,2840,2886,2933,2983,3028,3087,3139,3191,3234,3281,3337,3392,3447,3491,3533,3574,3624,3683,3734,3783,3832,3879,3926,3973,4018,4069,4122,4197,4256,4313,4387,4451,4520,4598,4708,4812,4885,4951,5006,5071,5136,5185,5268,5346,5390,5431,5474,5516,5554,5599,5647,5709,5766,5821,5880,5923,5990,6048,6110,6158,6203,6251,6302,6368",
-                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115",
-                        "endColumns": "14,71,65,72,67,62,49,39,47,47,57,44,56,42,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,43,40,42,41,37,44,47,61,56,54,58,42,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "379,451,517,590,658,721,771,811,859,907,965,1010,1067,1110,1164,1214,1276,1344,1421,1480,1546,1609,1664,1724,1787,1841,1901,1954,2016,2100,2180,2230,2289,2332,2385,2428,2479,2529,2589,2642,2693,2739,2787,2835,2881,2928,2978,3023,3082,3134,3186,3229,3276,3332,3387,3442,3486,3528,3569,3619,3678,3729,3778,3827,3874,3921,3968,4013,4064,4117,4192,4251,4308,4382,4446,4515,4593,4703,4807,4880,4946,5001,5066,5131,5180,5263,5341,5385,5426,5469,5511,5549,5594,5642,5704,5761,5816,5875,5918,5985,6043,6105,6153,6198,6246,6297,6363,6429"
+                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "215,384,456,522,595,663,726,776,816,864,912,970,1015,1072,1115,1169,1219,1281,1343,1411,1488,1547,1613,1676,1731,1791,1854,1908,1968,2021,2083,2167,2247,2297,2356,2399,2452,2495,2546,2596,2656,2709,2760,2806,2854,2902,2948,2995,3045,3090,3149,3201,3253,3296,3343,3399,3454,3509,3553,3595,3636,3686,3745,3796,3845,3894,3941,3988,4035,4080,4131,4184,4259,4318,4375,4449,4513,4582,4660,4770,4874,4947,5013,5068,5133,5198,5247,5330,5408,5452,5493,5536,5578,5616,5661,5709,5771,5828,5883,5942,5985,6052,6110,6172,6220,6265,6313,6364,6430",
+                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116",
+                        "endColumns": "14,71,65,72,67,62,49,39,47,47,57,44,56,42,53,49,61,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,43,40,42,41,37,44,47,61,56,54,58,42,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "379,451,517,590,658,721,771,811,859,907,965,1010,1067,1110,1164,1214,1276,1338,1406,1483,1542,1608,1671,1726,1786,1849,1903,1963,2016,2078,2162,2242,2292,2351,2394,2447,2490,2541,2591,2651,2704,2755,2801,2849,2897,2943,2990,3040,3085,3144,3196,3248,3291,3338,3394,3449,3504,3548,3590,3631,3681,3740,3791,3840,3889,3936,3983,4030,4075,4126,4179,4254,4313,4370,4444,4508,4577,4655,4765,4869,4942,5008,5063,5128,5193,5242,5325,5403,5447,5488,5531,5573,5611,5656,5704,5766,5823,5878,5937,5980,6047,6105,6167,6215,6260,6308,6359,6425,6491"
                     }
                 },
                 {
diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
index a0d6770..a1eb057 100644
--- a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
+++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
@@ -26,12 +26,12 @@
                         "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                     },
                     "to": {
-                        "startLines": "133,137,141,145,148,152,156,160,164,168,172",
+                        "startLines": "134,138,142,146,149,153,157,161,165,169,173",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8580,8784,8995,9160,9320,9503,9688,9873,10076,10282,10465",
-                        "endLines": "136,140,144,147,151,155,159,163,167,171,175",
+                        "startOffsets": "8636,8840,9051,9216,9376,9559,9744,9929,10132,10338,10521",
+                        "endLines": "137,141,145,148,152,156,160,164,168,172,176",
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8779,8990,9155,9315,9498,9683,9868,10071,10277,10460,10661"
+                        "endOffsets": "8835,9046,9211,9371,9554,9739,9924,10127,10333,10516,10717"
                     }
                 },
                 {
@@ -68,20 +68,20 @@
                 {
                     "source": "E:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\src\\main\\res\\values\\strings.xml",
                     "from": {
-                        "startLines": "136,-1,-1,-1,-1,-1,-1,-1,-1,-1,135,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startOffsets": "8464,-1,-1,-1,-1,-1,-1,-1,-1,-1,8392,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endLines": "140,-1,-1,-1,-1,-1,-1,-1,-1,-1,135,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,71,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endOffsets": "8868,-1,-1,-1,-1,-1,-1,-1,-1,-1,8459,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                        "startLines": "137,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,136,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "8520,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8464,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endLines": "141,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,136,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,55,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "8924,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8515,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                     },
                     "to": {
-                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "739,1092,1188,1271,1367,1439,1509,1578,1621,1673,1725,1797,1846,1909,1963,2021,2072,2156,2250,2358,2429,2513,2596,2662,2745,2847,2908,2970,3021,3099,3152,3212,3317,3376,3478,3533,3604,3653,3711,3758,3817,3874,3945,4006,4063,4113,4165,4218,4268,4318,4378,4431,4497,4559,4622,4669,4724,4812,4870,4932,4982,5027,5070,5130,5197,5252,5307,5360,5407,5460,5516,5564,5619,5672,5756,5823,5887,5983,6057,6138,6227,6390,6534,6613,6688,6770,6829,6909,6989,7044,7166,7269,7319,7363,7414,7457,7498,7551,7608,7682,7747,7815,7901,7981,8050,8144,8203,8258,8320,8380,8490",
-                        "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132",
-                        "endColumns": "14,95,82,95,71,69,68,42,51,51,71,48,62,53,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,49,43,50,42,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "1087,1183,1266,1362,1434,1504,1573,1616,1668,1720,1792,1841,1904,1958,2016,2067,2151,2245,2353,2424,2508,2591,2657,2740,2842,2903,2965,3016,3094,3147,3207,3312,3371,3473,3528,3599,3648,3706,3753,3812,3869,3940,4001,4058,4108,4160,4213,4263,4313,4373,4426,4492,4554,4617,4664,4719,4807,4865,4927,4977,5022,5065,5125,5192,5247,5302,5355,5402,5455,5511,5559,5614,5667,5751,5818,5882,5978,6052,6133,6222,6385,6529,6608,6683,6765,6824,6904,6984,7039,7161,7264,7314,7358,7409,7452,7493,7546,7603,7677,7742,7810,7896,7976,8045,8139,8198,8253,8315,8375,8485,8575"
+                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "739,1092,1188,1271,1367,1439,1509,1578,1621,1673,1725,1797,1846,1909,1963,2021,2072,2156,2250,2358,2429,2513,2596,2662,2745,2847,2908,2970,3021,3099,3152,3212,3317,3376,3478,3533,3604,3653,3711,3758,3817,3874,3945,4006,4063,4113,4165,4218,4268,4318,4378,4431,4497,4559,4622,4669,4724,4812,4870,4932,4982,5027,5070,5130,5197,5252,5307,5360,5407,5460,5516,5564,5619,5672,5756,5823,5887,5983,6057,6138,6227,6390,6534,6613,6688,6770,6829,6909,6989,7044,7166,7269,7319,7363,7414,7457,7498,7551,7608,7682,7747,7815,7901,7957,8037,8106,8200,8259,8314,8376,8436,8546",
+                        "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133",
+                        "endColumns": "14,95,82,95,71,69,68,42,51,51,71,48,62,53,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,49,43,50,42,40,52,56,73,64,67,85,55,79,68,93,58,54,61,59,109,89",
+                        "endOffsets": "1087,1183,1266,1362,1434,1504,1573,1616,1668,1720,1792,1841,1904,1958,2016,2067,2151,2245,2353,2424,2508,2591,2657,2740,2842,2903,2965,3016,3094,3147,3207,3312,3371,3473,3528,3599,3648,3706,3753,3812,3869,3940,4001,4058,4108,4160,4213,4263,4313,4373,4426,4492,4554,4617,4664,4719,4807,4865,4927,4977,5022,5065,5125,5192,5247,5302,5355,5402,5455,5511,5559,5614,5667,5751,5818,5882,5978,6052,6133,6222,6385,6529,6608,6683,6765,6824,6904,6984,7039,7161,7264,7314,7358,7409,7452,7493,7546,7603,7677,7742,7810,7896,7952,8032,8101,8195,8254,8309,8371,8431,8541,8631"
                     }
                 }
             ]
@@ -112,12 +112,12 @@
                         "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                     },
                     "to": {
-                        "startLines": "134,138,142,146,149,153,157,161,165,169,173",
+                        "startLines": "135,139,143,147,150,154,158,162,166,170,174",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8636,8840,9051,9216,9376,9559,9744,9929,10132,10338,10521",
-                        "endLines": "137,141,145,148,152,156,160,164,168,172,176",
+                        "startOffsets": "8706,8910,9121,9286,9446,9629,9814,9999,10202,10408,10591",
+                        "endLines": "138,142,146,149,153,157,161,165,169,173,177",
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8835,9046,9211,9371,9554,9739,9924,10127,10333,10516,10717"
+                        "endOffsets": "8905,9116,9281,9441,9624,9809,9994,10197,10403,10586,10787"
                     }
                 },
                 {
@@ -154,20 +154,20 @@
                 {
                     "source": "E:\\Homework\\SoftwareProject\\TeamProject\\src\\app\\src\\main\\res\\values\\strings.xml",
                     "from": {
-                        "startLines": "137,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,136,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startOffsets": "8520,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8464,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endLines": "141,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,136,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,55,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endOffsets": "8924,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8515,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                        "startLines": "138,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,137,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "8590,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8520,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endLines": "142,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,137,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,69,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "8994,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8585,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                     },
                     "to": {
-                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "739,1092,1188,1271,1367,1439,1509,1578,1621,1673,1725,1797,1846,1909,1963,2021,2072,2156,2250,2358,2429,2513,2596,2662,2745,2847,2908,2970,3021,3099,3152,3212,3317,3376,3478,3533,3604,3653,3711,3758,3817,3874,3945,4006,4063,4113,4165,4218,4268,4318,4378,4431,4497,4559,4622,4669,4724,4812,4870,4932,4982,5027,5070,5130,5197,5252,5307,5360,5407,5460,5516,5564,5619,5672,5756,5823,5887,5983,6057,6138,6227,6390,6534,6613,6688,6770,6829,6909,6989,7044,7166,7269,7319,7363,7414,7457,7498,7551,7608,7682,7747,7815,7901,7957,8037,8106,8200,8259,8314,8376,8436,8546",
-                        "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133",
-                        "endColumns": "14,95,82,95,71,69,68,42,51,51,71,48,62,53,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,49,43,50,42,40,52,56,73,64,67,85,55,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "1087,1183,1266,1362,1434,1504,1573,1616,1668,1720,1792,1841,1904,1958,2016,2067,2151,2245,2353,2424,2508,2591,2657,2740,2842,2903,2965,3016,3094,3147,3207,3312,3371,3473,3528,3599,3648,3706,3753,3812,3869,3940,4001,4058,4108,4160,4213,4263,4313,4373,4426,4492,4554,4617,4664,4719,4807,4865,4927,4977,5022,5065,5125,5192,5247,5302,5355,5402,5455,5511,5559,5614,5667,5751,5818,5882,5978,6052,6133,6222,6385,6529,6608,6683,6765,6824,6904,6984,7039,7161,7264,7314,7358,7409,7452,7493,7546,7603,7677,7742,7810,7896,7952,8032,8101,8195,8254,8309,8371,8431,8541,8631"
+                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "739,1092,1188,1271,1367,1439,1509,1578,1621,1673,1725,1797,1846,1909,1963,2021,2072,2156,2226,2320,2428,2499,2583,2666,2732,2815,2917,2978,3040,3091,3169,3222,3282,3387,3446,3548,3603,3674,3723,3781,3828,3887,3944,4015,4076,4133,4183,4235,4288,4338,4388,4448,4501,4567,4629,4692,4739,4794,4882,4940,5002,5052,5097,5140,5200,5267,5322,5377,5430,5477,5530,5586,5634,5689,5742,5826,5893,5957,6053,6127,6208,6297,6460,6604,6683,6758,6840,6899,6979,7059,7114,7236,7339,7389,7433,7484,7527,7568,7621,7678,7752,7817,7885,7971,8027,8107,8176,8270,8329,8384,8446,8506,8616",
+                        "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134",
+                        "endColumns": "14,95,82,95,71,69,68,42,51,51,71,48,62,53,57,50,83,69,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,49,43,50,42,40,52,56,73,64,67,85,55,79,68,93,58,54,61,59,109,89",
+                        "endOffsets": "1087,1183,1266,1362,1434,1504,1573,1616,1668,1720,1792,1841,1904,1958,2016,2067,2151,2221,2315,2423,2494,2578,2661,2727,2810,2912,2973,3035,3086,3164,3217,3277,3382,3441,3543,3598,3669,3718,3776,3823,3882,3939,4010,4071,4128,4178,4230,4283,4333,4383,4443,4496,4562,4624,4687,4734,4789,4877,4935,4997,5047,5092,5135,5195,5262,5317,5372,5425,5472,5525,5581,5629,5684,5737,5821,5888,5952,6048,6122,6203,6292,6455,6599,6678,6753,6835,6894,6974,7054,7109,7231,7334,7384,7428,7479,7522,7563,7616,7673,7747,7812,7880,7966,8022,8102,8171,8265,8324,8379,8441,8501,8611,8701"
                     }
                 }
             ]
diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
index cf274b6..c4a4824 100644
--- a/src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
+++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
@@ -15,18 +15,22 @@
         "merged": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list_dropdown_menu.xml.flat",
         "source": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list_dropdown_menu.xml"
     },
-    {
-        "merged": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_red.png.flat",
-        "source": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_red.png"
-    },
     {
         "merged": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_yellow.png.flat",
         "source": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_yellow.png"
     },
+    {
+        "merged": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_red.png.flat",
+        "source": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_red.png"
+    },
     {
         "merged": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_primary_text_dark.xml.flat",
         "source": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\primary_text_dark.xml"
     },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_add_bg.png.flat",
+        "source": "net.micode.notes.app-main-7:/drawable-hdpi/add_bg.png"
+    },
     {
         "merged": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_large.png.flat",
         "source": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_large.png"
@@ -71,14 +75,14 @@
         "merged": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_swith_bg.xml.flat",
         "source": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\swith_bg.xml"
     },
-    {
-        "merged": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_alert.png.flat",
-        "source": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_alert.png"
-    },
     {
         "merged": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_dream.png.flat",
         "source": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\dream.png"
     },
+    {
+        "merged": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_alert.png.flat",
+        "source": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_alert.png"
+    },
     {
         "merged": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_bar_bg.9.png.flat",
         "source": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_bar_bg.9.png"
@@ -95,14 +99,14 @@
         "merged": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list_options.xml.flat",
         "source": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list_options.xml"
     },
-    {
-        "merged": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_green.png.flat",
-        "source": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_green.png"
-    },
     {
         "merged": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_single.9.png.flat",
         "source": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_single.9.png"
     },
+    {
+        "merged": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_green.png.flat",
+        "source": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_green.png"
+    },
     {
         "merged": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_yellow.9.png.flat",
         "source": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_yellow.9.png"
@@ -127,10 +131,6 @@
         "merged": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_normal.png.flat",
         "source": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_normal.png"
     },
-    {
-        "merged": "net.micode.notes.app-merged_res-5:/layout_note_list.xml.flat",
-        "source": "net.micode.notes.app-main-7:/layout/note_list.xml"
-    },
     {
         "merged": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_notification.png.flat",
         "source": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\notification.png"
@@ -363,10 +363,6 @@
         "merged": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\raw-zh-rCN_introduction.flat",
         "source": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\raw-zh-rCN\\introduction"
     },
-    {
-        "merged": "net.micode.notes.app-merged_res-5:/layout_recycle_bin.xml.flat",
-        "source": "net.micode.notes.app-main-7:/layout/recycle_bin.xml"
-    },
     {
         "merged": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_sub_folder.xml.flat",
         "source": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\sub_folder.xml"
@@ -411,14 +407,14 @@
         "merged": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_down.9.png.flat",
         "source": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_down.9.png"
     },
-    {
-        "merged": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_up.9.png.flat",
-        "source": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_up.9.png"
-    },
     {
         "merged": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_recycle_bin.xml.flat",
         "source": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\recycle_bin.xml"
     },
+    {
+        "merged": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_up.9.png.flat",
+        "source": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_up.9.png"
+    },
     {
         "merged": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_deselect_all.png.flat",
         "source": "E:\\AndroidStudio\\AndroidGradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\deselect_all.png"
diff --git a/src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
index 3aca373..939ee9c 100644
Binary files a/src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/6aee93b7ba4377b9e39dd41db836744e43875798d0ce9269ac6f0bea098e641a_5.jar b/src/app/build/intermediates/project_dex_archive/debug/out/6aee93b7ba4377b9e39dd41db836744e43875798d0ce9269ac6f0bea098e641a_5.jar
deleted file mode 100644
index 0adf30d..0000000
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/6aee93b7ba4377b9e39dd41db836744e43875798d0ce9269ac6f0bea098e641a_5.jar and /dev/null differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/e9b358b15940b2c4f6bb76bb191fbb9a5e99fd1af70bb304e6dab98d0577cdfb_5.jar b/src/app/build/intermediates/project_dex_archive/debug/out/e9b358b15940b2c4f6bb76bb191fbb9a5e99fd1af70bb304e6dab98d0577cdfb_5.jar
new file mode 100644
index 0000000..9ce0c45
Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/e9b358b15940b2c4f6bb76bb191fbb9a5e99fd1af70bb304e6dab98d0577cdfb_5.jar differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex
index 03c3630..cb9a111 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/RecycleBinActivity$BackgroundQueryHandler.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/RecycleBinActivity$BackgroundQueryHandler.dex
index edfc632..2f02236 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/RecycleBinActivity$BackgroundQueryHandler.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/RecycleBinActivity$BackgroundQueryHandler.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/RecycleBinActivity$OnListItemClickListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/RecycleBinActivity$OnListItemClickListener.dex
index abcb8f3..7876207 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/RecycleBinActivity$OnListItemClickListener.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/RecycleBinActivity$OnListItemClickListener.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/RecycleBinActivity.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/RecycleBinActivity.dex
index 2e7ff2b..7f72d15 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/RecycleBinActivity.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/RecycleBinActivity.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SwithBgActivity.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SwithBgActivity.dex
index 4d10231..780f784 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SwithBgActivity.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SwithBgActivity.dex differ
diff --git a/src/app/build/intermediates/runtime_symbol_list/debug/R.txt b/src/app/build/intermediates/runtime_symbol_list/debug/R.txt
index f940d3f..04629ce 100644
--- a/src/app/build/intermediates/runtime_symbol_list/debug/R.txt
+++ b/src/app/build/intermediates/runtime_symbol_list/debug/R.txt
@@ -8,6 +8,7 @@ int dimen text_font_size_medium 0x7f030001
 int dimen text_font_size_normal 0x7f030002
 int dimen text_font_size_small 0x7f030003
 int dimen text_font_size_super 0x7f030004
+int drawable add_bg 0x7f040049
 int drawable bg_btn_set_color 0x7f040000
 int drawable bg_color_btn_mask 0x7f040001
 int drawable call_record 0x7f040002
@@ -201,6 +202,7 @@ int string change_bg 0x7f0a006b
 int string datetime_dialog_cancel 0x7f0a000b
 int string datetime_dialog_ok 0x7f0a000c
 int string delete_remind_time_message 0x7f0a000d
+int string error_delete_or_recover 0x7f0a006f
 int string error_note_empty_for_clock 0x7f0a000e
 int string error_note_empty_for_send_to_desktop 0x7f0a000f
 int string error_note_not_exist 0x7f0a0010
diff --git a/src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
index d94cf65..f808e6b 100644
--- a/src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
+++ b/src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
@@ -1,3 +1,4 @@
+net.micode.notes:string/error_delete_or_recover = 0x7f0a006f
 net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004
 net.micode.notes:string/sync_progress_init_list = 0x7f0a0062
 net.micode.notes:string/realdelete = 0x7f0a0058
@@ -7,8 +8,8 @@ net.micode.notes:string/ticker_syncing = 0x7f0a0068
 net.micode.notes:id/tv_title_bar = 0x7f050045
 net.micode.notes:string/menu_font_small = 0x7f0a002c
 net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0054
-net.micode.notes:string/preferences_account_summary = 0x7f0a0046
 net.micode.notes:drawable/cloude = 0x7f040046
+net.micode.notes:string/preferences_account_summary = 0x7f0a0046
 net.micode.notes:string/sync_progress_syncing = 0x7f0a0064
 net.micode.notes:xml/widget_4x_info = 0x7f0c0003
 net.micode.notes:string/file_path = 0x7f0a0018
@@ -23,6 +24,7 @@ net.micode.notes:string/background_description = 0x7f0a006d
 net.micode.notes:string/menu_sync = 0x7f0a003a
 net.micode.notes:xml/preferences = 0x7f0c0000
 net.micode.notes:id/iv_bg_white = 0x7f050015
+net.micode.notes:drawable/add_bg = 0x7f040049
 net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000
 net.micode.notes:string/recyclebin = 0x7f0a005a
 net.micode.notes:id/selection_menu = 0x7f05003d
@@ -94,8 +96,8 @@ net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007
 net.micode.notes:string/hint_foler_name = 0x7f0a001f
 net.micode.notes:id/bg_txt_icon = 0x7f05004e
 net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0057
-net.micode.notes:id/menu_send_to_desktop = 0x7f05002a
 net.micode.notes:string/widget_under_visit_mode = 0x7f0a006a
+net.micode.notes:id/menu_send_to_desktop = 0x7f05002a
 net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005
 net.micode.notes:string/menu_select_none = 0x7f0a0035
 net.micode.notes:string/failed_sdcard_export = 0x7f0a0016
diff --git a/src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
index 3d371c2..b8247b0 100644
Binary files a/src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ
diff --git a/src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
index a674d7a..d4179e7 100644
--- a/src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
+++ b/src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
@@ -595,15 +595,15 @@ public class NoteEditActivity extends Activity implements OnClickListener,
             } else {
                 Log.d(TAG, "Wrong note id, should not happen");
             }
-            if (!isSyncMode()) {
-                if (!DataUtils.batchDeleteNotes(getContentResolver(), ids)) {
-                    Log.e(TAG, "Delete Note error");
-                }
-            } else {
+//            if (!isSyncMode()) {
+//                if (!DataUtils.batchDeleteNotes(getContentResolver(), ids)) {
+//                    Log.e(TAG, "Delete Note error");
+//                }
+//            } else {
                 if (!DataUtils.batchMoveToFolder(getContentResolver(), ids, Notes.ID_TRASH_FOLER)) {
                     Log.e(TAG, "Move notes to trash folder error, should not happens");
                 }
-            }
+//            }
         }
         mWorkingNote.markDeleted(true);
     }
diff --git a/src/app/src/main/java/net/micode/notes/ui/RecycleBinActivity.java b/src/app/src/main/java/net/micode/notes/ui/RecycleBinActivity.java
index 731cc5a..14e6e3c 100644
--- a/src/app/src/main/java/net/micode/notes/ui/RecycleBinActivity.java
+++ b/src/app/src/main/java/net/micode/notes/ui/RecycleBinActivity.java
@@ -1,11 +1,12 @@
 package net.micode.notes.ui;
 
+import static android.widget.Toast.LENGTH_SHORT;
+
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.AsyncQueryHandler;
 import android.content.ContentResolver;
-import android.content.Intent;
 import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.graphics.Bitmap;
@@ -51,14 +52,6 @@ public class RecycleBinActivity extends Activity {
 
     private static final String NORMAL_SELECTION = NoteColumns.PARENT_ID + "=?";
 
-    private static final String ROOT_FOLDER_SELECTION = "(" + NoteColumns.TYPE + "<>"
-            + Notes.TYPE_SYSTEM + " AND " + NoteColumns.PARENT_ID + "=?)" + " OR ("
-            + NoteColumns.ID + "=" + Notes.ID_CALL_RECORD_FOLDER + " AND "
-            + NoteColumns.NOTES_COUNT + ">0)";
-
-    private final static int REQUEST_CODE_OPEN_NODE = 102;
-    private final static int REQUEST_CODE_NEW_NODE = 103;
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -67,52 +60,51 @@ public class RecycleBinActivity extends Activity {
         initBackground();
     }
 
+    /**
+     * 查询背景状态，初始化页面背景,与背景切换功能中相同
+     */
     private void initBackground() {
         //获取Editor对象的引用
         int bg = sharedPreferences.getInt("bg",0);
-        if (bg == 100)
+        if (bg == 100)      //默认背景
             getWindow().setBackgroundDrawableResource(R.drawable.list_background);
-        else if (bg == 99) {
+        else if (bg == 99) {//自定义背景
             String path = sharedPreferences.getString("Path", null);
             bitmapBg(path);
         }
-        else
+        else                //预设背景
             getWindow().setBackgroundDrawableResource(SwithBgActivity.imageIds[bg]);
     }
 
+    /**
+     * 切换自定义背景,与背景切换功能中相同
+     * @param path 图片地址
+     */
     private void bitmapBg(String path){
         Bitmap bm;
         try{
             File file=new File(path);
-            if (file.exists()){
-                //从路径获取图片
+            if (file.exists()){//bitmap转换图片
                 bm = BitmapFactory.decodeFile(path);
                 Drawable drawable = new BitmapDrawable(bm);
                 getWindow().setBackgroundDrawable(drawable);
             }
-        }catch (Exception e){
+        }catch (Exception e){//抛出异常
             e.printStackTrace();
-            Toast.makeText(this, "自定义背景切换失败", Toast.LENGTH_SHORT).show();
-        }
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (resultCode == RESULT_OK
-                && (requestCode == REQUEST_CODE_OPEN_NODE || requestCode == REQUEST_CODE_NEW_NODE)) {
-            mNotesListAdapter.changeCursor(null);
-        } else {
-            super.onActivityResult(requestCode, resultCode, data);
+            Toast.makeText(this, "自定义背景切换失败", LENGTH_SHORT).show();
         }
     }
 
     @Override
     protected void onStart() {
         super.onStart();
-        startAsyncNotesListQuery();
+        startAsyncNotesListQuery();//启动查询
     }
 
-    @SuppressLint("InflateParams")
+    /**
+     * 初始化各种资源的函数
+     */
+    @SuppressLint({"InflateParams", "WorldReadableFiles"})
     private void initResources() {
         mContentResolver = this.getContentResolver();
         mBackgroundQueryHandler = new BackgroundQueryHandler(this.getContentResolver());
@@ -127,12 +119,13 @@ public class RecycleBinActivity extends Activity {
         sharedPreferences = getSharedPreferences("user", MODE_WORLD_READABLE);
     }
 
-
+    /**
+     * 查询回收站便签列表,与NoteListActivity中相似
+     */
     private void startAsyncNotesListQuery() {
-        String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION
-                : NORMAL_SELECTION;
+        //查询便签列表,与NoteListActivity类似
         mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null,
-                Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[]{
+                Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, NORMAL_SELECTION, new String[]{
                         String.valueOf(mCurrentFolderId)
                 }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC");
     }
@@ -151,86 +144,124 @@ public class RecycleBinActivity extends Activity {
         }
     }
 
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+        finish();
+    }
+
+    /**
+     * 顶部菜单生成,生成顶部的全选 还原 删除 按钮
+     */
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        //重置菜单
+        menu.clear();
+        //从自定义xml中获取样式
+        getMenuInflater().inflate(R.menu.recyclebin_options, menu);
+        //绑定全选按钮
+        menuItem = menu.findItem(R.id.select_all);
+        return true;
+    }
+
     /**
-     * 删除所选便签的方法
+     * 删除所选便签的方法,直接永久删除便签,并调用弹窗供用户进行确认
      */
     private void batchDelete() {
-        // delete notes directly
+        //如果没有选中任何便签
+        if (mNotesListAdapter.getSelectedCount() == 0) {
+            Log.e(TAG, "Send to desktop error");
+            //小弹窗提醒
+            Toast.makeText(this, R.string.error_delete_or_recover, LENGTH_SHORT).show();
+            return;
+        }
+        // 构建确认弹窗
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        //设置弹窗标题
         builder.setTitle(getString(R.string.alert_title_delete));
+        //设置弹窗图标
         builder.setIcon(android.R.drawable.ic_dialog_alert);
+        //设置弹窗消息
         builder.setMessage(getString(R.string.alert_message_realdelete));
+        //设置积极选项
         builder.setPositiveButton(android.R.string.ok,
-                (dialog, which) -> {
+                (dialog, which) -> {//点击确认选项后的事件
                     if (!DataUtils.batchDeleteNotes(mContentResolver, mNotesListAdapter
                             .getSelectedItemIds())) {
                         Log.e(TAG, "Delete notes error, should not happens");
                     }
+                    //重置所有便签的选择状态
                     mNotesListAdapter.selectAll(false);
                 });
+        //设置消极选项
         builder.setNegativeButton(android.R.string.cancel, null);
+        //弹出弹窗
         builder.show();
     }
 
-    @Override
-    public void onBackPressed() {
-        super.onBackPressed();
-        finish();
-    }
-
-    /**
-     * 顶部菜单生成
-     */
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-
-        menu.clear();
-        getMenuInflater().inflate(R.menu.recyclebin_options, menu);
-        menuItem = menu.findItem(R.id.select_all);
-
-        return true;
-    }
-
     /**
-     * 还原所选中便签的方法
+     * 还原所选中便签的方法,原理为将便签移出trash文件夹到根文件夹,构建弹窗供用户确认
      */
     void recover() {
+        //如果没有选中任何便签
+        if (mNotesListAdapter.getSelectedCount() == 0) {
+            Log.e(TAG, "Send to desktop error");
+            //小弹窗提醒
+            Toast.makeText(this, R.string.error_delete_or_recover, LENGTH_SHORT).show();
+            return;
+        }
+        //构建弹窗
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        //设置弹窗标题
         builder.setTitle(getString(R.string.recover));
+        //设置弹窗图标
         builder.setIcon(android.R.drawable.ic_dialog_alert);
+        //设置弹窗内消息
         builder.setMessage(getString(R.string.alert_message_recover));
+        //设置积极选项
         builder.setPositiveButton(android.R.string.ok,
-                (dialog, which) -> {
+                (dialog, which) -> {//确认后执行的方法
                     if (mNotesListAdapter.getSelectedCount() != 0) {
+                        //移动所选便签至根文件夹
                         DataUtils.batchMoveToFolder(mContentResolver,
                                 mNotesListAdapter.getSelectedItemIds(), Notes.ID_ROOT_FOLDER);
+                        //重置所有便签的选择状态
                         mNotesListAdapter.selectAll(false);
                     }
-                    else
-                        Log.e(TAG, "Recover error, should not happens");
+                    else//空选便签时执行
+                        Log.e(TAG, "Recover error, no note was selected");
                 });
+        //设置消极选项
         builder.setNegativeButton(android.R.string.cancel, null);
+        //显示弹窗
         builder.show();
     }
 
     /**
-     * 当顶部菜单项被选择时所执行的函数
+     * 当顶部菜单中的选项被选择时所执行的函数
      */
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
 
         if (item.getItemId() == R.id.recover) {//还原选项
+            //还原便签
             recover();
+
         } else if (item.getItemId() == R.id.realdelete) {//删除选项
+            //删除便签
             batchDelete();
-        } else if (item.getItemId() == R.id.select_all) {//全选选项
-            if (!mNotesListAdapter.isAllSelected()) {
 
-                item.setIcon(getResources().getDrawable(R.drawable.deselect_all));//切换取消全选图标
+        } else if (item.getItemId() == R.id.select_all) {//全选选项
+            //全选按钮状态切换
+            if (!mNotesListAdapter.isAllSelected()) {//若便签没有被全选的情况下点击全选按钮
+                //切换取消全选图标
+                item.setIcon(getResources().getDrawable(R.drawable.deselect_all));
+                //选择所有便签
                 mNotesListAdapter.selectAll(true);
-            } else {
-
-                item.setIcon(getResources().getDrawable(R.drawable.select_all));//切换全选图标
+            } else {//如果便签已经被全选
+                //切换全选图标
+                item.setIcon(getResources().getDrawable(R.drawable.select_all));
+                //取消全选所有便签
                 mNotesListAdapter.selectAll(false);
             }
         }
@@ -243,19 +274,24 @@ public class RecycleBinActivity extends Activity {
     private class OnListItemClickListener implements OnItemClickListener {
 
         public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+            //当点击的是便签项时
             if (view instanceof NotesListItem) {
+                //从视图获取便签项
                 NoteItemData item = ((NotesListItem) view).getItemData();
-
+                //判断是不是便签,防止点击到文件夹的情况,与上一句一样基本上没用
                 if (item.getType() == Notes.TYPE_NOTE) {
+                    //定位
                     position = position - mNotesListView.getHeaderViewsCount();
+                    //改变单个便签的被选择状态
                     mNotesListAdapter.setCheckedItem(position, !mNotesListAdapter.isSelectedItem(position));
 
+                    //用于判断是否手动全选了便签
                     if (mNotesListAdapter.isAllSelected())
-
-                        menuItem.setIcon(getResources().getDrawable(R.drawable.deselect_all));//切换取消全选图标
+                        //切换取消全选图标
+                        menuItem.setIcon(getResources().getDrawable(R.drawable.deselect_all));
                     else
-
-                        menuItem.setIcon(getResources().getDrawable(R.drawable.select_all));//切换全选图标
+                        //切换全选图标
+                        menuItem.setIcon(getResources().getDrawable(R.drawable.select_all));
                 }
             }
         }
diff --git a/src/app/src/main/java/net/micode/notes/ui/SwithBgActivity.java b/src/app/src/main/java/net/micode/notes/ui/SwithBgActivity.java
index 11ca57c..248eeec 100644
--- a/src/app/src/main/java/net/micode/notes/ui/SwithBgActivity.java
+++ b/src/app/src/main/java/net/micode/notes/ui/SwithBgActivity.java
@@ -36,11 +36,11 @@ public class SwithBgActivity extends Activity {
     /** 背景颜色名字数组
      * 由于时间关系，只能使用这种方式存储，可以更换更好的方式存储
      */
-    public static final String[] backgrounds = new String[]{"cloude", "dream", "dusk", "add"};
+    public static final String[] backgrounds = new String[]{"云墨", "梦想", "黄昏", "自定义"};
     /** 背景图片数组
      * 同背景颜色名字一样，
      */
-    public static final int[] imageIds = new int[]{R.drawable.cloude, R.drawable.dream, R.drawable.dusk,R.drawable.icon_app};
+    public static final int[] imageIds = new int[]{R.drawable.cloude, R.drawable.dream, R.drawable.dusk,R.drawable.add_bg};
 
     private static final int IMAGE_CODE = 6;
 
@@ -62,7 +62,6 @@ public class SwithBgActivity extends Activity {
 
     /**
      * 当活动被创建时所执行的函数,用于初始化大部分变量
-     * @param savedInstanceState
      */
     @SuppressLint("WorldReadableFiles")
     @Override
@@ -76,10 +75,10 @@ public class SwithBgActivity extends Activity {
         mSwitchBg = (GridView) findViewById(R.id.switch_bg);
         //创建项目列表
         listItems = new ArrayList<>();
-        //获取Editor对象的引用
-        editor = sharedPreferences.edit();
         //获取SharedPreferences对象
         sharedPreferences = getSharedPreferences("user", MODE_WORLD_READABLE);
+        //获取Editor对象的引用
+        editor = sharedPreferences.edit();
         //初始化网格列表
         initList();
         //初始化背景
diff --git a/src/app/src/main/res/drawable-hdpi/add_bg.png b/src/app/src/main/res/drawable-hdpi/add_bg.png
new file mode 100644
index 0000000..67371f9
Binary files /dev/null and b/src/app/src/main/res/drawable-hdpi/add_bg.png differ
diff --git a/src/app/src/main/res/values-zh-rCN/strings.xml b/src/app/src/main/res/values-zh-rCN/strings.xml
index 2228322..3aad1d3 100644
--- a/src/app/src/main/res/values-zh-rCN/strings.xml
+++ b/src/app/src/main/res/values-zh-rCN/strings.xml
@@ -131,5 +131,6 @@
     <string name="reset_bg">恢复预设</string>
     <string name="background_description">这是一个背景</string>
     <string name="switch_bg">切换背景</string>
+    <string name="error_delete_or_recover">没有选中任何项目!</string>
 
 </resources>
diff --git a/src/app/src/main/res/values-zh-rTW/strings.xml b/src/app/src/main/res/values-zh-rTW/strings.xml
index ba422af..d4478f4 100644
--- a/src/app/src/main/res/values-zh-rTW/strings.xml
+++ b/src/app/src/main/res/values-zh-rTW/strings.xml
@@ -129,8 +129,9 @@
     <string name="alert_message_recover">確認要還原所選的便簽嗎?</string>
     <string name="alert_message_realdelete">確認要永久刪除所選的便簽嗎?</string>
     <string name="change_bg">背景切換</string>
-    <string name="reset_bg">恢复预设</string>
-    <string name="background_description">这是一个背景</string>
-    <string name="switch_bg">切换背景</string>
+    <string name="reset_bg">恢復預設</string>
+    <string name="background_description">這是一個背景</string>
+    <string name="switch_bg">切換背景</string>
+    <string name="error_delete_or_recover">沒有選中任何項目!</string>
 
 </resources>
diff --git a/src/app/src/main/res/values/strings.xml b/src/app/src/main/res/values/strings.xml
index a96608a..6b9e854 100644
--- a/src/app/src/main/res/values/strings.xml
+++ b/src/app/src/main/res/values/strings.xml
@@ -135,6 +135,7 @@
     <string name="reset_bg">reset</string>
     <string name="background_description">This is a background</string>
     <string name="switch_bg">Switch Background</string>
+    <string name="error_delete_or_recover">Nothing selected!</string>
     <plurals name="search_results_title">
          <item quantity="one"><xliff:g id="number" example="1">%1$s</xliff:g> result for \"<xliff:g id="search" example="???">%2$s</xliff:g>\"</item>
         <!-- Case of 0 or 2 or more results. -->