diff --git a/src/Notes/.gradle/8.0/executionHistory/executionHistory.bin b/src/Notes/.gradle/8.0/executionHistory/executionHistory.bin
index 2bf5a2a..bb0f83e 100644
Binary files a/src/Notes/.gradle/8.0/executionHistory/executionHistory.bin and b/src/Notes/.gradle/8.0/executionHistory/executionHistory.bin differ
diff --git a/src/Notes/.gradle/8.0/executionHistory/executionHistory.lock b/src/Notes/.gradle/8.0/executionHistory/executionHistory.lock
index 1a3b7a7..a8a4684 100644
Binary files a/src/Notes/.gradle/8.0/executionHistory/executionHistory.lock and b/src/Notes/.gradle/8.0/executionHistory/executionHistory.lock differ
diff --git a/src/Notes/.gradle/8.0/fileHashes/fileHashes.bin b/src/Notes/.gradle/8.0/fileHashes/fileHashes.bin
index 80b8cc9..9f47349 100644
Binary files a/src/Notes/.gradle/8.0/fileHashes/fileHashes.bin and b/src/Notes/.gradle/8.0/fileHashes/fileHashes.bin differ
diff --git a/src/Notes/.gradle/8.0/fileHashes/fileHashes.lock b/src/Notes/.gradle/8.0/fileHashes/fileHashes.lock
index 704cb33..2a4f76c 100644
Binary files a/src/Notes/.gradle/8.0/fileHashes/fileHashes.lock and b/src/Notes/.gradle/8.0/fileHashes/fileHashes.lock differ
diff --git a/src/Notes/.gradle/8.0/fileHashes/resourceHashesCache.bin b/src/Notes/.gradle/8.0/fileHashes/resourceHashesCache.bin
index e7cc245..285bc0c 100644
Binary files a/src/Notes/.gradle/8.0/fileHashes/resourceHashesCache.bin and b/src/Notes/.gradle/8.0/fileHashes/resourceHashesCache.bin differ
diff --git a/src/Notes/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 805ca69..da7f435 100644
Binary files a/src/Notes/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/Notes/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/src/Notes/.gradle/file-system.probe b/src/Notes/.gradle/file-system.probe
index 6be6af5..b6d9802 100644
Binary files a/src/Notes/.gradle/file-system.probe and b/src/Notes/.gradle/file-system.probe differ
diff --git a/src/Notes/app/build/intermediates/apk/debug/app-debug.apk b/src/Notes/app/build/intermediates/apk/debug/app-debug.apk
index 2528a7f..82435ad 100644
Binary files a/src/Notes/app/build/intermediates/apk/debug/app-debug.apk and b/src/Notes/app/build/intermediates/apk/debug/app-debug.apk differ
diff --git a/src/Notes/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin b/src/Notes/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin
index 2a0a825..8737910 100644
Binary files a/src/Notes/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin and b/src/Notes/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin differ
diff --git a/src/Notes/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin b/src/Notes/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin
index d847612..a94134c 100644
Binary files a/src/Notes/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin and b/src/Notes/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin differ
diff --git a/src/Notes/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/Notes/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
index 8c2f914..1fe2149 100644
Binary files a/src/Notes/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/src/Notes/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ
diff --git a/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
index 5865ad6..2215ade 100644
--- a/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
+++ b/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Sat Dec 16 23:24:10 CST 2023
+#Fri Dec 22 19:43:31 CST 2023
 net.micode.notes.app-main-6\:/color/primary_text_dark.xml=D\:\\Study\\SE\\MiNotes\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
 net.micode.notes.app-main-6\:/color/secondary_text_dark.xml=D\:\\Study\\SE\\MiNotes\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
 net.micode.notes.app-main-6\:/drawable-hdpi/bg_btn_set_color.png=D\:\\Study\\SE\\MiNotes\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
diff --git a/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
index e49b0c3..0102458 100644
--- a/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
+++ b/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
@@ -133,7 +133,7 @@
     </style>
     <style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
         <item name="android:displayOptions"/>
-        <item name="android:visibility">gone</item>
+        <item name="android:visibility">visible</item>
     </style>
     <style name="NoteTheme" parent="@android:style/Theme.Holo.Light">
         <item name="android:actionBarStyle">@style/NoteActionBarStyle</item>
diff --git a/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
index 0af65dd..5a13304 100644
--- a/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
+++ b/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
@@ -42,7 +42,7 @@
         <item name="android:actionBarStyle">@style/NoteActionBarStyle</item>
     </style><style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
         <item name="android:displayOptions"/>
-        <item name="android:visibility">gone</item>
+        <item name="android:visibility">visible</item>
     </style></file><file path="D:\Study\SE\MiNotes\src\Notes\app\src\main\res\values-zh-rCN\arrays.xml" qualifiers="zh-rCN"><string-array name="menu_share_ways">
         <item>短信</item>
         <item>邮件</item>
diff --git a/src/Notes/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/src/Notes/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
index 17daa6e..edd62ef 100644
--- a/src/Notes/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
+++ b/src/Notes/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Sat Dec 16 23:24:11 CST 2023
+#Fri Dec 22 19:43:31 CST 2023
 net.micode.notes.app-main-5\:/color/primary_text_dark.xml=D\:\\Study\\SE\\MiNotes\\src\\Notes\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml
 net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=D\:\\Study\\SE\\MiNotes\\src\\Notes\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml
 net.micode.notes.app-main-5\:/drawable-hdpi/bg_btn_set_color.png=D\:\\Study\\SE\\MiNotes\\src\\Notes\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_btn_set_color.png
diff --git a/src/Notes/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/src/Notes/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
deleted file mode 100644
index d65e0cc..0000000
--- a/src/Notes/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?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_title_delete">删除</string>
-    <string name="app_name">便签</string>
-    <string name="app_widget2x2">便签2x2</string>
-    <string name="app_widget4x4">便签4x4</string>
-    <string name="button_delete">删除</string>
-    <string name="call_record_folder_name">通话便签</string>
-    <string name="datetime_dialog_cancel">取消</string>
-    <string name="datetime_dialog_ok">设置</string>
-    <string name="delete_remind_time_message">成功删除提醒</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="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="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/Notes/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/src/Notes/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
deleted file mode 100644
index 226b5bc..0000000
--- a/src/Notes/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?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_title_delete">刪除</string>
-    <string name="app_name">便簽</string>
-    <string name="app_widget2x2">便簽2x2</string>
-    <string name="app_widget4x4">便簽4x4</string>
-    <string name="button_delete">刪除</string>
-    <string name="call_record_folder_name">通話便籤</string>
-    <string name="datetime_dialog_cancel">取消</string>
-    <string name="datetime_dialog_ok">設置</string>
-    <string name="delete_remind_time_message">成功刪除提醒</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="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="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/Notes/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml b/src/Notes/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml
index e49b0c3..0102458 100644
--- a/src/Notes/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml
+++ b/src/Notes/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml
@@ -133,7 +133,7 @@
     </style>
     <style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
         <item name="android:displayOptions"/>
-        <item name="android:visibility">gone</item>
+        <item name="android:visibility">visible</item>
     </style>
     <style name="NoteTheme" parent="@android:style/Theme.Holo.Light">
         <item name="android:actionBarStyle">@style/NoteActionBarStyle</item>
diff --git a/src/Notes/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml b/src/Notes/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml
index 0af65dd..5a13304 100644
--- a/src/Notes/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml
+++ b/src/Notes/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml
@@ -42,7 +42,7 @@
         <item name="android:actionBarStyle">@style/NoteActionBarStyle</item>
     </style><style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
         <item name="android:displayOptions"/>
-        <item name="android:visibility">gone</item>
+        <item name="android:visibility">visible</item>
     </style></file><file path="D:\Study\SE\MiNotes\src\Notes\app\src\main\res\values-zh-rCN\arrays.xml" qualifiers="zh-rCN"><string-array name="menu_share_ways">
         <item>短信</item>
         <item>邮件</item>
diff --git a/src/Notes/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
index 2825a6d..f56ec38 100644
--- a/src/Notes/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/src/Notes/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Wed Dec 20 23:50:56 CST 2023
+#Fri Dec 22 19:43:32 CST 2023
 base.0=D\:\\Study\\SE\\MiNotes\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
 path.0=classes.dex
 renamed.0=classes.dex
diff --git a/src/Notes/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
index 26337d5..8106485 100644
Binary files a/src/Notes/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/Notes/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class
index ec6183a..88b628d 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class
index 75ae652..c1d88a5 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class
index b964ed4..d3e4981 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class
index 6409b67..4e3869d 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class
index 16704b5..57c1d4f 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class
index e3d9c96..8a7f8a0 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class
index e286885..7bf0d6b 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class
index a95f925..f185cd1 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class
index 2191430..277fe40 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class
index 7ef0abc..aaf3a90 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class
index c926b67..7c0d343 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class
index 71a0091..03c8ea0 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class
index 47a468c..445ccf4 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class
index 4e56d58..3b93e5e 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class
index 06799d1..aecdf92 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class
index dfffa21..ea8b2ac 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class
index 7d42a84..72aee1f 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class
index 8e3e9ce..770d355 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
index f6a7826..b73d823 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class
index fbeff49..ec15e9e 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class
index e0eea60..eb8ca51 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class
index 05bc982..55719be 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class
index fb92d6c..7bf36f7 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class
index 659c454..98a649c 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class
index 324b349..e28e197 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class
index a090d40..09164c1 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class
index de4e408..568cece 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class
index 93cbf94..950a358 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
index 3fc279b..b1ecc29 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class
index 2312a28..649a9d5 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class
index de48358..bd775e5 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class
index cb50f1d..8b436df 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class
index 08950d5..5b7c24d 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class
index 2cdacee..004bb5a 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class
index bde970e..8ed8a58 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class
index 110a0b1..3afadbf 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
index ea940a9..2699bd3 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
index 79e06a7..0223718 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ
diff --git a/src/Notes/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Notes/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
index 4762f47..2d292cc 100644
--- a/src/Notes/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
+++ b/src/Notes/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
@@ -54,7 +54,7 @@
 34-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:33:22-78
 35
 36    <application
-36-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:35:5-151:19
+36-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:35:5-150:19
 37        android:debuggable="true"
 38        android:extractNativeLibs="true"
 39        android:icon="@drawable/icon_app"
@@ -63,7 +63,7 @@
 40-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:37:9-41
 41        android:testOnly="true" >
 42        <activity
-42-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:38:9-52:20
+42-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:38:9-51:20
 43            android:name="net.micode.notes.ui.NotesListActivity"
 43-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:39:13-49
 44            android:configChanges="keyboardHidden|orientation|screenSize"
@@ -76,214 +76,212 @@
 47-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:43:13-43
 48            android:theme="@style/NoteTheme"
 48-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:44:13-45
-49            android:uiOptions="splitActionBarWhenNarrow"
-49-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:45:13-57
-50            android:windowSoftInputMode="adjustPan" >
-50-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:46:13-52
-51            <intent-filter>
-51-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:48:13-51:29
-52                <action android:name="android.intent.action.MAIN" />
-52-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:49:17-69
-52-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:49:25-66
-53
-54                <category android:name="android.intent.category.LAUNCHER" />
-54-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:50:17-77
-54-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:50:27-74
-55            </intent-filter>
-56        </activity>
-57        <activity
-57-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:54:9-83:20
-58            android:name="net.micode.notes.ui.NoteEditActivity"
-58-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:55:13-48
-59            android:configChanges="keyboardHidden|orientation|screenSize"
-59-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:56:13-74
-60            android:launchMode="singleTop"
-60-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:57:13-43
-61            android:theme="@style/NoteTheme" >
-61-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:58:13-45
-62            <intent-filter>
-62-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:60:13-65:29
-63                <action android:name="android.intent.action.VIEW" />
-63-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:61:17-69
-63-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:61:25-66
-64
-65                <category android:name="android.intent.category.DEFAULT" />
-65-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:62:17-76
-65-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:62:27-73
-66
-67                <data
-67-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:63:17-167
-68                    android:host="com.example.notes.provider"
-68-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:63:101-142
-69                    android:mimeType="vnd.android.cursor.item/text_note"
-69-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:63:23-75
-70                    android:path="/notes"
-70-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:63:143-164
-71                    android:scheme="content" />
-71-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:63:76-100
-72                <data
-72-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:63:17-167
-73                    android:host="com.example.notes.provider"
-73-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:63:101-142
-74                    android:mimeType="vnd.android.cursor.item/call_note"
-74-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:63:23-75
-75                    android:path="/notes"
-75-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:63:143-164
-76                    android:scheme="content" />
-76-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:63:76-100
-77            </intent-filter>
-78            <intent-filter>
-78-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:68:13-73:29
-79                <action android:name="android.intent.action.INSERT_OR_EDIT" />
-79-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:69:17-79
-79-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:69:25-76
-80
-81                <category android:name="android.intent.category.DEFAULT" />
-81-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:62:17-76
-81-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:62:27-73
-82
-83                <data android:mimeType="vnd.android.cursor.item/text_note" />
-83-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:63:17-167
-83-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:63:23-75
-84                <data android:mimeType="vnd.android.cursor.item/call_note" />
-84-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:63:17-167
-84-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:63:23-75
-85            </intent-filter>
-86            <intent-filter>
-86-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:75:13-78:29
-87                <action android:name="android.intent.action.SEARCH" />
-87-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:76:17-71
-87-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:76:25-68
-88
-89                <category android:name="android.intent.category.DEFAULT" />
-89-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:62:17-76
-89-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:62:27-73
-90            </intent-filter>
-91
-92            <meta-data
-92-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:80:13-82:54
-93                android:name="android.app.searchable"
-93-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:81:17-54
-94                android:resource="@xml/searchable" />
-94-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:82:17-51
-95        </activity>
-96
-97        <provider
-97-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:85:9-88:43
-98            android:name="net.micode.notes.data.NotesProvider"
-98-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:86:13-63
-99            android:authorities="micode_notes"
-99-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:87:13-47
-100            android:multiprocess="true" />
-100-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:88:13-40
-101
-102        <receiver
-102-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:90:9-102:20
-103            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
-103-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:91:13-57
-104            android:label="@string/app_widget2x2" >
-104-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:92:13-50
-105            <intent-filter>
-105-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:93:13-97:29
-106                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-106-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:94:17-84
-106-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:94:25-81
-107                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+49            android:windowSoftInputMode="adjustPan" >
+49-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:45:13-52
+50            <intent-filter>
+50-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:47:13-50:29
+51                <action android:name="android.intent.action.MAIN" />
+51-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:48:17-69
+51-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:48:25-66
+52
+53                <category android:name="android.intent.category.LAUNCHER" />
+53-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:49:17-77
+53-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:49:27-74
+54            </intent-filter>
+55        </activity>
+56        <activity
+56-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:53:9-82:20
+57            android:name="net.micode.notes.ui.NoteEditActivity"
+57-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:54:13-48
+58            android:configChanges="keyboardHidden|orientation|screenSize"
+58-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:55:13-74
+59            android:launchMode="singleTop"
+59-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:56:13-43
+60            android:theme="@style/NoteTheme" >
+60-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:57:13-45
+61            <intent-filter>
+61-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:59:13-64:29
+62                <action android:name="android.intent.action.VIEW" />
+62-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:60:17-69
+62-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:60:25-66
+63
+64                <category android:name="android.intent.category.DEFAULT" />
+64-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:61:17-76
+64-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:61:27-73
+65
+66                <data
+66-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:62:17-167
+67                    android:host="com.example.notes.provider"
+67-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:62:101-142
+68                    android:mimeType="vnd.android.cursor.item/text_note"
+68-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:62:23-75
+69                    android:path="/notes"
+69-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:62:143-164
+70                    android:scheme="content" />
+70-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:62:76-100
+71                <data
+71-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:62:17-167
+72                    android:host="com.example.notes.provider"
+72-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:62:101-142
+73                    android:mimeType="vnd.android.cursor.item/call_note"
+73-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:62:23-75
+74                    android:path="/notes"
+74-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:62:143-164
+75                    android:scheme="content" />
+75-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:62:76-100
+76            </intent-filter>
+77            <intent-filter>
+77-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:67:13-72:29
+78                <action android:name="android.intent.action.INSERT_OR_EDIT" />
+78-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:68:17-79
+78-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:68:25-76
+79
+80                <category android:name="android.intent.category.DEFAULT" />
+80-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:61:17-76
+80-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:61:27-73
+81
+82                <data android:mimeType="vnd.android.cursor.item/text_note" />
+82-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:62:17-167
+82-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:62:23-75
+83                <data android:mimeType="vnd.android.cursor.item/call_note" />
+83-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:62:17-167
+83-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:62:23-75
+84            </intent-filter>
+85            <intent-filter>
+85-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:74:13-77:29
+86                <action android:name="android.intent.action.SEARCH" />
+86-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:75:17-71
+86-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:75:25-68
+87
+88                <category android:name="android.intent.category.DEFAULT" />
+88-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:61:17-76
+88-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:61:27-73
+89            </intent-filter>
+90
+91            <meta-data
+91-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:79:13-81:54
+92                android:name="android.app.searchable"
+92-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:80:17-54
+93                android:resource="@xml/searchable" />
+93-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:81:17-51
+94        </activity>
+95
+96        <provider
+96-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:84:9-87:43
+97            android:name="net.micode.notes.data.NotesProvider"
+97-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:85:13-63
+98            android:authorities="micode_notes"
+98-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:86:13-47
+99            android:multiprocess="true" />
+99-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:87:13-40
+100
+101        <receiver
+101-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:89:9-101:20
+102            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
+102-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:90:13-57
+103            android:label="@string/app_widget2x2" >
+103-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:91:13-50
+104            <intent-filter>
+104-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:92:13-96:29
+105                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+105-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:93:17-84
+105-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:93:25-81
+106                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+106-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:94:17-85
+106-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:94:25-82
+107                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
 107-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:95:17-85
 107-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:95:25-82
-108                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-108-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:96:17-85
-108-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:96:25-82
-109            </intent-filter>
-110
-111            <meta-data
-111-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:99:13-101:58
-112                android:name="android.appwidget.provider"
-112-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:100:17-58
-113                android:resource="@xml/widget_2x_info" />
-113-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:101:17-55
-114        </receiver>
-115        <receiver
-115-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:103:9-116:20
-116            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
-116-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:104:13-57
-117            android:label="@string/app_widget4x4" >
-117-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:105:13-50
-118            <intent-filter>
-118-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:93:13-97:29
-119                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-119-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:94:17-84
-119-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:94:25-81
-120                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+108            </intent-filter>
+109
+110            <meta-data
+110-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:98:13-100:58
+111                android:name="android.appwidget.provider"
+111-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:99:17-58
+112                android:resource="@xml/widget_2x_info" />
+112-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:100:17-55
+113        </receiver>
+114        <receiver
+114-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:102:9-115:20
+115            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
+115-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:103:13-57
+116            android:label="@string/app_widget4x4" >
+116-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:104:13-50
+117            <intent-filter>
+117-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:92:13-96:29
+118                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+118-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:93:17-84
+118-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:93:25-81
+119                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+119-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:94:17-85
+119-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:94:25-82
+120                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
 120-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:95:17-85
 120-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:95:25-82
-121                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-121-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:96:17-85
-121-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:96:25-82
-122            </intent-filter>
-123
-124            <meta-data
-124-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:99:13-101:58
-125                android:name="android.appwidget.provider"
-125-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:100:17-58
-126                android:resource="@xml/widget_4x_info" />
-126-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:101:17-55
-127        </receiver>
-128        <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
-128-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:118:9-122:20
-128-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:118:19-55
-129            <intent-filter>
-129-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:119:13-121:29
-130                <action android:name="android.intent.action.BOOT_COMPLETED" />
-130-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:120:17-79
-130-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:120:25-76
-131            </intent-filter>
-132        </receiver>
-133        <receiver
-133-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:124:9-127:20
-134            android:name="net.micode.notes.ui.AlarmReceiver"
-134-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:125:13-61
-135            android:process=":remote" >
-135-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:126:13-38
-136        </receiver>
-137
-138        <activity
-138-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:129:9-134:20
-139            android:name="net.micode.notes.ui.AlarmAlertActivity"
-139-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:130:13-50
-140            android:label="@string/app_name"
-140-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:131:13-45
-141            android:launchMode="singleInstance"
-141-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:132:13-48
-142            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
-142-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:133:13-75
-143        </activity>
-144        <activity
-144-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:136:9-141:20
-145            android:name="net.micode.notes.ui.NotesPreferenceActivity"
-145-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:137:13-71
-146            android:label="@string/preferences_title"
-146-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:138:13-54
-147            android:launchMode="singleTop"
-147-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:139:13-43
-148            android:theme="@android:style/Theme.Holo.Light" >
-148-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:140:13-60
-149        </activity>
-150
-151        <service
-151-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:143:9-146:19
-152            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-152-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:144:13-74
-153            android:exported="false" >
-153-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:145:13-37
-154        </service>
-155
-156        <meta-data
-156-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:148:9-150:52
-157            android:name="android.app.default_searchable"
-157-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:149:13-58
-158            android:value=".ui.NoteEditActivity" />
-158-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:150:13-49
-159    </application>
-160
-161</manifest>
+121            </intent-filter>
+122
+123            <meta-data
+123-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:98:13-100:58
+124                android:name="android.appwidget.provider"
+124-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:99:17-58
+125                android:resource="@xml/widget_4x_info" />
+125-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:100:17-55
+126        </receiver>
+127        <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
+127-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:117:9-121:20
+127-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:117:19-55
+128            <intent-filter>
+128-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:118:13-120:29
+129                <action android:name="android.intent.action.BOOT_COMPLETED" />
+129-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:119:17-79
+129-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:119:25-76
+130            </intent-filter>
+131        </receiver>
+132        <receiver
+132-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:123:9-126:20
+133            android:name="net.micode.notes.ui.AlarmReceiver"
+133-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:124:13-61
+134            android:process=":remote" >
+134-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:125:13-38
+135        </receiver>
+136
+137        <activity
+137-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:128:9-133:20
+138            android:name="net.micode.notes.ui.AlarmAlertActivity"
+138-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:129:13-50
+139            android:label="@string/app_name"
+139-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:130:13-45
+140            android:launchMode="singleInstance"
+140-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:131:13-48
+141            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
+141-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:132:13-75
+142        </activity>
+143        <activity
+143-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:135:9-140:20
+144            android:name="net.micode.notes.ui.NotesPreferenceActivity"
+144-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:136:13-71
+145            android:label="@string/preferences_title"
+145-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:137:13-54
+146            android:launchMode="singleTop"
+146-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:138:13-43
+147            android:theme="@android:style/Theme.Holo.Light" >
+147-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:139:13-60
+148        </activity>
+149
+150        <service
+150-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:142:9-145:19
+151            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
+151-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:143:13-74
+152            android:exported="false" >
+152-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:144:13-37
+153        </service>
+154
+155        <meta-data
+155-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:147:9-149:52
+156            android:name="android.app.default_searchable"
+156-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:148:13-58
+157            android:value=".ui.NoteEditActivity" />
+157-->D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:149:13-49
+158    </application>
+159
+160</manifest>
diff --git a/src/Notes/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/src/Notes/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
index bb2e737..10e3b54 100644
--- a/src/Notes/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
+++ b/src/Notes/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
@@ -46,7 +46,6 @@
             android:label="@string/app_name"
             android:launchMode="singleTop"
             android:theme="@style/NoteTheme"
-            android:uiOptions="splitActionBarWhenNarrow"
             android:windowSoftInputMode="adjustPan" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/src/Notes/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/src/Notes/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
index bb2e737..10e3b54 100644
--- a/src/Notes/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
+++ b/src/Notes/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
@@ -46,7 +46,6 @@
             android:label="@string/app_name"
             android:launchMode="singleTop"
             android:theme="@style/NoteTheme"
-            android:uiOptions="splitActionBarWhenNarrow"
             android:windowSoftInputMode="adjustPan" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/src/Notes/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/src/Notes/app/build/intermediates/merged_res/debug/values_values.arsc.flat
index 40e69d2..577bcf3 100644
Binary files a/src/Notes/app/build/intermediates/merged_res/debug/values_values.arsc.flat and b/src/Notes/app/build/intermediates/merged_res/debug/values_values.arsc.flat differ
diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
index 4bf7ce0..57244ef 100644
--- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
+++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
@@ -1,29 +1,29 @@
 {
     "logs": [
         {
-            "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rCN_values-zh-rCN.arsc.flat",
+            "outputFile": "C:\\Users\\11\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\values-zh-rTW_values-zh-rTW.arsc.flat",
             "map": [
                 {
-                    "source": "D:\\Study\\SE\\MiNotes\\src\\Notes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+                    "source": "D:\\Study\\SE\\MiNotes\\src\\Notes\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
                     "from": {
-                        "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
+                        "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052",
-                        "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
-                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113"
+                        "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052",
+                        "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
+                        "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113"
                     },
                     "to": {
                         "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925",
+                        "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923",
                         "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
-                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
+                        "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984"
                     }
                 },
                 {
-                    "source": "D:\\Study\\SE\\MiNotes\\src\\Notes\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+                    "source": "D:\\Study\\SE\\MiNotes\\src\\Notes\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
@@ -45,6 +45,92 @@
         },
         {
             "outputFile": "net.micode.notes.app-merged_res-4:/values_values.arsc.flat",
+            "map": [
+                {
+                    "source": "D:\\Study\\SE\\MiNotes\\src\\Notes\\app\\src\\main\\res\\values\\dimens.xml",
+                    "from": {
+                        "startLines": "-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1"
+                    },
+                    "to": {
+                        "startLines": "13,14,15,16,17",
+                        "startColumns": "4,4,4,4,4",
+                        "startOffsets": "477,529,582,635,687",
+                        "endColumns": "51,52,52,51,51",
+                        "endOffsets": "524,577,630,682,734"
+                    }
+                },
+                {
+                    "source": "D:\\Study\\SE\\MiNotes\\src\\Notes\\app\\src\\main\\res\\values\\arrays.xml",
+                    "from": {
+                        "startLines": "-1,-1",
+                        "startColumns": "-1,-1",
+                        "startOffsets": "-1,-1"
+                    },
+                    "to": {
+                        "startLines": "2,8",
+                        "startColumns": "4,4",
+                        "startOffsets": "105,300",
+                        "endLines": "7,11",
+                        "endColumns": "19,19",
+                        "endOffsets": "295,415"
+                    }
+                },
+                {
+                    "source": "D:\\Study\\SE\\MiNotes\\src\\Notes\\app\\src\\main\\res\\values\\colors.xml",
+                    "from": {
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
+                    },
+                    "to": {
+                        "startLines": "12",
+                        "startColumns": "4",
+                        "startOffsets": "420",
+                        "endColumns": "56",
+                        "endOffsets": "472"
+                    }
+                },
+                {
+                    "source": "D:\\Study\\SE\\MiNotes\\src\\Notes\\app\\src\\main\\res\\values\\strings.xml",
+                    "from": {
+                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                    },
+                    "to": {
+                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034",
+                        "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
+                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+                        "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119"
+                    }
+                },
+                {
+                    "source": "D:\\Study\\SE\\MiNotes\\src\\Notes\\app\\src\\main\\res\\values\\styles.xml",
+                    "from": {
+                        "startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,2704,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "-1,-1,2913,-1,-1,-1,-1,-1,-1,-1,-1"
+                    },
+                    "to": {
+                        "startLines": "125,129,133,137,140,144,148,152,156,160,164",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "8124,8328,8539,8749,8909,9092,9277,9462,9665,9871,10054",
+                        "endLines": "128,132,136,139,143,147,151,155,159,163,167",
+                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+                        "endOffsets": "8323,8534,8744,8904,9087,9272,9457,9660,9866,10049,10250"
+                    }
+                }
+            ]
+        },
+        {
+            "outputFile": "C:\\Users\\11\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\values_values.arsc.flat",
             "map": [
                 {
                     "source": "D:\\Study\\SE\\MiNotes\\src\\Notes\\app\\src\\main\\res\\values\\dimens.xml",
@@ -140,29 +226,29 @@
             ]
         },
         {
-            "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rTW_values-zh-rTW.arsc.flat",
+            "outputFile": "C:\\Users\\11\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\values-zh-rCN_values-zh-rCN.arsc.flat",
             "map": [
                 {
-                    "source": "D:\\Study\\SE\\MiNotes\\src\\Notes\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+                    "source": "D:\\Study\\SE\\MiNotes\\src\\Notes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
                     "from": {
-                        "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
+                        "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052",
-                        "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
-                        "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113"
+                        "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052",
+                        "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
+                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113"
                     },
                     "to": {
                         "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923",
+                        "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925",
                         "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
-                        "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984"
+                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
                     }
                 },
                 {
-                    "source": "D:\\Study\\SE\\MiNotes\\src\\Notes\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+                    "source": "D:\\Study\\SE\\MiNotes\\src\\Notes\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
diff --git a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
index 2c4b0e6..79e33e9 100644
--- a/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
+++ b/src/Notes/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
@@ -1,7 +1,7 @@
 {
     "logs": [
         {
-            "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values/values.xml",
+            "outputFile": "C:\\Users\\11\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-2:\\values\\values.xml",
             "map": [
                 {
                     "source": "D:\\Study\\SE\\MiNotes\\src\\Notes\\app\\src\\main\\res\\values\\dimens.xml",
@@ -95,6 +95,92 @@
                     }
                 }
             ]
+        },
+        {
+            "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values/values.xml",
+            "map": [
+                {
+                    "source": "D:\\Study\\SE\\MiNotes\\src\\Notes\\app\\src\\main\\res\\values\\dimens.xml",
+                    "from": {
+                        "startLines": "-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1"
+                    },
+                    "to": {
+                        "startLines": "13,14,15,16,17",
+                        "startColumns": "4,4,4,4,4",
+                        "startOffsets": "477,529,582,635,687",
+                        "endColumns": "51,52,52,51,51",
+                        "endOffsets": "524,577,630,682,734"
+                    }
+                },
+                {
+                    "source": "D:\\Study\\SE\\MiNotes\\src\\Notes\\app\\src\\main\\res\\values\\arrays.xml",
+                    "from": {
+                        "startLines": "-1,-1",
+                        "startColumns": "-1,-1",
+                        "startOffsets": "-1,-1"
+                    },
+                    "to": {
+                        "startLines": "2,8",
+                        "startColumns": "4,4",
+                        "startOffsets": "105,300",
+                        "endLines": "7,11",
+                        "endColumns": "19,19",
+                        "endOffsets": "295,415"
+                    }
+                },
+                {
+                    "source": "D:\\Study\\SE\\MiNotes\\src\\Notes\\app\\src\\main\\res\\values\\colors.xml",
+                    "from": {
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
+                    },
+                    "to": {
+                        "startLines": "12",
+                        "startColumns": "4",
+                        "startOffsets": "420",
+                        "endColumns": "56",
+                        "endOffsets": "472"
+                    }
+                },
+                {
+                    "source": "D:\\Study\\SE\\MiNotes\\src\\Notes\\app\\src\\main\\res\\values\\strings.xml",
+                    "from": {
+                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                    },
+                    "to": {
+                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034",
+                        "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
+                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+                        "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119"
+                    }
+                },
+                {
+                    "source": "D:\\Study\\SE\\MiNotes\\src\\Notes\\app\\src\\main\\res\\values\\styles.xml",
+                    "from": {
+                        "startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,2704,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "-1,-1,2913,-1,-1,-1,-1,-1,-1,-1,-1"
+                    },
+                    "to": {
+                        "startLines": "125,129,133,137,140,144,148,152,156,160,164",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "8124,8328,8539,8749,8909,9092,9277,9462,9665,9871,10054",
+                        "endLines": "128,132,136,139,143,147,151,155,159,163,167",
+                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+                        "endOffsets": "8323,8534,8744,8904,9087,9272,9457,9660,9866,10049,10250"
+                    }
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/src/Notes/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml b/src/Notes/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
index bb2e737..10e3b54 100644
--- a/src/Notes/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
+++ b/src/Notes/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
@@ -46,7 +46,6 @@
             android:label="@string/app_name"
             android:launchMode="singleTop"
             android:theme="@style/NoteTheme"
-            android:uiOptions="splitActionBarWhenNarrow"
             android:windowSoftInputMode="adjustPan" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/src/Notes/app/build/intermediates/packaged_res/debug/values/values.xml b/src/Notes/app/build/intermediates/packaged_res/debug/values/values.xml
index e49b0c3..0102458 100644
--- a/src/Notes/app/build/intermediates/packaged_res/debug/values/values.xml
+++ b/src/Notes/app/build/intermediates/packaged_res/debug/values/values.xml
@@ -133,7 +133,7 @@
     </style>
     <style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
         <item name="android:displayOptions"/>
-        <item name="android:visibility">gone</item>
+        <item name="android:visibility">visible</item>
     </style>
     <style name="NoteTheme" parent="@android:style/Theme.Holo.Light">
         <item name="android:actionBarStyle">@style/NoteActionBarStyle</item>
diff --git a/src/Notes/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/Notes/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
index 08dda6e..81398cf 100644
Binary files a/src/Notes/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/src/Notes/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ
diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex
index dfed02a..d9dbc59 100644
Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex differ
diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex
index 761c063..4f89a20 100644
Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex differ
diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex
index 4add090..661d592 100644
Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex differ
diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex
index dd9a473..7ba57c0 100644
Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex differ
diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex
index 4778d46..9dec7a4 100644
Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex differ
diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex
index 1459cce..0287241 100644
Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex differ
diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex
index f1b5516..c98deff 100644
Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex differ
diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex
index 327565b..e320810 100644
Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex differ
diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex
index faab475..157cf55 100644
Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex differ
diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex
index d76445e..785388d 100644
Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex differ
diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex
index 5ac0b90..58dd91f 100644
Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex differ
diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex
index 695f638..997771d 100644
Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex differ
diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex
index 5f9d776..b8c96b2 100644
Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex differ
diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex
index 58c1698..31bec51 100644
Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex differ
diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex
index dce99eb..a9ab536 100644
Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex differ
diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex
index 1d82439..f812a15 100644
Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex differ
diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex
index 1622b09..6b72c9a 100644
Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex differ
diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex
index bbff941..37f4f57 100644
Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex differ
diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex
index cdbe321..bda3c37 100644
Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ
diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex
index 87d4f4a..b7cd7c8 100644
Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex differ
diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex
index db6a8e2..f6616c3 100644
Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex differ
diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex
index b16cb95..9530b86 100644
Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex differ
diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex
index 29566d8..46c0582 100644
Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex differ
diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex
index 4080e90..c77c1af 100644
Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex differ
diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex
index 1bb60e2..174a744 100644
Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex differ
diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex
index 18c81d0..1300b6a 100644
Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex differ
diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex
index 201f737..435e61b 100644
Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex differ
diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex
index 4d634e1..2c4a38c 100644
Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex differ
diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex
index 418d07a..65ff865 100644
Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ
diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex
index 338d8ec..ab07440 100644
Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex differ
diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex
index 55a0cc0..76bd4b6 100644
Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex differ
diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex
index a9fbb4a..3fa4402 100644
Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex differ
diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex
index c47a99e..87a4341 100644
Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex differ
diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex
index 0edc9cb..6192f15 100644
Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex differ
diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex
index 645e8e7..7bcf861 100644
Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex differ
diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex
index 220c8cf..2cdf2cf 100644
Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex differ
diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex
index d5b3389..0939499 100644
Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex differ
diff --git a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex
index 434406a..2784a4f 100644
Binary files a/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and b/src/Notes/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ
diff --git a/src/Notes/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/src/Notes/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
index c78041f..6e7247b 100644
--- a/src/Notes/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
+++ b/src/Notes/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
@@ -1,109 +1,125 @@
-net.micode.notes:xml/searchable = 0x7f0c0001
 net.micode.notes:xml/preferences = 0x7f0c0000
+net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010
 net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a
-net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009
-net.micode.notes:xml/widget_2x_info = 0x7f0c0002
-net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007
-net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005
-net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001
-net.micode.notes:string/widget_under_visit_mode = 0x7f0a0065
-net.micode.notes:string/sync_progress_login = 0x7f0a005e
-net.micode.notes:string/success_sync_account = 0x7f0a005c
-net.micode.notes:string/search_setting_description = 0x7f0a0059
-net.micode.notes:string/search_hint = 0x7f0a0057
+net.micode.notes:string/menu_deselect_all = 0x7f0a0022
 net.micode.notes:string/search = 0x7f0a0056
-net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0055
+net.micode.notes:string/search_setting_description = 0x7f0a0059
+net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009
 net.micode.notes:string/preferences_title = 0x7f0a0053
-net.micode.notes:string/preferences_menu_change_account = 0x7f0a0051
+net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001
 net.micode.notes:string/preferences_last_sync_time = 0x7f0a004e
-net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004a
-net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a0047
-net.micode.notes:string/preferences_add_account = 0x7f0a0046
-net.micode.notes:string/preferences_account_title = 0x7f0a0045
+net.micode.notes:string/preferences_menu_change_account = 0x7f0a0051
 net.micode.notes:xml/widget_4x_info = 0x7f0c0003
-net.micode.notes:string/set_remind_time_message = 0x7f0a005a
 net.micode.notes:string/notealert_enter = 0x7f0a0040
-net.micode.notes:string/note_link_web = 0x7f0a003f
-net.micode.notes:string/note_link_tel = 0x7f0a003e
+net.micode.notes:string/set_remind_time_message = 0x7f0a005a
+net.micode.notes:string/menu_send_to_desktop = 0x7f0a0035
+net.micode.notes:id/account_dialog_subtitle = 0x7f050000
+net.micode.notes:menu/note_list = 0x7f070003
+net.micode.notes:string/sync_progress_login = 0x7f0a005e
 net.micode.notes:string/note_link_other = 0x7f0a003d
-net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004b
-net.micode.notes:string/note_link_email = 0x7f0a003c
+net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0055
+net.micode.notes:string/search_hint = 0x7f0a0057
+net.micode.notes:string/menu_normal_mode = 0x7f0a002f
+net.micode.notes:string/menu_setting = 0x7f0a0036
+net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a0047
+net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004a
+net.micode.notes:id/navigation_bar = 0x7f05002f
 net.micode.notes:string/note_alert_expired = 0x7f0a003b
-net.micode.notes:string/menu_sync_cancel = 0x7f0a0039
-net.micode.notes:string/menu_sync = 0x7f0a0038
+net.micode.notes:id/ll_font_super = 0x7f05001f
+net.micode.notes:dimen/text_font_size_large = 0x7f030000
 net.micode.notes:string/menu_share = 0x7f0a0037
-net.micode.notes:string/menu_setting = 0x7f0a0036
-net.micode.notes:string/menu_send_to_desktop = 0x7f0a0035
+net.micode.notes:string/error_sync_network = 0x7f0a0013
+net.micode.notes:id/notes_list = 0x7f050035
+net.micode.notes:string/widget_under_visit_mode = 0x7f0a0065
+net.micode.notes:string/menu_font_small = 0x7f0a002a
+net.micode.notes:string/menu_font_normal = 0x7f0a0028
+net.micode.notes:string/note_link_tel = 0x7f0a003e
 net.micode.notes:string/menu_select_title = 0x7f0a0034
-net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004
-net.micode.notes:string/menu_select_all = 0x7f0a0032
+net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005
+net.micode.notes:id/menu_send_to_desktop = 0x7f050029
+net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f
+net.micode.notes:menu/call_note_edit = 0x7f070000
+net.micode.notes:id/preference_sync_button = 0x7f050037
 net.micode.notes:string/menu_search = 0x7f0a0031
-net.micode.notes:string/menu_normal_mode = 0x7f0a002f
 net.micode.notes:string/menu_font_size = 0x7f0a0029
-net.micode.notes:string/menu_font_small = 0x7f0a002a
-net.micode.notes:string/menu_font_normal = 0x7f0a0028
-net.micode.notes:string/menu_remove_remind = 0x7f0a0030
-net.micode.notes:string/menu_font_large = 0x7f0a0027
+net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e
+net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004
+net.micode.notes:string/menu_select_all = 0x7f0a0032
+net.micode.notes:string/note_link_email = 0x7f0a003c
+net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004b
+net.micode.notes:xml/searchable = 0x7f0c0001
 net.micode.notes:string/menu_folder_change_name = 0x7f0a0024
+net.micode.notes:string/menu_sync_cancel = 0x7f0a0039
 net.micode.notes:string/menu_export_text = 0x7f0a0023
-net.micode.notes:string/menu_deselect_all = 0x7f0a0022
+net.micode.notes:string/menu_remove_remind = 0x7f0a0030
+net.micode.notes:string/menu_font_large = 0x7f0a0027
+net.micode.notes:menu/sub_folder = 0x7f070006
+net.micode.notes:layout/note_item = 0x7f060007
+net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009
 net.micode.notes:string/menu_create_folder = 0x7f0a0020
-net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e
+net.micode.notes:drawable/widget_2x_red = 0x7f04003a
+net.micode.notes:drawable/widget_4x_yellow = 0x7f040041
+net.micode.notes:string/format_date_ymd = 0x7f0a0018
+net.micode.notes:string/preferences_account_summary = 0x7f0a0044
 net.micode.notes:string/success_sdcard_export = 0x7f0a005b
 net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c
-net.micode.notes:string/preferences_account_summary = 0x7f0a0044
-net.micode.notes:string/format_date_ymd = 0x7f0a0018
+net.micode.notes:string/delete_remind_time_message = 0x7f0a000b
 net.micode.notes:string/file_name_txt_format = 0x7f0a0015
-net.micode.notes:id/note_edit_list = 0x7f050031
 net.micode.notes:drawable/new_note = 0x7f04002f
 net.micode.notes:string/folder_exist = 0x7f0a0017
-net.micode.notes:string/menu_select_none = 0x7f0a0033
+net.micode.notes:id/note_edit_list = 0x7f050031
 net.micode.notes:string/failed_sdcard_export = 0x7f0a0014
-net.micode.notes:string/ticker_cancel = 0x7f0a0060
-net.micode.notes:drawable/list_red_single = 0x7f040023
-net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009
+net.micode.notes:string/menu_select_none = 0x7f0a0033
+net.micode.notes:layout/widget_4x = 0x7f06000d
 net.micode.notes:string/error_sync_cancelled = 0x7f0a0011
-net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010
+net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009
+net.micode.notes:drawable/list_red_single = 0x7f040023
+net.micode.notes:string/ticker_cancel = 0x7f0a0060
 net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008
 net.micode.notes:drawable/widget_4x_green = 0x7f04003e
 net.micode.notes:string/error_sdcard_export = 0x7f0a000f
-net.micode.notes:string/notealert_ok = 0x7f0a0041
-net.micode.notes:string/menu_move_parent_folder = 0x7f0a002e
-net.micode.notes:id/tv_title = 0x7f05003f
+net.micode.notes:string/note_link_web = 0x7f0a003f
+net.micode.notes:id/menu_sync = 0x7f05002c
+net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007
+net.micode.notes:xml/widget_2x_info = 0x7f0c0002
 net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c
-net.micode.notes:string/delete_remind_time_message = 0x7f0a000b
+net.micode.notes:id/tv_title = 0x7f05003f
+net.micode.notes:string/menu_move_parent_folder = 0x7f0a002e
+net.micode.notes:string/notealert_ok = 0x7f0a0041
+net.micode.notes:id/iv_bg_yellow_select = 0x7f050017
 net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006
-net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0052
 net.micode.notes:string/button_delete = 0x7f0a0007
+net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0052
+net.micode.notes:id/menu_list_mode = 0x7f050025
+net.micode.notes:string/app_widget2x2 = 0x7f0a0005
 net.micode.notes:string/ticker_fail = 0x7f0a0061
+net.micode.notes:string/app_name = 0x7f0a0004
 net.micode.notes:string/search_label = 0x7f0a0058
 net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004c
-net.micode.notes:string/app_widget2x2 = 0x7f0a0005
-net.micode.notes:string/app_name = 0x7f0a0004
-net.micode.notes:string/menu_title_select_folder = 0x7f0a003a
-net.micode.notes:drawable/list_red_down = 0x7f040021
-net.micode.notes:id/menu_delete = 0x7f050021
-net.micode.notes:string/hint_foler_name = 0x7f0a001d
-net.micode.notes:string/widget_havenot_content = 0x7f0a0064
+net.micode.notes:string/success_sync_account = 0x7f0a005c
+net.micode.notes:drawable/widget_2x_yellow = 0x7f04003c
+net.micode.notes:id/amPm = 0x7f050003
+net.micode.notes:string/preferences_account_title = 0x7f0a0045
 net.micode.notes:string/alert_title_delete = 0x7f0a0003
+net.micode.notes:string/widget_havenot_content = 0x7f0a0064
+net.micode.notes:string/hint_foler_name = 0x7f0a001d
+net.micode.notes:id/menu_delete = 0x7f050021
+net.micode.notes:drawable/list_red_down = 0x7f040021
+net.micode.notes:string/menu_title_select_folder = 0x7f0a003a
 net.micode.notes:string/alert_message_delete_note = 0x7f0a0001
 net.micode.notes:string/format_datetime_mdhm = 0x7f0a0019
 net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000
-net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009
-net.micode.notes:layout/note_item = 0x7f060007
-net.micode.notes:menu/sub_folder = 0x7f070006
-net.micode.notes:menu/note_list = 0x7f070003
+net.micode.notes:string/preferences_add_account = 0x7f0a0046
+net.micode.notes:string/menu_sync = 0x7f0a0038
+net.micode.notes:id/move = 0x7f05002e
+net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a
 net.micode.notes:string/ticker_syncing = 0x7f0a0063
-net.micode.notes:drawable/menu_move = 0x7f04002e
 net.micode.notes:id/menu_search = 0x7f050028
-net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a
+net.micode.notes:drawable/menu_move = 0x7f04002e
 net.micode.notes:raw/introduction = 0x7f090000
 net.micode.notes:menu/call_record_folder = 0x7f070001
-net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f
-net.micode.notes:menu/call_note_edit = 0x7f070000
 net.micode.notes:drawable/list_red_middle = 0x7f040022
 net.micode.notes:layout/widget_2x = 0x7f06000c
-net.micode.notes:layout/widget_4x = 0x7f06000d
 net.micode.notes:drawable/icon_app = 0x7f040015
 net.micode.notes:layout/note_list = 0x7f060008
 net.micode.notes:layout/note_edit = 0x7f060005
@@ -112,8 +128,8 @@ net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002
 net.micode.notes:drawable/widget_2x_blue = 0x7f040038
 net.micode.notes:layout/folder_list_item = 0x7f060004
 net.micode.notes:string/sync_progress_init_list = 0x7f0a005d
-net.micode.notes:id/btn_new_note = 0x7f050004
 net.micode.notes:layout/add_account_text = 0x7f060001
+net.micode.notes:id/btn_new_note = 0x7f050004
 net.micode.notes:id/widget_text = 0x7f050042
 net.micode.notes:id/widget_bg_image = 0x7f050041
 net.micode.notes:string/menu_folder_delete = 0x7f0a0025
@@ -124,49 +140,38 @@ net.micode.notes:id/tv_alert_date = 0x7f05003a
 net.micode.notes:color/primary_text_dark = 0x7f020000
 net.micode.notes:id/tv_time = 0x7f05003e
 net.micode.notes:id/selection_menu = 0x7f050038
-net.micode.notes:id/preference_sync_button = 0x7f050037
-net.micode.notes:string/error_sync_network = 0x7f0a0013
-net.micode.notes:id/notes_list = 0x7f050035
+net.micode.notes:id/ll_font_small = 0x7f05001e
 net.micode.notes:id/note_title = 0x7f050034
 net.micode.notes:string/format_exported_file_location = 0x7f0a001a
 net.micode.notes:id/note_bg_color_selector = 0x7f050030
-net.micode.notes:id/navigation_bar = 0x7f05002f
-net.micode.notes:id/move = 0x7f05002e
-net.micode.notes:id/menu_sync = 0x7f05002c
 net.micode.notes:id/menu_share = 0x7f05002b
 net.micode.notes:string/format_folder_files_count = 0x7f0a001b
+net.micode.notes:id/menu_setting = 0x7f05002a
 net.micode.notes:string/menu_move = 0x7f0a002d
 net.micode.notes:id/date = 0x7f050007
 net.micode.notes:id/note_item = 0x7f050033
-net.micode.notes:id/menu_setting = 0x7f05002a
-net.micode.notes:id/menu_send_to_desktop = 0x7f050029
-net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000
 net.micode.notes:drawable/font_size_selector_bg = 0x7f040012
 net.micode.notes:id/note_edit_view = 0x7f050032
-net.micode.notes:id/menu_list_mode = 0x7f050025
+net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000
 net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a004d
 net.micode.notes:id/menu_font_size = 0x7f050024
 net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a0048
 net.micode.notes:id/menu_alert = 0x7f050020
-net.micode.notes:dimen/text_font_size_large = 0x7f030000
-net.micode.notes:id/ll_font_super = 0x7f05001f
-net.micode.notes:id/ll_font_small = 0x7f05001e
 net.micode.notes:string/error_note_not_exist = 0x7f0a000e
 net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000d
 net.micode.notes:id/minute = 0x7f05002d
 net.micode.notes:id/ll_font_normal = 0x7f05001d
 net.micode.notes:id/ll_font_large = 0x7f05001c
-net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a0049
 net.micode.notes:id/iv_super_select = 0x7f05001b
-net.micode.notes:string/ticker_success = 0x7f0a0062
+net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a0049
+net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001
+net.micode.notes:drawable/list_yellow_up = 0x7f04002c
+net.micode.notes:id/iv_bg_white = 0x7f050014
 net.micode.notes:id/iv_medium_select = 0x7f050019
+net.micode.notes:string/ticker_success = 0x7f0a0062
 net.micode.notes:id/iv_large_select = 0x7f050018
-net.micode.notes:id/iv_bg_yellow_select = 0x7f050017
 net.micode.notes:drawable/bg_btn_set_color = 0x7f040000
 net.micode.notes:id/iv_bg_yellow = 0x7f050016
-net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001
-net.micode.notes:drawable/list_yellow_up = 0x7f04002c
-net.micode.notes:id/iv_bg_white = 0x7f050014
 net.micode.notes:menu/note_edit = 0x7f070002
 net.micode.notes:drawable/list_white_down = 0x7f040025
 net.micode.notes:drawable/list_white_up = 0x7f040028
@@ -177,23 +182,18 @@ net.micode.notes:drawable/list_green_single = 0x7f04001f
 net.micode.notes:id/iv_alert_icon = 0x7f05000d
 net.micode.notes:drawable/list_yellow_single = 0x7f04002b
 net.micode.notes:id/cb_edit_item = 0x7f050006
+net.micode.notes:id/font_size_selector = 0x7f05000b
+net.micode.notes:color/user_query_highlight = 0x7f020002
 net.micode.notes:drawable/font_super = 0x7f040014
 net.micode.notes:drawable/edit_title_blue = 0x7f040009
-net.micode.notes:color/user_query_highlight = 0x7f020002
-net.micode.notes:id/font_size_selector = 0x7f05000b
-net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0054
 net.micode.notes:id/et_edit_text = 0x7f050009
-net.micode.notes:drawable/widget_2x_yellow = 0x7f04003c
-net.micode.notes:id/amPm = 0x7f050003
-net.micode.notes:id/account_dialog_subtitle = 0x7f050000
-net.micode.notes:id/menu_new_note = 0x7f050027
+net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0054
 net.micode.notes:id/iv_bg_green_select = 0x7f050011
-net.micode.notes:drawable/widget_2x_red = 0x7f04003a
-net.micode.notes:drawable/widget_4x_yellow = 0x7f040041
+net.micode.notes:id/menu_new_note = 0x7f050027
 net.micode.notes:drawable/clock = 0x7f040003
+net.micode.notes:array/menu_share_ways = 0x7f010001
 net.micode.notes:drawable/font_small = 0x7f040013
 net.micode.notes:id/btn_set_bg_color = 0x7f050005
-net.micode.notes:array/menu_share_ways = 0x7f010001
 net.micode.notes:style/NoteTheme = 0x7f0b0003
 net.micode.notes:drawable/notification = 0x7f040033
 net.micode.notes:id/iv_bg_blue_select = 0x7f05000f
diff --git a/src/Notes/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/Notes/app/build/outputs/logs/manifest-merger-debug-report.txt
index 2b5c43e..0439431 100644
--- a/src/Notes/app/build/outputs/logs/manifest-merger-debug-report.txt
+++ b/src/Notes/app/build/outputs/logs/manifest-merger-debug-report.txt
@@ -1,9 +1,9 @@
 -- Merging decision tree log ---
 manifest
-ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:18:1-152:12
-INJECTED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:18:1-152:12
-INJECTED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:18:1-152:12
-INJECTED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:18:1-152:12
+ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:18:1-151:12
+INJECTED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:18:1-151:12
+INJECTED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:18:1-151:12
+INJECTED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:18:1-151:12
 	package
 		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:19:5-31
 		INJECTED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml
@@ -61,8 +61,8 @@ ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:33:5-8
 	android:name
 		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:33:22-78
 application
-ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:35:5-151:19
-INJECTED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:35:5-151:19
+ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:35:5-150:19
+INJECTED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:35:5-150:19
 	android:extractNativeLibs
 		INJECTED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml
 	android:label
@@ -70,17 +70,15 @@ INJECTED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:35:
 	android:icon
 		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:36:9-42
 activity#net.micode.notes.ui.NotesListActivity
-ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:38:9-52:20
+ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:38:9-51:20
 	android:label
 		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:42:13-45
 	android:launchMode
 		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:43:13-43
 	android:windowSoftInputMode
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:46:13-52
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:45:13-52
 	android:exported
 		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:40:13-36
-	android:uiOptions
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:45:13-57
 	android:configChanges
 		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:41:13-74
 	android:theme
@@ -88,148 +86,148 @@ ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:38:9-5
 	android:name
 		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:39:13-49
 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
-ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:48:13-51:29
+ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:47:13-50:29
 action#android.intent.action.MAIN
-ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:49:17-69
+ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:48:17-69
 	android:name
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:49:25-66
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:48:25-66
 category#android.intent.category.LAUNCHER
-ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:50:17-77
+ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:49:17-77
 	android:name
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:50:27-74
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:49:27-74
 activity#net.micode.notes.ui.NoteEditActivity
-ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:54:9-83:20
+ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:53:9-82:20
 	android:launchMode
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:57:13-43
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:56:13-43
 	android:configChanges
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:56:13-74
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:55:13-74
 	android:theme
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:58:13-45
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:57:13-45
 	android:name
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:55:13-48
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:54:13-48
 intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:host:com.example.notes.provider+data:host:com.example.notes.provider+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note+data:path:/notes+data:path:/notes+data:scheme:content+data:scheme:content
-ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:60:13-65:29
+ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:59:13-64:29
 action#android.intent.action.VIEW
-ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:61:17-69
+ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:60:17-69
 	android:name
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:61:25-66
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:60:25-66
 category#android.intent.category.DEFAULT
-ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:62:17-76
+ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:61:17-76
 	android:name
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:62:27-73
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:61:27-73
 data
-ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:63:17-167
+ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:62:17-167
 	android:path
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:63:143-164
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:62:143-164
 	android:host
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:63:101-142
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:62:101-142
 	android:scheme
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:63:76-100
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:62:76-100
 	android:mimeType
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:63:23-75
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:62:23-75
 intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
-ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:68:13-73:29
+ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:67:13-72:29
 action#android.intent.action.INSERT_OR_EDIT
-ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:69:17-79
+ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:68:17-79
 	android:name
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:69:25-76
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:68:25-76
 intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT
-ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:75:13-78:29
+ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:74:13-77:29
 action#android.intent.action.SEARCH
-ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:76:17-71
+ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:75:17-71
 	android:name
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:76:25-68
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:75:25-68
 meta-data#android.app.searchable
-ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:80:13-82:54
+ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:79:13-81:54
 	android:resource
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:82:17-51
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:81:17-51
 	android:name
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:81:17-54
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:80:17-54
 provider#net.micode.notes.data.NotesProvider
-ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:85:9-88:43
+ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:84:9-87:43
 	android:authorities
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:87:13-47
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:86:13-47
 	android:multiprocess
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:88:13-40
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:87:13-40
 	android:name
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:86:13-63
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:85:13-63
 receiver#net.micode.notes.widget.NoteWidgetProvider_2x
-ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:90:9-102:20
+ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:89:9-101:20
 	android:label
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:92:13-50
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:91:13-50
 	android:name
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:91:13-57
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:90:13-57
 intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED
-ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:93:13-97:29
+ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:92:13-96:29
 action#android.appwidget.action.APPWIDGET_UPDATE
-ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:94:17-84
+ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:93:17-84
 	android:name
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:94:25-81
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:93:25-81
 action#android.appwidget.action.APPWIDGET_DELETED
-ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:95:17-85
+ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:94:17-85
 	android:name
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:95:25-82
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:94:25-82
 action#android.intent.action.PRIVACY_MODE_CHANGED
-ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:96:17-85
+ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:95:17-85
 	android:name
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:96:25-82
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:95:25-82
 meta-data#android.appwidget.provider
-ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:99:13-101:58
+ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:98:13-100:58
 	android:resource
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:101:17-55
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:100:17-55
 	android:name
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:100:17-58
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:99:17-58
 receiver#net.micode.notes.widget.NoteWidgetProvider_4x
-ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:103:9-116:20
+ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:102:9-115:20
 	android:label
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:105:13-50
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:104:13-50
 	android:name
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:104:13-57
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:103:13-57
 receiver#net.micode.notes.ui.AlarmInitReceiver
-ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:118:9-122:20
+ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:117:9-121:20
 	android:name
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:118:19-55
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:117:19-55
 intent-filter#action:name:android.intent.action.BOOT_COMPLETED
-ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:119:13-121:29
+ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:118:13-120:29
 action#android.intent.action.BOOT_COMPLETED
-ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:120:17-79
+ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:119:17-79
 	android:name
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:120:25-76
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:119:25-76
 receiver#net.micode.notes.ui.AlarmReceiver
-ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:124:9-127:20
+ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:123:9-126:20
 	android:process
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:126:13-38
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:125:13-38
 	android:name
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:125:13-61
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:124:13-61
 activity#net.micode.notes.ui.AlarmAlertActivity
-ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:129:9-134:20
+ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:128:9-133:20
 	android:label
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:131:13-45
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:130:13-45
 	android:launchMode
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:132:13-48
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:131:13-48
 	android:theme
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:133:13-75
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:132:13-75
 	android:name
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:130:13-50
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:129:13-50
 activity#net.micode.notes.ui.NotesPreferenceActivity
-ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:136:9-141:20
+ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:135:9-140:20
 	android:label
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:138:13-54
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:137:13-54
 	android:launchMode
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:139:13-43
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:138:13-43
 	android:theme
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:140:13-60
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:139:13-60
 	android:name
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:137:13-71
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:136:13-71
 service#net.micode.notes.gtask.remote.GTaskSyncService
-ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:143:9-146:19
+ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:142:9-145:19
 	android:exported
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:145:13-37
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:144:13-37
 	android:name
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:144:13-74
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:143:13-74
 meta-data#android.app.default_searchable
-ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:148:9-150:52
+ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:147:9-149:52
 	android:value
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:150:13-49
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:149:13-49
 	android:name
-		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:149:13-58
+		ADDED from D:\Study\SE\MiNotes\src\Notes\app\src\main\AndroidManifest.xml:148:13-58
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmAlertActivity.class.uniqueId27 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmAlertActivity.class.uniqueId27
deleted file mode 100644
index c1d88a5..0000000
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmAlertActivity.class.uniqueId27 and /dev/null differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmAlertActivity.class.uniqueId34 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmAlertActivity.class.uniqueId49
similarity index 100%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmAlertActivity.class.uniqueId34
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmAlertActivity.class.uniqueId49
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmInitReceiver.class.uniqueId26 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmInitReceiver.class.uniqueId42
similarity index 100%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmInitReceiver.class.uniqueId26
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmInitReceiver.class.uniqueId42
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmReceiver.class.uniqueId12 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmReceiver.class.uniqueId34
similarity index 81%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmReceiver.class.uniqueId12
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmReceiver.class.uniqueId34
index d53427a..7118088 100644
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmReceiver.class.uniqueId12 and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmReceiver.class.uniqueId34 differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Contact.class.uniqueId14 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Contact.class.uniqueId14
deleted file mode 100644
index b46f52c..0000000
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Contact.class.uniqueId14 and /dev/null differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$1.class.uniqueId41 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$1.class.uniqueId41
new file mode 100644
index 0000000..6409b67
Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$1.class.uniqueId41 differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$2.class.uniqueId31 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$2.class.uniqueId31
new file mode 100644
index 0000000..16704b5
Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$2.class.uniqueId31 differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$3.class.uniqueId10 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$3.class.uniqueId10
new file mode 100644
index 0000000..e3d9c96
Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$3.class.uniqueId10 differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$4.class.uniqueId51 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$4.class.uniqueId51
new file mode 100644
index 0000000..e286885
Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$4.class.uniqueId51 differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$OnDateTimeChangedListener.class.uniqueId56 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$OnDateTimeChangedListener.class.uniqueId56
new file mode 100644
index 0000000..255a4e6
Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker$OnDateTimeChangedListener.class.uniqueId56 differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker.class.uniqueId12 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker.class.uniqueId12
new file mode 100644
index 0000000..a95f925
Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePicker.class.uniqueId12 differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePickerDialog$1.class.uniqueId29 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePickerDialog$1.class.uniqueId29
new file mode 100644
index 0000000..2191430
Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePickerDialog$1.class.uniqueId29 differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePickerDialog$OnDateTimeSetListener.class.uniqueId43 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePickerDialog$OnDateTimeSetListener.class.uniqueId43
new file mode 100644
index 0000000..70481dd
Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePickerDialog$OnDateTimeSetListener.class.uniqueId43 differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePickerDialog.class.uniqueId14 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePickerDialog.class.uniqueId14
new file mode 100644
index 0000000..7ef0abc
Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DateTimePickerDialog.class.uniqueId14 differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DropdownMenu$1.class.uniqueId20 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DropdownMenu$1.class.uniqueId20
new file mode 100644
index 0000000..c926b67
Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DropdownMenu$1.class.uniqueId20 differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DropdownMenu.class.uniqueId22 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DropdownMenu.class.uniqueId22
new file mode 100644
index 0000000..71a0091
Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/DropdownMenu.class.uniqueId22 differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/FoldersListAdapter$FolderListItem.class.uniqueId23 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/FoldersListAdapter$FolderListItem.class.uniqueId23
new file mode 100644
index 0000000..47a468c
Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/FoldersListAdapter$FolderListItem.class.uniqueId23 differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/FoldersListAdapter.class.uniqueId16 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/FoldersListAdapter.class.uniqueId16
new file mode 100644
index 0000000..4e56d58
Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/FoldersListAdapter.class.uniqueId16 differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$1.class.uniqueId2 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$1.class.uniqueId0
similarity index 100%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$1.class.uniqueId2
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$1.class.uniqueId0
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$OnCompleteListener.class.uniqueId31 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$OnCompleteListener.class.uniqueId31
deleted file mode 100644
index f73069c..0000000
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$OnCompleteListener.class.uniqueId31 and /dev/null differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$OnCompleteListener.class.uniqueId24 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$OnCompleteListener.class.uniqueId47
similarity index 100%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$OnCompleteListener.class.uniqueId24
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask$OnCompleteListener.class.uniqueId47
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask.class.uniqueId17 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask.class.uniqueId13
similarity index 100%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask.class.uniqueId17
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask.class.uniqueId13
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask.class.uniqueId23 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask.class.uniqueId23
deleted file mode 100644
index 1a6aedc..0000000
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskASyncTask.class.uniqueId23 and /dev/null differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Note$NoteData.class.uniqueId8 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Note$NoteData.class.uniqueId8
deleted file mode 100644
index c40e945..0000000
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Note$NoteData.class.uniqueId8 and /dev/null differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Note.class.uniqueId19 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Note.class.uniqueId19
deleted file mode 100644
index d2041cc..0000000
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Note.class.uniqueId19 and /dev/null differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$1.class.uniqueId10 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$1.class.uniqueId5
similarity index 100%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$1.class.uniqueId10
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$1.class.uniqueId5
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$1.class.uniqueId8 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$1.class.uniqueId8
deleted file mode 100644
index aecdf92..0000000
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$1.class.uniqueId8 and /dev/null differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$2.class.uniqueId20 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$2.class.uniqueId20
deleted file mode 100644
index be3692f..0000000
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$2.class.uniqueId20 and /dev/null differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$2.class.uniqueId27 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$2.class.uniqueId44
similarity index 100%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$2.class.uniqueId27
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$2.class.uniqueId44
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$3.class.uniqueId43 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$3.class.uniqueId25
similarity index 100%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$3.class.uniqueId43
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$3.class.uniqueId25
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$3.class.uniqueId36 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$3.class.uniqueId36
deleted file mode 100644
index 1d74556..0000000
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$3.class.uniqueId36 and /dev/null differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$HeadViewHolder.class.uniqueId22 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$HeadViewHolder.class.uniqueId22
deleted file mode 100644
index 770d355..0000000
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$HeadViewHolder.class.uniqueId22 and /dev/null differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$HeadViewHolder.class.uniqueId29 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$HeadViewHolder.class.uniqueId46
similarity index 100%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$HeadViewHolder.class.uniqueId29
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$HeadViewHolder.class.uniqueId46
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity.class.uniqueId0 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity.class.uniqueId26
similarity index 98%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity.class.uniqueId0
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity.class.uniqueId26
index 332e266..f6a7826 100644
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity.class.uniqueId0 and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity.class.uniqueId26 differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditText$1.class.uniqueId18 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditText$1.class.uniqueId18
new file mode 100644
index 0000000..fbeff49
Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditText$1.class.uniqueId18 differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditText$OnTextViewChangeListener.class.uniqueId32 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditText$OnTextViewChangeListener.class.uniqueId32
new file mode 100644
index 0000000..9874f47
Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditText$OnTextViewChangeListener.class.uniqueId32 differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditText.class.uniqueId1 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditText.class.uniqueId1
new file mode 100644
index 0000000..e0eea60
Binary files /dev/null and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditText.class.uniqueId1 differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteItemData.class.uniqueId42 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteItemData.class.uniqueId42
deleted file mode 100644
index 771aa91..0000000
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteItemData.class.uniqueId42 and /dev/null differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteItemData.class.uniqueId35 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteItemData.class.uniqueId55
similarity index 100%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteItemData.class.uniqueId35
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteItemData.class.uniqueId55
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider.class.uniqueId34 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider.class.uniqueId24
similarity index 100%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider.class.uniqueId34
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider.class.uniqueId24
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider.class.uniqueId41 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider.class.uniqueId41
deleted file mode 100644
index a00281f..0000000
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider.class.uniqueId41 and /dev/null differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$1.class.uniqueId12 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$1.class.uniqueId12
deleted file mode 100644
index ec9d37a..0000000
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$1.class.uniqueId12 and /dev/null differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$1.class.uniqueId16 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$1.class.uniqueId37
similarity index 89%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$1.class.uniqueId16
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$1.class.uniqueId37
index 28051ed..05bc982 100644
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$1.class.uniqueId16 and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$1.class.uniqueId37 differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$2.class.uniqueId11 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$2.class.uniqueId11
deleted file mode 100644
index 0985c40..0000000
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$2.class.uniqueId11 and /dev/null differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$2.class.uniqueId9 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$2.class.uniqueId6
similarity index 88%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$2.class.uniqueId9
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$2.class.uniqueId6
index 8e4f47c..fb92d6c 100644
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$2.class.uniqueId9 and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$2.class.uniqueId6 differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$3.class.uniqueId26 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$3.class.uniqueId17
similarity index 85%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$3.class.uniqueId26
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$3.class.uniqueId17
index 3ed1d3d..659c454 100644
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$3.class.uniqueId26 and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$3.class.uniqueId17 differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$3.class.uniqueId33 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$3.class.uniqueId33
deleted file mode 100644
index 4b38b8c..0000000
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$3.class.uniqueId33 and /dev/null differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$4.class.uniqueId3 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$4.class.uniqueId28
similarity index 92%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$4.class.uniqueId3
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$4.class.uniqueId28
index bda5266..324b349 100644
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$4.class.uniqueId3 and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$4.class.uniqueId28 differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$5.class.uniqueId24 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$5.class.uniqueId24
deleted file mode 100644
index fe71934..0000000
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$5.class.uniqueId24 and /dev/null differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$5.class.uniqueId18 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$5.class.uniqueId39
similarity index 83%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$5.class.uniqueId18
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$5.class.uniqueId39
index 46daf22..a090d40 100644
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$5.class.uniqueId18 and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$5.class.uniqueId39 differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$6.class.uniqueId6 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$6.class.uniqueId3
similarity index 90%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$6.class.uniqueId6
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$6.class.uniqueId3
index b0e7e8f..de4e408 100644
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$6.class.uniqueId6 and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$6.class.uniqueId3 differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$7.class.uniqueId10 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$7.class.uniqueId10
deleted file mode 100644
index 2661165..0000000
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$7.class.uniqueId10 and /dev/null differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$7.class.uniqueId13 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$7.class.uniqueId35
similarity index 88%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$7.class.uniqueId13
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$7.class.uniqueId35
index b1605a3..93cbf94 100644
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$7.class.uniqueId13 and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$7.class.uniqueId35 differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$8.class.uniqueId38 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$8.class.uniqueId38
deleted file mode 100644
index dad22ac..0000000
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$8.class.uniqueId38 and /dev/null differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$8.class.uniqueId31 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$8.class.uniqueId52
similarity index 82%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$8.class.uniqueId31
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$8.class.uniqueId52
index 2982ddd..3fc279b 100644
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$8.class.uniqueId31 and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$8.class.uniqueId52 differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$9.class.uniqueId15 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$9.class.uniqueId15
deleted file mode 100644
index 50c87fb..0000000
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$9.class.uniqueId15 and /dev/null differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$9.class.uniqueId21 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$9.class.uniqueId9
similarity index 88%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$9.class.uniqueId21
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$9.class.uniqueId9
index 82de4d1..2312a28 100644
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$9.class.uniqueId21 and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$9.class.uniqueId9 differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$BackgroundQueryHandler.class.uniqueId28 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$BackgroundQueryHandler.class.uniqueId28
deleted file mode 100644
index 872c330..0000000
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$BackgroundQueryHandler.class.uniqueId28 and /dev/null differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$BackgroundQueryHandler.class.uniqueId21 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$BackgroundQueryHandler.class.uniqueId45
similarity index 86%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$BackgroundQueryHandler.class.uniqueId21
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$BackgroundQueryHandler.class.uniqueId45
index 6ae6ab7..de48358 100644
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$BackgroundQueryHandler.class.uniqueId21 and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$BackgroundQueryHandler.class.uniqueId45 differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ListEditState.class.uniqueId19 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ListEditState.class.uniqueId19
deleted file mode 100644
index f797073..0000000
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ListEditState.class.uniqueId19 and /dev/null differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ListEditState.class.uniqueId25 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ListEditState.class.uniqueId40
similarity index 100%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ListEditState.class.uniqueId25
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ListEditState.class.uniqueId40
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$1.class.uniqueId35 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$1.class.uniqueId35
deleted file mode 100644
index d8afb0b..0000000
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$1.class.uniqueId35 and /dev/null differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$1.class.uniqueId28 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$1.class.uniqueId50
similarity index 92%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$1.class.uniqueId28
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$1.class.uniqueId50
index adaff34..08950d5 100644
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$1.class.uniqueId28 and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$1.class.uniqueId50 differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$2.class.uniqueId7 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$2.class.uniqueId4
similarity index 88%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$2.class.uniqueId7
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$2.class.uniqueId4
index b30291e..2cdacee 100644
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$2.class.uniqueId7 and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$2.class.uniqueId4 differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback.class.uniqueId1 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback.class.uniqueId27
similarity index 84%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback.class.uniqueId1
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback.class.uniqueId27
index 090d898..bde970e 100644
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback.class.uniqueId1 and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback.class.uniqueId27 differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$NewNoteOnTouchListener.class.uniqueId22 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$NewNoteOnTouchListener.class.uniqueId11
similarity index 89%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$NewNoteOnTouchListener.class.uniqueId22
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$NewNoteOnTouchListener.class.uniqueId11
index 2e5d866..110a0b1 100644
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$NewNoteOnTouchListener.class.uniqueId22 and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$NewNoteOnTouchListener.class.uniqueId11 differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$NewNoteOnTouchListener.class.uniqueId16 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$NewNoteOnTouchListener.class.uniqueId16
deleted file mode 100644
index 0f41962..0000000
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$NewNoteOnTouchListener.class.uniqueId16 and /dev/null differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$OnListItemClickListener.class.uniqueId23 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$OnListItemClickListener.class.uniqueId15
similarity index 92%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$OnListItemClickListener.class.uniqueId23
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$OnListItemClickListener.class.uniqueId15
index 1afb712..ea940a9 100644
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$OnListItemClickListener.class.uniqueId23 and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$OnListItemClickListener.class.uniqueId15 differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$OnListItemClickListener.class.uniqueId30 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$OnListItemClickListener.class.uniqueId30
deleted file mode 100644
index 09d5374..0000000
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$OnListItemClickListener.class.uniqueId30 and /dev/null differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId13 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId13
deleted file mode 100644
index 39b6a2f..0000000
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId13 and /dev/null differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId18 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId38
similarity index 88%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId18
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId38
index 7c17727..79e06a7 100644
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId18 and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId38 differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$1.class.uniqueId15 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$1.class.uniqueId15
deleted file mode 100644
index 4d5c288..0000000
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$1.class.uniqueId15 and /dev/null differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$1.class.uniqueId11 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$1.class.uniqueId36
similarity index 100%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$1.class.uniqueId11
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$1.class.uniqueId36
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$2.class.uniqueId39 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$2.class.uniqueId39
deleted file mode 100644
index 47c78ef..0000000
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$2.class.uniqueId39 and /dev/null differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$2.class.uniqueId32 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$2.class.uniqueId53
similarity index 100%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$2.class.uniqueId32
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$2.class.uniqueId53
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$3.class.uniqueId29 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$3.class.uniqueId19
similarity index 100%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$3.class.uniqueId29
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$3.class.uniqueId19
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$3.class.uniqueId36 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$3.class.uniqueId36
deleted file mode 100644
index baa7752..0000000
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$3.class.uniqueId36 and /dev/null differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$4.class.uniqueId4 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$4.class.uniqueId30
similarity index 100%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$4.class.uniqueId4
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$4.class.uniqueId30
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$5.class.uniqueId44 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$5.class.uniqueId44
deleted file mode 100644
index 320d722..0000000
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$5.class.uniqueId44 and /dev/null differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$5.class.uniqueId37 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$5.class.uniqueId57
similarity index 100%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$5.class.uniqueId37
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$5.class.uniqueId57
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$6.class.uniqueId20 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$6.class.uniqueId20
deleted file mode 100644
index 0f88f2b..0000000
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$6.class.uniqueId20 and /dev/null differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$6.class.uniqueId14 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$6.class.uniqueId8
similarity index 100%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$6.class.uniqueId14
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$6.class.uniqueId8
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$7.class.uniqueId30 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$7.class.uniqueId21
similarity index 100%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$7.class.uniqueId30
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$7.class.uniqueId21
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$7.class.uniqueId37 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$7.class.uniqueId37
deleted file mode 100644
index 4691731..0000000
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$7.class.uniqueId37 and /dev/null differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$8.class.uniqueId40 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$8.class.uniqueId40
deleted file mode 100644
index 56f7e5c..0000000
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$8.class.uniqueId40 and /dev/null differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$8.class.uniqueId33 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$8.class.uniqueId54
similarity index 100%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$8.class.uniqueId33
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$8.class.uniqueId54
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$GTaskReceiver.class.uniqueId32 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$GTaskReceiver.class.uniqueId32
deleted file mode 100644
index 8329599..0000000
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$GTaskReceiver.class.uniqueId32 and /dev/null differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$GTaskReceiver.class.uniqueId25 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$GTaskReceiver.class.uniqueId48
similarity index 100%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$GTaskReceiver.class.uniqueId25
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity$GTaskReceiver.class.uniqueId48
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity.class.uniqueId5 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity.class.uniqueId2
similarity index 100%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity.class.uniqueId5
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesPreferenceActivity.class.uniqueId2
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/WorkingNote$NoteSettingChangedListener.class.uniqueId17 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/WorkingNote$NoteSettingChangedListener.class.uniqueId7
similarity index 100%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/WorkingNote$NoteSettingChangedListener.class.uniqueId17
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/WorkingNote$NoteSettingChangedListener.class.uniqueId7
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/WorkingNote.class.uniqueId9 b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/WorkingNote.class.uniqueId33
similarity index 72%
rename from src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/WorkingNote.class.uniqueId9
rename to src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/WorkingNote.class.uniqueId33
index df71afc..ec6183a 100644
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/WorkingNote.class.uniqueId9 and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/WorkingNote.class.uniqueId33 differ
diff --git a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
index 93c884f..8bdaa80 100644
Binary files a/src/Notes/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/src/Notes/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ
diff --git a/src/Notes/app/src/main/AndroidManifest.xml b/src/Notes/app/src/main/AndroidManifest.xml
index ba178fd..c71be5b 100644
--- a/src/Notes/app/src/main/AndroidManifest.xml
+++ b/src/Notes/app/src/main/AndroidManifest.xml
@@ -15,26 +15,40 @@
      limitations under the License.
 -->
 
+<!--- 定义应用程序的名称和版本号 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="net.micode.notes"
     android:versionCode="1"
     android:versionName="0.1" >
 
+    <!--- 指定应用程序需要支持的最低的 Android SDK 版本 -->
     <uses-sdk android:minSdkVersion="14" />
 
+    <!--- 权限声明 -->
+    <!--- 写入 SD 卡的权限 -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <!--- 创建、删除有关快捷方式的权限 -->
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
+    <!--- 访问网络的权限 -->
     <uses-permission android:name="android.permission.INTERNET" />
+    <!--- 读取联系人的权限 -->
     <uses-permission android:name="android.permission.READ_CONTACTS" />
+    <!--- 账户管理的权限 -->
     <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
+    <!--- 验证账户的权限 -->
     <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
+    <!--- 开机自动运行权限 -->
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
+    <!--- 应用程序组件声明 -->
+    <!--- 定义应用程序的图标和名称 -->
     <application
         android:icon="@drawable/icon_app"
         android:label="@string/app_name" >
+
+        <!--- 应用程序的入口 NotesListActivity -->
         <activity
             android:name=".ui.NotesListActivity"
             android:exported="true"
@@ -44,57 +58,69 @@
             android:theme="@style/NoteTheme"
             android:windowSoftInputMode="adjustPan" >
 
+            <!--- 定义该 Activity 为启动器，即默认启动的 Activity -->
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
+        <!--- 笔记编辑 Activity -->
         <activity
             android:name=".ui.NoteEditActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:launchMode="singleTop"
             android:theme="@style/NoteTheme" >
 
+            <!--- 笔记编辑 Activity 的 Intent Filter，用于接收其他应用程序发送过来的消息 -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
+                <!--- 笔记编辑 Activity 可以处理的 MIME 类型 -->
                 <data android:mimeType="vnd.android.cursor.item/text_note" android:scheme="content" android:host="com.example.notes.provider" android:path="/notes" />
                 <data android:mimeType="vnd.android.cursor.item/call_note" android:scheme="content" android:host="com.example.notes.provider" android:path="/notes" />
             </intent-filter>
 
-
+            <!--- 笔记编辑 Activity 的 Intent Filter，用于接收其他应用程序发送过来的消息 -->
             <intent-filter>
                 <action android:name="android.intent.action.INSERT_OR_EDIT" />
                 <category android:name="android.intent.category.DEFAULT" />
+                <!--- 笔记编辑 Activity 可以处理的 MIME 类型 -->
                 <data android:mimeType="vnd.android.cursor.item/text_note" />
                 <data android:mimeType="vnd.android.cursor.item/call_note" />
             </intent-filter>
 
+            <!--- 搜索 Intent Filter，用于响应搜索请求 -->
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
 
+            <!--- 搜索框的配置信息 -->
             <meta-data
                 android:name="android.app.searchable"
                 android:resource="@xml/searchable" />
         </activity>
 
+        <!--- 笔记供应器，用于共享笔记数据 -->
         <provider
             android:name="net.micode.notes.data.NotesProvider"
             android:authorities="micode_notes"
             android:multiprocess="true" />
 
+        <!--- 笔记小部件，支持两种大小 -->
         <receiver
             android:name=".widget.NoteWidgetProvider_2x"
             android:label="@string/app_widget2x2" >
+
+            <!--- 笔记小部件的 Intent Filter，用于接收系统广播和小部件更新操作 -->
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
                 <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
                 <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
             </intent-filter>
 
+            <!--- 笔记小部件的配置信息 -->
             <meta-data
                 android:name="android.appwidget.provider"
                 android:resource="@xml/widget_2x_info" />
@@ -103,28 +129,33 @@
             android:name=".widget.NoteWidgetProvider_4x"
             android:label="@string/app_widget4x4" >
 
+            <!--- 笔记小部件的 Intent Filter，用于接收系统广播和小部件更新操作 -->
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
                 <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
                 <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
             </intent-filter>
 
+            <!--- 笔记小部件的配置信息 -->
             <meta-data
                 android:name="android.appwidget.provider"
                 android:resource="@xml/widget_4x_info" />
         </receiver>
 
+        <!--- 启动时需要初始化闹钟服务 -->
         <receiver android:name=".ui.AlarmInitReceiver" >
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
         </receiver>
 
+        <!--- 闹钟服务 -->
         <receiver
             android:name="net.micode.notes.ui.AlarmReceiver"
             android:process=":remote" >
         </receiver>
 
+        <!--- 闹钟提示 Activity -->
         <activity
             android:name=".ui.AlarmAlertActivity"
             android:label="@string/app_name"
@@ -132,6 +163,7 @@
             android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
         </activity>
 
+        <!--- 首选项 Activity -->
         <activity
             android:name="net.micode.notes.ui.NotesPreferenceActivity"
             android:label="@string/preferences_title"
@@ -139,11 +171,13 @@
             android:theme="@android:style/Theme.Holo.Light" >
         </activity>
 
+        <!--- GTask 同步服务 -->
         <service
             android:name="net.micode.notes.gtask.remote.GTaskSyncService"
             android:exported="false" >
         </service>
 
+        <!--- 默认搜索 Activity -->
         <meta-data
             android:name="android.app.default_searchable"
             android:value=".ui.NoteEditActivity" />
diff --git a/src/Notes/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java b/src/Notes/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
index e6a9d73..96f28bf 100644
--- a/src/Notes/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
+++ b/src/Notes/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
@@ -46,23 +46,21 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        // 设置界面显示——无标题
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
+
+        requestWindowFeature(Window.FEATURE_NO_TITLE);//设置界面显示——无标题
 
         final Window win = getWindow();
-        // 设置窗体属性——在锁屏时显示
-        win.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
+
+        win.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);//设置窗体属性——在锁屏时显示
 
         if (!isScreenOn()) {
-            // 设置窗体属性——保持点亮、点亮屏幕、允许点亮时解锁
-            win.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
+            win.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON//保持点亮、点亮屏幕、允许点亮时解锁
                     | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
                     | WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON
                     | WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR);
         }
 
-        // 获取传递的 Intent
-        Intent intent = getIntent();
+        Intent intent = getIntent();//获取传递的 Intent
 
         try {
             // 从 Intent 中获取数据并处理——获取标签 ID
@@ -80,24 +78,33 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
 
         mPlayer = new MediaPlayer();
         if (DataUtils.visibleInNoteDatabase(getContentResolver(), mNoteId, Notes.TYPE_NOTE)) {
-            // 显示对话框
-            showActionDialog();
-            // 播放闹钟提示音
-            playAlarmSound();
+            showActionDialog();// 显示对话框
+            playAlarmSound();// 播放闹钟提示音
         } else {
-            // 结束当前 Activity
-            finish();
+            finish();// 结束当前 Activity
         }
     }
-
+    /**
+     * @method  isScreenOn
+     * @description
+     * 判断屏幕是否锁屏，调用系统函数判断，最后返回值是布尔类型
+     * @date: 12/23/2023 11:21 PM
+     * @author: YangYizhe
+     * @param
+     * @return
+     */
     private boolean isScreenOn() {
-        //判断屏幕是否锁屏，调用系统函数判断，最后返回值是布尔类型
         PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
         return pm.isScreenOn();
     }
-
+    /**
+     * @method  playAlarmSound
+     * @description
+     * 播放闹钟提示音
+     * @date: 12/23/2023 11:21 PM
+     * @author: YangYizhe
+     */
     private void playAlarmSound() {
-        //闹钟提示音激发
         Uri url = RingtoneManager.getActualDefaultRingtoneUri(this, RingtoneManager.TYPE_ALARM);
         //调用系统的铃声管理URI，得到闹钟提示音
         int silentModeStreams = Settings.System.getInt(getContentResolver(),
@@ -110,19 +117,12 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
         }
         try {
             mPlayer.setDataSource(this, url);
-            //方法：setDataSource(Context context, Uri uri) 
-            //解释：无返回值，设置多媒体数据来源【根据 Uri】
             mPlayer.prepare();
-            //准备同步
-            mPlayer.setLooping(true);
-            //设置是否循环播放
-            mPlayer.start();
-            //开始播放
+            mPlayer.setLooping(true);//设置是否循环播放
+            mPlayer.start();//开始播放
         } catch (IllegalArgumentException e) {
             // TODO Auto-generated catch block
             e.printStackTrace();
-            //e.printStackTrace()函数功能是抛出异常， 还将显示出更深的调用信息
-            //System.out.println(e)，这个方法打印出异常，并且输出在哪里出现的异常
         } catch (SecurityException e) {
             // TODO Auto-generated catch block
             e.printStackTrace();
@@ -134,61 +134,67 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
             e.printStackTrace();
         }
     }
-
+    /**
+     * @method  showActionDialog
+     * @description
+     * AlertDialog的构造方法全部是Protected的
+     * 所以不能直接通过new一个AlertDialog来创建出一个AlertDialog。
+     * 要创建一个AlertDialog，就要用到AlertDialog.Builder中的create()方法
+     * 如这里的dialog就是新建了一个AlertDialog
+     * @date: 12/23/2023 11:28 PM
+     * @author: YangYizhe
+     */
     private void showActionDialog() {
         AlertDialog.Builder dialog = new AlertDialog.Builder(this);
-        /* AlertDialog的构造方法全部是Protected的
-        * 所以不能直接通过new一个AlertDialog来创建出一个AlertDialog。
-        * 要创建一个AlertDialog，就要用到AlertDialog.Builder中的create()方法
-        * 如这里的dialog就是新建了一个AlertDialog
-        */
-        dialog.setTitle(R.string.app_name);
-        //为对话框设置标题
-        dialog.setMessage(mSnippet);
-        //为对话框设置内容
-        dialog.setPositiveButton(R.string.notealert_ok, this);
-        //给对话框添加"Yes"按钮
+        dialog.setTitle(R.string.app_name);//为对话框设置标题
+        dialog.setMessage(mSnippet);//为对话框设置内容
+        dialog.setPositiveButton(R.string.notealert_ok, this);//给对话框添加"Yes"按钮
         if (isScreenOn()) {
-            dialog.setNegativeButton(R.string.notealert_enter, this);
-        }//对话框添加"No"按钮
+            dialog.setNegativeButton(R.string.notealert_enter, this);//对话框添加"No"按钮
+        }
         dialog.show().setOnDismissListener(this);
     }
-
+    /**
+     * @method  onClick
+     * @description 处理点击事件
+     * @date: 12/23/2023 11:27 PM
+     * @author: YangYizhe
+     * @param dialog
+     * @param which
+     */
     public void onClick(DialogInterface dialog, int which) {
-        switch (which) {
-            //用which来选择click后下一步的操作
-            case DialogInterface.BUTTON_NEGATIVE:
-                //这是取消操作
-                Intent intent = new Intent(this, NoteEditActivity.class);
-                //实现两个类间的数据传输
-                intent.setAction(Intent.ACTION_VIEW);
-                //设置动作属性
-                intent.putExtra(Intent.EXTRA_UID, mNoteId);
-                //实现key-value对
-                //EXTRA_UID为key；mNoteId为键
-                startActivity(intent);
-                //开始动作
+        switch (which) {//用which来选择click后下一步的操作
+            case DialogInterface.BUTTON_NEGATIVE://这是取消操作
+                Intent intent = new Intent(this, NoteEditActivity.class);//实现两个类间的数据传输
+                intent.setAction(Intent.ACTION_VIEW);//设置动作属性
+                intent.putExtra(Intent.EXTRA_UID, mNoteId);//实现key-value对     EXTRA_UID为key；mNoteId为键
+                startActivity(intent);//开始动作
                 break;
             default:
-                //这是确定操作
                 break;
         }
     }
-
+    /**
+     * @method  onDismiss
+     * @description 忽略
+     * @date: 12/23/2023 11:25 PM
+     * @author: YangYizhe
+     * @param dialog
+     */
     public void onDismiss(DialogInterface dialog) {
-        //忽略
-        stopAlarmSound();
-        //停止闹钟声音
+        stopAlarmSound();//停止闹钟声音
         finish();
-        //完成该动作
     }
-
+    /**
+     * @method  stopAlarmSound
+     * @description 停止闹钟的声音
+     * @date: 12/23/2023 11:26 PM
+     * @author: YangYizhe
+     */
     private void stopAlarmSound() {
         if (mPlayer != null) {
-            mPlayer.stop();
-            //停止播放
-            mPlayer.release();
-            //释放MediaPlayer对象
+            mPlayer.stop();//停止播放
+            mPlayer.release();//释放MediaPlayer对象
             mPlayer = null;
         }
     }
diff --git a/src/Notes/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java b/src/Notes/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
index 7be84dc..1982fda 100644
--- a/src/Notes/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
+++ b/src/Notes/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
@@ -22,26 +22,21 @@ import net.micode.notes.data.Notes.NoteColumns;
  * @Version:        1.0
  */
 public class AlarmInitReceiver extends BroadcastReceiver {
-
     private static final String [] PROJECTION = new String [] {
             NoteColumns.ID,
             NoteColumns.ALERTED_DATE
-    };
-    //对数据库的操作，调用标签ID和闹钟时间
+    };//对数据库的操作，调用标签ID和闹钟时间
     private static final int COLUMN_ID                = 0;
     private static final int COLUMN_ALERTED_DATE      = 1;
 
     @Override
     public void onReceive(Context context, Intent intent) {
-        long currentDate = System.currentTimeMillis();
-        //System.currentTimeMillis()产生一个当前的毫秒
-        //这个毫秒其实就是自1970年1月1日0时起的毫秒数
+        long currentDate = System.currentTimeMillis();//System.currentTimeMillis()产生一个当前的毫秒
         Cursor c = context.getContentResolver().query(Notes.CONTENT_NOTE_URI,
                 PROJECTION,
                 NoteColumns.ALERTED_DATE + ">? AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE,
                 new String[] { String.valueOf(currentDate) },
-                //将long变量currentDate转化为字符串
-                null);
+                null);//将long变量currentDate转化为字符串
         //Cursor在这里的作用是通过查找数据库中的标签内容，找到和当前系统时间相等的标签
 
         if (c != null) {
diff --git a/src/Notes/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java b/src/Notes/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
index a4c7120..646f69f 100644
--- a/src/Notes/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
+++ b/src/Notes/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
@@ -6,7 +6,7 @@ import android.content.Intent;
 /**
  * @Package:        net.micode.notes.ui
  * @ClassName:      AlarmReceiver
- * @Description:
+ * @Description:    闹钟接收器，接收到闹钟触发的广播后启动AlarmAlertActivity进行闹钟提醒
  * @Author:         YangYizhe
  * @CreateDate:     12/17/2023 10:02 AM
  * @UpdateUser:     none
@@ -17,14 +17,9 @@ import android.content.Intent;
 public class AlarmReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
-        intent.setClass(context, AlarmAlertActivity.class);
-        //启动AlarmAlertActivity
+        intent.setClass(context, AlarmAlertActivity.class);//启动AlarmAlertActivity
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        //activity要存在于activity的栈中，而非activity的途径启动activity时必然不存在一个activity的栈
-        //所以要新起一个栈装入启动的activity
-        context.startActivity(intent);
+        context.startActivity(intent);//启动闹钟提醒界面
     }
 }
-//这是实现alarm这个功能最接近用户层的包，基于上面的两个包，
-//作用还需要深究但是对于setClass和addFlags的
  
\ No newline at end of file
diff --git a/src/Notes/app/src/main/java/net/micode/notes/ui/DateTimePicker.java b/src/Notes/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
index bc0485b..9cf4ba6 100644
--- a/src/Notes/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
+++ b/src/Notes/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
@@ -51,8 +51,7 @@ public class DateTimePicker extends FrameLayout {
     private final NumberPicker mHourSpinner;
     private final NumberPicker mMinuteSpinner;
     private final NumberPicker mAmPmSpinner;
-    //定义了Calendar类型的变量mDate，用于操作时间
-    private Calendar mDate;
+    private Calendar mDate;//定义了Calendar类型的变量mDate，用于操作时间
     private String[] mDateDisplayValues = new String[DAYS_IN_ALL_WEEK];
 
     private boolean mIsAm;
@@ -180,25 +179,24 @@ public class DateTimePicker extends FrameLayout {
      * 构造方法
      */
     public DateTimePicker(Context context) {
-        //通过对数据库的访问，获取当前的系统时间
-        this(context, System.currentTimeMillis());
+        this(context, System.currentTimeMillis());//通过对数据库的访问，获取当前的系统时间
     }
 
     public DateTimePicker(Context context, long date) {
-        //上面函数的得到的是一个天文数字（1970至今的秒数），需要DateFormat将其变得有意义
-        this(context, date, DateFormat.is24HourFormat(context));
+        this(context, date, DateFormat.is24HourFormat(context));//上面函数的得到的是一个天文数字（1970至今的秒数），需要DateFormat将其变得有意义
     }
 
     public DateTimePicker(Context context, long date, boolean is24HourView) {
         super(context);
-        //获取系统时间
-        mDate = Calendar.getInstance();
+        mDate = Calendar.getInstance();//获取系统时间
         mInitialising = true;
         mIsAm = getCurrentHourOfDay() >= HOURS_IN_HALF_DAY;
         inflate(context, R.layout.datetime_picker, this);
-        //如果当前Activity里用到别的layout，比如对话框layout
-        //还要设置这个layout上的其他组件的内容，就必须用inflate()方法先将对话框的layout找出来
-        //然后再用findViewById()找到它上面的其它组件
+        /*
+        * 如果当前Activity里用到别的layout，比如对话框layout
+        * 还要设置这个layout上的其他组件的内容，就必须用inflate()方法先将对话框的layout找出来
+        * 然后再用findViewById()找到它上面的其它组件
+        */
         mDateSpinner = (NumberPicker) findViewById(R.id.date);
         mDateSpinner.setMinValue(DATE_SPINNER_MIN_VAL);
         mDateSpinner.setMaxValue(DATE_SPINNER_MAX_VAL);
diff --git a/src/Notes/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/Notes/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
index 273c303..2b0e901 100644
--- a/src/Notes/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
+++ b/src/Notes/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
@@ -832,8 +832,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
      * @description:    生成便签初始界面
      * @date:           2023/12/21 1:16
      * @author:         WUSHUXIAN
-     * @param
-     * @return
      */
     private final OnCreateContextMenuListener mFolderOnCreateContextMenuListener = new OnCreateContextMenuListener() {
         public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
diff --git a/src/Notes/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java b/src/Notes/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
index b165769..4492ca9 100644
--- a/src/Notes/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
+++ b/src/Notes/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
@@ -15,10 +15,15 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 
-
-/*
- * 功能：直译为便签表连接器，继承了CursorAdapter，它为cursor和ListView提供了连接的桥梁。
- *     所以NotesListAdapter实现的是鼠标和编辑便签链接的桥梁
+/**
+ * @Package:        net.micode.notes.ui
+ * @ClassName:      NotesListAdapter
+ * @Description:
+ * 直译为便签表连接器，继承了CursorAdapter，它为cursor和ListView提供了连接的桥梁。
+ * 所以NotesListAdapter实现的是鼠标和编辑便签链接的桥梁
+ * @Author:         YangYizhe
+ * @CreateDate:     12/23/2023 11:35 PM
+ * @Version:        1.0
  */
 public class NotesListAdapter extends CursorAdapter {
     private static final String TAG = "NotesListAdapter";
@@ -34,10 +39,14 @@ public class NotesListAdapter extends CursorAdapter {
         public int widgetId;
         public int widgetType;
     };
-
-    /*
-     * 函数功能：初始化便签链接器
+    /**
+     * @method  NotesListAdapter
+     * @description
+     * 初始化便签链接器
      * 函数实现：根据传进来的内容设置相关变量
+     * @date: 12/23/2023 11:35 PM
+     * @author: YangYizhe
+     * @param context
      */
     public NotesListAdapter(Context context) {
         super(context, null);  //父类对象置空
@@ -47,32 +56,45 @@ public class NotesListAdapter extends CursorAdapter {
     }
 
     @Override
-    /*
-     * 函数功能：新建一个视图来存储光标所指向的数据
-     * 函数实现：使用兄弟类NotesListItem新建一个项目选项
+    /**
+     * @method  newView
+     * @description
+     * 新建一个视图来存储光标所指向的数据
+     * 通过使用兄弟类NotesListItem新建一个项目选项
+     * @date: 12/23/2023 11:35 PM
+     * @author: YangYizhe
+     * @param [context, cursor, parent]
+     * @return android.view.View
      */
     public View newView(Context context, Cursor cursor, ViewGroup parent) {
         return new NotesListItem(context);
     }
-
-    /*
-     * 函数功能：将已经存在的视图和鼠标指向的数据进行捆绑
-     * 函数实现：如下注释
-     */
     @Override
+    /**
+     * @method  bindView
+     * @description 将已经存在的视图和鼠标指向的数据进行捆绑
+     * @date: 12/23/2023 11:41 PM
+     * @author: YangYizhe
+     * @param [view, context, cursor]
+     * @return void
+     */
     public void bindView(View view, Context context, Cursor cursor) {
         if (view instanceof NotesListItem) {
             //若view是NotesListItem的一个实例
+            //则新建一个项目选项并且用bind跟将view和鼠标，内容，便签数据捆绑在一起
             NoteItemData itemData = new NoteItemData(context, cursor);
             ((NotesListItem) view).bind(context, itemData, mChoiceMode,
                     isSelectedItem(cursor.getPosition()));
-            //则新建一个项目选项并且用bind跟将view和鼠标，内容，便签数据捆绑在一起
         }
     }
-
-    /*
-     * 函数功能：设置勾选框
-     * 函数实现：如下注释
+    /**
+     * @method  setCheckedItem
+     * @description 设置勾选框
+     * @date: 12/23/2023 11:41 PM
+     * @author: YangYizhe
+     * @param  checked
+     * @param position
+     * @return void
      */
     public void setCheckedItem(final int position, final boolean checked) {
         mSelectedIndex.put(position, checked);
@@ -81,29 +103,32 @@ public class NotesListAdapter extends CursorAdapter {
         //在修改后刷新activity
     }
 
-    /*
-     * 函数功能：判断单选按钮是否勾选
-     */
     public boolean isInChoiceMode() {
         return mChoiceMode;
-    }
+    }//判断单选按钮是否勾选
 
-    /*
-     * 函数功能：设置单项选项框
-     * 函数实现：重置下标并且根据参数mode设置选项
+    /**
+     * @method  setChoiceMode
+     * @description 设置单项选项框
+     * @date: 12/23/2023 11:40 PM
+     * @author: YangYizhe
+     * @param
+     * @return
      */
     public void setChoiceMode(boolean mode) {
         mSelectedIndex.clear();
         mChoiceMode = mode;
     }
 
-    /*
-     * 函数功能：选择全部选项
-     * 函数实现：如下注释
+    /**
+     * @method  selectAll
+     * @description 选择全部选项
+     * @date: 12/23/2023 11:40 PM
+     * @author: YangYizhe
+     * @param checked
      */
     public void selectAll(boolean checked) {
-        Cursor cursor = getCursor();
-        //获取光标位置
+        Cursor cursor = getCursor();//获取光标位置
         for (int i = 0; i < getCount(); i++) {
             if (cursor.moveToPosition(i)) {
                 if (NoteItemData.getNoteType(cursor) == Notes.TYPE_NOTE) {
@@ -113,14 +138,16 @@ public class NotesListAdapter extends CursorAdapter {
         }
         //遍历所有光标可用的位置在判断为便签类型之后勾选单项框
     }
-
-    /*
-     * 函数功能：建立选择项的下标列表
-     * 函数实现：如下注释
+    /**
+     * @method  getSelectedItemIds
+     * @description 建立选择项的下标列表
+     * @date: 12/23/2023 11:39 PM
+     * @author: YangYizhe
+     * @param
+     * @return
      */
     public HashSet<Long> getSelectedItemIds() {
-        HashSet<Long> itemSet = new HashSet<Long>();
-        //建立hash表
+        HashSet<Long> itemSet = new HashSet<Long>();//建立hash表
         for (Integer position : mSelectedIndex.keySet()) {
             //遍历所有的关键
             if (mSelectedIndex.get(position) == true) {
@@ -132,17 +159,18 @@ public class NotesListAdapter extends CursorAdapter {
                 } else {
                     itemSet.add(id);
                 }
-                //则将id该下标假如选项集合中
-
             }
         }
 
         return itemSet;
     }
-
-    /*
-     * 函数功能：建立桌面Widget的选项表
-     * 函数实现：如下注释
+    /**
+     * @method  getSelectedWidget
+     * @description 建立桌面Widget的选项表
+     * @date: 12/23/2023 11:39 PM
+     * @author: YangYizhe
+     * @param
+     * @return
      */
     public HashSet<AppWidgetAttribute> getSelectedWidget() {
         HashSet<AppWidgetAttribute> itemSet = new HashSet<AppWidgetAttribute>();
@@ -169,41 +197,44 @@ public class NotesListAdapter extends CursorAdapter {
         return itemSet;
     }
 
-    /*
-     * 函数功能：获取选项个数
-     * 函数实现：如下注释
+    /**
+     * @method  getSelectedCount
+     * @description 获取选项个数
+     * @date: 12/23/2023 11:39 PM
+     * @author: YangYizhe
      */
     public int getSelectedCount() {
-        Collection<Boolean> values = mSelectedIndex.values();
-        //首先获取选项下标的值
+        Collection<Boolean> values = mSelectedIndex.values();//首先获取选项下标的值
         if (null == values) {
             return 0;
         }
-        Iterator<Boolean> iter = values.iterator();
-        //初始化叠加器
+        Iterator<Boolean> iter = values.iterator();//初始化叠加器
         int count = 0;
         while (iter.hasNext()) {
             if (true == iter.next()) {
-                //若value值为真计数+1
-                count++;
+                count++;//若value值为真计数+1
             }
         }
         return count;
     }
 
-    /*
-     * 函数功能：判断是否全部选中
-     * 函数实现：如下注释
+    /**
+     * @method  isAllSelected
+     * @description 判断是否全部选中
+     * @date: 12/23/2023 11:38 PM
+     * @author: YangYizhe
      */
     public boolean isAllSelected() {
         int checkedCount = getSelectedCount();
-        return (checkedCount != 0 && checkedCount == mNotesCount);
-        //获取选项数看是否等于便签的个数
+        return (checkedCount != 0 && checkedCount == mNotesCount);//获取选项数看是否等于便签的个数
     }
-
-    /*
-     * 函数功能：判断是否为选项表
-     * 函数实现：通过传递的下标来确定
+    /**
+     * @method  isSelectedItem
+     * @description 判断是否为选项表,通过传递的下标来确定
+     * @date: 12/23/2023 11:38 PM
+     * @author: YangYizhe
+     * @param
+     * @return
      */
     public boolean isSelectedItem(final int position) {
         if (null == mSelectedIndex.get(position)) {
@@ -213,29 +244,39 @@ public class NotesListAdapter extends CursorAdapter {
     }
 
     @Override
-    /*
-     * 函数功能：在activity内容发生局部变动的时候回调该函数计算便签的数量
-     * 函数实现：如下注释
+    /**
+     * @method  onContentChanged
+     * @description 在activity内容发生局部变动的时候回调该函数计算便签的数量
+     * @date: 12/23/2023 11:38 PM
+     * @author: YangYizhe
+     * @param []
+     * @return void
      */
     protected void onContentChanged() {
         super.onContentChanged();
-        //执行基类函数
-        calcNotesCount();
+        calcNotesCount();//执行基类函数
     }
 
     @Override
-    /*
-     * 函数功能：在activity光标发生局部变动的时候回调该函数计算便签的数量
+    /**
+     * @method  changeCursor
+     * @description 在activity光标发生局部变动的时候回调该函数计算便签的数量
+     * @date: 12/23/2023 11:37 PM
+     * @author: YangYizhe
+     * @param [cursor]
+     * @return void
      */
     public void changeCursor(Cursor cursor) {
         super.changeCursor(cursor);
-        //执行基类函数
-        calcNotesCount();
+        calcNotesCount();//执行基类函数
     }
-
-    /*
-     * 函数功能：计算便签数量
-     *
+    /**
+     * @method  calcNotesCount
+     * @description 计算便签数量
+     * @date: 12/23/2023 11:37 PM
+     * @author: YangYizhe
+     * @param
+     * @return
      */
     private void calcNotesCount() {
         mNotesCount = 0;
@@ -244,14 +285,12 @@ public class NotesListAdapter extends CursorAdapter {
             Cursor c = (Cursor) getItem(i);
             if (c != null) {
                 if (NoteItemData.getNoteType(c) == Notes.TYPE_NOTE) {
-                    mNotesCount++;
-                    //若该位置不为空并且文本类型为便签就+1
+                    mNotesCount++;//若该位置不为空并且文本类型为便签就+1
                 }
             } else {
                 Log.e(TAG, "Invalid cursor");
                 return;
             }
-            //否则报错
         }
     }
 }
\ No newline at end of file
diff --git a/src/Notes/app/src/main/java/net/micode/notes/ui/NotesListItem.java b/src/Notes/app/src/main/java/net/micode/notes/ui/NotesListItem.java
index fa8b3d2..d32a37b 100644
--- a/src/Notes/app/src/main/java/net/micode/notes/ui/NotesListItem.java
+++ b/src/Notes/app/src/main/java/net/micode/notes/ui/NotesListItem.java
@@ -14,7 +14,14 @@ import net.micode.notes.tool.DataUtils;
 import net.micode.notes.tool.ResourceParser.NoteItemBgResources;
 
 
-//创建便签列表项目选项
+/**
+ * @Package:        net.micode.notes.ui
+ * @ClassName:      NotesListItem
+ * @Description:    
+ * @Author:         YangYizhe
+ * @CreateDate:     12/23/2023 11:35 PM
+ * @Version:        1.0
+ */
 public class NotesListItem extends LinearLayout {
     private ImageView mAlert;//闹钟图片
     private TextView mTitle;  //标题
diff --git a/src/Notes/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java b/src/Notes/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
index 6f8a89f..e4109c6 100644
--- a/src/Notes/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
+++ b/src/Notes/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
@@ -31,78 +31,68 @@ import net.micode.notes.data.Notes;
 import net.micode.notes.data.Notes.NoteColumns;
 import net.micode.notes.gtask.remote.GTaskSyncService;
 
-/*
- *该类功能：NotesPreferenceActivity，在小米便签中主要实现的是对背景颜色和字体大小的数据储存。
- *       继承了PreferenceActivity主要功能为对系统信息和配置进行自动保存的Activity
+/**
+ * @Package:        net.micode.notes.ui
+ * @ClassName:      NotesPreferenceActivity
+ * @Description:
+ * NotesPreferenceActivity，在小米便签中主要实现的是对背景颜色和字体大小的数据储存。
+ * 继承了PreferenceActivity主要功能为对系统信息和配置进行自动保存的Activity
+ * @Author:         YangYizhe
+ * @CreateDate:     12/23/2023 11:42 PM
+ * @Version:        1.0
  */
 public class NotesPreferenceActivity extends PreferenceActivity {
-    public static final String PREFERENCE_NAME = "notes_preferences";
-    //优先名
-    public static final String PREFERENCE_SYNC_ACCOUNT_NAME = "pref_key_account_name";
-    //同步账号
-    public static final String PREFERENCE_LAST_SYNC_TIME = "pref_last_sync_time";
-    //同步时间
+    public static final String PREFERENCE_NAME = "notes_preferences";//优先名
+    public static final String PREFERENCE_SYNC_ACCOUNT_NAME = "pref_key_account_name";//同步账号
+    public static final String PREFERENCE_LAST_SYNC_TIME = "pref_last_sync_time";//同步时间
     public static final String PREFERENCE_SET_BG_COLOR_KEY = "pref_key_bg_random_appear";
-
-    private static final String PREFERENCE_SYNC_ACCOUNT_KEY = "pref_sync_account_key";
-    //同步密码
+    private static final String PREFERENCE_SYNC_ACCOUNT_KEY = "pref_sync_account_key";//同步密码
     private static final String AUTHORITIES_FILTER_KEY = "authorities";
-    //本地密码
-    private PreferenceCategory mAccountCategory;
-    //账户分组
-    private GTaskReceiver mReceiver;
-    //同步任务接收器
-    private Account[] mOriAccounts;
-    //账户
-    private boolean mHasAddedAccount;
-    //账户的hash标记
+    private PreferenceCategory mAccountCategory;//账户分组
+    private GTaskReceiver mReceiver;//同步任务接收器
+    private Account[] mOriAccounts;//账户
+    private boolean mHasAddedAccount;//账户的hash标记
 
     @Override
-    /*
-     *函数功能：创建一个activity，在函数里要完成所有的正常静态设置
-     *参数：Bundle icicle：存放了 activity 当前的状态
-     *函数实现：如下注释
+    /**
+     * @method  onCreate
+     * @description 创建一个activity，在函数里要完成所有的正常静态设置
+     * @date: 12/23/2023 11:43 PM
+     * @author: YangYizhe
+     * @param [icicle]
+     * @return void
      */
     protected void onCreate(Bundle icicle) {
-        //先执行父类的创建函数
         super.onCreate(icicle);
-
         /* using the app icon for navigation */
-        getActionBar().setDisplayHomeAsUpEnabled(true);
-        //给左上角图标的左边加上一个返回的图标 
-
-        addPreferencesFromResource(R.xml.preferences);
-        //添加xml来源并显示 xml
-        mAccountCategory = (PreferenceCategory) findPreference(PREFERENCE_SYNC_ACCOUNT_KEY);
-        //根据同步账户关键码来初始化分组
+        getActionBar().setDisplayHomeAsUpEnabled(true);//给左上角图标的左边加上一个返回的图标
+        addPreferencesFromResource(R.xml.preferences);//添加xml来源并显示 xml
+        mAccountCategory = (PreferenceCategory) findPreference(PREFERENCE_SYNC_ACCOUNT_KEY);//根据同步账户关键码来初始化分组
         mReceiver = new GTaskReceiver();
         IntentFilter filter = new IntentFilter();
         filter.addAction(GTaskSyncService.GTASK_SERVICE_BROADCAST_NAME);
-        registerReceiver(mReceiver, filter);
-        //初始化同步组件
-
+        registerReceiver(mReceiver, filter);//初始化同步组件
         mOriAccounts = null;
-        View header = LayoutInflater.from(this).inflate(R.layout.settings_header, null);
-        //获取listvivew，ListView的作用:用于列出所有选择 
-        getListView().addHeaderView(header, null, true);
-        //在listview组件上方添加其他组件
+        View header = LayoutInflater.from(this).inflate(R.layout.settings_header, null);//获取listvivew，ListView的作用:用于列出所有选择
+        getListView().addHeaderView(header, null, true);//在listview组件上方添加其他组件
     }
 
     @Override
-    /*
-     * 函数功能：activity交互功能的实现，用于接受用户的输入
-     * 函数实现：如下注释
+    /**
+     * @method  onResume
+     * @description activity交互功能的实现，用于接受用户的输入
+     * @date: 12/23/2023 11:44 PM
+     * @author: YangYizhe
+     * @return void
      */
     protected void onResume() {
-        //先执行父类 的交互实现
         super.onResume();
 
         // need to set sync account automatically if user has added a new
         // account
         if (mHasAddedAccount) {
             //若用户新加了账户则自动设置同步账户
-            Account[] accounts = getGoogleAccounts();
-            //获取google同步账户
+            Account[] accounts = getGoogleAccounts();//获取google同步账户
             if (mOriAccounts != null && accounts.length > mOriAccounts.length) {
                 //若原账户不为空且当前账户有增加
                 for (Account accountNew : accounts) {
@@ -123,37 +113,31 @@ public class NotesPreferenceActivity extends PreferenceActivity {
             }
         }
 
-        refreshUI();
-        //刷新标签界面
+        refreshUI();//刷新标签界面
     }
 
     @Override
-    /*
-     * 函数功能：销毁一个activity
-     * 函数实现：如下注释
-     */
     protected void onDestroy() {
         if (mReceiver != null) {
-            unregisterReceiver(mReceiver);
-            //注销接收器
+            unregisterReceiver(mReceiver);//注销接收器
         }
-        super.onDestroy();
-        //执行父类的销毁动作
+        super.onDestroy();//执行父类的销毁动作
     }
 
-    /*
-     * 函数功能：重新设置账户信息
-     * 函数实现：如下注释
+    /**
+     * @method  loadAccountPreference
+     * @description 重新设置账户信息
+     * @date: 12/23/2023 11:45 PM
+     * @author: YangYizhe
+     * @param
+     * @return
      */
     private void loadAccountPreference() {
-        mAccountCategory.removeAll();
-        //销毁所有的分组
-        Preference accountPref = new Preference(this);
-        //建立首选项
+        mAccountCategory.removeAll();//销毁所有的分组
+        Preference accountPref = new Preference(this);//建立首选项
         final String defaultAccount = getSyncAccountName(this);
         accountPref.setTitle(getString(R.string.preferences_account_title));
-        accountPref.setSummary(getString(R.string.preferences_account_summary));
-        //设置首选项的大标题和小标题
+        accountPref.setSummary(getString(R.string.preferences_account_summary));//设置首选项的大标题和小标题
         accountPref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
             public boolean onPreferenceClick(Preference preference) {
                 //建立监听器
@@ -177,14 +161,15 @@ public class NotesPreferenceActivity extends PreferenceActivity {
                 return true;
             }
         });
-
-        //根据新建首选项编辑新的账户分组
-        mAccountCategory.addPreference(accountPref);
+        mAccountCategory.addPreference(accountPref);//根据新建首选项编辑新的账户分组
     }
-
-    /*
-     *函数功能：设置按键的状态和最后同步的时间
-     *函数实现：如下注释
+    /**
+     * @method  loadSyncButton
+     * @description 设置按键的状态和最后同步的时间
+     * @date: 12/23/2023 11:46 PM
+     * @author: YangYizhe
+     * @param
+     * @return
      */
     private void loadSyncButton() {
         Button syncButton = (Button) findViewById(R.id.preference_sync_button);
@@ -199,20 +184,16 @@ public class NotesPreferenceActivity extends PreferenceActivity {
                 public void onClick(View v) {
                     GTaskSyncService.cancelSync(NotesPreferenceActivity.this);
                 }
-            });
-            //设置按钮显示的文本为“取消同步”以及监听器
+            });//设置按钮显示的文本为“取消同步”以及监听器
         } else {
             syncButton.setText(getString(R.string.preferences_button_sync_immediately));
             syncButton.setOnClickListener(new View.OnClickListener() {
                 public void onClick(View v) {
                     GTaskSyncService.startSync(NotesPreferenceActivity.this);
                 }
-            });
-            //若是不同步则设置按钮显示的文本为“立即同步”以及对应监听器
+            });//若是不同步则设置按钮显示的文本为“立即同步”以及对应监听器
         }
-        syncButton.setEnabled(!TextUtils.isEmpty(getSyncAccountName(this)));
-        //设置按键可用还是不可用
-
+        syncButton.setEnabled(!TextUtils.isEmpty(getSyncAccountName(this)));//设置按键可用还是不可用
         // set last sync time
         // 设置最终同步时间
         if (GTaskSyncService.isSyncing()) {
@@ -235,35 +216,38 @@ public class NotesPreferenceActivity extends PreferenceActivity {
             }
         }
     }
-    /*
-     *函数功能：刷新标签界面
-     *函数实现：调用上文设置账号和设置按键两个函数来实现
+    /**
+     * @method  refreshUI
+     * @description
+     * 刷新标签界面
+     * 调用上文设置账号和设置按键两个函数来实现
+     * @date: 12/23/2023 11:46 PM
+     * @author: YangYizhe
      */
     private void refreshUI() {
         loadAccountPreference();
         loadSyncButton();
     }
-
-    /*
-     * 函数功能：显示账户选择的对话框并进行账户的设置
-     * 函数实现：如下注释
+    /**
+     * @method  showSelectAccountAlertDialog
+     * @description 显示账户选择的对话框并进行账户的设置
+     * @date: 12/23/2023 11:47 PM
+     * @author: YangYizhe
+     * @param
+     * @return
      */
     private void showSelectAccountAlertDialog() {
-        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);
-        //创建一个新的对话框
+        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);//创建一个新的对话框
 
         View titleView = LayoutInflater.from(this).inflate(R.layout.account_dialog_title, null);
         TextView titleTextView = (TextView) titleView.findViewById(R.id.account_dialog_title);
         titleTextView.setText(getString(R.string.preferences_dialog_select_account_title));
         TextView subtitleTextView = (TextView) titleView.findViewById(R.id.account_dialog_subtitle);
-        subtitleTextView.setText(getString(R.string.preferences_dialog_select_account_tips));
-        //设置标题以及子标题的内容
+        subtitleTextView.setText(getString(R.string.preferences_dialog_select_account_tips));//设置标题以及子标题的内容
         dialogBuilder.setCustomTitle(titleView);
-        dialogBuilder.setPositiveButton(null, null);
-        //设置对话框的自定义标题，建立一个YES的按钮
+        dialogBuilder.setPositiveButton(null, null);//设置对话框的自定义标题，建立一个YES的按钮
         Account[] accounts = getGoogleAccounts();
-        String defAccount = getSyncAccountName(this);
-        //获取同步账户信息
+        String defAccount = getSyncAccountName(this);//获取同步账户信息
         mOriAccounts = accounts;
         mHasAddedAccount = false;
 
@@ -275,8 +259,7 @@ public class NotesPreferenceActivity extends PreferenceActivity {
             int index = 0;
             for (Account account : accounts) {
                 if (TextUtils.equals(account.name, defAccount)) {
-                    checkedItem = index;
-                    //在账户列表中查询到所需账户
+                    checkedItem = index;//在账户列表中查询到所需账户
                 }
                 items[index++] = account.name;
             }
@@ -285,21 +268,16 @@ public class NotesPreferenceActivity extends PreferenceActivity {
                     new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int which) {
                             setSyncAccount(itemMapping[which].toString());
-                            dialog.dismiss();
-                            //取消对话框
+                            dialog.dismiss();//取消对话框
                             refreshUI();
                         }
-                        //设置点击后执行的事件，包括检录新同步账户和刷新标签界面
-                    });
-            //建立对话框网络版的监听器
+                    });//建立对话框网络版的监听器
         }
 
         View addAccountView = LayoutInflater.from(this).inflate(R.layout.add_account_text, null);
-        dialogBuilder.setView(addAccountView);
-        //给新加账户对话框设置自定义样式
+        dialogBuilder.setView(addAccountView);//给新加账户对话框设置自定义样式
 
-        final AlertDialog dialog = dialogBuilder.show();
-        //显示对话框
+        final AlertDialog dialog = dialogBuilder.show();//显示对话框
         addAccountView.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
                 mHasAddedAccount = true;
@@ -313,32 +291,28 @@ public class NotesPreferenceActivity extends PreferenceActivity {
                 //跳回上一个选项
                 dialog.dismiss();
             }
-        });
-        //建立新加账户对话框的监听器
+        });//建立新加账户对话框的监听器
     }
-
-    /*
-     * 函数功能：显示账户选择对话框和相关账户操作
-     * 函数实现：如下注释
+    /**
+     * @method  showChangeAccountConfirmAlertDialog
+     * @description 显示账户选择对话框和相关账户操作
+     * @date: 12/23/2023 11:48 PM
+     * @author: YangYizhe
      */
     private void showChangeAccountConfirmAlertDialog() {
-        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);
-        //创建一个新的对话框
+        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);//创建一个新的对话框
         View titleView = LayoutInflater.from(this).inflate(R.layout.account_dialog_title, null);
         TextView titleTextView = (TextView) titleView.findViewById(R.id.account_dialog_title);
         titleTextView.setText(getString(R.string.preferences_dialog_change_account_title,
                 getSyncAccountName(this)));
         TextView subtitleTextView = (TextView) titleView.findViewById(R.id.account_dialog_subtitle);
-        subtitleTextView.setText(getString(R.string.preferences_dialog_change_account_warn_msg));
-        //根据同步修改的账户信息设置标题以及子标题的内容
-        dialogBuilder.setCustomTitle(titleView);
-        //设置对话框的自定义标题
+        subtitleTextView.setText(getString(R.string.preferences_dialog_change_account_warn_msg));//根据同步修改的账户信息设置标题以及子标题的内容
+        dialogBuilder.setCustomTitle(titleView);//设置对话框的自定义标题
         CharSequence[] menuItemArray = new CharSequence[] {
                 getString(R.string.preferences_menu_change_account),
                 getString(R.string.preferences_menu_remove_account),
                 getString(R.string.preferences_menu_cancel)
         };
-        //定义一些标记字符串
         dialogBuilder.setItems(menuItemArray, new DialogInterface.OnClickListener() {
             //设置对话框要显示的一个list，用于显示几个命令时,即change，remove，cancel
             public void onClick(DialogInterface dialog, int which) {
@@ -353,42 +327,42 @@ public class NotesPreferenceActivity extends PreferenceActivity {
                 }
             }
         });
-        dialogBuilder.show();
-        //显示对话框
+        dialogBuilder.show();//显示对话框
     }
 
-    /*
-     *函数功能：获取谷歌账户
-     *函数实现：通过账户管理器直接获取
+    /**
+     * @method  getGoogleAccounts
+     * @description
+     * 获取谷歌账户
+     * 通过账户管理器直接获取
+     * @date: 12/23/2023 11:49 PM
+     * @author: YangYizhe
      */
     private Account[] getGoogleAccounts() {
         AccountManager accountManager = AccountManager.get(this);
         return accountManager.getAccountsByType("com.google");
     }
 
-    /*
-     * 函数功能：设置同步账户
-     * 函数实现：如下注释：
+    /**
+     * @method  setSyncAccount
+     * @description 设置同步账户
+     * @date: 12/23/2023 11:49 PM
+     * @author: YangYizhe
+     * @param account
      */
     private void setSyncAccount(String account) {
         if (!getSyncAccountName(this).equals(account)) {
             //假如该账号不在同步账号列表中
             SharedPreferences settings = getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE);
-            SharedPreferences.Editor editor = settings.edit();
-            //编辑共享的首选项
+            SharedPreferences.Editor editor = settings.edit();//编辑共享的首选项
             if (account != null) {
                 editor.putString(PREFERENCE_SYNC_ACCOUNT_NAME, account);
             } else {
                 editor.putString(PREFERENCE_SYNC_ACCOUNT_NAME, "");
-            }
-            //将该账号加入到首选项中
-
-            editor.commit();
-            //提交修改的数据
-
+            }//将该账号加入到首选项中
 
-            setLastSyncTime(this, 0);
-            //将最后同步时间清零
+            editor.commit();//提交修改的数据
+            setLastSyncTime(this, 0);//将最后同步时间清零
 
             // clean up local gtask related info
             new Thread(new Runnable() {
@@ -407,25 +381,23 @@ public class NotesPreferenceActivity extends PreferenceActivity {
             //将toast的文本信息置为“设置账户成功”并显示出来
         }
     }
-    /*
-     * 函数功能：删除同步账户
-     * 函数实现：如下注释：
+    /**
+     * @method  removeSyncAccount
+     * @description 删除同步账户
+     * @date: 12/23/2023 11:49 PM
+     * @author: YangYizhe
      */
     private void removeSyncAccount() {
         SharedPreferences settings = getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE);
-        SharedPreferences.Editor editor = settings.edit();
-        //设置共享首选项
+        SharedPreferences.Editor editor = settings.edit();//设置共享首选项
 
         if (settings.contains(PREFERENCE_SYNC_ACCOUNT_NAME)) {
-            editor.remove(PREFERENCE_SYNC_ACCOUNT_NAME);
-            //假如当前首选项中有账户就删除
+            editor.remove(PREFERENCE_SYNC_ACCOUNT_NAME);//假如当前首选项中有账户就删除
         }
         if (settings.contains(PREFERENCE_LAST_SYNC_TIME)) {
-            editor.remove(PREFERENCE_LAST_SYNC_TIME);
-            //删除当前首选项中有账户时间
+            editor.remove(PREFERENCE_LAST_SYNC_TIME);//删除当前首选项中有账户时间
         }
-        editor.commit();
-        //提交更新后的数据
+        editor.commit();//提交更新后的数据
 
         // clean up local gtask related info
         new Thread(new Runnable() {
@@ -438,33 +410,43 @@ public class NotesPreferenceActivity extends PreferenceActivity {
         }).start();
         //重置当地同步任务的信息
     }
-
-    /*
-     * 函数功能：获取同步账户名称
-     * 函数实现：通过共享的首选项里的信息直接获取
+    /**
+     * @method  getSyncAccountName
+     * @description
+     * 获取同步账户名称
+     * 通过共享的首选项里的信息直接获取
+     * @date: 12/23/2023 11:50 PM
+     * @author: YangYizhe
+     * @param context
      */
     public static String getSyncAccountName(Context context) {
         SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME,
                 Context.MODE_PRIVATE);
         return settings.getString(PREFERENCE_SYNC_ACCOUNT_NAME, "");
     }
-
-    /*
-     * 函数功能：设置最终同步的时间
-     * 函数实现：如下注释
+    /**
+     * @method  setLastSyncTime
+     * @description 设置最终同步的时间
+     * @date: 12/23/2023 11:50 PM
+     * @author: YangYizhe
+     * @param
+     * @return
      */
     public static void setLastSyncTime(Context context, long time) {
         SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME,
                 Context.MODE_PRIVATE);
-        SharedPreferences.Editor editor = settings.edit();
-        // 从共享首选项中找到相关账户并获取其编辑器
+        SharedPreferences.Editor editor = settings.edit();// 从共享首选项中找到相关账户并获取其编辑器
         editor.putLong(PREFERENCE_LAST_SYNC_TIME, time);
-        editor.commit();
-        //编辑最终同步时间并提交更新
+        editor.commit();//编辑最终同步时间并提交更新
     }
-    /*
-     * 函数功能：获取最终同步时间
-     * 函数实现：通过共享的首选项里的信息直接获取
+    /**
+     * @method  getLastSyncTime
+     * @description
+     * 获取最终同步时间
+     * 通过共享的首选项里的信息直接获取
+     * @date: 12/23/2023 11:51 PM
+     * @author: YangYizhe
+     * @param context
      */
     public static long getLastSyncTime(Context context) {
         SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME,
@@ -472,10 +454,6 @@ public class NotesPreferenceActivity extends PreferenceActivity {
         return settings.getLong(PREFERENCE_LAST_SYNC_TIME, 0);
     }
 
-    /*
-     * 函数功能：接受同步信息
-     * 函数实现：继承BroadcastReceiver
-     */
     private class GTaskReceiver extends BroadcastReceiver {
 
         @Override
@@ -485,17 +463,17 @@ public class NotesPreferenceActivity extends PreferenceActivity {
                 //获取随广播而来的Intent中的同步服务的数据
                 TextView syncStatus = (TextView) findViewById(R.id.prefenerece_sync_status_textview);
                 syncStatus.setText(intent
-                        .getStringExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_PROGRESS_MSG));
-                //通过获取的数据在设置系统的状态
+                        .getStringExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_PROGRESS_MSG));//通过获取的数据在设置系统的状态
             }
 
         }
     }
-
-    /*
-     * 函数功能：处理菜单的选项
-     * 函数实现：如下注释
-     * 参数:MenuItem菜单选项
+    /**
+     * @method  onOptionsItemSelected
+     * @description 处理菜单的选项
+     * @date: 12/23/2023 11:52 PM
+     * @author: YangYizhe
+     * @param item
      */
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
diff --git a/src/Notes/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java b/src/Notes/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
index d6534c8..d8eb50b 100644
--- a/src/Notes/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
+++ b/src/Notes/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
@@ -31,7 +31,14 @@ import net.micode.notes.data.Notes.NoteColumns;
 import net.micode.notes.tool.ResourceParser;
 import net.micode.notes.ui.NoteEditActivity;
 import net.micode.notes.ui.NotesListActivity;
-//定义了一个抽象类，提供便签挂件
+/**
+ * @Package:        net.micode.notes.widget
+ * @ClassName:      NoteWidgetProvider
+ * @Description:    这个抽象类用作MiNote应用程序中笔记小部件的基础。它提供了在主屏幕上更新和管理笔记小部件的功能。
+ * @Author:         YangYizhe
+ * @CreateDate:     12/23/2023 11:53 PM
+ * @Version:        1.0
+ */
 public abstract class NoteWidgetProvider extends AppWidgetProvider {
     public static final String [] PROJECTION = new String [] {
         NoteColumns.ID,
diff --git a/src/Notes/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java b/src/Notes/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
index adcb2f7..f3d5f1e 100644
--- a/src/Notes/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
+++ b/src/Notes/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
@@ -23,7 +23,16 @@ import net.micode.notes.R;
 import net.micode.notes.data.Notes;
 import net.micode.notes.tool.ResourceParser;
 
-
+/**
+ * @Package:        net.micode.notes.widget
+ * @ClassName:      NoteWidgetProvider_2x
+ * @Description:
+ * 这个类是NoteWidgetProvider的一个具体实现，用于实现2x大小的笔记小部件。
+ * 它继承自NoteWidgetProvider，并提供特定于2x小部件的布局ID、背景资源和小部件类型。
+ * @Author:         YangYizhe
+ * @CreateDate:     12/23/2023 11:55 PM
+ * @Version:        1.0
+ */
 public class NoteWidgetProvider_2x extends NoteWidgetProvider {
     @Override
     public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
diff --git a/src/Notes/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java b/src/Notes/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
index c12a02e..0c3ae50 100644
--- a/src/Notes/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
+++ b/src/Notes/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
@@ -23,7 +23,16 @@ import net.micode.notes.R;
 import net.micode.notes.data.Notes;
 import net.micode.notes.tool.ResourceParser;
 
-
+/**
+ * @Package:        net.micode.notes.widget
+ * @ClassName:      NoteWidgetProvider_4x
+ * @Description:
+ * 这个类是NoteWidgetProvider的一个具体实现，用于实现4x大小的笔记小部件。
+ * 它继承自NoteWidgetProvider，并提供特定于4x小部件的布局ID、背景资源和小部件类型。
+ * @Author:         YangYizhe
+ * @CreateDate:     12/23/2023 11:56 PM
+ * @Version:        1.0
+ */
 public class NoteWidgetProvider_4x extends NoteWidgetProvider {
     @Override
     public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..c71be5b
--- /dev/null
+++ b/src/main/AndroidManifest.xml
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!--- 定义应用程序的名称和版本号 -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="net.micode.notes"
+    android:versionCode="1"
+    android:versionName="0.1" >
+
+    <!--- 指定应用程序需要支持的最低的 Android SDK 版本 -->
+    <uses-sdk android:minSdkVersion="14" />
+
+    <!--- 权限声明 -->
+    <!--- 写入 SD 卡的权限 -->
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <!--- 创建、删除有关快捷方式的权限 -->
+    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
+    <!--- 访问网络的权限 -->
+    <uses-permission android:name="android.permission.INTERNET" />
+    <!--- 读取联系人的权限 -->
+    <uses-permission android:name="android.permission.READ_CONTACTS" />
+    <!--- 账户管理的权限 -->
+    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
+    <!--- 验证账户的权限 -->
+    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
+    <!--- 开机自动运行权限 -->
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+
+    <!--- 应用程序组件声明 -->
+    <!--- 定义应用程序的图标和名称 -->
+    <application
+        android:icon="@drawable/icon_app"
+        android:label="@string/app_name" >
+
+        <!--- 应用程序的入口 NotesListActivity -->
+        <activity
+            android:name=".ui.NotesListActivity"
+            android:exported="true"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:label="@string/app_name"
+            android:launchMode="singleTop"
+            android:theme="@style/NoteTheme"
+            android:windowSoftInputMode="adjustPan" >
+
+            <!--- 定义该 Activity 为启动器，即默认启动的 Activity -->
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <!--- 笔记编辑 Activity -->
+        <activity
+            android:name=".ui.NoteEditActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:launchMode="singleTop"
+            android:theme="@style/NoteTheme" >
+
+            <!--- 笔记编辑 Activity 的 Intent Filter，用于接收其他应用程序发送过来的消息 -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <!--- 笔记编辑 Activity 可以处理的 MIME 类型 -->
+                <data android:mimeType="vnd.android.cursor.item/text_note" android:scheme="content" android:host="com.example.notes.provider" android:path="/notes" />
+                <data android:mimeType="vnd.android.cursor.item/call_note" android:scheme="content" android:host="com.example.notes.provider" android:path="/notes" />
+            </intent-filter>
+
+            <!--- 笔记编辑 Activity 的 Intent Filter，用于接收其他应用程序发送过来的消息 -->
+            <intent-filter>
+                <action android:name="android.intent.action.INSERT_OR_EDIT" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <!--- 笔记编辑 Activity 可以处理的 MIME 类型 -->
+                <data android:mimeType="vnd.android.cursor.item/text_note" />
+                <data android:mimeType="vnd.android.cursor.item/call_note" />
+            </intent-filter>
+
+            <!--- 搜索 Intent Filter，用于响应搜索请求 -->
+            <intent-filter>
+                <action android:name="android.intent.action.SEARCH" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+
+            <!--- 搜索框的配置信息 -->
+            <meta-data
+                android:name="android.app.searchable"
+                android:resource="@xml/searchable" />
+        </activity>
+
+        <!--- 笔记供应器，用于共享笔记数据 -->
+        <provider
+            android:name="net.micode.notes.data.NotesProvider"
+            android:authorities="micode_notes"
+            android:multiprocess="true" />
+
+        <!--- 笔记小部件，支持两种大小 -->
+        <receiver
+            android:name=".widget.NoteWidgetProvider_2x"
+            android:label="@string/app_widget2x2" >
+
+            <!--- 笔记小部件的 Intent Filter，用于接收系统广播和小部件更新操作 -->
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+            </intent-filter>
+
+            <!--- 笔记小部件的配置信息 -->
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/widget_2x_info" />
+        </receiver>
+        <receiver
+            android:name=".widget.NoteWidgetProvider_4x"
+            android:label="@string/app_widget4x4" >
+
+            <!--- 笔记小部件的 Intent Filter，用于接收系统广播和小部件更新操作 -->
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+            </intent-filter>
+
+            <!--- 笔记小部件的配置信息 -->
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/widget_4x_info" />
+        </receiver>
+
+        <!--- 启动时需要初始化闹钟服务 -->
+        <receiver android:name=".ui.AlarmInitReceiver" >
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
+
+        <!--- 闹钟服务 -->
+        <receiver
+            android:name="net.micode.notes.ui.AlarmReceiver"
+            android:process=":remote" >
+        </receiver>
+
+        <!--- 闹钟提示 Activity -->
+        <activity
+            android:name=".ui.AlarmAlertActivity"
+            android:label="@string/app_name"
+            android:launchMode="singleInstance"
+            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
+        </activity>
+
+        <!--- 首选项 Activity -->
+        <activity
+            android:name="net.micode.notes.ui.NotesPreferenceActivity"
+            android:label="@string/preferences_title"
+            android:launchMode="singleTop"
+            android:theme="@android:style/Theme.Holo.Light" >
+        </activity>
+
+        <!--- GTask 同步服务 -->
+        <service
+            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
+            android:exported="false" >
+        </service>
+
+        <!--- 默认搜索 Activity -->
+        <meta-data
+            android:name="android.app.default_searchable"
+            android:value=".ui.NoteEditActivity" />
+    </application>
+</manifest>
diff --git a/src/data/Contact.java b/src/main/java/net/micode/notes/data/Contact.java
similarity index 100%
rename from src/data/Contact.java
rename to src/main/java/net/micode/notes/data/Contact.java
diff --git a/src/data/Notes.java b/src/main/java/net/micode/notes/data/Notes.java
similarity index 100%
rename from src/data/Notes.java
rename to src/main/java/net/micode/notes/data/Notes.java
diff --git a/src/data/NotesDatabaseHelper.java b/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
similarity index 100%
rename from src/data/NotesDatabaseHelper.java
rename to src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
diff --git a/src/data/NotesProvider.java b/src/main/java/net/micode/notes/data/NotesProvider.java
similarity index 100%
rename from src/data/NotesProvider.java
rename to src/main/java/net/micode/notes/data/NotesProvider.java
diff --git a/src/gtask/data/MetaData.java b/src/main/java/net/micode/notes/gtask/data/MetaData.java
similarity index 100%
rename from src/gtask/data/MetaData.java
rename to src/main/java/net/micode/notes/gtask/data/MetaData.java
diff --git a/src/gtask/data/Node.java b/src/main/java/net/micode/notes/gtask/data/Node.java
similarity index 100%
rename from src/gtask/data/Node.java
rename to src/main/java/net/micode/notes/gtask/data/Node.java
diff --git a/src/gtask/data/SqlData.java b/src/main/java/net/micode/notes/gtask/data/SqlData.java
similarity index 100%
rename from src/gtask/data/SqlData.java
rename to src/main/java/net/micode/notes/gtask/data/SqlData.java
diff --git a/src/gtask/data/SqlNote.java b/src/main/java/net/micode/notes/gtask/data/SqlNote.java
similarity index 100%
rename from src/gtask/data/SqlNote.java
rename to src/main/java/net/micode/notes/gtask/data/SqlNote.java
diff --git a/src/gtask/data/Task.java b/src/main/java/net/micode/notes/gtask/data/Task.java
similarity index 100%
rename from src/gtask/data/Task.java
rename to src/main/java/net/micode/notes/gtask/data/Task.java
diff --git a/src/gtask/data/TaskList.java b/src/main/java/net/micode/notes/gtask/data/TaskList.java
similarity index 100%
rename from src/gtask/data/TaskList.java
rename to src/main/java/net/micode/notes/gtask/data/TaskList.java
diff --git a/src/gtask/exception/ActionFailureException.java b/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
similarity index 100%
rename from src/gtask/exception/ActionFailureException.java
rename to src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
diff --git a/src/gtask/exception/NetworkFailureException.java b/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
similarity index 100%
rename from src/gtask/exception/NetworkFailureException.java
rename to src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
diff --git a/src/gtask/remote/GTaskASyncTask.java b/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
similarity index 100%
rename from src/gtask/remote/GTaskASyncTask.java
rename to src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
diff --git a/src/gtask/remote/GTaskClient.java b/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
similarity index 100%
rename from src/gtask/remote/GTaskClient.java
rename to src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
diff --git a/src/gtask/remote/GTaskManager.java b/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
similarity index 100%
rename from src/gtask/remote/GTaskManager.java
rename to src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
diff --git a/src/gtask/remote/GTaskSyncService.java b/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
similarity index 100%
rename from src/gtask/remote/GTaskSyncService.java
rename to src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
diff --git a/src/model/Note.java b/src/main/java/net/micode/notes/model/Note.java
similarity index 100%
rename from src/model/Note.java
rename to src/main/java/net/micode/notes/model/Note.java
diff --git a/src/model/WorkingNote.java b/src/main/java/net/micode/notes/model/WorkingNote.java
similarity index 100%
rename from src/model/WorkingNote.java
rename to src/main/java/net/micode/notes/model/WorkingNote.java
diff --git a/src/tool/BackupUtils.java b/src/main/java/net/micode/notes/tool/BackupUtils.java
similarity index 100%
rename from src/tool/BackupUtils.java
rename to src/main/java/net/micode/notes/tool/BackupUtils.java
diff --git a/src/tool/DataUtils.java b/src/main/java/net/micode/notes/tool/DataUtils.java
similarity index 100%
rename from src/tool/DataUtils.java
rename to src/main/java/net/micode/notes/tool/DataUtils.java
diff --git a/src/tool/GTaskStringUtils.java b/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
similarity index 100%
rename from src/tool/GTaskStringUtils.java
rename to src/main/java/net/micode/notes/tool/GTaskStringUtils.java
diff --git a/src/tool/ResourceParser.java b/src/main/java/net/micode/notes/tool/ResourceParser.java
similarity index 100%
rename from src/tool/ResourceParser.java
rename to src/main/java/net/micode/notes/tool/ResourceParser.java
diff --git a/src/ui/AlarmAlertActivity.java b/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
similarity index 64%
rename from src/ui/AlarmAlertActivity.java
rename to src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
index e6a9d73..96f28bf 100644
--- a/src/ui/AlarmAlertActivity.java
+++ b/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
@@ -46,23 +46,21 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        // 设置界面显示——无标题
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
+
+        requestWindowFeature(Window.FEATURE_NO_TITLE);//设置界面显示——无标题
 
         final Window win = getWindow();
-        // 设置窗体属性——在锁屏时显示
-        win.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
+
+        win.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);//设置窗体属性——在锁屏时显示
 
         if (!isScreenOn()) {
-            // 设置窗体属性——保持点亮、点亮屏幕、允许点亮时解锁
-            win.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
+            win.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON//保持点亮、点亮屏幕、允许点亮时解锁
                     | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
                     | WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON
                     | WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR);
         }
 
-        // 获取传递的 Intent
-        Intent intent = getIntent();
+        Intent intent = getIntent();//获取传递的 Intent
 
         try {
             // 从 Intent 中获取数据并处理——获取标签 ID
@@ -80,24 +78,33 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
 
         mPlayer = new MediaPlayer();
         if (DataUtils.visibleInNoteDatabase(getContentResolver(), mNoteId, Notes.TYPE_NOTE)) {
-            // 显示对话框
-            showActionDialog();
-            // 播放闹钟提示音
-            playAlarmSound();
+            showActionDialog();// 显示对话框
+            playAlarmSound();// 播放闹钟提示音
         } else {
-            // 结束当前 Activity
-            finish();
+            finish();// 结束当前 Activity
         }
     }
-
+    /**
+     * @method  isScreenOn
+     * @description
+     * 判断屏幕是否锁屏，调用系统函数判断，最后返回值是布尔类型
+     * @date: 12/23/2023 11:21 PM
+     * @author: YangYizhe
+     * @param
+     * @return
+     */
     private boolean isScreenOn() {
-        //判断屏幕是否锁屏，调用系统函数判断，最后返回值是布尔类型
         PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
         return pm.isScreenOn();
     }
-
+    /**
+     * @method  playAlarmSound
+     * @description
+     * 播放闹钟提示音
+     * @date: 12/23/2023 11:21 PM
+     * @author: YangYizhe
+     */
     private void playAlarmSound() {
-        //闹钟提示音激发
         Uri url = RingtoneManager.getActualDefaultRingtoneUri(this, RingtoneManager.TYPE_ALARM);
         //调用系统的铃声管理URI，得到闹钟提示音
         int silentModeStreams = Settings.System.getInt(getContentResolver(),
@@ -110,19 +117,12 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
         }
         try {
             mPlayer.setDataSource(this, url);
-            //方法：setDataSource(Context context, Uri uri) 
-            //解释：无返回值，设置多媒体数据来源【根据 Uri】
             mPlayer.prepare();
-            //准备同步
-            mPlayer.setLooping(true);
-            //设置是否循环播放
-            mPlayer.start();
-            //开始播放
+            mPlayer.setLooping(true);//设置是否循环播放
+            mPlayer.start();//开始播放
         } catch (IllegalArgumentException e) {
             // TODO Auto-generated catch block
             e.printStackTrace();
-            //e.printStackTrace()函数功能是抛出异常， 还将显示出更深的调用信息
-            //System.out.println(e)，这个方法打印出异常，并且输出在哪里出现的异常
         } catch (SecurityException e) {
             // TODO Auto-generated catch block
             e.printStackTrace();
@@ -134,61 +134,67 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
             e.printStackTrace();
         }
     }
-
+    /**
+     * @method  showActionDialog
+     * @description
+     * AlertDialog的构造方法全部是Protected的
+     * 所以不能直接通过new一个AlertDialog来创建出一个AlertDialog。
+     * 要创建一个AlertDialog，就要用到AlertDialog.Builder中的create()方法
+     * 如这里的dialog就是新建了一个AlertDialog
+     * @date: 12/23/2023 11:28 PM
+     * @author: YangYizhe
+     */
     private void showActionDialog() {
         AlertDialog.Builder dialog = new AlertDialog.Builder(this);
-        /* AlertDialog的构造方法全部是Protected的
-        * 所以不能直接通过new一个AlertDialog来创建出一个AlertDialog。
-        * 要创建一个AlertDialog，就要用到AlertDialog.Builder中的create()方法
-        * 如这里的dialog就是新建了一个AlertDialog
-        */
-        dialog.setTitle(R.string.app_name);
-        //为对话框设置标题
-        dialog.setMessage(mSnippet);
-        //为对话框设置内容
-        dialog.setPositiveButton(R.string.notealert_ok, this);
-        //给对话框添加"Yes"按钮
+        dialog.setTitle(R.string.app_name);//为对话框设置标题
+        dialog.setMessage(mSnippet);//为对话框设置内容
+        dialog.setPositiveButton(R.string.notealert_ok, this);//给对话框添加"Yes"按钮
         if (isScreenOn()) {
-            dialog.setNegativeButton(R.string.notealert_enter, this);
-        }//对话框添加"No"按钮
+            dialog.setNegativeButton(R.string.notealert_enter, this);//对话框添加"No"按钮
+        }
         dialog.show().setOnDismissListener(this);
     }
-
+    /**
+     * @method  onClick
+     * @description 处理点击事件
+     * @date: 12/23/2023 11:27 PM
+     * @author: YangYizhe
+     * @param dialog
+     * @param which
+     */
     public void onClick(DialogInterface dialog, int which) {
-        switch (which) {
-            //用which来选择click后下一步的操作
-            case DialogInterface.BUTTON_NEGATIVE:
-                //这是取消操作
-                Intent intent = new Intent(this, NoteEditActivity.class);
-                //实现两个类间的数据传输
-                intent.setAction(Intent.ACTION_VIEW);
-                //设置动作属性
-                intent.putExtra(Intent.EXTRA_UID, mNoteId);
-                //实现key-value对
-                //EXTRA_UID为key；mNoteId为键
-                startActivity(intent);
-                //开始动作
+        switch (which) {//用which来选择click后下一步的操作
+            case DialogInterface.BUTTON_NEGATIVE://这是取消操作
+                Intent intent = new Intent(this, NoteEditActivity.class);//实现两个类间的数据传输
+                intent.setAction(Intent.ACTION_VIEW);//设置动作属性
+                intent.putExtra(Intent.EXTRA_UID, mNoteId);//实现key-value对     EXTRA_UID为key；mNoteId为键
+                startActivity(intent);//开始动作
                 break;
             default:
-                //这是确定操作
                 break;
         }
     }
-
+    /**
+     * @method  onDismiss
+     * @description 忽略
+     * @date: 12/23/2023 11:25 PM
+     * @author: YangYizhe
+     * @param dialog
+     */
     public void onDismiss(DialogInterface dialog) {
-        //忽略
-        stopAlarmSound();
-        //停止闹钟声音
+        stopAlarmSound();//停止闹钟声音
         finish();
-        //完成该动作
     }
-
+    /**
+     * @method  stopAlarmSound
+     * @description 停止闹钟的声音
+     * @date: 12/23/2023 11:26 PM
+     * @author: YangYizhe
+     */
     private void stopAlarmSound() {
         if (mPlayer != null) {
-            mPlayer.stop();
-            //停止播放
-            mPlayer.release();
-            //释放MediaPlayer对象
+            mPlayer.stop();//停止播放
+            mPlayer.release();//释放MediaPlayer对象
             mPlayer = null;
         }
     }
diff --git a/src/ui/AlarmInitReceiver.java b/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
similarity index 86%
rename from src/ui/AlarmInitReceiver.java
rename to src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
index 7be84dc..1982fda 100644
--- a/src/ui/AlarmInitReceiver.java
+++ b/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
@@ -22,26 +22,21 @@ import net.micode.notes.data.Notes.NoteColumns;
  * @Version:        1.0
  */
 public class AlarmInitReceiver extends BroadcastReceiver {
-
     private static final String [] PROJECTION = new String [] {
             NoteColumns.ID,
             NoteColumns.ALERTED_DATE
-    };
-    //对数据库的操作，调用标签ID和闹钟时间
+    };//对数据库的操作，调用标签ID和闹钟时间
     private static final int COLUMN_ID                = 0;
     private static final int COLUMN_ALERTED_DATE      = 1;
 
     @Override
     public void onReceive(Context context, Intent intent) {
-        long currentDate = System.currentTimeMillis();
-        //System.currentTimeMillis()产生一个当前的毫秒
-        //这个毫秒其实就是自1970年1月1日0时起的毫秒数
+        long currentDate = System.currentTimeMillis();//System.currentTimeMillis()产生一个当前的毫秒
         Cursor c = context.getContentResolver().query(Notes.CONTENT_NOTE_URI,
                 PROJECTION,
                 NoteColumns.ALERTED_DATE + ">? AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE,
                 new String[] { String.valueOf(currentDate) },
-                //将long变量currentDate转化为字符串
-                null);
+                null);//将long变量currentDate转化为字符串
         //Cursor在这里的作用是通过查找数据库中的标签内容，找到和当前系统时间相等的标签
 
         if (c != null) {
diff --git a/src/ui/AlarmReceiver.java b/src/main/java/net/micode/notes/ui/AlarmReceiver.java
similarity index 55%
rename from src/ui/AlarmReceiver.java
rename to src/main/java/net/micode/notes/ui/AlarmReceiver.java
index a4c7120..646f69f 100644
--- a/src/ui/AlarmReceiver.java
+++ b/src/main/java/net/micode/notes/ui/AlarmReceiver.java
@@ -6,7 +6,7 @@ import android.content.Intent;
 /**
  * @Package:        net.micode.notes.ui
  * @ClassName:      AlarmReceiver
- * @Description:
+ * @Description:    闹钟接收器，接收到闹钟触发的广播后启动AlarmAlertActivity进行闹钟提醒
  * @Author:         YangYizhe
  * @CreateDate:     12/17/2023 10:02 AM
  * @UpdateUser:     none
@@ -17,14 +17,9 @@ import android.content.Intent;
 public class AlarmReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
-        intent.setClass(context, AlarmAlertActivity.class);
-        //启动AlarmAlertActivity
+        intent.setClass(context, AlarmAlertActivity.class);//启动AlarmAlertActivity
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        //activity要存在于activity的栈中，而非activity的途径启动activity时必然不存在一个activity的栈
-        //所以要新起一个栈装入启动的activity
-        context.startActivity(intent);
+        context.startActivity(intent);//启动闹钟提醒界面
     }
 }
-//这是实现alarm这个功能最接近用户层的包，基于上面的两个包，
-//作用还需要深究但是对于setClass和addFlags的
  
\ No newline at end of file
diff --git a/src/ui/DateTimePicker.java b/src/main/java/net/micode/notes/ui/DateTimePicker.java
similarity index 96%
rename from src/ui/DateTimePicker.java
rename to src/main/java/net/micode/notes/ui/DateTimePicker.java
index bc0485b..9cf4ba6 100644
--- a/src/ui/DateTimePicker.java
+++ b/src/main/java/net/micode/notes/ui/DateTimePicker.java
@@ -51,8 +51,7 @@ public class DateTimePicker extends FrameLayout {
     private final NumberPicker mHourSpinner;
     private final NumberPicker mMinuteSpinner;
     private final NumberPicker mAmPmSpinner;
-    //定义了Calendar类型的变量mDate，用于操作时间
-    private Calendar mDate;
+    private Calendar mDate;//定义了Calendar类型的变量mDate，用于操作时间
     private String[] mDateDisplayValues = new String[DAYS_IN_ALL_WEEK];
 
     private boolean mIsAm;
@@ -180,25 +179,24 @@ public class DateTimePicker extends FrameLayout {
      * 构造方法
      */
     public DateTimePicker(Context context) {
-        //通过对数据库的访问，获取当前的系统时间
-        this(context, System.currentTimeMillis());
+        this(context, System.currentTimeMillis());//通过对数据库的访问，获取当前的系统时间
     }
 
     public DateTimePicker(Context context, long date) {
-        //上面函数的得到的是一个天文数字（1970至今的秒数），需要DateFormat将其变得有意义
-        this(context, date, DateFormat.is24HourFormat(context));
+        this(context, date, DateFormat.is24HourFormat(context));//上面函数的得到的是一个天文数字（1970至今的秒数），需要DateFormat将其变得有意义
     }
 
     public DateTimePicker(Context context, long date, boolean is24HourView) {
         super(context);
-        //获取系统时间
-        mDate = Calendar.getInstance();
+        mDate = Calendar.getInstance();//获取系统时间
         mInitialising = true;
         mIsAm = getCurrentHourOfDay() >= HOURS_IN_HALF_DAY;
         inflate(context, R.layout.datetime_picker, this);
-        //如果当前Activity里用到别的layout，比如对话框layout
-        //还要设置这个layout上的其他组件的内容，就必须用inflate()方法先将对话框的layout找出来
-        //然后再用findViewById()找到它上面的其它组件
+        /*
+        * 如果当前Activity里用到别的layout，比如对话框layout
+        * 还要设置这个layout上的其他组件的内容，就必须用inflate()方法先将对话框的layout找出来
+        * 然后再用findViewById()找到它上面的其它组件
+        */
         mDateSpinner = (NumberPicker) findViewById(R.id.date);
         mDateSpinner.setMinValue(DATE_SPINNER_MIN_VAL);
         mDateSpinner.setMaxValue(DATE_SPINNER_MAX_VAL);
diff --git a/src/ui/DateTimePickerDialog.java b/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
similarity index 95%
rename from src/ui/DateTimePickerDialog.java
rename to src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
index c979aec..52640a8 100644
--- a/src/ui/DateTimePickerDialog.java
+++ b/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
@@ -41,8 +41,12 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener
     }
 
     /**
-     * 构造一个新的DateTimePickerDialog。
-     *
+     * @method  DateTimePickerDialog
+     * @description
+     * 构造一个新的DateTimePickerDialog
+     * Remind me功能的对话框
+     * @date: 12/21/2023 8:01 AM
+     * @author: YangYizhe
      * @param context 上下文环境。
      * @param date    要在对话框中显示的初始日期。
      */
diff --git a/src/ui/DropdownMenu.java b/src/main/java/net/micode/notes/ui/DropdownMenu.java
similarity index 100%
rename from src/ui/DropdownMenu.java
rename to src/main/java/net/micode/notes/ui/DropdownMenu.java
diff --git a/src/ui/FoldersListAdapter.java b/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
similarity index 100%
rename from src/ui/FoldersListAdapter.java
rename to src/main/java/net/micode/notes/ui/FoldersListAdapter.java
diff --git a/src/ui/NoteEditActivity.java b/src/main/java/net/micode/notes/ui/NoteEditActivity.java
similarity index 98%
rename from src/ui/NoteEditActivity.java
rename to src/main/java/net/micode/notes/ui/NoteEditActivity.java
index eea7cbd..8f9cea9 100644
--- a/src/ui/NoteEditActivity.java
+++ b/src/main/java/net/micode/notes/ui/NoteEditActivity.java
@@ -534,6 +534,12 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         return true;
     }
 
+    /**
+     * @method  setReminder
+     * @description 设置提醒Remind me
+     * @date: 12/21/2023 8:04 AM
+     * @author: YangYizhe
+     */
     private void setReminder() {
         DateTimePickerDialog d = new DateTimePickerDialog(this, System.currentTimeMillis());
         d.setOnDateTimeSetListener(new OnDateTimeSetListener() {
@@ -788,9 +794,14 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         }
         return hasChecked;
     }
-    /*
-     * 函数功能：保存便签
-     * 函数实现：如下注释
+    /**
+     * @method  saveNote
+     * @description
+     * 保存便签,退出时候会自动调本函数
+     * @date: 12/21/2023 8:14 AM
+     * @author: YangYizhe
+     * @param
+     * @return
      */
     private boolean saveNote() {
         getWorkingText();
@@ -809,7 +820,15 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         }
         return saved;
     }
-
+    /**
+     * @method  sendToDesktop
+     * @description
+     * send to home功能，发到桌面上
+     * @date: 12/21/2023 8:15 AM
+     * @author: YangYizhe
+     * @param
+     * @return
+     */
     private void sendToDesktop() {
         /**
          * Before send message to home, we should make sure that current
@@ -849,7 +868,6 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         content = content.replace(TAG_UNCHECKED, "");
         return content.length() > SHORTCUT_ICON_TITLE_MAX_LEN ? content.substring(0,
                 SHORTCUT_ICON_TITLE_MAX_LEN) : content;
-        //直接设置为content中的内容并返回，有勾选和未勾选2种
     }
     private void showToast(int resId) {
         showToast(resId, Toast.LENGTH_SHORT);
diff --git a/src/ui/NoteEditText.java b/src/main/java/net/micode/notes/ui/NoteEditText.java
similarity index 100%
rename from src/ui/NoteEditText.java
rename to src/main/java/net/micode/notes/ui/NoteEditText.java
diff --git a/src/ui/NoteItemData.java b/src/main/java/net/micode/notes/ui/NoteItemData.java
similarity index 100%
rename from src/ui/NoteItemData.java
rename to src/main/java/net/micode/notes/ui/NoteItemData.java
diff --git a/src/ui/NotesListActivity.java b/src/main/java/net/micode/notes/ui/NotesListActivity.java
similarity index 85%
rename from src/ui/NotesListActivity.java
rename to src/main/java/net/micode/notes/ui/NotesListActivity.java
index b7cd7d7..2b0e901 100644
--- a/src/ui/NotesListActivity.java
+++ b/src/main/java/net/micode/notes/ui/NotesListActivity.java
@@ -1,5 +1,6 @@
 package net.micode.notes.ui;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -61,12 +62,17 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.HashSet;
-//主界面，一进入就是这个界面
 /**
- * @author k
- *
+ * @Package:        net.micode.notes.ui
+ * @ClassName:      NotesListActivity
+ * @Description:
+ * 小米便签的主入口，提供了一系列便签操作主要功能
+ * @Author:         WUSHUXIAN
+ * @CreateDate:     2023/12/20 23:02
+ * @Version:        1.0
  */
-public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener {   //没有用特定的标签加注释。。。感觉没有什么用
+public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener {
+
     private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0;
 
     private static final int FOLDER_LIST_QUERY_TOKEN      = 1;
@@ -77,7 +83,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
 
     private static final int MENU_FOLDER_CHANGE_NAME = 2;
 
-    private static final String PREFERENCE_ADD_INTRODUCTION = "net.micode.notes.introduction";  //单行超过80个字符
+    private static final String PREFERENCE_ADD_INTRODUCTION = "net.micode.notes.introduction";
 
     private enum ListEditState {
         NOTE_LIST, SUB_FOLDER, CALL_RECORD_FOLDER
@@ -122,58 +128,62 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
 
     private final static int REQUEST_CODE_OPEN_NODE = 102;
     private final static int REQUEST_CODE_NEW_NODE  = 103;
-
     @Override
     /**
-     * @method  onCreate
-     * @description 
-     * @date:  9:58 AM
-     * @author: YangYizhe
-     * @param [savedInstanceState]
-     * @return void
+     * @method          onCreate
+     * @description:
+     * @date:           2023/12/21 1:52
+     * @author:         WUSHUXIAN
+     * @param           void
+     * @return          void
      */
-    protected void onCreate(final Bundle savedInstanceState) {  //需要是final类型   根据程序上下文环境，Java关键字final有“这是无法改变的”或者“终态的”含义，它可以修饰非抽象类、非抽象类成员方法和变量。你可能出于两种理解而需要阻止改变：设计或效率。
-        // final类不能被继承，没有子类，final类中的方法默认是final的。
-        //final方法不能被子类的方法覆盖，但可以被继承。
-        //final成员变量表示常量，只能被赋值一次，赋值后值不再改变。
-        //final不能用于修饰构造方法。
+    protected void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState); // 调用父类的onCreate函数
         setContentView(R.layout.note_list);
         initResources();
-
-        /**
-         * Insert an introduction when user firstly use this application
-         */
         setAppInfoFromRawRes();
     }
 
     @Override
-    // 返回一些子模块完成的数据交给主Activity处理
+    /**
+     * @method          onActivityResult
+     * @description:
+     *                  参数：
+     *                  requestCode：
+     *                  resultCode：
+     *                  data；
+     * @date:           2023/12/20 23:26
+     * @author:         WUSHUXIAN
+     * @param           void
+     * @return          void
+     */
     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);
-            // 调用 Activity 的onActivityResult（）
+            super.onActivityResult(requestCode, resultCode, data);// 调用 Activity 的onActivityResult()
         }
     }
-
+    /**
+     * @method          setAppInfoFromRawRes
+     * @description:
+     * @date:           2023/12/20 23:24
+     * @author:         WUSHUXIAN
+     * @param
+     * @return
+     */
     private void setAppInfoFromRawRes() {
-        // Android平台给我们提供了一个SharedPreferences类，它是一个轻量级的存储类，特别适合用于保存软件配置参数。
-        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
+        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);// Android平台给我们提供了一个SharedPreferences类，它是一个轻量级的存储类，特别适合用于保存软件配置参数。
         if (!sp.getBoolean(PREFERENCE_ADD_INTRODUCTION, false)) {
             StringBuilder sb = new StringBuilder();
             InputStream in = null;
             try {
-                // 把资源文件放到应用程序的/raw/raw下，那么就可以在应用中使用getResources获取资源后,
-                // 以openRawResource方法（不带后缀的资源文件名）打开这个文件。
                 in = getResources().openRawResource(R.raw.introduction);
                 if (in != null) {
                     InputStreamReader isr = new InputStreamReader(in);
                     BufferedReader br = new BufferedReader(isr);
-                    char [] buf = new char[1024];  // 自行定义的数值，使用者不知道有什么意义
+                    char [] buf = new char[1024];
                     int len = 0;
                     while ((len = br.read(buf)) > 0) {
                         sb.append(buf, 0, len);
@@ -216,8 +226,14 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         super.onStart();
         startAsyncNotesListQuery();
     }
-
-    // 初始化资源
+    /**
+     * @method  initResources
+     * @description 初始化资源
+     * @date: 2023/12/20 23:09
+     * @author: WUSHUXIAN
+     * @param
+     * @return
+     */
     private void initResources() {
         mContentResolver = this.getContentResolver(); // 获取应用程序的数据，得到类似数据表的东西
         mBackgroundQueryHandler = new BackgroundQueryHandler(this.getContentResolver());
@@ -242,7 +258,15 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         mModeCallBack = new ModeCallback();
     }
 
-    // 继承自ListView.MultiChoiceModeListener 和 OnMenuItemClickListener
+    //
+    /**
+     * @Package:        net.micode.notes.ui
+     * @ClassName:      ModeCallback
+     * @Description:    继承自ListView.MultiChoiceModeListener 和 OnMenuItemClickListener
+     * @Author:         WUSHUXIAN
+     * @CreateDate:     2023/12/20 23:37
+     * @Version:        1.0
+     */
     private class ModeCallback implements ListView.MultiChoiceModeListener, OnMenuItemClickListener {
         private DropdownMenu mDropDownMenu;
         private ActionMode mActionMode;
@@ -280,8 +304,14 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
             });
             return true;
         }
-
-        // 更新菜单
+        /**
+         * @method  updateMenu
+         * @description 更新菜单
+         * @date: 2023/12/16 23:36
+         * @author: WUSHUXIAN
+         * @param
+         * @return
+         */
         private void updateMenu() {
             int selectedCount = mNotesListAdapter.getSelectedCount();
             // Update dropdown menu
@@ -324,7 +354,14 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
             mNotesListAdapter.setCheckedItem(position, checked);
             updateMenu();
         }
-
+        /**
+         * @method          onMenuItemClick
+         * @description:
+         * @date:           2023/12/20 23:39
+         * @author:         WUSHUXIAN
+         * @param
+         * @return
+         */
         public boolean onMenuItemClick(MenuItem item) {
             if (mNotesListAdapter.getSelectedCount() == 0) {
                 Toast.makeText(NotesListActivity.this, getString(R.string.menu_select_none),
@@ -356,9 +393,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
             return true;
         }
     }
-
+    //接口的实现
     private class NewNoteOnTouchListener implements OnTouchListener {
-
         public boolean onTouch(View v, MotionEvent event) {
             switch (event.getAction()) {
                 case MotionEvent.ACTION_DOWN: {
@@ -418,22 +454,44 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         }
 
     };
-
+    /**
+     * @method          startAsyncNotesListQuery
+     * @description:    启动异步Notes列表查询
+     * @date:           2023/12/20 23:45
+     * @author:         WUSHUXIAN
+     * @param
+     * @return
+     */
     private void startAsyncNotesListQuery() {
-        String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION
-                : NORMAL_SELECTION;
+        String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION : NORMAL_SELECTION;
         mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null,
-                Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[] {
-                        String.valueOf(mCurrentFolderId)
-                }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC");
+                Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[] {String.valueOf(mCurrentFolderId)},
+                NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC");
     }
-
+    /**
+     * @Package:        net.micode.notes.ui
+     * @ClassName:      BackgroundQueryHandler
+     * @Description:    对AsyncQueryHandler的拓展，背景查询处理
+     * @Author:         WUSHUXIAN
+     * @CreateDate:     2023/12/21 0:01
+     * @Version:        1.0
+     */
     private final class BackgroundQueryHandler extends AsyncQueryHandler {
         public BackgroundQueryHandler(ContentResolver contentResolver) {
             super(contentResolver);
         }
 
         @Override
+        /**
+         * @method          onQueryComplete
+         * @description:    在异步查询完成时调用。
+         * @date:           2023/12/20 23:56
+         * @author:         WUSHUXIAN
+         * @param           token 标识查询的令牌
+         * @param           cookie 传入的cookie对象
+         * @param           cursor 保存查询结果的光标
+         * @return          void
+         */
         protected void onQueryComplete(int token, Object cookie, Cursor cursor) {
             switch (token) {
                 case FOLDER_NOTE_LIST_QUERY_TOKEN:
@@ -472,28 +530,44 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         });
         builder.show();
     }
-
+    /**
+     * @method  createNewNote
+     * @description 创建便签
+     * @date: 12/21/2023 1:58 AM
+     * @author: YangYizhe
+     * @param
+     * @return
+     */
     private void createNewNote() {
         Intent intent = new Intent(this, NoteEditActivity.class);
         intent.setAction(Intent.ACTION_INSERT_OR_EDIT);
         intent.putExtra(Notes.INTENT_EXTRA_FOLDER_ID, mCurrentFolderId);
         this.startActivityForResult(intent, REQUEST_CODE_NEW_NODE);
     }
-
+    /**
+     * @method          batchDelete
+     * @description:
+     * 删除便签操作
+     * @date:           2023/12/21 0:14
+     * @author:         WUSHUXIAN
+     * @param
+     * @return          void
+     */
+    @SuppressLint("StaticFieldLeak")
     private void batchDelete() {
         new AsyncTask<Void, Void, HashSet<AppWidgetAttribute>>() {
             protected HashSet<AppWidgetAttribute> doInBackground(Void... unused) {
                 HashSet<AppWidgetAttribute> widgets = mNotesListAdapter.getSelectedWidget();
+                //如果没有同步，直接删除
                 if (!isSyncMode()) {
-                    // if not synced, delete notes directly
                     if (DataUtils.batchDeleteNotes(mContentResolver, mNotesListAdapter
                             .getSelectedItemIds())) {
                     } else {
                         Log.e(TAG, "Delete notes error, should not happens");
                     }
-                } else {
-                    // in sync mode, we'll move the deleted note into the trash
-                    // folder
+                }
+                //已同步，将删除的便签移到垃圾桶
+                else {
                     if (!DataUtils.batchMoveToFolder(mContentResolver, mNotesListAdapter
                             .getSelectedItemIds(), Notes.ID_TRASH_FOLER)) {
                         Log.e(TAG, "Move notes to trash folder error, should not happens");
@@ -516,7 +590,14 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
             }
         }.execute();
     }
-
+    /**
+     * @method          deleteFolder
+     * @description:    删除文件夹
+     * @date:           2023/12/21 0:32
+     * @author:         WUSHUXIAN
+     * @param           folderId 文件标识
+     * @return          void
+     */
     private void deleteFolder(long folderId) {
         if (folderId == Notes.ID_ROOT_FOLDER) {
             Log.e(TAG, "Wrong folder id, should not happen " + folderId);
@@ -544,13 +625,27 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         }
     }
 
+    /**
+     * @method  openNode
+     * @description
+     * 打开便签的功能
+     * @date: 12/21/2023 8:05 AM
+     * @author: YangYizhe
+     * @param data
+     */
     private void openNode(NoteItemData data) {
         Intent intent = new Intent(this, NoteEditActivity.class);
         intent.setAction(Intent.ACTION_VIEW);
         intent.putExtra(Intent.EXTRA_UID, data.getId());
         this.startActivityForResult(intent, REQUEST_CODE_OPEN_NODE);
     }
-
+    /**
+     * @method  openFolder
+     * @description 打开文件夹功能
+     * @date: 12/21/2023 8:05 AM
+     * @author: YangYizhe
+     * @param data
+     */
     private void openFolder(NoteItemData data) {
         mCurrentFolderId = data.getId();
         startAsyncNotesListQuery();
@@ -567,7 +662,13 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         }
         mTitleBar.setVisibility(View.VISIBLE);
     }
-
+    /**
+     * @method  onClick
+     * @description 如果碰到写便签按钮，新建便签
+     * @date: 12/21/2023 8:06 AM
+     * @author: YangYizhe
+     * @param
+     */
     public void onClick(View v) {
         if (v.getId() == R.id.btn_new_note) {
             createNewNote();
@@ -585,7 +686,14 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
         inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0);
     }
-
+    /**
+     * @method          showCreateOrModifyFolderDialog
+     * @description:    创建或者修改文件夹时显示对话框
+     * @date:           2023/12/21 0:39
+     * @author:         WUSHUXIAN
+     * @param           create
+     * @return          void
+     */
     private void showCreateOrModifyFolderDialog(final boolean create) {
         final AlertDialog.Builder builder = new AlertDialog.Builder(this);
         View view = LayoutInflater.from(this).inflate(R.layout.dialog_edit_text, null);
@@ -643,13 +751,10 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                 dialog.dismiss();
             }
         });
-
+        //如果便签名是空的，则禁用确认按钮
         if (TextUtils.isEmpty(etName.getText())) {
             positive.setEnabled(false);
         }
-        /**
-         * When the name edit text is null, disable the positive button
-         */
         etName.addTextChangedListener(new TextWatcher() {
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {
                 // TODO Auto-generated method stub
@@ -676,26 +781,27 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
      * 按返回键时根据情况更改类中的数据
      */
     @Override
-    public void onBackPressed() { switch (mState) {
-        case SUB_FOLDER:
-            mCurrentFolderId = Notes.ID_ROOT_FOLDER;
-            mState = ListEditState.NOTE_LIST;
-            startAsyncNotesListQuery();
-            mTitleBar.setVisibility(View.GONE);
-            break;
-        case CALL_RECORD_FOLDER:
-            mCurrentFolderId = Notes.ID_ROOT_FOLDER;
-            mState = ListEditState.NOTE_LIST;
-            mAddNewNote.setVisibility(View.VISIBLE);
-            mTitleBar.setVisibility(View.GONE);
-            startAsyncNotesListQuery();
-            break;
-        case NOTE_LIST:
-            super.onBackPressed();
-            break;
-        default:
-            break;
-    }
+    public void onBackPressed() {
+        switch (mState) {
+            case SUB_FOLDER:
+                mCurrentFolderId = Notes.ID_ROOT_FOLDER;
+                mState = ListEditState.NOTE_LIST;
+                startAsyncNotesListQuery();
+                mTitleBar.setVisibility(View.GONE);
+                break;
+            case CALL_RECORD_FOLDER:
+                mCurrentFolderId = Notes.ID_ROOT_FOLDER;
+                mState = ListEditState.NOTE_LIST;
+                mAddNewNote.setVisibility(View.VISIBLE);
+                mTitleBar.setVisibility(View.GONE);
+                startAsyncNotesListQuery();
+                break;
+            case NOTE_LIST:
+                super.onBackPressed();
+                break;
+            default:
+                break;
+        }
     }
 
     /**
@@ -721,9 +827,11 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         sendBroadcast(intent);
         setResult(RESULT_OK, intent);
     }
-
     /**
-     * 声明监听器，建立菜单，包括名称，视图，删除操作，更改名称操作；
+     * @method          OnCreateContextMenuListener
+     * @description:    生成便签初始界面
+     * @date:           2023/12/21 1:16
+     * @author:         WUSHUXIAN
      */
     private final OnCreateContextMenuListener mFolderOnCreateContextMenuListener = new OnCreateContextMenuListener() {
         public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
@@ -838,7 +946,10 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     }
 
     /**
-     * 函数功能：实现将便签导出到文本功能
+     * @method  exportNoteToText
+     * @description 将便签导出，export text按钮
+     * @date: 12/21/2023 8:08 AM
+     * @author: YangYizhe
      */
     private void exportNoteToText() {
         final BackupUtils backup = BackupUtils.getInstance(NotesListActivity.this);
@@ -882,17 +993,11 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         }.execute();
     }
 
-    /**
-     * @return
-     * 功能：判断是否正在同步
-     */
+
     private boolean isSyncMode() {
         return NotesPreferenceActivity.getSyncAccountName(this).trim().length() > 0;
     }
 
-    /**
-     * 功能：跳转到PreferenceActivity界面
-     */
     private void startPreferenceActivity() {
         Activity from = getParent() != null ? getParent() : this;
         Intent intent = new Intent(from, NotesPreferenceActivity.class);
@@ -900,8 +1005,12 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     }
 
     /**
-     * @author k
-     * 函数功能：实现对便签列表项的点击事件（短按）
+     * @Package:        net.micode.notes.ui
+     * @ClassName:      NotesListActivity
+     * @Description:    响应了按钮的点击
+     * @Author:         YangYizhe
+     * @CreateDate:     12/21/2023 8:09 AM
+     * @Version:        1.0
      */
     private class OnListItemClickListener implements OnItemClickListener {
 
@@ -965,11 +1074,15 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                 NoteColumns.MODIFIED_DATE + " DESC");
     }
 
-    /* (non-Javadoc)
-     * @see android.widget.AdapterView.OnItemLongClickListener#onItemLongClick(android.widget.AdapterView, android.view.View, int, long)
+    /**
+     * @method  onItemLongClick
+     * @description
      * 长按某一项时进行的操作
      * 如果长按的是便签，则通过ActionMode菜单实现；如果长按的是文件夹，则通过ContextMenu菜单实现；
-     *        具体ActionMOde菜单和ContextMenu菜单的详细见精度笔记
+     * @date: 12/21/2023 8:10 AM
+     * @author: YangYizhe
+     * @param
+     * @return
      */
     public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
         if (view instanceof NotesListItem) {
diff --git a/src/ui/NotesListAdapter.java b/src/main/java/net/micode/notes/ui/NotesListAdapter.java
similarity index 60%
rename from src/ui/NotesListAdapter.java
rename to src/main/java/net/micode/notes/ui/NotesListAdapter.java
index b165769..4492ca9 100644
--- a/src/ui/NotesListAdapter.java
+++ b/src/main/java/net/micode/notes/ui/NotesListAdapter.java
@@ -15,10 +15,15 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 
-
-/*
- * 功能：直译为便签表连接器，继承了CursorAdapter，它为cursor和ListView提供了连接的桥梁。
- *     所以NotesListAdapter实现的是鼠标和编辑便签链接的桥梁
+/**
+ * @Package:        net.micode.notes.ui
+ * @ClassName:      NotesListAdapter
+ * @Description:
+ * 直译为便签表连接器，继承了CursorAdapter，它为cursor和ListView提供了连接的桥梁。
+ * 所以NotesListAdapter实现的是鼠标和编辑便签链接的桥梁
+ * @Author:         YangYizhe
+ * @CreateDate:     12/23/2023 11:35 PM
+ * @Version:        1.0
  */
 public class NotesListAdapter extends CursorAdapter {
     private static final String TAG = "NotesListAdapter";
@@ -34,10 +39,14 @@ public class NotesListAdapter extends CursorAdapter {
         public int widgetId;
         public int widgetType;
     };
-
-    /*
-     * 函数功能：初始化便签链接器
+    /**
+     * @method  NotesListAdapter
+     * @description
+     * 初始化便签链接器
      * 函数实现：根据传进来的内容设置相关变量
+     * @date: 12/23/2023 11:35 PM
+     * @author: YangYizhe
+     * @param context
      */
     public NotesListAdapter(Context context) {
         super(context, null);  //父类对象置空
@@ -47,32 +56,45 @@ public class NotesListAdapter extends CursorAdapter {
     }
 
     @Override
-    /*
-     * 函数功能：新建一个视图来存储光标所指向的数据
-     * 函数实现：使用兄弟类NotesListItem新建一个项目选项
+    /**
+     * @method  newView
+     * @description
+     * 新建一个视图来存储光标所指向的数据
+     * 通过使用兄弟类NotesListItem新建一个项目选项
+     * @date: 12/23/2023 11:35 PM
+     * @author: YangYizhe
+     * @param [context, cursor, parent]
+     * @return android.view.View
      */
     public View newView(Context context, Cursor cursor, ViewGroup parent) {
         return new NotesListItem(context);
     }
-
-    /*
-     * 函数功能：将已经存在的视图和鼠标指向的数据进行捆绑
-     * 函数实现：如下注释
-     */
     @Override
+    /**
+     * @method  bindView
+     * @description 将已经存在的视图和鼠标指向的数据进行捆绑
+     * @date: 12/23/2023 11:41 PM
+     * @author: YangYizhe
+     * @param [view, context, cursor]
+     * @return void
+     */
     public void bindView(View view, Context context, Cursor cursor) {
         if (view instanceof NotesListItem) {
             //若view是NotesListItem的一个实例
+            //则新建一个项目选项并且用bind跟将view和鼠标，内容，便签数据捆绑在一起
             NoteItemData itemData = new NoteItemData(context, cursor);
             ((NotesListItem) view).bind(context, itemData, mChoiceMode,
                     isSelectedItem(cursor.getPosition()));
-            //则新建一个项目选项并且用bind跟将view和鼠标，内容，便签数据捆绑在一起
         }
     }
-
-    /*
-     * 函数功能：设置勾选框
-     * 函数实现：如下注释
+    /**
+     * @method  setCheckedItem
+     * @description 设置勾选框
+     * @date: 12/23/2023 11:41 PM
+     * @author: YangYizhe
+     * @param  checked
+     * @param position
+     * @return void
      */
     public void setCheckedItem(final int position, final boolean checked) {
         mSelectedIndex.put(position, checked);
@@ -81,29 +103,32 @@ public class NotesListAdapter extends CursorAdapter {
         //在修改后刷新activity
     }
 
-    /*
-     * 函数功能：判断单选按钮是否勾选
-     */
     public boolean isInChoiceMode() {
         return mChoiceMode;
-    }
+    }//判断单选按钮是否勾选
 
-    /*
-     * 函数功能：设置单项选项框
-     * 函数实现：重置下标并且根据参数mode设置选项
+    /**
+     * @method  setChoiceMode
+     * @description 设置单项选项框
+     * @date: 12/23/2023 11:40 PM
+     * @author: YangYizhe
+     * @param
+     * @return
      */
     public void setChoiceMode(boolean mode) {
         mSelectedIndex.clear();
         mChoiceMode = mode;
     }
 
-    /*
-     * 函数功能：选择全部选项
-     * 函数实现：如下注释
+    /**
+     * @method  selectAll
+     * @description 选择全部选项
+     * @date: 12/23/2023 11:40 PM
+     * @author: YangYizhe
+     * @param checked
      */
     public void selectAll(boolean checked) {
-        Cursor cursor = getCursor();
-        //获取光标位置
+        Cursor cursor = getCursor();//获取光标位置
         for (int i = 0; i < getCount(); i++) {
             if (cursor.moveToPosition(i)) {
                 if (NoteItemData.getNoteType(cursor) == Notes.TYPE_NOTE) {
@@ -113,14 +138,16 @@ public class NotesListAdapter extends CursorAdapter {
         }
         //遍历所有光标可用的位置在判断为便签类型之后勾选单项框
     }
-
-    /*
-     * 函数功能：建立选择项的下标列表
-     * 函数实现：如下注释
+    /**
+     * @method  getSelectedItemIds
+     * @description 建立选择项的下标列表
+     * @date: 12/23/2023 11:39 PM
+     * @author: YangYizhe
+     * @param
+     * @return
      */
     public HashSet<Long> getSelectedItemIds() {
-        HashSet<Long> itemSet = new HashSet<Long>();
-        //建立hash表
+        HashSet<Long> itemSet = new HashSet<Long>();//建立hash表
         for (Integer position : mSelectedIndex.keySet()) {
             //遍历所有的关键
             if (mSelectedIndex.get(position) == true) {
@@ -132,17 +159,18 @@ public class NotesListAdapter extends CursorAdapter {
                 } else {
                     itemSet.add(id);
                 }
-                //则将id该下标假如选项集合中
-
             }
         }
 
         return itemSet;
     }
-
-    /*
-     * 函数功能：建立桌面Widget的选项表
-     * 函数实现：如下注释
+    /**
+     * @method  getSelectedWidget
+     * @description 建立桌面Widget的选项表
+     * @date: 12/23/2023 11:39 PM
+     * @author: YangYizhe
+     * @param
+     * @return
      */
     public HashSet<AppWidgetAttribute> getSelectedWidget() {
         HashSet<AppWidgetAttribute> itemSet = new HashSet<AppWidgetAttribute>();
@@ -169,41 +197,44 @@ public class NotesListAdapter extends CursorAdapter {
         return itemSet;
     }
 
-    /*
-     * 函数功能：获取选项个数
-     * 函数实现：如下注释
+    /**
+     * @method  getSelectedCount
+     * @description 获取选项个数
+     * @date: 12/23/2023 11:39 PM
+     * @author: YangYizhe
      */
     public int getSelectedCount() {
-        Collection<Boolean> values = mSelectedIndex.values();
-        //首先获取选项下标的值
+        Collection<Boolean> values = mSelectedIndex.values();//首先获取选项下标的值
         if (null == values) {
             return 0;
         }
-        Iterator<Boolean> iter = values.iterator();
-        //初始化叠加器
+        Iterator<Boolean> iter = values.iterator();//初始化叠加器
         int count = 0;
         while (iter.hasNext()) {
             if (true == iter.next()) {
-                //若value值为真计数+1
-                count++;
+                count++;//若value值为真计数+1
             }
         }
         return count;
     }
 
-    /*
-     * 函数功能：判断是否全部选中
-     * 函数实现：如下注释
+    /**
+     * @method  isAllSelected
+     * @description 判断是否全部选中
+     * @date: 12/23/2023 11:38 PM
+     * @author: YangYizhe
      */
     public boolean isAllSelected() {
         int checkedCount = getSelectedCount();
-        return (checkedCount != 0 && checkedCount == mNotesCount);
-        //获取选项数看是否等于便签的个数
+        return (checkedCount != 0 && checkedCount == mNotesCount);//获取选项数看是否等于便签的个数
     }
-
-    /*
-     * 函数功能：判断是否为选项表
-     * 函数实现：通过传递的下标来确定
+    /**
+     * @method  isSelectedItem
+     * @description 判断是否为选项表,通过传递的下标来确定
+     * @date: 12/23/2023 11:38 PM
+     * @author: YangYizhe
+     * @param
+     * @return
      */
     public boolean isSelectedItem(final int position) {
         if (null == mSelectedIndex.get(position)) {
@@ -213,29 +244,39 @@ public class NotesListAdapter extends CursorAdapter {
     }
 
     @Override
-    /*
-     * 函数功能：在activity内容发生局部变动的时候回调该函数计算便签的数量
-     * 函数实现：如下注释
+    /**
+     * @method  onContentChanged
+     * @description 在activity内容发生局部变动的时候回调该函数计算便签的数量
+     * @date: 12/23/2023 11:38 PM
+     * @author: YangYizhe
+     * @param []
+     * @return void
      */
     protected void onContentChanged() {
         super.onContentChanged();
-        //执行基类函数
-        calcNotesCount();
+        calcNotesCount();//执行基类函数
     }
 
     @Override
-    /*
-     * 函数功能：在activity光标发生局部变动的时候回调该函数计算便签的数量
+    /**
+     * @method  changeCursor
+     * @description 在activity光标发生局部变动的时候回调该函数计算便签的数量
+     * @date: 12/23/2023 11:37 PM
+     * @author: YangYizhe
+     * @param [cursor]
+     * @return void
      */
     public void changeCursor(Cursor cursor) {
         super.changeCursor(cursor);
-        //执行基类函数
-        calcNotesCount();
+        calcNotesCount();//执行基类函数
     }
-
-    /*
-     * 函数功能：计算便签数量
-     *
+    /**
+     * @method  calcNotesCount
+     * @description 计算便签数量
+     * @date: 12/23/2023 11:37 PM
+     * @author: YangYizhe
+     * @param
+     * @return
      */
     private void calcNotesCount() {
         mNotesCount = 0;
@@ -244,14 +285,12 @@ public class NotesListAdapter extends CursorAdapter {
             Cursor c = (Cursor) getItem(i);
             if (c != null) {
                 if (NoteItemData.getNoteType(c) == Notes.TYPE_NOTE) {
-                    mNotesCount++;
-                    //若该位置不为空并且文本类型为便签就+1
+                    mNotesCount++;//若该位置不为空并且文本类型为便签就+1
                 }
             } else {
                 Log.e(TAG, "Invalid cursor");
                 return;
             }
-            //否则报错
         }
     }
 }
\ No newline at end of file
diff --git a/src/ui/NotesListItem.java b/src/main/java/net/micode/notes/ui/NotesListItem.java
similarity index 96%
rename from src/ui/NotesListItem.java
rename to src/main/java/net/micode/notes/ui/NotesListItem.java
index fa8b3d2..d32a37b 100644
--- a/src/ui/NotesListItem.java
+++ b/src/main/java/net/micode/notes/ui/NotesListItem.java
@@ -14,7 +14,14 @@ import net.micode.notes.tool.DataUtils;
 import net.micode.notes.tool.ResourceParser.NoteItemBgResources;
 
 
-//创建便签列表项目选项
+/**
+ * @Package:        net.micode.notes.ui
+ * @ClassName:      NotesListItem
+ * @Description:    
+ * @Author:         YangYizhe
+ * @CreateDate:     12/23/2023 11:35 PM
+ * @Version:        1.0
+ */
 public class NotesListItem extends LinearLayout {
     private ImageView mAlert;//闹钟图片
     private TextView mTitle;  //标题
diff --git a/src/ui/NotesPreferenceActivity.java b/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
similarity index 69%
rename from src/ui/NotesPreferenceActivity.java
rename to src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
index 6f8a89f..e4109c6 100644
--- a/src/ui/NotesPreferenceActivity.java
+++ b/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
@@ -31,78 +31,68 @@ import net.micode.notes.data.Notes;
 import net.micode.notes.data.Notes.NoteColumns;
 import net.micode.notes.gtask.remote.GTaskSyncService;
 
-/*
- *该类功能：NotesPreferenceActivity，在小米便签中主要实现的是对背景颜色和字体大小的数据储存。
- *       继承了PreferenceActivity主要功能为对系统信息和配置进行自动保存的Activity
+/**
+ * @Package:        net.micode.notes.ui
+ * @ClassName:      NotesPreferenceActivity
+ * @Description:
+ * NotesPreferenceActivity，在小米便签中主要实现的是对背景颜色和字体大小的数据储存。
+ * 继承了PreferenceActivity主要功能为对系统信息和配置进行自动保存的Activity
+ * @Author:         YangYizhe
+ * @CreateDate:     12/23/2023 11:42 PM
+ * @Version:        1.0
  */
 public class NotesPreferenceActivity extends PreferenceActivity {
-    public static final String PREFERENCE_NAME = "notes_preferences";
-    //优先名
-    public static final String PREFERENCE_SYNC_ACCOUNT_NAME = "pref_key_account_name";
-    //同步账号
-    public static final String PREFERENCE_LAST_SYNC_TIME = "pref_last_sync_time";
-    //同步时间
+    public static final String PREFERENCE_NAME = "notes_preferences";//优先名
+    public static final String PREFERENCE_SYNC_ACCOUNT_NAME = "pref_key_account_name";//同步账号
+    public static final String PREFERENCE_LAST_SYNC_TIME = "pref_last_sync_time";//同步时间
     public static final String PREFERENCE_SET_BG_COLOR_KEY = "pref_key_bg_random_appear";
-
-    private static final String PREFERENCE_SYNC_ACCOUNT_KEY = "pref_sync_account_key";
-    //同步密码
+    private static final String PREFERENCE_SYNC_ACCOUNT_KEY = "pref_sync_account_key";//同步密码
     private static final String AUTHORITIES_FILTER_KEY = "authorities";
-    //本地密码
-    private PreferenceCategory mAccountCategory;
-    //账户分组
-    private GTaskReceiver mReceiver;
-    //同步任务接收器
-    private Account[] mOriAccounts;
-    //账户
-    private boolean mHasAddedAccount;
-    //账户的hash标记
+    private PreferenceCategory mAccountCategory;//账户分组
+    private GTaskReceiver mReceiver;//同步任务接收器
+    private Account[] mOriAccounts;//账户
+    private boolean mHasAddedAccount;//账户的hash标记
 
     @Override
-    /*
-     *函数功能：创建一个activity，在函数里要完成所有的正常静态设置
-     *参数：Bundle icicle：存放了 activity 当前的状态
-     *函数实现：如下注释
+    /**
+     * @method  onCreate
+     * @description 创建一个activity，在函数里要完成所有的正常静态设置
+     * @date: 12/23/2023 11:43 PM
+     * @author: YangYizhe
+     * @param [icicle]
+     * @return void
      */
     protected void onCreate(Bundle icicle) {
-        //先执行父类的创建函数
         super.onCreate(icicle);
-
         /* using the app icon for navigation */
-        getActionBar().setDisplayHomeAsUpEnabled(true);
-        //给左上角图标的左边加上一个返回的图标 
-
-        addPreferencesFromResource(R.xml.preferences);
-        //添加xml来源并显示 xml
-        mAccountCategory = (PreferenceCategory) findPreference(PREFERENCE_SYNC_ACCOUNT_KEY);
-        //根据同步账户关键码来初始化分组
+        getActionBar().setDisplayHomeAsUpEnabled(true);//给左上角图标的左边加上一个返回的图标
+        addPreferencesFromResource(R.xml.preferences);//添加xml来源并显示 xml
+        mAccountCategory = (PreferenceCategory) findPreference(PREFERENCE_SYNC_ACCOUNT_KEY);//根据同步账户关键码来初始化分组
         mReceiver = new GTaskReceiver();
         IntentFilter filter = new IntentFilter();
         filter.addAction(GTaskSyncService.GTASK_SERVICE_BROADCAST_NAME);
-        registerReceiver(mReceiver, filter);
-        //初始化同步组件
-
+        registerReceiver(mReceiver, filter);//初始化同步组件
         mOriAccounts = null;
-        View header = LayoutInflater.from(this).inflate(R.layout.settings_header, null);
-        //获取listvivew，ListView的作用:用于列出所有选择 
-        getListView().addHeaderView(header, null, true);
-        //在listview组件上方添加其他组件
+        View header = LayoutInflater.from(this).inflate(R.layout.settings_header, null);//获取listvivew，ListView的作用:用于列出所有选择
+        getListView().addHeaderView(header, null, true);//在listview组件上方添加其他组件
     }
 
     @Override
-    /*
-     * 函数功能：activity交互功能的实现，用于接受用户的输入
-     * 函数实现：如下注释
+    /**
+     * @method  onResume
+     * @description activity交互功能的实现，用于接受用户的输入
+     * @date: 12/23/2023 11:44 PM
+     * @author: YangYizhe
+     * @return void
      */
     protected void onResume() {
-        //先执行父类 的交互实现
         super.onResume();
 
         // need to set sync account automatically if user has added a new
         // account
         if (mHasAddedAccount) {
             //若用户新加了账户则自动设置同步账户
-            Account[] accounts = getGoogleAccounts();
-            //获取google同步账户
+            Account[] accounts = getGoogleAccounts();//获取google同步账户
             if (mOriAccounts != null && accounts.length > mOriAccounts.length) {
                 //若原账户不为空且当前账户有增加
                 for (Account accountNew : accounts) {
@@ -123,37 +113,31 @@ public class NotesPreferenceActivity extends PreferenceActivity {
             }
         }
 
-        refreshUI();
-        //刷新标签界面
+        refreshUI();//刷新标签界面
     }
 
     @Override
-    /*
-     * 函数功能：销毁一个activity
-     * 函数实现：如下注释
-     */
     protected void onDestroy() {
         if (mReceiver != null) {
-            unregisterReceiver(mReceiver);
-            //注销接收器
+            unregisterReceiver(mReceiver);//注销接收器
         }
-        super.onDestroy();
-        //执行父类的销毁动作
+        super.onDestroy();//执行父类的销毁动作
     }
 
-    /*
-     * 函数功能：重新设置账户信息
-     * 函数实现：如下注释
+    /**
+     * @method  loadAccountPreference
+     * @description 重新设置账户信息
+     * @date: 12/23/2023 11:45 PM
+     * @author: YangYizhe
+     * @param
+     * @return
      */
     private void loadAccountPreference() {
-        mAccountCategory.removeAll();
-        //销毁所有的分组
-        Preference accountPref = new Preference(this);
-        //建立首选项
+        mAccountCategory.removeAll();//销毁所有的分组
+        Preference accountPref = new Preference(this);//建立首选项
         final String defaultAccount = getSyncAccountName(this);
         accountPref.setTitle(getString(R.string.preferences_account_title));
-        accountPref.setSummary(getString(R.string.preferences_account_summary));
-        //设置首选项的大标题和小标题
+        accountPref.setSummary(getString(R.string.preferences_account_summary));//设置首选项的大标题和小标题
         accountPref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
             public boolean onPreferenceClick(Preference preference) {
                 //建立监听器
@@ -177,14 +161,15 @@ public class NotesPreferenceActivity extends PreferenceActivity {
                 return true;
             }
         });
-
-        //根据新建首选项编辑新的账户分组
-        mAccountCategory.addPreference(accountPref);
+        mAccountCategory.addPreference(accountPref);//根据新建首选项编辑新的账户分组
     }
-
-    /*
-     *函数功能：设置按键的状态和最后同步的时间
-     *函数实现：如下注释
+    /**
+     * @method  loadSyncButton
+     * @description 设置按键的状态和最后同步的时间
+     * @date: 12/23/2023 11:46 PM
+     * @author: YangYizhe
+     * @param
+     * @return
      */
     private void loadSyncButton() {
         Button syncButton = (Button) findViewById(R.id.preference_sync_button);
@@ -199,20 +184,16 @@ public class NotesPreferenceActivity extends PreferenceActivity {
                 public void onClick(View v) {
                     GTaskSyncService.cancelSync(NotesPreferenceActivity.this);
                 }
-            });
-            //设置按钮显示的文本为“取消同步”以及监听器
+            });//设置按钮显示的文本为“取消同步”以及监听器
         } else {
             syncButton.setText(getString(R.string.preferences_button_sync_immediately));
             syncButton.setOnClickListener(new View.OnClickListener() {
                 public void onClick(View v) {
                     GTaskSyncService.startSync(NotesPreferenceActivity.this);
                 }
-            });
-            //若是不同步则设置按钮显示的文本为“立即同步”以及对应监听器
+            });//若是不同步则设置按钮显示的文本为“立即同步”以及对应监听器
         }
-        syncButton.setEnabled(!TextUtils.isEmpty(getSyncAccountName(this)));
-        //设置按键可用还是不可用
-
+        syncButton.setEnabled(!TextUtils.isEmpty(getSyncAccountName(this)));//设置按键可用还是不可用
         // set last sync time
         // 设置最终同步时间
         if (GTaskSyncService.isSyncing()) {
@@ -235,35 +216,38 @@ public class NotesPreferenceActivity extends PreferenceActivity {
             }
         }
     }
-    /*
-     *函数功能：刷新标签界面
-     *函数实现：调用上文设置账号和设置按键两个函数来实现
+    /**
+     * @method  refreshUI
+     * @description
+     * 刷新标签界面
+     * 调用上文设置账号和设置按键两个函数来实现
+     * @date: 12/23/2023 11:46 PM
+     * @author: YangYizhe
      */
     private void refreshUI() {
         loadAccountPreference();
         loadSyncButton();
     }
-
-    /*
-     * 函数功能：显示账户选择的对话框并进行账户的设置
-     * 函数实现：如下注释
+    /**
+     * @method  showSelectAccountAlertDialog
+     * @description 显示账户选择的对话框并进行账户的设置
+     * @date: 12/23/2023 11:47 PM
+     * @author: YangYizhe
+     * @param
+     * @return
      */
     private void showSelectAccountAlertDialog() {
-        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);
-        //创建一个新的对话框
+        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);//创建一个新的对话框
 
         View titleView = LayoutInflater.from(this).inflate(R.layout.account_dialog_title, null);
         TextView titleTextView = (TextView) titleView.findViewById(R.id.account_dialog_title);
         titleTextView.setText(getString(R.string.preferences_dialog_select_account_title));
         TextView subtitleTextView = (TextView) titleView.findViewById(R.id.account_dialog_subtitle);
-        subtitleTextView.setText(getString(R.string.preferences_dialog_select_account_tips));
-        //设置标题以及子标题的内容
+        subtitleTextView.setText(getString(R.string.preferences_dialog_select_account_tips));//设置标题以及子标题的内容
         dialogBuilder.setCustomTitle(titleView);
-        dialogBuilder.setPositiveButton(null, null);
-        //设置对话框的自定义标题，建立一个YES的按钮
+        dialogBuilder.setPositiveButton(null, null);//设置对话框的自定义标题，建立一个YES的按钮
         Account[] accounts = getGoogleAccounts();
-        String defAccount = getSyncAccountName(this);
-        //获取同步账户信息
+        String defAccount = getSyncAccountName(this);//获取同步账户信息
         mOriAccounts = accounts;
         mHasAddedAccount = false;
 
@@ -275,8 +259,7 @@ public class NotesPreferenceActivity extends PreferenceActivity {
             int index = 0;
             for (Account account : accounts) {
                 if (TextUtils.equals(account.name, defAccount)) {
-                    checkedItem = index;
-                    //在账户列表中查询到所需账户
+                    checkedItem = index;//在账户列表中查询到所需账户
                 }
                 items[index++] = account.name;
             }
@@ -285,21 +268,16 @@ public class NotesPreferenceActivity extends PreferenceActivity {
                     new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int which) {
                             setSyncAccount(itemMapping[which].toString());
-                            dialog.dismiss();
-                            //取消对话框
+                            dialog.dismiss();//取消对话框
                             refreshUI();
                         }
-                        //设置点击后执行的事件，包括检录新同步账户和刷新标签界面
-                    });
-            //建立对话框网络版的监听器
+                    });//建立对话框网络版的监听器
         }
 
         View addAccountView = LayoutInflater.from(this).inflate(R.layout.add_account_text, null);
-        dialogBuilder.setView(addAccountView);
-        //给新加账户对话框设置自定义样式
+        dialogBuilder.setView(addAccountView);//给新加账户对话框设置自定义样式
 
-        final AlertDialog dialog = dialogBuilder.show();
-        //显示对话框
+        final AlertDialog dialog = dialogBuilder.show();//显示对话框
         addAccountView.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
                 mHasAddedAccount = true;
@@ -313,32 +291,28 @@ public class NotesPreferenceActivity extends PreferenceActivity {
                 //跳回上一个选项
                 dialog.dismiss();
             }
-        });
-        //建立新加账户对话框的监听器
+        });//建立新加账户对话框的监听器
     }
-
-    /*
-     * 函数功能：显示账户选择对话框和相关账户操作
-     * 函数实现：如下注释
+    /**
+     * @method  showChangeAccountConfirmAlertDialog
+     * @description 显示账户选择对话框和相关账户操作
+     * @date: 12/23/2023 11:48 PM
+     * @author: YangYizhe
      */
     private void showChangeAccountConfirmAlertDialog() {
-        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);
-        //创建一个新的对话框
+        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);//创建一个新的对话框
         View titleView = LayoutInflater.from(this).inflate(R.layout.account_dialog_title, null);
         TextView titleTextView = (TextView) titleView.findViewById(R.id.account_dialog_title);
         titleTextView.setText(getString(R.string.preferences_dialog_change_account_title,
                 getSyncAccountName(this)));
         TextView subtitleTextView = (TextView) titleView.findViewById(R.id.account_dialog_subtitle);
-        subtitleTextView.setText(getString(R.string.preferences_dialog_change_account_warn_msg));
-        //根据同步修改的账户信息设置标题以及子标题的内容
-        dialogBuilder.setCustomTitle(titleView);
-        //设置对话框的自定义标题
+        subtitleTextView.setText(getString(R.string.preferences_dialog_change_account_warn_msg));//根据同步修改的账户信息设置标题以及子标题的内容
+        dialogBuilder.setCustomTitle(titleView);//设置对话框的自定义标题
         CharSequence[] menuItemArray = new CharSequence[] {
                 getString(R.string.preferences_menu_change_account),
                 getString(R.string.preferences_menu_remove_account),
                 getString(R.string.preferences_menu_cancel)
         };
-        //定义一些标记字符串
         dialogBuilder.setItems(menuItemArray, new DialogInterface.OnClickListener() {
             //设置对话框要显示的一个list，用于显示几个命令时,即change，remove，cancel
             public void onClick(DialogInterface dialog, int which) {
@@ -353,42 +327,42 @@ public class NotesPreferenceActivity extends PreferenceActivity {
                 }
             }
         });
-        dialogBuilder.show();
-        //显示对话框
+        dialogBuilder.show();//显示对话框
     }
 
-    /*
-     *函数功能：获取谷歌账户
-     *函数实现：通过账户管理器直接获取
+    /**
+     * @method  getGoogleAccounts
+     * @description
+     * 获取谷歌账户
+     * 通过账户管理器直接获取
+     * @date: 12/23/2023 11:49 PM
+     * @author: YangYizhe
      */
     private Account[] getGoogleAccounts() {
         AccountManager accountManager = AccountManager.get(this);
         return accountManager.getAccountsByType("com.google");
     }
 
-    /*
-     * 函数功能：设置同步账户
-     * 函数实现：如下注释：
+    /**
+     * @method  setSyncAccount
+     * @description 设置同步账户
+     * @date: 12/23/2023 11:49 PM
+     * @author: YangYizhe
+     * @param account
      */
     private void setSyncAccount(String account) {
         if (!getSyncAccountName(this).equals(account)) {
             //假如该账号不在同步账号列表中
             SharedPreferences settings = getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE);
-            SharedPreferences.Editor editor = settings.edit();
-            //编辑共享的首选项
+            SharedPreferences.Editor editor = settings.edit();//编辑共享的首选项
             if (account != null) {
                 editor.putString(PREFERENCE_SYNC_ACCOUNT_NAME, account);
             } else {
                 editor.putString(PREFERENCE_SYNC_ACCOUNT_NAME, "");
-            }
-            //将该账号加入到首选项中
-
-            editor.commit();
-            //提交修改的数据
-
+            }//将该账号加入到首选项中
 
-            setLastSyncTime(this, 0);
-            //将最后同步时间清零
+            editor.commit();//提交修改的数据
+            setLastSyncTime(this, 0);//将最后同步时间清零
 
             // clean up local gtask related info
             new Thread(new Runnable() {
@@ -407,25 +381,23 @@ public class NotesPreferenceActivity extends PreferenceActivity {
             //将toast的文本信息置为“设置账户成功”并显示出来
         }
     }
-    /*
-     * 函数功能：删除同步账户
-     * 函数实现：如下注释：
+    /**
+     * @method  removeSyncAccount
+     * @description 删除同步账户
+     * @date: 12/23/2023 11:49 PM
+     * @author: YangYizhe
      */
     private void removeSyncAccount() {
         SharedPreferences settings = getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE);
-        SharedPreferences.Editor editor = settings.edit();
-        //设置共享首选项
+        SharedPreferences.Editor editor = settings.edit();//设置共享首选项
 
         if (settings.contains(PREFERENCE_SYNC_ACCOUNT_NAME)) {
-            editor.remove(PREFERENCE_SYNC_ACCOUNT_NAME);
-            //假如当前首选项中有账户就删除
+            editor.remove(PREFERENCE_SYNC_ACCOUNT_NAME);//假如当前首选项中有账户就删除
         }
         if (settings.contains(PREFERENCE_LAST_SYNC_TIME)) {
-            editor.remove(PREFERENCE_LAST_SYNC_TIME);
-            //删除当前首选项中有账户时间
+            editor.remove(PREFERENCE_LAST_SYNC_TIME);//删除当前首选项中有账户时间
         }
-        editor.commit();
-        //提交更新后的数据
+        editor.commit();//提交更新后的数据
 
         // clean up local gtask related info
         new Thread(new Runnable() {
@@ -438,33 +410,43 @@ public class NotesPreferenceActivity extends PreferenceActivity {
         }).start();
         //重置当地同步任务的信息
     }
-
-    /*
-     * 函数功能：获取同步账户名称
-     * 函数实现：通过共享的首选项里的信息直接获取
+    /**
+     * @method  getSyncAccountName
+     * @description
+     * 获取同步账户名称
+     * 通过共享的首选项里的信息直接获取
+     * @date: 12/23/2023 11:50 PM
+     * @author: YangYizhe
+     * @param context
      */
     public static String getSyncAccountName(Context context) {
         SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME,
                 Context.MODE_PRIVATE);
         return settings.getString(PREFERENCE_SYNC_ACCOUNT_NAME, "");
     }
-
-    /*
-     * 函数功能：设置最终同步的时间
-     * 函数实现：如下注释
+    /**
+     * @method  setLastSyncTime
+     * @description 设置最终同步的时间
+     * @date: 12/23/2023 11:50 PM
+     * @author: YangYizhe
+     * @param
+     * @return
      */
     public static void setLastSyncTime(Context context, long time) {
         SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME,
                 Context.MODE_PRIVATE);
-        SharedPreferences.Editor editor = settings.edit();
-        // 从共享首选项中找到相关账户并获取其编辑器
+        SharedPreferences.Editor editor = settings.edit();// 从共享首选项中找到相关账户并获取其编辑器
         editor.putLong(PREFERENCE_LAST_SYNC_TIME, time);
-        editor.commit();
-        //编辑最终同步时间并提交更新
+        editor.commit();//编辑最终同步时间并提交更新
     }
-    /*
-     * 函数功能：获取最终同步时间
-     * 函数实现：通过共享的首选项里的信息直接获取
+    /**
+     * @method  getLastSyncTime
+     * @description
+     * 获取最终同步时间
+     * 通过共享的首选项里的信息直接获取
+     * @date: 12/23/2023 11:51 PM
+     * @author: YangYizhe
+     * @param context
      */
     public static long getLastSyncTime(Context context) {
         SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME,
@@ -472,10 +454,6 @@ public class NotesPreferenceActivity extends PreferenceActivity {
         return settings.getLong(PREFERENCE_LAST_SYNC_TIME, 0);
     }
 
-    /*
-     * 函数功能：接受同步信息
-     * 函数实现：继承BroadcastReceiver
-     */
     private class GTaskReceiver extends BroadcastReceiver {
 
         @Override
@@ -485,17 +463,17 @@ public class NotesPreferenceActivity extends PreferenceActivity {
                 //获取随广播而来的Intent中的同步服务的数据
                 TextView syncStatus = (TextView) findViewById(R.id.prefenerece_sync_status_textview);
                 syncStatus.setText(intent
-                        .getStringExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_PROGRESS_MSG));
-                //通过获取的数据在设置系统的状态
+                        .getStringExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_PROGRESS_MSG));//通过获取的数据在设置系统的状态
             }
 
         }
     }
-
-    /*
-     * 函数功能：处理菜单的选项
-     * 函数实现：如下注释
-     * 参数:MenuItem菜单选项
+    /**
+     * @method  onOptionsItemSelected
+     * @description 处理菜单的选项
+     * @date: 12/23/2023 11:52 PM
+     * @author: YangYizhe
+     * @param item
      */
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
diff --git a/src/widget/NoteWidgetProvider.java b/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
similarity index 94%
rename from src/widget/NoteWidgetProvider.java
rename to src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
index d6534c8..d8eb50b 100644
--- a/src/widget/NoteWidgetProvider.java
+++ b/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
@@ -31,7 +31,14 @@ import net.micode.notes.data.Notes.NoteColumns;
 import net.micode.notes.tool.ResourceParser;
 import net.micode.notes.ui.NoteEditActivity;
 import net.micode.notes.ui.NotesListActivity;
-//定义了一个抽象类，提供便签挂件
+/**
+ * @Package:        net.micode.notes.widget
+ * @ClassName:      NoteWidgetProvider
+ * @Description:    这个抽象类用作MiNote应用程序中笔记小部件的基础。它提供了在主屏幕上更新和管理笔记小部件的功能。
+ * @Author:         YangYizhe
+ * @CreateDate:     12/23/2023 11:53 PM
+ * @Version:        1.0
+ */
 public abstract class NoteWidgetProvider extends AppWidgetProvider {
     public static final String [] PROJECTION = new String [] {
         NoteColumns.ID,
diff --git a/src/widget/NoteWidgetProvider_2x.java b/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
similarity index 77%
rename from src/widget/NoteWidgetProvider_2x.java
rename to src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
index adcb2f7..f3d5f1e 100644
--- a/src/widget/NoteWidgetProvider_2x.java
+++ b/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
@@ -23,7 +23,16 @@ import net.micode.notes.R;
 import net.micode.notes.data.Notes;
 import net.micode.notes.tool.ResourceParser;
 
-
+/**
+ * @Package:        net.micode.notes.widget
+ * @ClassName:      NoteWidgetProvider_2x
+ * @Description:
+ * 这个类是NoteWidgetProvider的一个具体实现，用于实现2x大小的笔记小部件。
+ * 它继承自NoteWidgetProvider，并提供特定于2x小部件的布局ID、背景资源和小部件类型。
+ * @Author:         YangYizhe
+ * @CreateDate:     12/23/2023 11:55 PM
+ * @Version:        1.0
+ */
 public class NoteWidgetProvider_2x extends NoteWidgetProvider {
     @Override
     public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
diff --git a/src/widget/NoteWidgetProvider_4x.java b/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
similarity index 77%
rename from src/widget/NoteWidgetProvider_4x.java
rename to src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
index c12a02e..0c3ae50 100644
--- a/src/widget/NoteWidgetProvider_4x.java
+++ b/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
@@ -23,7 +23,16 @@ import net.micode.notes.R;
 import net.micode.notes.data.Notes;
 import net.micode.notes.tool.ResourceParser;
 
-
+/**
+ * @Package:        net.micode.notes.widget
+ * @ClassName:      NoteWidgetProvider_4x
+ * @Description:
+ * 这个类是NoteWidgetProvider的一个具体实现，用于实现4x大小的笔记小部件。
+ * 它继承自NoteWidgetProvider，并提供特定于4x小部件的布局ID、背景资源和小部件类型。
+ * @Author:         YangYizhe
+ * @CreateDate:     12/23/2023 11:56 PM
+ * @Version:        1.0
+ */
 public class NoteWidgetProvider_4x extends NoteWidgetProvider {
     @Override
     public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
diff --git a/src/main/res/color/primary_text_dark.xml b/src/main/res/color/primary_text_dark.xml
new file mode 100644
index 0000000..8ad98e3
--- /dev/null
+++ b/src/main/res/color/primary_text_dark.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:state_pressed="true" android:color="#88555555" />
+  <item android:state_selected="true" android:color="#ff999999" />
+  <item android:color="#ff000000" />
+</selector>
\ No newline at end of file
diff --git a/src/main/res/color/secondary_text_dark.xml b/src/main/res/color/secondary_text_dark.xml
new file mode 100644
index 0000000..9cf8a1a
--- /dev/null
+++ b/src/main/res/color/secondary_text_dark.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:color="#50000000" />
+</selector>
\ No newline at end of file
diff --git a/src/main/res/drawable-hdpi/bg_btn_set_color.png b/src/main/res/drawable-hdpi/bg_btn_set_color.png
new file mode 100644
index 0000000..5eb5d44
Binary files /dev/null and b/src/main/res/drawable-hdpi/bg_btn_set_color.png differ
diff --git a/src/main/res/drawable-hdpi/bg_color_btn_mask.png b/src/main/res/drawable-hdpi/bg_color_btn_mask.png
new file mode 100644
index 0000000..100db77
Binary files /dev/null and b/src/main/res/drawable-hdpi/bg_color_btn_mask.png differ
diff --git a/src/main/res/drawable-hdpi/call_record.png b/src/main/res/drawable-hdpi/call_record.png
new file mode 100644
index 0000000..fb88ca4
Binary files /dev/null and b/src/main/res/drawable-hdpi/call_record.png differ
diff --git a/src/main/res/drawable-hdpi/clock.png b/src/main/res/drawable-hdpi/clock.png
new file mode 100644
index 0000000..5f2ae9a
Binary files /dev/null and b/src/main/res/drawable-hdpi/clock.png differ
diff --git a/src/main/res/drawable-hdpi/delete.png b/src/main/res/drawable-hdpi/delete.png
new file mode 100644
index 0000000..643de3e
Binary files /dev/null and b/src/main/res/drawable-hdpi/delete.png differ
diff --git a/src/main/res/drawable-hdpi/dropdown_icon.9.png b/src/main/res/drawable-hdpi/dropdown_icon.9.png
new file mode 100644
index 0000000..5525025
Binary files /dev/null and b/src/main/res/drawable-hdpi/dropdown_icon.9.png differ
diff --git a/src/main/res/drawable-hdpi/edit_blue.9.png b/src/main/res/drawable-hdpi/edit_blue.9.png
new file mode 100644
index 0000000..55a1856
Binary files /dev/null and b/src/main/res/drawable-hdpi/edit_blue.9.png differ
diff --git a/src/main/res/drawable-hdpi/edit_green.9.png b/src/main/res/drawable-hdpi/edit_green.9.png
new file mode 100644
index 0000000..2cb2d60
Binary files /dev/null and b/src/main/res/drawable-hdpi/edit_green.9.png differ
diff --git a/src/main/res/drawable-hdpi/edit_red.9.png b/src/main/res/drawable-hdpi/edit_red.9.png
new file mode 100644
index 0000000..bae944a
Binary files /dev/null and b/src/main/res/drawable-hdpi/edit_red.9.png differ
diff --git a/src/main/res/drawable-hdpi/edit_title_blue.9.png b/src/main/res/drawable-hdpi/edit_title_blue.9.png
new file mode 100644
index 0000000..96e6092
Binary files /dev/null and b/src/main/res/drawable-hdpi/edit_title_blue.9.png differ
diff --git a/src/main/res/drawable-hdpi/edit_title_green.9.png b/src/main/res/drawable-hdpi/edit_title_green.9.png
new file mode 100644
index 0000000..08d8644
Binary files /dev/null and b/src/main/res/drawable-hdpi/edit_title_green.9.png differ
diff --git a/src/main/res/drawable-hdpi/edit_title_red.9.png b/src/main/res/drawable-hdpi/edit_title_red.9.png
new file mode 100644
index 0000000..9c430e5
Binary files /dev/null and b/src/main/res/drawable-hdpi/edit_title_red.9.png differ
diff --git a/src/main/res/drawable-hdpi/edit_title_white.9.png b/src/main/res/drawable-hdpi/edit_title_white.9.png
new file mode 100644
index 0000000..19e8d95
Binary files /dev/null and b/src/main/res/drawable-hdpi/edit_title_white.9.png differ
diff --git a/src/main/res/drawable-hdpi/edit_title_yellow.9.png b/src/main/res/drawable-hdpi/edit_title_yellow.9.png
new file mode 100644
index 0000000..bf8f580
Binary files /dev/null and b/src/main/res/drawable-hdpi/edit_title_yellow.9.png differ
diff --git a/src/main/res/drawable-hdpi/edit_white.9.png b/src/main/res/drawable-hdpi/edit_white.9.png
new file mode 100644
index 0000000..918f7a6
Binary files /dev/null and b/src/main/res/drawable-hdpi/edit_white.9.png differ
diff --git a/src/main/res/drawable-hdpi/edit_yellow.9.png b/src/main/res/drawable-hdpi/edit_yellow.9.png
new file mode 100644
index 0000000..10cb642
Binary files /dev/null and b/src/main/res/drawable-hdpi/edit_yellow.9.png differ
diff --git a/src/main/res/drawable-hdpi/font_large.png b/src/main/res/drawable-hdpi/font_large.png
new file mode 100644
index 0000000..78cf2e6
Binary files /dev/null and b/src/main/res/drawable-hdpi/font_large.png differ
diff --git a/src/main/res/drawable-hdpi/font_normal.png b/src/main/res/drawable-hdpi/font_normal.png
new file mode 100644
index 0000000..9de7ced
Binary files /dev/null and b/src/main/res/drawable-hdpi/font_normal.png differ
diff --git a/src/main/res/drawable-hdpi/font_size_selector_bg.9.png b/src/main/res/drawable-hdpi/font_size_selector_bg.9.png
new file mode 100644
index 0000000..be8e64c
Binary files /dev/null and b/src/main/res/drawable-hdpi/font_size_selector_bg.9.png differ
diff --git a/src/main/res/drawable-hdpi/font_small.png b/src/main/res/drawable-hdpi/font_small.png
new file mode 100644
index 0000000..d3ff104
Binary files /dev/null and b/src/main/res/drawable-hdpi/font_small.png differ
diff --git a/src/main/res/drawable-hdpi/font_super.png b/src/main/res/drawable-hdpi/font_super.png
new file mode 100644
index 0000000..85b13a1
Binary files /dev/null and b/src/main/res/drawable-hdpi/font_super.png differ
diff --git a/src/main/res/drawable-hdpi/icon_app.png b/src/main/res/drawable-hdpi/icon_app.png
new file mode 100644
index 0000000..418aadc
Binary files /dev/null and b/src/main/res/drawable-hdpi/icon_app.png differ
diff --git a/src/main/res/drawable-hdpi/list_background.png b/src/main/res/drawable-hdpi/list_background.png
new file mode 100644
index 0000000..087e1f9
Binary files /dev/null and b/src/main/res/drawable-hdpi/list_background.png differ
diff --git a/src/main/res/drawable-hdpi/list_blue_down.9.png b/src/main/res/drawable-hdpi/list_blue_down.9.png
new file mode 100644
index 0000000..b88eebf
Binary files /dev/null and b/src/main/res/drawable-hdpi/list_blue_down.9.png differ
diff --git a/src/main/res/drawable-hdpi/list_blue_middle.9.png b/src/main/res/drawable-hdpi/list_blue_middle.9.png
new file mode 100644
index 0000000..96b1c8b
Binary files /dev/null and b/src/main/res/drawable-hdpi/list_blue_middle.9.png differ
diff --git a/src/main/res/drawable-hdpi/list_blue_single.9.png b/src/main/res/drawable-hdpi/list_blue_single.9.png
new file mode 100644
index 0000000..d7e7206
Binary files /dev/null and b/src/main/res/drawable-hdpi/list_blue_single.9.png differ
diff --git a/src/main/res/drawable-hdpi/list_blue_up.9.png b/src/main/res/drawable-hdpi/list_blue_up.9.png
new file mode 100644
index 0000000..632e88c
Binary files /dev/null and b/src/main/res/drawable-hdpi/list_blue_up.9.png differ
diff --git a/src/main/res/drawable-hdpi/list_folder.9.png b/src/main/res/drawable-hdpi/list_folder.9.png
new file mode 100644
index 0000000..829f61b
Binary files /dev/null and b/src/main/res/drawable-hdpi/list_folder.9.png differ
diff --git a/src/main/res/drawable-hdpi/list_footer_bg.9.png b/src/main/res/drawable-hdpi/list_footer_bg.9.png
new file mode 100644
index 0000000..5325c25
Binary files /dev/null and b/src/main/res/drawable-hdpi/list_footer_bg.9.png differ
diff --git a/src/main/res/drawable-hdpi/list_green_down.9.png b/src/main/res/drawable-hdpi/list_green_down.9.png
new file mode 100644
index 0000000..64a39d9
Binary files /dev/null and b/src/main/res/drawable-hdpi/list_green_down.9.png differ
diff --git a/src/main/res/drawable-hdpi/list_green_middle.9.png b/src/main/res/drawable-hdpi/list_green_middle.9.png
new file mode 100644
index 0000000..897325a
Binary files /dev/null and b/src/main/res/drawable-hdpi/list_green_middle.9.png differ
diff --git a/src/main/res/drawable-hdpi/list_green_single.9.png b/src/main/res/drawable-hdpi/list_green_single.9.png
new file mode 100644
index 0000000..c83405f
Binary files /dev/null and b/src/main/res/drawable-hdpi/list_green_single.9.png differ
diff --git a/src/main/res/drawable-hdpi/list_green_up.9.png b/src/main/res/drawable-hdpi/list_green_up.9.png
new file mode 100644
index 0000000..141f9e1
Binary files /dev/null and b/src/main/res/drawable-hdpi/list_green_up.9.png differ
diff --git a/src/main/res/drawable-hdpi/list_red_down.9.png b/src/main/res/drawable-hdpi/list_red_down.9.png
new file mode 100644
index 0000000..4224309
Binary files /dev/null and b/src/main/res/drawable-hdpi/list_red_down.9.png differ
diff --git a/src/main/res/drawable-hdpi/list_red_middle.9.png b/src/main/res/drawable-hdpi/list_red_middle.9.png
new file mode 100644
index 0000000..9988f17
Binary files /dev/null and b/src/main/res/drawable-hdpi/list_red_middle.9.png differ
diff --git a/src/main/res/drawable-hdpi/list_red_single.9.png b/src/main/res/drawable-hdpi/list_red_single.9.png
new file mode 100644
index 0000000..587c348
Binary files /dev/null and b/src/main/res/drawable-hdpi/list_red_single.9.png differ
diff --git a/src/main/res/drawable-hdpi/list_red_up.9.png b/src/main/res/drawable-hdpi/list_red_up.9.png
new file mode 100644
index 0000000..46b4757
Binary files /dev/null and b/src/main/res/drawable-hdpi/list_red_up.9.png differ
diff --git a/src/main/res/drawable-hdpi/list_white_down.9.png b/src/main/res/drawable-hdpi/list_white_down.9.png
new file mode 100644
index 0000000..29f9d8c
Binary files /dev/null and b/src/main/res/drawable-hdpi/list_white_down.9.png differ
diff --git a/src/main/res/drawable-hdpi/list_white_middle.9.png b/src/main/res/drawable-hdpi/list_white_middle.9.png
new file mode 100644
index 0000000..77a4ab4
Binary files /dev/null and b/src/main/res/drawable-hdpi/list_white_middle.9.png differ
diff --git a/src/main/res/drawable-hdpi/list_white_single.9.png b/src/main/res/drawable-hdpi/list_white_single.9.png
new file mode 100644
index 0000000..3e79189
Binary files /dev/null and b/src/main/res/drawable-hdpi/list_white_single.9.png differ
diff --git a/src/main/res/drawable-hdpi/list_white_up.9.png b/src/main/res/drawable-hdpi/list_white_up.9.png
new file mode 100644
index 0000000..e23cd5c
Binary files /dev/null and b/src/main/res/drawable-hdpi/list_white_up.9.png differ
diff --git a/src/main/res/drawable-hdpi/list_yellow_down.9.png b/src/main/res/drawable-hdpi/list_yellow_down.9.png
new file mode 100644
index 0000000..31cfc1e
Binary files /dev/null and b/src/main/res/drawable-hdpi/list_yellow_down.9.png differ
diff --git a/src/main/res/drawable-hdpi/list_yellow_middle.9.png b/src/main/res/drawable-hdpi/list_yellow_middle.9.png
new file mode 100644
index 0000000..b6549b2
Binary files /dev/null and b/src/main/res/drawable-hdpi/list_yellow_middle.9.png differ
diff --git a/src/main/res/drawable-hdpi/list_yellow_single.9.png b/src/main/res/drawable-hdpi/list_yellow_single.9.png
new file mode 100644
index 0000000..3faf507
Binary files /dev/null and b/src/main/res/drawable-hdpi/list_yellow_single.9.png differ
diff --git a/src/main/res/drawable-hdpi/list_yellow_up.9.png b/src/main/res/drawable-hdpi/list_yellow_up.9.png
new file mode 100644
index 0000000..4ae791c
Binary files /dev/null and b/src/main/res/drawable-hdpi/list_yellow_up.9.png differ
diff --git a/src/main/res/drawable-hdpi/menu_delete.png b/src/main/res/drawable-hdpi/menu_delete.png
new file mode 100644
index 0000000..ccdfc4b
Binary files /dev/null and b/src/main/res/drawable-hdpi/menu_delete.png differ
diff --git a/src/main/res/drawable-hdpi/menu_move.png b/src/main/res/drawable-hdpi/menu_move.png
new file mode 100644
index 0000000..1140b71
Binary files /dev/null and b/src/main/res/drawable-hdpi/menu_move.png differ
diff --git a/src/main/res/drawable-hdpi/new_note_normal.png b/src/main/res/drawable-hdpi/new_note_normal.png
new file mode 100644
index 0000000..e24e0d1
Binary files /dev/null and b/src/main/res/drawable-hdpi/new_note_normal.png differ
diff --git a/src/main/res/drawable-hdpi/new_note_pressed.png b/src/main/res/drawable-hdpi/new_note_pressed.png
new file mode 100644
index 0000000..c748936
Binary files /dev/null and b/src/main/res/drawable-hdpi/new_note_pressed.png differ
diff --git a/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png b/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png
new file mode 100644
index 0000000..fc49552
Binary files /dev/null and b/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png differ
diff --git a/src/main/res/drawable-hdpi/notification.png b/src/main/res/drawable-hdpi/notification.png
new file mode 100644
index 0000000..b13ab4a
Binary files /dev/null and b/src/main/res/drawable-hdpi/notification.png differ
diff --git a/src/main/res/drawable-hdpi/search_result.png b/src/main/res/drawable-hdpi/search_result.png
new file mode 100644
index 0000000..ff2befd
Binary files /dev/null and b/src/main/res/drawable-hdpi/search_result.png differ
diff --git a/src/main/res/drawable-hdpi/selected.png b/src/main/res/drawable-hdpi/selected.png
new file mode 100644
index 0000000..b889bef
Binary files /dev/null and b/src/main/res/drawable-hdpi/selected.png differ
diff --git a/src/main/res/drawable-hdpi/title_alert.png b/src/main/res/drawable-hdpi/title_alert.png
new file mode 100644
index 0000000..544ee9c
Binary files /dev/null and b/src/main/res/drawable-hdpi/title_alert.png differ
diff --git a/src/main/res/drawable-hdpi/title_bar_bg.9.png b/src/main/res/drawable-hdpi/title_bar_bg.9.png
new file mode 100644
index 0000000..eb6bff0
Binary files /dev/null and b/src/main/res/drawable-hdpi/title_bar_bg.9.png differ
diff --git a/src/main/res/drawable-hdpi/widget_2x_blue.png b/src/main/res/drawable-hdpi/widget_2x_blue.png
new file mode 100644
index 0000000..a1707f4
Binary files /dev/null and b/src/main/res/drawable-hdpi/widget_2x_blue.png differ
diff --git a/src/main/res/drawable-hdpi/widget_2x_green.png b/src/main/res/drawable-hdpi/widget_2x_green.png
new file mode 100644
index 0000000..f86886c
Binary files /dev/null and b/src/main/res/drawable-hdpi/widget_2x_green.png differ
diff --git a/src/main/res/drawable-hdpi/widget_2x_red.png b/src/main/res/drawable-hdpi/widget_2x_red.png
new file mode 100644
index 0000000..0e66c29
Binary files /dev/null and b/src/main/res/drawable-hdpi/widget_2x_red.png differ
diff --git a/src/main/res/drawable-hdpi/widget_2x_white.png b/src/main/res/drawable-hdpi/widget_2x_white.png
new file mode 100644
index 0000000..5f0619a
Binary files /dev/null and b/src/main/res/drawable-hdpi/widget_2x_white.png differ
diff --git a/src/main/res/drawable-hdpi/widget_2x_yellow.png b/src/main/res/drawable-hdpi/widget_2x_yellow.png
new file mode 100644
index 0000000..12d1c2b
Binary files /dev/null and b/src/main/res/drawable-hdpi/widget_2x_yellow.png differ
diff --git a/src/main/res/drawable-hdpi/widget_4x_blue.png b/src/main/res/drawable-hdpi/widget_4x_blue.png
new file mode 100644
index 0000000..9183738
Binary files /dev/null and b/src/main/res/drawable-hdpi/widget_4x_blue.png differ
diff --git a/src/main/res/drawable-hdpi/widget_4x_green.png b/src/main/res/drawable-hdpi/widget_4x_green.png
new file mode 100644
index 0000000..fa8b452
Binary files /dev/null and b/src/main/res/drawable-hdpi/widget_4x_green.png differ
diff --git a/src/main/res/drawable-hdpi/widget_4x_red.png b/src/main/res/drawable-hdpi/widget_4x_red.png
new file mode 100644
index 0000000..62de074
Binary files /dev/null and b/src/main/res/drawable-hdpi/widget_4x_red.png differ
diff --git a/src/main/res/drawable-hdpi/widget_4x_white.png b/src/main/res/drawable-hdpi/widget_4x_white.png
new file mode 100644
index 0000000..a37d67c
Binary files /dev/null and b/src/main/res/drawable-hdpi/widget_4x_white.png differ
diff --git a/src/main/res/drawable-hdpi/widget_4x_yellow.png b/src/main/res/drawable-hdpi/widget_4x_yellow.png
new file mode 100644
index 0000000..d7c5fa4
Binary files /dev/null and b/src/main/res/drawable-hdpi/widget_4x_yellow.png differ
diff --git a/src/main/res/drawable/new_note.xml b/src/main/res/drawable/new_note.xml
new file mode 100644
index 0000000..2154ebc
--- /dev/null
+++ b/src/main/res/drawable/new_note.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true"
+        android:drawable="@drawable/new_note_pressed" />
+    <item
+        android:drawable="@drawable/new_note_normal" />
+</selector>
diff --git a/src/main/res/layout/account_dialog_title.xml b/src/main/res/layout/account_dialog_title.xml
new file mode 100644
index 0000000..7717112
--- /dev/null
+++ b/src/main/res/layout/account_dialog_title.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="vertical"
+        xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <TextView
+        android:id="@+id/account_dialog_title"
+        style="?android:attr/textAppearanceMedium"
+        android:singleLine="true"
+        android:ellipsize="end"
+        android:gravity="center"
+        android:layout_marginTop="-2.7dip"
+        android:layout_marginBottom="-2.7dip"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"/>
+
+    <TextView
+        android:id="@+id/account_dialog_subtitle"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="5dip"
+        android:layout_marginBottom="1dip"
+        android:gravity="center"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/add_account_text.xml b/src/main/res/layout/add_account_text.xml
new file mode 100644
index 0000000..c799178
--- /dev/null
+++ b/src/main/res/layout/add_account_text.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="50dip"
+    android:gravity="center_vertical"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:text="@string/preferences_add_account" />
+</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/datetime_picker.xml b/src/main/res/layout/datetime_picker.xml
new file mode 100644
index 0000000..f10d592
--- /dev/null
+++ b/src/main/res/layout/datetime_picker.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_gravity="center_horizontal"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <NumberPicker
+        android:id="@+id/date"
+        android:layout_width="120dip"
+        android:layout_height="wrap_content"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        />
+
+    <NumberPicker
+        android:id="@+id/hour"
+        android:layout_width="50dip"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="5dip"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        />
+
+    <NumberPicker
+        android:id="@+id/minute"
+        android:layout_width="50dip"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="5dip"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        />
+
+    <NumberPicker
+        android:id="@+id/amPm"
+        android:layout_width="50dip"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="5dip"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        />
+</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/dialog_edit_text.xml b/src/main/res/layout/dialog_edit_text.xml
new file mode 100644
index 0000000..361b39a
--- /dev/null
+++ b/src/main/res/layout/dialog_edit_text.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<EditText
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/et_foler_name"
+    android:layout_width="fill_parent"
+    android:hint="@string/hint_foler_name"
+    android:layout_height="fill_parent" />
\ No newline at end of file
diff --git a/src/main/res/layout/folder_list_item.xml b/src/main/res/layout/folder_list_item.xml
new file mode 100644
index 0000000..77e8148
--- /dev/null
+++ b/src/main/res/layout/folder_list_item.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:minHeight="50dip" >
+
+    <TextView
+        android:id="@+id/tv_folder_name"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:textAppearance="@style/TextAppearancePrimaryItem" />
+</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/note_edit.xml b/src/main/res/layout/note_edit.xml
new file mode 100644
index 0000000..10b2aa7
--- /dev/null
+++ b/src/main/res/layout/note_edit.xml
@@ -0,0 +1,400 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<FrameLayout
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="@drawable/list_background"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:id="@+id/note_title"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:id="@+id/tv_modified_date"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:layout_gravity="left|center_vertical"
+                android:layout_marginRight="8dip"
+                android:textAppearance="@style/TextAppearanceSecondaryItem" />
+
+            <ImageView
+                android:id="@+id/iv_alert_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:background="@drawable/title_alert" />
+
+            <TextView
+                android:id="@+id/tv_alert_date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="2dip"
+                android:layout_marginRight="8dip"
+                android:textAppearance="@style/TextAppearanceSecondaryItem" />
+
+            <ImageButton
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:background="@drawable/bg_btn_set_color" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/sv_note_edit"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:orientation="vertical">
+
+            <ImageView
+                android:layout_width="fill_parent"
+                android:layout_height="7dip"
+                android:background="@drawable/bg_color_btn_mask" />
+
+            <ScrollView
+                android:layout_width="fill_parent"
+                android:layout_height="0dip"
+                android:layout_weight="1"
+                android:scrollbars="none"
+                android:overScrollMode="never"
+                android:layout_gravity="left|top"
+                android:fadingEdgeLength="0dip">
+
+                <LinearLayout
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent">
+
+                    <net.micode.notes.ui.NoteEditText
+                        android:id="@+id/note_edit_view"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="left|top"
+                        android:background="@null"
+                        android:autoLink="all"
+                        android:linksClickable="false"
+                        android:minLines="12"
+                        android:textAppearance="@style/TextAppearancePrimaryItem"
+                        android:lineSpacingMultiplier="1.2" />
+
+                    <LinearLayout
+                        android:id="@+id/note_edit_list"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:layout_marginLeft="-10dip"
+                        android:visibility="gone" />
+                </LinearLayout>
+            </ScrollView>
+
+            <ImageView
+                android:layout_width="fill_parent"
+                android:layout_height="7dip"
+                android:background="@drawable/bg_color_btn_mask" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/btn_set_bg_color"
+        android:layout_height="43dip"
+        android:layout_width="wrap_content"
+        android:background="@drawable/bg_color_btn_mask"
+        android:layout_gravity="top|right" />
+
+    <LinearLayout
+        android:id="@+id/note_bg_color_selector"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/note_edit_color_selector_panel"
+        android:layout_marginTop="30dip"
+        android:layout_marginRight="8dip"
+        android:layout_gravity="top|right"
+        android:visibility="gone">
+
+        <FrameLayout
+            android:layout_width="0dip"
+            android:layout_height="match_parent"
+            android:layout_weight="1">
+
+            <ImageView
+                android:id="@+id/iv_bg_yellow"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+            <ImageView
+                android:id="@+id/iv_bg_yellow_select"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|right"
+                android:layout_marginRight="5dip"
+                android:focusable="false"
+                android:visibility="gone"
+                android:src="@drawable/selected" />
+        </FrameLayout>
+
+        <FrameLayout
+            android:layout_width="0dip"
+            android:layout_height="match_parent"
+            android:layout_weight="1">
+
+            <ImageView
+                android:id="@+id/iv_bg_blue"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+            <ImageView
+                android:id="@+id/iv_bg_blue_select"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|right"
+                android:focusable="false"
+                android:visibility="gone"
+                android:layout_marginRight="3dip"
+                android:src="@drawable/selected" />
+        </FrameLayout>
+
+        <FrameLayout
+            android:layout_width="0dip"
+            android:layout_height="match_parent"
+            android:layout_weight="1">
+
+            <ImageView
+                android:id="@+id/iv_bg_white"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+            <ImageView
+                android:id="@+id/iv_bg_white_select"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|right"
+                android:focusable="false"
+                android:visibility="gone"
+                android:layout_marginRight="2dip"
+                android:src="@drawable/selected" />
+        </FrameLayout>
+
+        <FrameLayout
+            android:layout_width="0dip"
+            android:layout_height="match_parent"
+            android:layout_weight="1">
+
+            <ImageView
+                android:id="@+id/iv_bg_green"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+            <ImageView
+                android:id="@+id/iv_bg_green_select"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|right"
+                android:focusable="false"
+                android:visibility="gone"
+                android:src="@drawable/selected" />
+        </FrameLayout>
+
+        <FrameLayout
+            android:layout_width="0dip"
+            android:layout_height="match_parent"
+            android:layout_weight="1">
+
+            <ImageView
+                android:id="@+id/iv_bg_red"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+            <ImageView
+                android:id="@+id/iv_bg_red_select"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|right"
+                android:focusable="false"
+                android:visibility="gone"
+                android:src="@drawable/selected" />
+        </FrameLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/font_size_selector"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/font_size_selector_bg"
+        android:layout_gravity="bottom"
+        android:visibility="gone">
+
+        <FrameLayout
+            android:id="@+id/ll_font_small"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_gravity="center"
+                android:gravity="center">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/font_small"
+                    android:layout_marginBottom="5dip" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/menu_font_small"
+                    android:textAppearance="@style/TextAppearanceUnderMenuIcon" />
+            </LinearLayout>
+
+            <ImageView
+                android:id="@+id/iv_small_select"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|right"
+                android:layout_marginRight="6dip"
+                android:layout_marginBottom="-7dip"
+                android:focusable="false"
+                android:visibility="gone"
+                android:src="@drawable/selected" />
+        </FrameLayout>
+
+        <FrameLayout
+            android:id="@+id/ll_font_normal"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_gravity="center"
+                android:gravity="center">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/font_normal"
+                    android:layout_marginBottom="5dip" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/menu_font_normal"
+                    android:textAppearance="@style/TextAppearanceUnderMenuIcon" />
+            </LinearLayout>
+
+            <ImageView
+                android:id="@+id/iv_medium_select"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|right"
+                android:focusable="false"
+                android:visibility="gone"
+                android:layout_marginRight="6dip"
+                android:layout_marginBottom="-7dip"
+                android:src="@drawable/selected" />
+        </FrameLayout>
+
+        <FrameLayout
+            android:id="@+id/ll_font_large"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_gravity="center"
+                android:gravity="center">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/font_large"
+                    android:layout_marginBottom="5dip" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/menu_font_large"
+                    android:textAppearance="@style/TextAppearanceUnderMenuIcon" />
+            </LinearLayout>
+
+            <ImageView
+                android:id="@+id/iv_large_select"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|right"
+                android:focusable="false"
+                android:visibility="gone"
+                android:layout_marginRight="6dip"
+                android:layout_marginBottom="-7dip"
+                android:src="@drawable/selected" />
+        </FrameLayout>
+
+        <FrameLayout
+            android:id="@+id/ll_font_super"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_gravity="center"
+                android:gravity="center">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/font_super"
+                    android:layout_marginBottom="5dip" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/menu_font_super"
+                    android:textAppearance="@style/TextAppearanceUnderMenuIcon" />
+            </LinearLayout>
+
+            <ImageView
+                android:id="@+id/iv_super_select"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|right"
+                android:focusable="false"
+                android:visibility="gone"
+                android:layout_marginRight="6dip"
+                android:layout_marginBottom="-7dip"
+                android:src="@drawable/selected" />
+        </FrameLayout>
+    </LinearLayout>
+</FrameLayout>
diff --git a/src/main/res/layout/note_edit_list_item.xml b/src/main/res/layout/note_edit_list_item.xml
new file mode 100644
index 0000000..a885f9c
--- /dev/null
+++ b/src/main/res/layout/note_edit_list_item.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content">
+
+    <CheckBox
+        android:id="@+id/cb_edit_item"
+        android:layout_width="wrap_content"
+        android:layout_height="28dip"
+        android:checked="false"
+        android:focusable="false"
+        android:layout_gravity="top|left" />
+
+    <net.micode.notes.ui.NoteEditText
+        android:id="@+id/et_edit_text"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:lineSpacingMultiplier="1.2"
+        android:layout_gravity="center_vertical"
+        android:textAppearance="@style/TextAppearancePrimaryItem"
+        android:background="@null" />
+</LinearLayout>
diff --git a/src/main/res/layout/note_item.xml b/src/main/res/layout/note_item.xml
new file mode 100644
index 0000000..d541f6a
--- /dev/null
+++ b/src/main/res/layout/note_item.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/note_item"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:gravity="center_vertical">
+
+        <LinearLayout
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/tv_name"
+                android:layout_width="wrap_content"
+                android:layout_height="0dip"
+                android:layout_weight="1"
+                android:textAppearance="@style/TextAppearancePrimaryItem"
+                android:visibility="gone" />
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical">
+
+                <TextView
+                    android:id="@+id/tv_title"
+                    android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:singleLine="true" />
+
+                <TextView
+                    android:id="@+id/tv_time"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="@style/TextAppearanceSecondaryItem" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <CheckBox
+            android:id="@android:id/checkbox"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:focusable="false"
+            android:clickable="false"
+            android:visibility="gone" />
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/iv_alert_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="top|right"/>
+</FrameLayout>
diff --git a/src/main/res/layout/note_list.xml b/src/main/res/layout/note_list.xml
new file mode 100644
index 0000000..6b25d38
--- /dev/null
+++ b/src/main/res/layout/note_list.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="@drawable/list_background">
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/tv_title_bar"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/title_bar_bg"
+            android:visibility="gone"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:textColor="#FFEAD1AE"
+            android:textSize="@dimen/text_font_size_medium" />
+
+        <ListView
+            android:id="@+id/notes_list"
+            android:layout_width="fill_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1"
+            android:cacheColorHint="@null"
+            android:listSelector="@android:color/transparent"
+            android:divider="@null"
+            android:fadingEdge="@null" />
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/btn_new_note"
+        android:background="@drawable/new_note"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:focusable="false"
+        android:layout_gravity="bottom" />
+</FrameLayout>
diff --git a/src/main/res/layout/note_list_dropdown_menu.xml b/src/main/res/layout/note_list_dropdown_menu.xml
new file mode 100644
index 0000000..3fa271d
--- /dev/null
+++ b/src/main/res/layout/note_list_dropdown_menu.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/navigation_bar"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
+
+    <Button android:id="@+id/selection_menu"
+            android:divider="?android:attr/listDividerAlertDialog"
+            android:singleLine="true"
+            android:gravity="left|center_vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            style="?android:attr/borderlessButtonStyle" />
+</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/note_list_footer.xml b/src/main/res/layout/note_list_footer.xml
new file mode 100644
index 0000000..5ca7b22
--- /dev/null
+++ b/src/main/res/layout/note_list_footer.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<View
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="100dip"
+    android:visibility="invisible"
+    android:focusable="false"
+    android:background="@drawable/list_footer_bg" />
\ No newline at end of file
diff --git a/src/main/res/layout/settings_header.xml b/src/main/res/layout/settings_header.xml
new file mode 100644
index 0000000..5eb8c50
--- /dev/null
+++ b/src/main/res/layout/settings_header.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <Button
+        android:id="@+id/preference_sync_button"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="15dip"
+        android:layout_marginLeft="30dip"
+        android:layout_marginRight="30dip"
+        style="?android:attr/textAppearanceMedium"
+        android:text="@string/preferences_button_sync_immediately"/>
+
+    <TextView
+        android:id="@+id/prefenerece_sync_status_textview"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:visibility="gone"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/widget_2x.xml b/src/main/res/layout/widget_2x.xml
new file mode 100644
index 0000000..55970ce
--- /dev/null
+++ b/src/main/res/layout/widget_2x.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="146dip"
+    android:layout_height="146dip">
+    <ImageView
+        android:id="@+id/widget_bg_image"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent" />
+    <TextView
+        android:id="@+id/widget_text"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:paddingTop="20dip"
+        android:paddingLeft="15dip"
+        android:paddingRight="15dip"
+        android:textSize="14sp"
+        android:textColor="#FF663300"
+        android:maxLines="6"
+        android:lineSpacingMultiplier="1.2" />
+</FrameLayout>
diff --git a/src/main/res/layout/widget_4x.xml b/src/main/res/layout/widget_4x.xml
new file mode 100644
index 0000000..dc9bb51
--- /dev/null
+++ b/src/main/res/layout/widget_4x.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="294dip"
+    android:layout_height="294dip">
+
+    <ImageView
+        android:id="@+id/widget_bg_image"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent" />
+
+    <TextView
+        android:id="@+id/widget_text"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:paddingTop="40dip"
+        android:paddingLeft="15dip"
+        android:paddingRight="15dip"
+        android:textSize="14sp"
+        android:textColor="#FF663300"
+        android:maxLines="12"
+        android:lineSpacingMultiplier="1.2" />
+</FrameLayout>
diff --git a/src/main/res/menu/call_note_edit.xml b/src/main/res/menu/call_note_edit.xml
new file mode 100644
index 0000000..02c0528
--- /dev/null
+++ b/src/main/res/menu/call_note_edit.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/menu_delete"
+        android:title="@string/menu_delete" />
+
+    <item
+        android:id="@+id/menu_font_size"
+        android:title="@string/menu_font_size"/>
+
+    <item
+        android:id="@+id/menu_list_mode"
+        android:title="@string/menu_list_mode" />
+
+    <item
+        android:id="@+id/menu_share"
+        android:title="@string/menu_share"/>
+
+    <item
+        android:id="@+id/menu_send_to_desktop"
+        android:title="@string/menu_send_to_desktop"/>
+
+    <item
+        android:id="@+id/menu_alert"
+        android:title="@string/menu_alert" />
+
+    <item
+        android:id="@+id/menu_delete_remind"
+        android:title="@string/menu_remove_remind" />
+</menu>
diff --git a/src/main/res/menu/call_record_folder.xml b/src/main/res/menu/call_record_folder.xml
new file mode 100644
index 0000000..c664346
--- /dev/null
+++ b/src/main/res/menu/call_record_folder.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/menu_search"
+        android:title="@string/menu_search" />
+</menu>
diff --git a/src/main/res/menu/note_edit.xml b/src/main/res/menu/note_edit.xml
new file mode 100644
index 0000000..35cacd1
--- /dev/null
+++ b/src/main/res/menu/note_edit.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/menu_new_note"
+        android:title="@string/notelist_menu_new"/>
+
+    <item
+        android:id="@+id/menu_delete"
+        android:title="@string/menu_delete"/>
+
+    <item
+        android:id="@+id/menu_font_size"
+        android:title="@string/menu_font_size"/>
+
+    <item
+        android:id="@+id/menu_list_mode"
+        android:title="@string/menu_list_mode" />
+
+    <item
+        android:id="@+id/menu_share"
+        android:title="@string/menu_share"/>
+
+    <item
+        android:id="@+id/menu_send_to_desktop"
+        android:title="@string/menu_send_to_desktop"/>
+
+    <item
+        android:id="@+id/menu_alert"
+        android:title="@string/menu_alert" />
+
+    <item
+        android:id="@+id/menu_delete_remind"
+        android:title="@string/menu_remove_remind" />
+</menu>
\ No newline at end of file
diff --git a/src/main/res/menu/note_list.xml b/src/main/res/menu/note_list.xml
new file mode 100644
index 0000000..42ea736
--- /dev/null
+++ b/src/main/res/menu/note_list.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/menu_new_folder"
+        android:title="@string/menu_create_folder"/>
+
+    <item
+        android:id="@+id/menu_export_text"
+        android:title="@string/menu_export_text"/>
+
+    <item
+        android:id="@+id/menu_sync"
+        android:title="@string/menu_sync"/>
+
+    <item
+        android:id="@+id/menu_setting"
+        android:title="@string/menu_setting" />
+
+    <item
+        android:id="@+id/menu_search"
+        android:title="@string/menu_search"/>
+</menu>
diff --git a/src/main/res/menu/note_list_dropdown.xml b/src/main/res/menu/note_list_dropdown.xml
new file mode 100644
index 0000000..7cbaadc
--- /dev/null
+++ b/src/main/res/menu/note_list_dropdown.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/action_select_all" android:title="@string/menu_select_all" />
+</menu>
\ No newline at end of file
diff --git a/src/main/res/menu/note_list_options.xml b/src/main/res/menu/note_list_options.xml
new file mode 100644
index 0000000..daac008
--- /dev/null
+++ b/src/main/res/menu/note_list_options.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/move"
+        android:title="@string/menu_move"
+        android:icon="@drawable/menu_move"
+        android:showAsAction="always|withText" />
+
+    <item
+        android:id="@+id/delete"
+        android:title="@string/menu_delete"
+        android:icon="@drawable/menu_delete"
+        android:showAsAction="always|withText" />
+</menu>
\ No newline at end of file
diff --git a/src/main/res/menu/sub_folder.xml b/src/main/res/menu/sub_folder.xml
new file mode 100644
index 0000000..b00de26
--- /dev/null
+++ b/src/main/res/menu/sub_folder.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/menu_new_note"
+        android:title="@string/notelist_menu_new"/>
+</menu>
\ No newline at end of file
diff --git a/src/main/res/raw-zh-rCN/introduction b/src/main/res/raw-zh-rCN/introduction
new file mode 100644
index 0000000..7188359
--- /dev/null
+++ b/src/main/res/raw-zh-rCN/introduction
@@ -0,0 +1,7 @@
+欢迎使用MIUI便签！
+
+      无论从软件中直接添加，还是从桌面拖出widget，MIUI便签能让你快速建立和保存便签；
+
+      除了调整文字大小、便签背景、文件夹等基础功能外，你会发现MIUI便签也提供了清单模式、便签提醒、软件加密、导出到SD卡、同步google task的高级功能，让你的生活记录更加美好和安全；
+
+      来分享你的使用体验吧：http://www.miui.com/index.php
diff --git a/src/main/res/raw/introduction b/src/main/res/raw/introduction
new file mode 100644
index 0000000..269cf7b
--- /dev/null
+++ b/src/main/res/raw/introduction
@@ -0,0 +1 @@
+Welcome to use MIUI notes!
\ No newline at end of file
diff --git a/src/main/res/values-zh-rCN/arrays.xml b/src/main/res/values-zh-rCN/arrays.xml
new file mode 100644
index 0000000..a092386
--- /dev/null
+++ b/src/main/res/values-zh-rCN/arrays.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <string-array name="menu_share_ways">
+        <item>短信</item>
+        <item>邮件</item>
+    </string-array>
+</resources>
\ No newline at end of file
diff --git a/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/src/main/res/values-zh-rCN/strings.xml
similarity index 86%
rename from src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
rename to src/main/res/values-zh-rCN/strings.xml
index d65e0cc..09f75ed 100644
--- a/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -1,108 +1,126 @@
 <?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_title_delete">删除</string>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">便签</string>
     <string name="app_widget2x2">便签2x2</string>
     <string name="app_widget4x4">便签4x4</string>
-    <string name="button_delete">删除</string>
-    <string name="call_record_folder_name">通话便签</string>
-    <string name="datetime_dialog_cancel">取消</string>
-    <string name="datetime_dialog_ok">设置</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="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="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="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="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>
+    <!-- note list 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_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_normal">正常</string>
+    <string name="menu_font_large">大</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_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_sync">同步</string>
-    <string name="menu_sync_cancel">取消同步</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="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="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>
+    <!-- export text -->
+    <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>
+    <!-- Sync -->
+    <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>
+    <!-- Preferences -->
+    <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_bg_random_appear_title">新建便签背景颜色随机</string>
-    <string name="preferences_button_sync_cancel">取消同步</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_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_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="search">便签</string>
-    <string name="search_hint">搜索便签</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="set_remind_time_message">创建提醒</string>
-    <string name="success_sdcard_export">导出成功</string>
-    <string name="success_sync_account">与%1$s同步成功</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
+    <string name="search">便签</string>
+    <string name="datetime_dialog_ok">设置</string>
+    <string name="datetime_dialog_cancel">取消</string>
+    <plurals name="search_results_title">
+        <item quantity="other"><xliff:g id="NUMBER">%1$s</xliff:g> 条符合“<xliff:g id="SEARCH">%2$s</xliff:g>”的搜索结果</item>
+    </plurals>
+
+</resources>
diff --git a/src/main/res/values-zh-rTW/arrays.xml b/src/main/res/values-zh-rTW/arrays.xml
new file mode 100644
index 0000000..5297209
--- /dev/null
+++ b/src/main/res/values-zh-rTW/arrays.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <string-array name="menu_share_ways">
+        <item>短信</item>
+        <item>郵件</item>
+    </string-array>
+</resources>
\ No newline at end of file
diff --git a/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/src/main/res/values-zh-rTW/strings.xml
similarity index 87%
rename from src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
rename to src/main/res/values-zh-rTW/strings.xml
index 226b5bc..e29b79b 100644
--- a/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -1,108 +1,127 @@
 <?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_title_delete">刪除</string>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">便簽</string>
     <string name="app_widget2x2">便簽2x2</string>
     <string name="app_widget4x4">便簽4x4</string>
-    <string name="button_delete">刪除</string>
-    <string name="call_record_folder_name">通話便籤</string>
-    <string name="datetime_dialog_cancel">取消</string>
-    <string name="datetime_dialog_ok">設置</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="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="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="format_exported_file_location">已將文本文件(%1$s)導出至SD(%2$s)目錄</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="hint_foler_name">請輸入名稱</string>
-    <string name="info_note_enter_desktop">已添加到桌面</string>
-    <string name="menu_alert">提醒我</string>
+    <!-- note list 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_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_normal">正常</string>
+    <string name="menu_font_large">大</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_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_sync">同步</string>
-    <string name="menu_sync_cancel">取消同步</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="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="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>
+    <!-- Sync -->
+    <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>
+    <!-- Preferences -->
+    <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_bg_random_appear_title">新建便籤背景顏色隨機</string>
-    <string name="preferences_button_sync_cancel">取消同步</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_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_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="search">便籤</string>
-    <string name="search_hint">搜索便籤</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="set_remind_time_message">創建提醒</string>
-    <string name="success_sdcard_export">導出成功</string>
-    <string name="success_sync_account">與%1$s同步成功</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
+    <string name="search">便籤</string>
+    <string name="datetime_dialog_ok">設置</string>
+    <string name="datetime_dialog_cancel">取消</string>
+    <plurals name="search_results_title">
+        <item quantity="other"><xliff:g id="NUMBER">%1$s</xliff:g> 條符合”<xliff:g id="SEARCH">%2$s</xliff:g>“的搜尋結果</item>
+    </plurals>
+
+</resources>
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
new file mode 100644
index 0000000..e00210b
--- /dev/null
+++ b/src/main/res/values/arrays.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <!-- Backup format -->
+    <string-array name="format_for_exported_note">
+        <item>-%s</item>      <!-- format_folder_name -->
+        <item>--%s</item>     <!-- format_folder_note_date -->
+        <item>--%s</item>     <!-- format_note_date -->
+        <item>--%s</item>     <!-- format_note_content -->
+    </string-array>
+
+    <string-array name="menu_share_ways">
+        <item>Messaging</item>
+        <item>Email</item>
+    </string-array>
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
new file mode 100644
index 0000000..123ffbf
--- /dev/null
+++ b/src/main/res/values/colors.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <color name="user_query_highlight">#335b5b5b</color>
+</resources>
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..194e84f
--- /dev/null
+++ b/src/main/res/values/dimens.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <dimen name="text_font_size_super">33sp</dimen>
+    <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>
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
new file mode 100644
index 0000000..55df868
--- /dev/null
+++ b/src/main/res/values/strings.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name">Notes</string>
+    <string name="app_widget2x2">Notes 2x2</string>
+    <string name="app_widget4x4">Notes 4x4</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>
+    <string name="notelist_string_info">...</string>
+    <string name="notelist_menu_new">Add note</string>
+    <string name="delete_remind_time_message">Delete reminder successfully</string>
+    <string name="set_remind_time_message">Set reminder</string>
+    <string name="note_alert_expired">Expired</string>
+    <string name="format_date_ymd">yyyyMMdd</string>
+    <string name="format_datetime_mdhm">MMMd kk:mm</string>
+    <string name="notealert_ok">Got it</string>
+    <string name="notealert_enter">Take a look</string>
+    <string name="note_link_tel">Call</string>
+    <string name="note_link_email">Send email</string>
+    <string name="note_link_web">Browse web</string>
+    <string name="note_link_other">Open map</string>
+    <!-- Text export file information -->
+    <string name="file_path">/MIUI/notes/</string>
+    <string name="file_name_txt_format">notes_%s.txt</string>
+    <!-- notes list string -->
+    <string name="format_folder_files_count">(%d)</string>
+    <string name="menu_create_folder">New Folder</string>
+    <string name="menu_export_text">Export text</string>
+    <string name="menu_sync">Sync</string>
+    <string name="menu_sync_cancel">Cancel syncing</string>
+    <string name="menu_setting">Settings</string>
+    <string name="menu_search">Search</string>
+    <string name="menu_delete">Delete</string>
+    <string name="menu_move">Move to folder</string>
+    <string name="menu_select_title">%d selected</string>
+    <string name="menu_select_none">Nothing selected, the operation is invalid</string>
+    <string name="menu_select_all">Select all</string>
+    <string name="menu_deselect_all">Deselect all</string>
+    <string name="menu_font_size">Font size</string>
+    <string name="menu_font_small">Small</string>
+    <string name="menu_font_normal">Medium</string>
+    <string name="menu_font_large">Large</string>
+    <string name="menu_font_super">Super</string>
+    <string name="menu_list_mode">Enter check list</string>
+    <string name="menu_normal_mode">Leave check list</string>
+    <string name="menu_folder_view">View folder</string>
+    <string name="menu_folder_delete">Delete folder</string>
+    <string name="menu_folder_change_name">Change folder name</string>
+    <string name="folder_exist">The folder %1$s exist, please rename</string>
+    <string name="menu_share">Share</string>
+    <string name="menu_send_to_desktop">Send to home</string>
+    <string name="menu_alert">Remind me</string>
+    <string name="menu_remove_remind">Delete reminder</string>
+    <string name="menu_title_select_folder">Select folder</string>
+    <string name="menu_move_parent_folder">Parent folder</string>
+    <string name="info_note_enter_desktop">Note added to home</string>
+    <string name="alert_message_delete_folder">Confirm to delete folder and its notes?</string>
+    <string name="alert_title_delete">Delete selected notes</string>
+    <string name="alert_message_delete_notes">Confirm to delete the selected %d notes?</string>
+    <string name="alert_message_delete_note">Confirm to delete this note?</string>
+    <string name="format_move_notes_to_folder">Have moved selected %1$d notes to %2$s folder</string>
+    <!-- Error information -->
+    <string name="error_sdcard_unmounted">SD card busy, not available now</string>
+    <string name="error_sdcard_export">Export failed, please check SD card</string>
+    <string name="error_note_not_exist">The note is not exist</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="success_sdcard_export">Export successful</string>
+    <string name="failed_sdcard_export">Export fail</string>
+    <string name="format_exported_file_location">Export text file (%1$s) to SD (%2$s) directory</string>
+    <!-- Sync -->
+    <string name="ticker_syncing">Syncing notes...</string>
+    <string name="ticker_success">Sync is successful</string>
+    <string name="ticker_fail">Sync is failed</string>
+    <string name="ticker_cancel">Sync is canceled</string>
+    <string name="success_sync_account">Sync is successful with account %1$s</string>
+    <string name="error_sync_network">Sync failed, please check network and account settings</string>
+    <string name="error_sync_internal">Sync failed, internal error occurs</string>
+    <string name="error_sync_cancelled">Sync is canceled</string>
+    <string name="sync_progress_login">Logging into %1$s...</string>
+    <string name="sync_progress_init_list">Getting remote note list...</string>
+    <string name="sync_progress_syncing">Synchronize local notes with Google Task...</string>
+    <!-- Preferences -->
+    <string name="preferences_title">Settings</string>
+    <string name="preferences_account_title">Sync account</string>
+    <string name="preferences_account_summary">Sync notes with google task</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_add_account">Add account</string>
+    <string name="preferences_menu_change_account">Change sync account</string>
+    <string name="preferences_menu_remove_account">Remove sync account</string>
+    <string name="preferences_menu_cancel">Cancel</string>
+    <string name="preferences_button_sync_immediately">Sync immediately</string>
+    <string name="preferences_button_sync_cancel">Cancel syncing</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_title">Sync notes</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_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="preferences_bg_random_appear_title">New note background color random</string>
+
+    <string name="button_delete">Delete</string>
+    <string name="call_record_folder_name">Call notes</string>
+    <string name="hint_foler_name">Input name</string>
+
+    <string name="search_label">Searching Notes</string>
+    <string name="search_hint">Search notes</string>
+    <string name="search_setting_description">Text in your notes</string>
+    <string name="search">Notes</string>
+    <string name="datetime_dialog_ok">set</string>
+    <string name="datetime_dialog_cancel">cancel</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. -->
+        <item quantity="other"><xliff:g id="number" example="15">%1$s</xliff:g> results for \"<xliff:g id="search" example="???">%2$s</xliff:g>\"</item>
+    </plurals>
+
+</resources>
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
new file mode 100644
index 0000000..ad0d90d
--- /dev/null
+++ b/src/main/res/values/styles.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <style name="TextAppearanceSuper">
+        <item name="android:textSize">@dimen/text_font_size_super</item>
+        <item name="android:textColorLink">#0000ff</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="TextAppearanceUnderMenuIcon">
+        <item name="android:textSize">@dimen/text_font_size_normal</item>
+        <item name="android:textColor">@android:color/black</item>
+    </style>
+
+    <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="NoteTheme" parent="@android:style/Theme.Holo.Light">
+        <item name="android:actionBarStyle">@style/NoteActionBarStyle</item>
+    </style>
+
+    <style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
+        <item name="android:displayOptions" />
+        <item name="android:visibility">visible</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
new file mode 100644
index 0000000..fe58f8f
--- /dev/null
+++ b/src/main/res/xml/preferences.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceCategory
+        android:key="pref_sync_account_key">
+    </PreferenceCategory>
+
+    <PreferenceCategory>
+        <CheckBoxPreference
+            android:key="pref_key_bg_random_appear"
+            android:title="@string/preferences_bg_random_appear_title"
+            android:defaultValue="false" />
+    </PreferenceCategory>
+</PreferenceScreen>
diff --git a/src/main/res/xml/searchable.xml b/src/main/res/xml/searchable.xml
new file mode 100644
index 0000000..bf74f14
--- /dev/null
+++ b/src/main/res/xml/searchable.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<searchable
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:label="@string/search_label"
+    android:hint="@string/search_hint"
+    android:searchMode="queryRewriteFromText"
+
+    android:searchSuggestAuthority="notes"
+    android:searchSuggestIntentAction="android.intent.action.VIEW"
+    android:searchSettingsDescription="@string/search_setting_description"
+    android:includeInGlobalSearch="true" />
diff --git a/src/main/res/xml/widget_2x_info.xml b/src/main/res/xml/widget_2x_info.xml
new file mode 100644
index 0000000..ac8b225
--- /dev/null
+++ b/src/main/res/xml/widget_2x_info.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<appwidget-provider
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:initialLayout="@layout/widget_2x"
+    android:minWidth="146dip"
+    android:minHeight="146dip">
+</appwidget-provider>
diff --git a/src/main/res/xml/widget_4x_info.xml b/src/main/res/xml/widget_4x_info.xml
new file mode 100644
index 0000000..cf79f9c
--- /dev/null
+++ b/src/main/res/xml/widget_4x_info.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<appwidget-provider
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:initialLayout="@layout/widget_4x"
+    android:minWidth="294dip"
+    android:minHeight="294dip">
+</appwidget-provider>