diff --git a/Src/.idea/assetWizardSettings.xml b/Src/.idea/assetWizardSettings.xml
new file mode 100644
index 0000000..3168c72
--- /dev/null
+++ b/Src/.idea/assetWizardSettings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="WizardSettings">
+    <option name="children">
+      <map>
+        <entry key="vectorWizard">
+          <value>
+            <PersistentState>
+              <option name="children">
+                <map>
+                  <entry key="vectorAssetStep">
+                    <value>
+                      <PersistentState>
+                        <option name="children">
+                          <map>
+                            <entry key="clipartAsset">
+                              <value>
+                                <PersistentState>
+                                  <option name="values">
+                                    <map>
+                                      <entry key="url" value="jar:file:/D:/Android%20Studio/plugins/android/lib/android.jar!/images/material/icons/materialicons/delete/baseline_delete_24.xml" />
+                                    </map>
+                                  </option>
+                                </PersistentState>
+                              </value>
+                            </entry>
+                          </map>
+                        </option>
+                        <option name="values">
+                          <map>
+                            <entry key="outputName" value="ic_delete" />
+                            <entry key="sourceFile" value="D:\gitnote\notes" />
+                          </map>
+                        </option>
+                      </PersistentState>
+                    </value>
+                  </entry>
+                </map>
+              </option>
+            </PersistentState>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/Src/app/build/intermediates/compile_app_classes_jar/debug/classes.jar b/Src/app/build/intermediates/compile_app_classes_jar/debug/classes.jar
index 4d2d1fe..89bfa98 100644
Binary files a/Src/app/build/intermediates/compile_app_classes_jar/debug/classes.jar and b/Src/app/build/intermediates/compile_app_classes_jar/debug/classes.jar differ
diff --git a/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin
index 601f245..ee6e8bc 100644
Binary files a/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin and b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin differ
diff --git a/Src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/Src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
index be3f612..3477dce 100644
--- a/Src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
+++ b/Src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
@@ -1,8 +1,12 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 #Mon Dec 30 21:15:33 CST 2024
 =======
 #Mon Jan 06 19:32:33 CST 2025
 >>>>>>> a
+=======
+#Thu Jan 09 10:35:48 CST 2025
+>>>>>>> a
 net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
 net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
 net.micode.notes.app-main-7\:/color/text_color_state_list.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\color_text_color_state_list.xml.flat
@@ -80,6 +84,13 @@ net.micode.notes.app-main-7\:/drawable/gesture_background.xml=D\:\\gitnote\\note
 net.micode.notes.app-main-7\:/drawable/gesture_button_background.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_gesture_button_background.xml.flat
 net.micode.notes.app-main-7\:/drawable/gesture_panel_background.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_gesture_panel_background.xml.flat
 net.micode.notes.app-main-7\:/drawable/ic_audio.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_audio.png.flat
+net.micode.notes.app-main-7\:/drawable/ic_delete.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_delete.xml.flat
+net.micode.notes.app-main-7\:/drawable/ic_format_bold.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_format_bold.xml.flat
+net.micode.notes.app-main-7\:/drawable/ic_format_bullet.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_format_bullet.xml.flat
+net.micode.notes.app-main-7\:/drawable/ic_format_color.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_format_color.xml.flat
+net.micode.notes.app-main-7\:/drawable/ic_format_italic.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_format_italic.xml.flat
+net.micode.notes.app-main-7\:/drawable/ic_format_strikethrough.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_format_strikethrough.xml.flat
+net.micode.notes.app-main-7\:/drawable/ic_format_underline.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_format_underline.xml.flat
 net.micode.notes.app-main-7\:/drawable/ic_lock_outline.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_lock_outline.xml.flat
 >>>>>>> a
 net.micode.notes.app-main-7\:/drawable/ic_warning.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_warning.png.flat
@@ -88,10 +99,13 @@ net.micode.notes.app-main-7\:/drawable/toast_background.xml=D\:\\gitnote\\notes\
 net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
 net.micode.notes.app-main-7\:/layout/activity_login.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_login.xml.flat
 net.micode.notes.app-main-7\:/layout/activity_register.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_register.xml.flat
+net.micode.notes.app-main-7\:/layout/activity_user_management.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_user_management.xml.flat
 net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
 net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
+net.micode.notes.app-main-7\:/layout/dialog_add_user.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_add_user.xml.flat
 net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
 net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
+net.micode.notes.app-main-7\:/layout/item_user.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_item_user.xml.flat
 net.micode.notes.app-main-7\:/layout/layout_custom_toast.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_layout_custom_toast.xml.flat
 net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
 net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
diff --git a/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
index bbc8564..d2ffa10 100644
--- a/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
+++ b/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
@@ -11,6 +11,7 @@
     </string-array><string-array name="menu_share_ways">
         <item>Messaging</item>
         <item>Email</item>
+<<<<<<< HEAD
 <<<<<<< HEAD
     </string-array></file><file path="D:\gitnote\notes\app\src\main\res\values\colors.xml" qualifiers=""><color name="user_query_highlight">#335b5b5b</color><color name="background_color">#FFFFFF</color><color name="button_text_color">#FFFFFF</color><color name="button_color">#2196F3</color><color name="hint_color">#808080</color><color name="text_color">#000000</color></file><file path="D:\gitnote\notes\app\src\main\res\values\dimens.xml" qualifiers=""><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></file><file path="D:\gitnote\notes\app\src\main\res\values\strings.xml" qualifiers=""><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><string name="file_path">/MIUI/notes/</string><string name="file_name_txt_format">notes_%s.txt</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><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><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><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"><ns1:g example="1" id="number">%1$s</ns1:g> result for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
@@ -23,6 +24,13 @@
         
         <item quantity="other"><ns1:g example="15" id="number">%1$s</ns1:g> results for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
     </plurals><string name="confirm_gesture">确认</string><string name="gesture_verify_fail_max">验证失败次数过多，笔记已锁定</string><string name="gesture_verify_hint">请绘制手势密码解锁笔记</string><string name="gesture_verify_fail_tries">验证失败，还剩 %d 次机会</string><string name="gesture_forgot_message">您可以通过其他方式重置密码</string><string name="gesture_verify_success">验证成功</string><string name="gesture_forgot_pattern">忘记密码？</string><string name="gesture_verify_error">图案错误，还可以尝试%d次</string><string name="gesture_forgot_title">忘记密码</string><string name="cancel">取消</string><string name="ok">确定</string></file><file path="D:\gitnote\notes\app\src\main\res\values\styles.xml" qualifiers=""><style name="TextAppearanceSuper">
+>>>>>>> a
+=======
+    </string-array></file><file path="D:\gitnote\notes\app\src\main\res\values\colors.xml" qualifiers=""><color name="user_query_highlight">#335b5b5b</color><color name="background_color">#FFFFFF</color><color name="button_text_color">#FFFFFF</color><color name="button_color">#2196F3</color><color name="hint_color">#808080</color><color name="text_color">#000000</color><color name="gesture_panel_border">#E0E0E0</color><color name="gesture_point_selected">#2196F3</color><color name="gesture_text_color">#333333</color><color name="gesture_line_normal">#2196F3</color><color name="gesture_point_error">#F44336</color><color name="gesture_hint_color">#757575</color><color name="gesture_panel_background">#FFFFFF</color><color name="gesture_button_background">#2196F3</color><color name="gesture_background">#F5F5F5</color><color name="gesture_icon_color">#2196F3</color><color name="gesture_link_color">#2196F3</color><color name="gesture_line_error">#F44336</color><color name="gesture_success_color">#4CAF50</color><color name="gesture_button_text">#FFFFFF</color><color name="gesture_button_ripple">#80FFFFFF</color><color name="gesture_error_color">#F44336</color><color name="gesture_point_normal">#E0E0E0</color><color name="toolbar_button_selected">#E0E0E0</color><color name="toolbar_background">#F5F5F5</color></file><file path="D:\gitnote\notes\app\src\main\res\values\dimens.xml" qualifiers=""><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></file><file path="D:\gitnote\notes\app\src\main\res\values\strings.xml" qualifiers=""><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><string name="file_path">/MIUI/notes/</string><string name="file_name_txt_format">notes_%s.txt</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><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><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><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><string name="gesture_instruction">请绘制手势密码</string><string name="confirm_gesture_pattern">请再次绘制手势密码确认</string><string name="gesture_too_short">手势太短，至少需要4个点</string><string name="gesture_matched">手势匹配成功</string><string name="gesture_not_matched">手势不匹配，请重试</string><string name="gesture_password_set">手势密码设置成功</string><string name="menu_set_gesture">设置手势密码</string><plurals name="search_results_title">
+         <item quantity="one"><ns1:g example="1" id="number">%1$s</ns1:g> result for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
+        
+        <item quantity="other"><ns1:g example="15" id="number">%1$s</ns1:g> results for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
+    </plurals><string name="confirm_gesture">确认</string><string name="gesture_verify_fail_max">验证失败次数过多，笔记已锁定</string><string name="gesture_verify_hint">请绘制手势密码解锁笔记</string><string name="gesture_verify_fail_tries">验证失败，还剩 %d 次机会</string><string name="gesture_forgot_message">您可以通过其他方式重置密码</string><string name="gesture_verify_success">验证成功</string><string name="gesture_forgot_pattern">忘记密码？</string><string name="gesture_verify_error">图案错误，还可以尝试%d次</string><string name="gesture_forgot_title">忘记密码</string><string name="cancel">取消</string><string name="ok">确定</string><string name="format_bold">加粗</string><string name="format_underline">下划线</string><string name="format_strikethrough">删除线</string><string name="format_bullet">项目符号</string><string name="format_italic">斜体</string><string name="format_text_color">文字颜色</string></file><file path="D:\gitnote\notes\app\src\main\res\values\styles.xml" qualifiers=""><style name="TextAppearanceSuper">
 >>>>>>> a
         <item name="android:textSize">@dimen/text_font_size_super</item>
         <item name="android:textColorLink">#0000ff</item>
@@ -78,14 +86,22 @@
         <item>邮件</item>
     </string-array></file><file path="D:\gitnote\notes\app\src\main\res\values-zh-rCN\strings.xml" qualifiers="zh-rCN"><string name="app_name">便签</string><string name="app_widget2x2">便签2x2</string><string name="app_widget4x4">便签4x4</string><string name="widget_havenot_content">没有关联内容，点击新建便签。</string><string name="widget_under_visit_mode">访客模式下，便签内容不可见</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">新建便签</string><string name="delete_remind_time_message">成功删除提醒</string><string name="set_remind_time_message">创建提醒</string><string name="note_alert_expired">已过期</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MM月dd日 kk:mm</string><string name="notealert_ok">知道了</string><string name="notealert_enter">查看</string><string name="note_link_tel">呼叫电话</string><string name="note_link_email">发送邮件</string><string name="note_link_web">浏览网页</string><string name="note_link_other">打开地图</string><string name="menu_create_folder">新建文件夹</string><string name="menu_export_text">导出文本</string><string name="menu_sync">同步</string><string name="menu_sync_cancel">取消同步</string><string name="menu_setting">设置</string><string name="menu_search">搜索</string><string name="menu_delete">删除</string><string name="menu_move">移动到文件夹</string><string name="menu_select_title">选中了 %d 项</string><string name="menu_select_none">没有选中项，操作无效</string><string name="menu_select_all">全选</string><string name="menu_deselect_all">取消全选</string><string name="menu_font_size">文字大小</string><string name="menu_font_small">小</string><string name="menu_font_normal">正常</string><string name="menu_font_large">大</string><string name="menu_font_super">超大</string><string name="menu_list_mode">进入清单模式</string><string name="menu_normal_mode">退出清单模式</string><string name="menu_folder_view">查看文件夹</string><string name="menu_folder_delete">刪除文件夹</string><string name="menu_folder_change_name">修改文件夹名称</string><string name="folder_exist">文件夹 %1$s 已存在，请重新命名</string><string name="menu_share">分享</string><string name="menu_send_to_desktop">发送到桌面</string><string name="menu_alert">提醒我</string><string name="menu_remove_remind">删除提醒</string><string name="menu_title_select_folder">选择文件夹</string><string name="menu_move_parent_folder">上一级文件夹</string><string name="info_note_enter_desktop">已添加到桌面</string><string name="alert_title_delete">删除</string><string name="alert_message_delete_notes">确认要删除所选的 %d 条便签吗?</string><string name="alert_message_delete_note">确认要删除该条便签吗?</string><string name="alert_message_delete_folder">确认删除文件夹及所包含的便签吗？</string><string name="format_move_notes_to_folder">已将所选 %1$d 条便签移到 %2$s 文件夹</string><string name="error_sdcard_unmounted">SD卡被占用，不能操作</string><string name="error_sdcard_export">导出文本时发生错误，请检查SD卡</string><string name="error_note_not_exist">要查看的便签不存在</string><string name="error_note_empty_for_clock">不能为空便签设置闹钟提醒</string><string name="error_note_empty_for_send_to_desktop">不能将空便签发送到桌面</string><string name="success_sdcard_export">导出成功</string><string name="failed_sdcard_export">导出失败</string><string name="format_exported_file_location">已将文本文件(%1$s)输出至SD卡(%2$s)目录</string><string name="ticker_syncing">同步便签...</string><string name="ticker_success">同步成功</string><string name="ticker_fail">同步失败</string><string name="ticker_cancel">同步已取消</string><string name="success_sync_account">与%1$s同步成功</string><string name="error_sync_network">同步失败，请检查网络和帐号设置</string><string name="error_sync_internal">同步失败，发生内部错误</string><string name="error_sync_cancelled">同步已取消</string><string name="sync_progress_login">登录%1$s...</string><string name="sync_progress_init_list">正在获取服务器便签列表...</string><string name="sync_progress_syncing">正在同步本地便签...</string><string name="preferences_title">设置</string><string name="preferences_account_title">同步账号</string><string name="preferences_account_summary">与google task同步便签记录</string><string name="preferences_last_sync_time">上次同步于 %1$s</string><string name="preferences_add_account">添加账号</string><string name="preferences_menu_change_account">更换账号</string><string name="preferences_menu_remove_account">删除账号</string><string name="preferences_menu_cancel">取消</string><string name="preferences_button_sync_immediately">立即同步</string><string name="preferences_button_sync_cancel">取消同步</string><string name="preferences_dialog_change_account_title">当前帐号 %1$s</string><string name="preferences_dialog_change_account_warn_msg">如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复</string><string name="preferences_dialog_select_account_title">同步便签</string><string name="preferences_dialog_select_account_tips">请选择google帐号，便签将与该帐号的google task内容同步。</string><string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帐号</string><string name="preferences_toast_success_set_accout">同步帐号已设置为%1$s</string><string name="preferences_bg_random_appear_title">新建便签背景颜色随机</string><string name="button_delete">删除</string><string name="call_record_folder_name">通话便签</string><string name="hint_foler_name">请输入名称</string><string name="search_label">正在搜索便签</string><string name="search_hint">搜索便签</string><string name="search_setting_description">便签中的文字</string><string name="search">便签</string><string name="datetime_dialog_ok">设置</string><string name="datetime_dialog_cancel">取消</string><string name="gesture_instruction">请绘制手势密码</string><string name="confirm_gesture_pattern">请再次绘制手势密码确认</string><string name="gesture_too_short">手势太短，至少需要4个点</string><string name="gesture_matched">手势匹配成功</string><string name="gesture_not_matched">手势不匹配，请重试</string><string name="gesture_password_set">手势密码设置成功</string><string name="menu_set_gesture">设置手势密码</string><plurals name="search_results_title">
         <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 条符合“<ns1:g id="SEARCH">%2$s</ns1:g>”的搜索结果</item>
+<<<<<<< HEAD
     </plurals><string name="confirm_gesture">确认</string><string name="gesture_verify_hint">请绘制手势密码解锁笔记</string><string name="gesture_verify_fail_max">验证失败次数过多，笔记已锁定</string><string name="gesture_verify_fail_tries">验证失败，还剩 %d 次机会</string><string name="gesture_verify_success">验证成功</string><string name="gesture_forgot_title">忘记密码</string><string name="gesture_forgot_message">您可以通过其他方式重置密码</string><string name="ok">确定</string><string name="gesture_forgot_pattern">忘记密码？</string><string name="cancel">取消</string><string name="gesture_verify_error">图案错误，还可以尝试%d次</string></file><file path="D:\gitnote\notes\app\src\main\res\values-zh-rTW\arrays.xml" qualifiers="zh-rTW"><string-array name="menu_share_ways">
+>>>>>>> a
+=======
+    </plurals><string name="confirm_gesture">确认</string><string name="gesture_verify_hint">请绘制手势密码解锁笔记</string><string name="gesture_verify_fail_max">验证失败次数过多，笔记已锁定</string><string name="gesture_verify_fail_tries">验证失败，还剩 %d 次机会</string><string name="gesture_verify_success">验证成功</string><string name="gesture_forgot_title">忘记密码</string><string name="gesture_forgot_message">您可以通过其他方式重置密码</string><string name="ok">确定</string><string name="gesture_forgot_pattern">忘记密码？</string><string name="cancel">取消</string><string name="gesture_verify_error">图案错误，还可以尝试%d次</string><string name="format_italic">斜体</string><string name="format_text_color">文字颜色</string><string name="format_bold">加粗</string><string name="format_underline">下划线</string><string name="format_strikethrough">删除线</string><string name="format_bullet">项目符号</string></file><file path="D:\gitnote\notes\app\src\main\res\values-zh-rTW\arrays.xml" qualifiers="zh-rTW"><string-array name="menu_share_ways">
 >>>>>>> a
         <item>短信</item>
         <item>郵件</item>
     </string-array></file><file path="D:\gitnote\notes\app\src\main\res\values-zh-rTW\strings.xml" qualifiers="zh-rTW"><string name="app_name">便簽</string><string name="app_widget2x2">便簽2x2</string><string name="app_widget4x4">便簽4x4</string><string name="widget_havenot_content">沒有關聯內容，點擊新建便簽。</string><string name="widget_under_visit_mode">訪客模式下，便籤內容不可見</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">新建便簽</string><string name="delete_remind_time_message">成功刪除提醒</string><string name="set_remind_time_message">創建提醒</string><string name="note_alert_expired">已過期</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MM月dd日 kk:mm</string><string name="notealert_ok">知道了</string><string name="notealert_enter">查看</string><string name="note_link_tel">呼叫電話</string><string name="note_link_email">發送郵件</string><string name="note_link_web">浏覽網頁</string><string name="note_link_other">打開地圖</string><string name="format_move_notes_to_folder">已將所選 %1$d 便籤移到 %2$s 文件夾</string><string name="menu_create_folder">新建文件夾</string><string name="menu_export_text">導出文本</string><string name="menu_sync">同步</string><string name="menu_sync_cancel">取消同步</string><string name="menu_setting">設置</string><string name="menu_search">搜尋</string><string name="menu_delete">刪除</string><string name="menu_move">移動到文件夾</string><string name="menu_select_title">選中了 %d 項</string><string name="menu_select_none">沒有選中項，操作無效</string><string name="menu_select_all">全選</string><string name="menu_deselect_all">取消全選</string><string name="menu_font_size">文字大小</string><string name="menu_font_small">小</string><string name="menu_font_normal">正常</string><string name="menu_font_large">大</string><string name="menu_font_super">超大</string><string name="menu_list_mode">進入清單模式</string><string name="menu_normal_mode">退出清單模式</string><string name="menu_folder_view">查看文件夾</string><string name="menu_folder_delete">刪除文件夾</string><string name="menu_folder_change_name">修改文件夾名稱</string><string name="folder_exist">文件夾 %1$s 已存在，請重新命名</string><string name="menu_share">分享</string><string name="menu_send_to_desktop">發送到桌面</string><string name="menu_alert">提醒我</string><string name="menu_remove_remind">刪除提醒</string><string name="menu_title_select_folder">選擇文件夾</string><string name="menu_move_parent_folder">上一級文件夾</string><string name="info_note_enter_desktop">已添加到桌面</string><string name="alert_title_delete">刪除</string><string name="alert_message_delete_notes">确认要刪除所選的 %d 條便籤嗎?</string><string name="alert_message_delete_note">确认要删除該條便籤嗎?</string><string name="alert_message_delete_folder">確認刪除檔夾及所包含的便簽嗎？</string><string name="error_sdcard_unmounted">SD卡被佔用，不能操作</string><string name="error_sdcard_export">導出TXT時發生錯誤，請檢查SD卡</string><string name="error_note_not_exist">要查看的便籤不存在</string><string name="error_note_empty_for_clock">不能爲空便籤設置鬧鐘提醒</string><string name="error_note_empty_for_send_to_desktop">不能將空便籤發送到桌面</string><string name="success_sdcard_export">導出成功</string><string name="failed_sdcard_export">導出失敗</string><string name="format_exported_file_location">已將文本文件(%1$s)導出至SD(%2$s)目錄</string><string name="ticker_syncing">同步便簽...</string><string name="ticker_success">同步成功</string><string name="ticker_fail">同步失敗</string><string name="ticker_cancel">同步已取消</string><string name="success_sync_account">與%1$s同步成功</string><string name="error_sync_network">同步失敗，請檢查網絡和帳號設置</string><string name="error_sync_internal">同步失敗，發生內部錯誤</string><string name="error_sync_cancelled">同步已取消</string><string name="sync_progress_login">登陸%1$s...</string><string name="sync_progress_init_list">正在獲取服務器便籤列表...</string><string name="sync_progress_syncing">正在同步本地便籤...</string><string name="preferences_title">設置</string><string name="preferences_account_title">同步賬號</string><string name="preferences_account_summary">与google task同步便簽記錄</string><string name="preferences_last_sync_time">上次同步于 %1$s</string><string name="preferences_add_account">添加賬號</string><string name="preferences_menu_change_account">更換賬號</string><string name="preferences_menu_remove_account">刪除賬號</string><string name="preferences_menu_cancel">取消</string><string name="preferences_button_sync_immediately">立即同步</string><string name="preferences_button_sync_cancel">取消同步</string><string name="preferences_dialog_change_account_title">當前帳號 %1$s</string><string name="preferences_dialog_change_account_warn_msg">如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復</string><string name="preferences_dialog_select_account_title">同步便簽</string><string name="preferences_dialog_select_account_tips">請選擇google帳號，便簽將與該帳號的google task內容同步。</string><string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帳號</string><string name="preferences_toast_success_set_accout">同步帳號已設置為%1$s</string><string name="preferences_bg_random_appear_title">新建便籤背景顏色隨機</string><string name="button_delete">刪除</string><string name="call_record_folder_name">通話便籤</string><string name="hint_foler_name">請輸入名稱</string><string name="search_label">正在搜索便籤</string><string name="search_hint">搜索便籤</string><string name="search_setting_description">便籤中的文字</string><string name="search">便籤</string><string name="datetime_dialog_ok">設置</string><string name="datetime_dialog_cancel">取消</string><plurals name="search_results_title">
         <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 條符合”<ns1:g id="SEARCH">%2$s</ns1:g>“的搜尋結果</item>
+<<<<<<< HEAD
 <<<<<<< HEAD
     </plurals></file><file name="preferences" path="D:\gitnote\notes\app\src\main\res\xml\preferences.xml" qualifiers="" type="xml"/><file name="searchable" path="D:\gitnote\notes\app\src\main\res\xml\searchable.xml" qualifiers="" type="xml"/><file name="widget_2x_info" path="D:\gitnote\notes\app\src\main\res\xml\widget_2x_info.xml" qualifiers="" type="xml"/><file name="widget_4x_info" path="D:\gitnote\notes\app\src\main\res\xml\widget_4x_info.xml" qualifiers="" type="xml"/></source><source path="D:\gitnote\notes\app\build\generated\res\rs\debug"/><source path="D:\gitnote\notes\app\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\gitnote\notes\app\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\gitnote\notes\app\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><mergedItems/></merger>
 =======
     </plurals></file><file name="preferences" path="D:\gitnote\notes\app\src\main\res\xml\preferences.xml" qualifiers="" type="xml"/><file name="searchable" path="D:\gitnote\notes\app\src\main\res\xml\searchable.xml" qualifiers="" type="xml"/><file name="widget_2x_info" path="D:\gitnote\notes\app\src\main\res\xml\widget_2x_info.xml" qualifiers="" type="xml"/><file name="widget_4x_info" path="D:\gitnote\notes\app\src\main\res\xml\widget_4x_info.xml" qualifiers="" type="xml"/><file name="note_gesture_verify" path="D:\gitnote\notes\app\src\main\res\layout\note_gesture_verify.xml" qualifiers="" type="layout"/><file name="gesture_background" path="D:\gitnote\notes\app\src\main\res\drawable\gesture_background.xml" qualifiers="" type="drawable"/><file name="gesture_button_background" path="D:\gitnote\notes\app\src\main\res\drawable\gesture_button_background.xml" qualifiers="" type="drawable"/><file name="gesture_panel_background" path="D:\gitnote\notes\app\src\main\res\drawable\gesture_panel_background.xml" qualifiers="" type="drawable"/><file name="ic_lock_outline" path="D:\gitnote\notes\app\src\main\res\drawable\ic_lock_outline.xml" qualifiers="" type="drawable"/></source><source path="D:\gitnote\notes\app\build\generated\res\rs\debug"/><source path="D:\gitnote\notes\app\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\gitnote\notes\app\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\gitnote\notes\app\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><mergedItems/></merger>
 >>>>>>> a
+=======
+    </plurals></file><file name="preferences" path="D:\gitnote\notes\app\src\main\res\xml\preferences.xml" qualifiers="" type="xml"/><file name="searchable" path="D:\gitnote\notes\app\src\main\res\xml\searchable.xml" qualifiers="" type="xml"/><file name="widget_2x_info" path="D:\gitnote\notes\app\src\main\res\xml\widget_2x_info.xml" qualifiers="" type="xml"/><file name="widget_4x_info" path="D:\gitnote\notes\app\src\main\res\xml\widget_4x_info.xml" qualifiers="" type="xml"/><file name="note_gesture_verify" path="D:\gitnote\notes\app\src\main\res\layout\note_gesture_verify.xml" qualifiers="" type="layout"/><file name="gesture_background" path="D:\gitnote\notes\app\src\main\res\drawable\gesture_background.xml" qualifiers="" type="drawable"/><file name="gesture_button_background" path="D:\gitnote\notes\app\src\main\res\drawable\gesture_button_background.xml" qualifiers="" type="drawable"/><file name="gesture_panel_background" path="D:\gitnote\notes\app\src\main\res\drawable\gesture_panel_background.xml" qualifiers="" type="drawable"/><file name="ic_lock_outline" path="D:\gitnote\notes\app\src\main\res\drawable\ic_lock_outline.xml" qualifiers="" type="drawable"/><file name="ic_format_bold" path="D:\gitnote\notes\app\src\main\res\drawable\ic_format_bold.xml" qualifiers="" type="drawable"/><file name="ic_format_bullet" path="D:\gitnote\notes\app\src\main\res\drawable\ic_format_bullet.xml" qualifiers="" type="drawable"/><file name="ic_format_color" path="D:\gitnote\notes\app\src\main\res\drawable\ic_format_color.xml" qualifiers="" type="drawable"/><file name="ic_format_italic" path="D:\gitnote\notes\app\src\main\res\drawable\ic_format_italic.xml" qualifiers="" type="drawable"/><file name="ic_format_strikethrough" path="D:\gitnote\notes\app\src\main\res\drawable\ic_format_strikethrough.xml" qualifiers="" type="drawable"/><file name="ic_format_underline" path="D:\gitnote\notes\app\src\main\res\drawable\ic_format_underline.xml" qualifiers="" type="drawable"/><file name="ic_delete" path="D:\gitnote\notes\app\src\main\res\drawable\ic_delete.xml" qualifiers="" type="drawable"/><file name="activity_user_management" path="D:\gitnote\notes\app\src\main\res\layout\activity_user_management.xml" qualifiers="" type="layout"/><file name="dialog_add_user" path="D:\gitnote\notes\app\src\main\res\layout\dialog_add_user.xml" qualifiers="" type="layout"/><file name="item_user" path="D:\gitnote\notes\app\src\main\res\layout\item_user.xml" qualifiers="" type="layout"/></source><source path="D:\gitnote\notes\app\build\generated\res\rs\debug"/><source path="D:\gitnote\notes\app\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\gitnote\notes\app\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\gitnote\notes\app\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><mergedItems/></merger>
+>>>>>>> a
diff --git a/Src/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties b/Src/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties
index 39b6311..2d21123 100644
--- a/Src/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties
+++ b/Src/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties
@@ -1 +1 @@
-#Mon Dec 30 21:15:38 CST 2024
+#Wed Jan 08 10:29:59 CST 2025
diff --git a/Src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/Src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
index b773fa7..c66b60a 100644
--- a/Src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/Src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@@ -1,8 +1,12 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 #Tue Dec 31 09:10:17 CST 2024
 =======
 #Mon Jan 06 20:13:24 CST 2025
 >>>>>>> a
+=======
+#Thu Jan 09 10:35:49 CST 2025
+>>>>>>> a
 base.0=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex
 base.1=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex
 base.2=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\11\\classes.dex
diff --git a/Src/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt b/Src/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt
index bcd40d5..83fa6b9 100644
--- a/Src/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt
+++ b/Src/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Mon Dec 30 21:15:41 CST 2024
+#Wed Jan 08 10:30:02 CST 2025
 base.0=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeProjectDexDebugAndroidTest\\0\\classes.dex
 base.1=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeProjectDexDebugAndroidTest\\13\\classes.dex
 path.0=0/classes.dex
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class
index 2d64390..a8fb3f3 100644
Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class
index 9d9accd..2d02d02 100644
Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class
index ac989dd..510f272 100644
Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/login/UserListAdapter.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/login/UserListAdapter.class
new file mode 100644
index 0000000..1f2b508
Binary files /dev/null and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/login/UserListAdapter.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/login/UserManagementActivity.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/login/UserManagementActivity.class
new file mode 100644
index 0000000..98000e2
Binary files /dev/null and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/login/UserManagementActivity.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class
index 75809b4..75aa041 100644
Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class
index 0225f1c..d0acabb 100644
Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class
index 8581c90..d53ec35 100644
Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class
index 7d3d293..00ef4fc 100644
Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class
index cd49e5c..4820b09 100644
Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class
index 960604a..189f5ca 100644
Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class
index 0e017c8..5984555 100644
Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class
index 66594fc..1d32ffc 100644
Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/ColorPickerDialog$OnColorSelectedListener.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/ColorPickerDialog$OnColorSelectedListener.class
new file mode 100644
index 0000000..1937c4c
Binary files /dev/null and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/ColorPickerDialog$OnColorSelectedListener.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/ColorPickerDialog.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/ColorPickerDialog.class
new file mode 100644
index 0000000..abea4b4
Binary files /dev/null and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/ColorPickerDialog.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class
index f7a5576..605eff2 100644
Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class
index e6dd700..d056fd6 100644
Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LockPatternView.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LockPatternView.class
index 8319da2..e0cb45b 100644
Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LockPatternView.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LockPatternView.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$9.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$9.class
new file mode 100644
index 0000000..d93250b
Binary files /dev/null and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$9.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class
index 48209e9..a25729f 100644
Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class
index 8e8ded7..0540649 100644
Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteGesturePasswordActivity$1.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteGesturePasswordActivity$1.class
index f64b096..fa6869f 100644
Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteGesturePasswordActivity$1.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteGesturePasswordActivity$1.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteGesturePasswordActivity.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteGesturePasswordActivity.class
index ce86b9b..f857556 100644
Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteGesturePasswordActivity.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteGesturePasswordActivity.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteGestureVerifyActivity.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteGestureVerifyActivity.class
index ab0b538..40fbf61 100644
Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteGestureVerifyActivity.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteGestureVerifyActivity.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class
index 6f10c11..7c17131 100644
Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class
index bbadd31..769ba8c 100644
Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class
index e62d0c9..78a2e58 100644
Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class
index e96df11..df85aaa 100644
Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class
index a254504..ac860ec 100644
Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class
index d8a5628..a9969ea 100644
Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class
index 85c1e20..63741df 100644
Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class
index 79cdd31..ac14ac3 100644
Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class
index 6bcf931..f214dcf 100644
Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class
index 7cf018d..a98c02d 100644
Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
index 92fe4c7..10673fb 100644
Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class
index b6809ea..68ae3ee 100644
Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class differ
diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RichEditText.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RichEditText.class
new file mode 100644
index 0000000..d95446e
Binary files /dev/null and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RichEditText.class differ
diff --git a/Src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/Src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
index bb49674..240fb43 100644
--- a/Src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
+++ b/Src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
@@ -35,6 +35,7 @@
 19
 20    <application
 <<<<<<< HEAD
+<<<<<<< HEAD
 20-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:17:5-137:19
 21        android:debuggable="true"
 22        android:icon="@drawable/icon_app"
@@ -268,11 +269,15 @@
 149</manifest>
 =======
 20-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:17:5-145:19
+=======
+20-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:17:5-147:19
+>>>>>>> a
 21        android:debuggable="true"
 22        android:icon="@drawable/icon_app"
 22-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:18:9-42
-23        android:label="@string/app_name"
+23        android:label="@string/app_name" >
 23-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:19:9-41
+<<<<<<< HEAD
 24        android:testOnly="true" >
 25
 26        <!-- 登录Activity，启动器 -->
@@ -517,3 +522,251 @@
 157
 158</manifest>
 >>>>>>> a
+=======
+24
+25        <!-- 登录Activity，启动器 -->
+26        <activity
+26-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:22:9-29:20
+27            android:name="net.micode.notes.login.LoginActivity"
+27-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:23:13-48
+28            android:launchMode="singleTop" >
+28-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:24:13-43
+29            <intent-filter>
+29-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:25:13-28:29
+30                <action android:name="android.intent.action.MAIN" />
+30-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:26:17-69
+30-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:26:25-66
+31
+32                <category android:name="android.intent.category.LAUNCHER" />
+32-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:27:17-77
+32-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:27:27-74
+33            </intent-filter>
+34        </activity>
+35
+36        <!-- 注册Activity -->
+37        <activity android:name="net.micode.notes.login.RegisterActivity" />
+37-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:32:9-60
+37-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:32:19-57
+38        <!-- 主Activity -->
+39        <activity
+39-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:34:9-40:55
+40            android:name="net.micode.notes.ui.NotesListActivity"
+40-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:35:13-49
+41            android:configChanges="keyboardHidden|orientation|screenSize"
+41-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:36:13-74
+42            android:label="@string/app_name"
+42-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:37:13-45
+43            android:launchMode="singleTop"
+43-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:38:13-43
+44            android:theme="@style/NoteTheme"
+44-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:39:13-45
+45            android:windowSoftInputMode="adjustPan" />
+45-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:40:13-52
+46        <activity
+46-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:41:9-44:70
+47            android:name="net.micode.notes.ui.NoteGesturePasswordActivity"
+47-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:42:13-59
+48            android:label="@string/menu_set_gesture"
+48-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:43:13-53
+49            android:theme="@android:style/Theme.Holo.Light.Dialog" />
+49-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:44:13-67
+50        <activity
+50-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:45:9-49:63
+51            android:name="net.micode.notes.ui.NoteGestureVerifyActivity"
+51-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:46:13-57
+52            android:screenOrientation="portrait"
+52-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:48:13-49
+53            android:theme="@style/GestureVerifyTheme"
+53-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:47:13-54
+54            android:windowSoftInputMode="stateAlwaysHidden" />
+54-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:49:13-60
+55        <!-- 用户管理的Activity -->
+56        <activity android:name="net.micode.notes.login.UserManagementActivity" />
+56-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:51:9-65
+56-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:51:19-63
+57        <!-- 编辑笔记的Activity -->
+58        <activity
+58-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:53:9-79:20
+59            android:name="net.micode.notes.ui.NoteEditActivity"
+59-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:54:13-48
+60            android:configChanges="keyboardHidden|orientation|screenSize"
+60-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:55:13-74
+61            android:launchMode="singleTop"
+61-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:56:13-43
+62            android:theme="@style/NoteTheme" >
+62-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:57:13-45
+63            <intent-filter android:scheme="http" >
+63-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:58:13-65:29
+63-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:59:17-38
+64                <action android:name="android.intent.action.VIEW" />
+64-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:61:17-69
+64-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:61:25-66
+65
+66                <category android:name="android.intent.category.DEFAULT" />
+66-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:62:17-76
+66-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:62:27-73
+67
+68                <data android:mimeType="vnd.android.cursor.item/text_note" />
+68-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:63:17-78
+68-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:63:23-75
+69                <data android:mimeType="vnd.android.cursor.item/call_note" />
+69-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:63:17-78
+69-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:63:23-75
+70            </intent-filter>
+71            <intent-filter>
+71-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:66:13-71:29
+72                <action android:name="android.intent.action.INSERT_OR_EDIT" />
+72-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:67:17-79
+72-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:67:25-76
+73
+74                <category android:name="android.intent.category.DEFAULT" />
+74-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:62:17-76
+74-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:62:27-73
+75
+76                <data android:mimeType="vnd.android.cursor.item/text_note" />
+76-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:63:17-78
+76-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:63:23-75
+77                <data android:mimeType="vnd.android.cursor.item/call_note" />
+77-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:63:17-78
+77-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:63:23-75
+78            </intent-filter>
+79            <intent-filter>
+79-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:72:13-75:29
+80                <action android:name="android.intent.action.SEARCH" />
+80-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:73:17-71
+80-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:73:25-68
+81
+82                <category android:name="android.intent.category.DEFAULT" />
+82-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:62:17-76
+82-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:62:27-73
+83            </intent-filter>
+84
+85            <meta-data
+85-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:76:13-78:54
+86                android:name="android.app.searchable"
+86-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:77:17-54
+87                android:resource="@xml/searchable" />
+87-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:78:17-51
+88        </activity>
+89
+90        <!-- 提供者：用于管理笔记数据 -->
+91        <provider
+91-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:82:9-85:43
+92            android:name="net.micode.notes.data.NotesProvider"
+92-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:83:13-63
+93            android:authorities="micode_notes"
+93-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:84:13-47
+94            android:multiprocess="true" />
+94-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:85:13-40
+95
+96        <!-- 小部件提供者 -->
+97        <receiver
+97-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:88:9-98:20
+98            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
+98-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:89:13-57
+99            android:label="@string/app_widget2x2" >
+99-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:90:13-50
+100            <intent-filter>
+100-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:91:13-94:29
+101                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+101-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:92:17-84
+101-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:92:25-81
+102                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+102-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:93:17-85
+102-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:93:25-82
+103            </intent-filter>
+104
+105            <meta-data
+105-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:95:13-97:58
+106                android:name="android.appwidget.provider"
+106-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:96:17-58
+107                android:resource="@xml/widget_2x_info" />
+107-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:97:17-55
+108        </receiver>
+109        <receiver
+109-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:100:9-110:20
+110            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
+110-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:101:13-57
+111            android:label="@string/app_widget4x4" >
+111-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:102:13-50
+112            <intent-filter>
+112-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:91:13-94:29
+113                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+113-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:92:17-84
+113-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:92:25-81
+114                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+114-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:93:17-85
+114-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:93:25-82
+115            </intent-filter>
+116
+117            <meta-data
+117-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:95:13-97:58
+118                android:name="android.appwidget.provider"
+118-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:96:17-58
+119                android:resource="@xml/widget_4x_info" />
+119-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:97:17-55
+120        </receiver>
+121
+122        <!-- 启动完成时初始化闹钟 -->
+123        <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
+123-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:113:9-117:20
+123-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:113:19-55
+124            <intent-filter>
+124-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:114:13-116:29
+125                <action android:name="android.intent.action.BOOT_COMPLETED" />
+125-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:115:17-79
+125-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:115:25-76
+126            </intent-filter>
+127        </receiver>
+128
+129        <!-- 闹钟接收器 -->
+130        <receiver
+130-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:120:9-122:41
+131            android:name="net.micode.notes.ui.AlarmReceiver"
+131-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:121:13-61
+132            android:process=":remote" />
+132-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:122:13-38
+133
+134        <!-- 闹钟提醒Activity -->
+135        <activity
+135-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:125:9-129:87
+136            android:name="net.micode.notes.ui.AlarmAlertActivity"
+136-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:126:13-50
+137            android:label="@string/app_name"
+137-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:127:13-45
+138            android:launchMode="singleInstance"
+138-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:128:13-48
+139            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" />
+139-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:129:13-75
+140
+141        <!-- 设置Activity -->
+142        <activity
+142-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:132:9-136:72
+143            android:name="net.micode.notes.ui.NotesPreferenceActivity"
+143-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:133:13-71
+144            android:label="@string/preferences_title"
+144-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:134:13-54
+145            android:launchMode="singleTop"
+145-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:135:13-43
+146            android:theme="@android:style/Theme.Holo.Light" />
+146-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:136:13-60
+147
+148        <!-- 任务同步服务 -->
+149        <service
+149-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:139:9-141:40
+150            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
+150-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:140:13-74
+151            android:exported="false" />
+151-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:141:13-37
+152
+153        <!-- 默认搜索设置 -->
+154        <meta-data
+154-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:144:9-146:52
+155            android:name="android.app.default_searchable"
+155-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:145:13-58
+156            android:value=".ui.NoteEditActivity" />
+156-->D:\gitnote\notes\app\src\main\AndroidManifest.xml:146:13-49
+157    </application>
+158
+159</manifest>
+>>>>>>> a
diff --git a/Src/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt b/Src/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt
index bcf6df6..b1b54b6 100644
--- a/Src/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt
+++ b/Src/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt
@@ -3,30 +3,30 @@
 3    package="net.micode.notes.test" >
 4
 5    <uses-sdk
-5-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest516058341142764059.xml:5:5-74
+5-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest3798541519749136732.xml:5:5-74
 6        android:minSdkVersion="21"
-6-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest516058341142764059.xml:5:15-41
+6-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest3798541519749136732.xml:5:15-41
 7        android:targetSdkVersion="21" />
-7-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest516058341142764059.xml:5:42-71
+7-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest3798541519749136732.xml:5:42-71
 8
 9    <instrumentation
-9-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest516058341142764059.xml:11:5-15:66
+9-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest3798541519749136732.xml:11:5-15:66
 10        android:name="android.test.InstrumentationTestRunner"
-10-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest516058341142764059.xml:11:22-75
+10-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest3798541519749136732.xml:11:22-75
 11        android:functionalTest="false"
-11-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest516058341142764059.xml:14:22-52
+11-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest3798541519749136732.xml:14:22-52
 12        android:handleProfiling="false"
-12-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest516058341142764059.xml:13:22-53
+12-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest3798541519749136732.xml:13:22-53
 13        android:label="Tests for net.micode.notes"
-13-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest516058341142764059.xml:15:22-64
+13-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest3798541519749136732.xml:15:22-64
 14        android:targetPackage="net.micode.notes" />
-14-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest516058341142764059.xml:12:22-62
+14-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest3798541519749136732.xml:12:22-62
 15
 16    <application android:debuggable="true" >
-16-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest516058341142764059.xml:7:5-9:19
+16-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest3798541519749136732.xml:7:5-9:19
 17        <uses-library android:name="android.test.runner" />
-17-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest516058341142764059.xml:8:9-60
-17-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest516058341142764059.xml:8:23-57
+17-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest3798541519749136732.xml:8:9-60
+17-->D:\gitnote\notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest3798541519749136732.xml:8:23-57
 18    </application>
 19
 20</manifest>
diff --git a/Src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/Src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
index 3f94dc0..9990c6d 100644
--- a/Src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
+++ b/Src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
@@ -55,6 +55,11 @@
             android:screenOrientation="portrait"
             android:theme="@style/GestureVerifyTheme"
             android:windowSoftInputMode="stateAlwaysHidden" />
+<<<<<<< HEAD
+>>>>>>> a
+=======
+        <!-- 用户管理的Activity -->
+        <activity android:name="net.micode.notes.login.UserManagementActivity" />
 >>>>>>> a
         <!-- 编辑笔记的Activity -->
         <activity
diff --git a/Src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/Src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
index 3f94dc0..9990c6d 100644
--- a/Src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
+++ b/Src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
@@ -55,6 +55,11 @@
             android:screenOrientation="portrait"
             android:theme="@style/GestureVerifyTheme"
             android:windowSoftInputMode="stateAlwaysHidden" />
+<<<<<<< HEAD
+>>>>>>> a
+=======
+        <!-- 用户管理的Activity -->
+        <activity android:name="net.micode.notes.login.UserManagementActivity" />
 >>>>>>> a
         <!-- 编辑笔记的Activity -->
         <activity
diff --git a/Src/app/build/intermediates/merged_res/debug/drawable_ic_delete.xml.flat b/Src/app/build/intermediates/merged_res/debug/drawable_ic_delete.xml.flat
new file mode 100644
index 0000000..483c3d7
Binary files /dev/null and b/Src/app/build/intermediates/merged_res/debug/drawable_ic_delete.xml.flat differ
diff --git a/Src/app/build/intermediates/merged_res/debug/drawable_ic_format_bold.xml.flat b/Src/app/build/intermediates/merged_res/debug/drawable_ic_format_bold.xml.flat
new file mode 100644
index 0000000..bdcb529
Binary files /dev/null and b/Src/app/build/intermediates/merged_res/debug/drawable_ic_format_bold.xml.flat differ
diff --git a/Src/app/build/intermediates/merged_res/debug/drawable_ic_format_bullet.xml.flat b/Src/app/build/intermediates/merged_res/debug/drawable_ic_format_bullet.xml.flat
new file mode 100644
index 0000000..fafdcc9
Binary files /dev/null and b/Src/app/build/intermediates/merged_res/debug/drawable_ic_format_bullet.xml.flat differ
diff --git a/Src/app/build/intermediates/merged_res/debug/drawable_ic_format_color.xml.flat b/Src/app/build/intermediates/merged_res/debug/drawable_ic_format_color.xml.flat
new file mode 100644
index 0000000..397c286
Binary files /dev/null and b/Src/app/build/intermediates/merged_res/debug/drawable_ic_format_color.xml.flat differ
diff --git a/Src/app/build/intermediates/merged_res/debug/drawable_ic_format_italic.xml.flat b/Src/app/build/intermediates/merged_res/debug/drawable_ic_format_italic.xml.flat
new file mode 100644
index 0000000..ef8f5ad
Binary files /dev/null and b/Src/app/build/intermediates/merged_res/debug/drawable_ic_format_italic.xml.flat differ
diff --git a/Src/app/build/intermediates/merged_res/debug/drawable_ic_format_strikethrough.xml.flat b/Src/app/build/intermediates/merged_res/debug/drawable_ic_format_strikethrough.xml.flat
new file mode 100644
index 0000000..155fef3
Binary files /dev/null and b/Src/app/build/intermediates/merged_res/debug/drawable_ic_format_strikethrough.xml.flat differ
diff --git a/Src/app/build/intermediates/merged_res/debug/drawable_ic_format_underline.xml.flat b/Src/app/build/intermediates/merged_res/debug/drawable_ic_format_underline.xml.flat
new file mode 100644
index 0000000..790377d
Binary files /dev/null and b/Src/app/build/intermediates/merged_res/debug/drawable_ic_format_underline.xml.flat differ
diff --git a/Src/app/build/intermediates/merged_res/debug/layout_activity_login.xml.flat b/Src/app/build/intermediates/merged_res/debug/layout_activity_login.xml.flat
index fae5476..786b2dc 100644
Binary files a/Src/app/build/intermediates/merged_res/debug/layout_activity_login.xml.flat and b/Src/app/build/intermediates/merged_res/debug/layout_activity_login.xml.flat differ
diff --git a/Src/app/build/intermediates/merged_res/debug/layout_activity_register.xml.flat b/Src/app/build/intermediates/merged_res/debug/layout_activity_register.xml.flat
index ce2908e..3396f8c 100644
Binary files a/Src/app/build/intermediates/merged_res/debug/layout_activity_register.xml.flat and b/Src/app/build/intermediates/merged_res/debug/layout_activity_register.xml.flat differ
diff --git a/Src/app/build/intermediates/merged_res/debug/layout_activity_user_management.xml.flat b/Src/app/build/intermediates/merged_res/debug/layout_activity_user_management.xml.flat
new file mode 100644
index 0000000..c708987
Binary files /dev/null and b/Src/app/build/intermediates/merged_res/debug/layout_activity_user_management.xml.flat differ
diff --git a/Src/app/build/intermediates/merged_res/debug/layout_dialog_add_user.xml.flat b/Src/app/build/intermediates/merged_res/debug/layout_dialog_add_user.xml.flat
new file mode 100644
index 0000000..abd50b1
Binary files /dev/null and b/Src/app/build/intermediates/merged_res/debug/layout_dialog_add_user.xml.flat differ
diff --git a/Src/app/build/intermediates/merged_res/debug/layout_item_user.xml.flat b/Src/app/build/intermediates/merged_res/debug/layout_item_user.xml.flat
new file mode 100644
index 0000000..3a3a7b7
Binary files /dev/null and b/Src/app/build/intermediates/merged_res/debug/layout_item_user.xml.flat differ
diff --git a/Src/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat b/Src/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat
index 824fb67..7bfdc6f 100644
Binary files a/Src/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat and b/Src/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat differ
diff --git a/Src/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat b/Src/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat
index 89f2790..aab4e0a 100644
Binary files a/Src/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat and b/Src/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat differ
diff --git a/Src/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/Src/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat
index 42b8bae..44abe6d 100644
Binary files a/Src/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat and b/Src/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat differ
diff --git a/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
index bfb923e..160c860 100644
--- a/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
+++ b/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
@@ -56,6 +56,45 @@
                 }
             ]
         },
+        {
+            "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat",
+            "map": [
+                {
+                    "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+                    "from": {
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
+                    },
+                    "to": {
+                        "startLines": "2",
+                        "startColumns": "4",
+                        "startOffsets": "105",
+                        "endLines": "5",
+                        "endColumns": "19",
+                        "endOffsets": "210"
+                    }
+                },
+                {
+                    "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+                    "from": {
+                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,141,145,-1,-1,-1,142,-1,144,146,143,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "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,4,4,-1,-1,-1,4,-1,4,4,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "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,7586,7776,-1,-1,-1,7629,-1,7723,7823,7674,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,46,-1,-1,-1,44,-1,52,50,48,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7624,7818,-1,-1,-1,7669,-1,7771,7869,7718,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                    },
+                    "to": {
+                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,922,969,1033,1087,1137,1199,1267,1344,1403,1468,1531,1586,1646,1709,1763,1823,1866,1913,1966,2028,2113,2158,2239,2292,2343,2392,2457,2514,2568,2624,2675,2733,2791,2850,2913,2980,3049,3109,3165,3215,3274,3317,3370,3413,3464,3514,3574,3627,3678,3724,3772,3820,3866,3913,3963,4008,4067,4119,4171,4214,4261,4317,4372,4427,4479,4523,4565,4606,4656,4715,4766,4815,4864,4911,4958,5005,5050,5101,5154,5188,5263,5322,5379,5453,5517,5586,5664,5774,5878,5951,6017,6072,6137,6202,6251,6334,6412,6450,6495,6543,6605,6662,6717,6776,6843,6901,6963,7011,7056,7104,7155,7221",
+                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130",
+                        "endColumns": "14,72,65,72,49,39,47,47,44,56,37,46,63,53,49,61,67,76,58,64,62,54,59,62,53,59,42,46,52,61,84,44,80,52,50,48,64,56,53,55,50,57,57,58,62,66,68,59,55,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,51,43,41,40,49,58,50,48,48,46,46,46,44,50,52,33,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,917,964,1028,1082,1132,1194,1262,1339,1398,1463,1526,1581,1641,1704,1758,1818,1861,1908,1961,2023,2108,2153,2234,2287,2338,2387,2452,2509,2563,2619,2670,2728,2786,2845,2908,2975,3044,3104,3160,3210,3269,3312,3365,3408,3459,3509,3569,3622,3673,3719,3767,3815,3861,3908,3958,4003,4062,4114,4166,4209,4256,4312,4367,4422,4474,4518,4560,4601,4651,4710,4761,4810,4859,4906,4953,5000,5045,5096,5149,5183,5258,5317,5374,5448,5512,5581,5659,5769,5873,5946,6012,6067,6132,6197,6246,6329,6407,6445,6490,6538,6600,6657,6712,6771,6838,6896,6958,7006,7051,7099,7150,7216,7282"
+                    }
+                }
+            ]
+        },
         {
             "outputFile": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rTW_values-zh-rTW.arsc.flat",
             "map": [
@@ -113,6 +152,7 @@
                 {
                     "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\colors.xml",
                     "from": {
+<<<<<<< HEAD
 <<<<<<< HEAD
                         "startLines": "17,19,18,20,21,16",
                         "startColumns": "4,4,4,4,4,4",
@@ -130,29 +170,39 @@
                         "startLines": "-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",
                         "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+=======
+                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,43,-1",
+                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,4,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1688,1741,-1",
+                        "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,52,57,-1",
+                        "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1736,1794,-1"
+>>>>>>> a
                     },
                     "to": {
-                        "startLines": "12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "420,471,518,570,623,683,741,795,849,902,955,1008,1062,1115,1174,1229,1283,1338,1395,1451,1504,1549,1594",
-                        "endColumns": "50,46,51,52,59,57,53,53,52,52,52,53,52,58,54,53,54,56,55,52,44,44,56",
-                        "endOffsets": "466,513,565,618,678,736,790,844,897,950,1003,1057,1110,1169,1224,1278,1333,1390,1446,1499,1544,1589,1646"
+                        "startLines": "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",
+                        "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",
+                        "startOffsets": "420,471,518,570,623,683,741,795,849,902,955,1008,1062,1115,1174,1229,1283,1338,1395,1451,1504,1549,1594,1647,1705",
+                        "endColumns": "50,46,51,52,59,57,53,53,52,52,52,53,52,58,54,53,54,56,55,52,44,44,52,57,56",
+                        "endOffsets": "466,513,565,618,678,736,790,844,897,950,1003,1057,1110,1169,1224,1278,1333,1390,1446,1499,1544,1589,1642,1700,1757"
                     }
                 },
                 {
                     "source": "D:\\gitnote\\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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                        "startLines": "155,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,149,153,-1,-1,-1,-1,150,-1,152,154,151,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,4,-1,-1,-1,-1,4,-1,4,4,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "9351,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,9063,9253,-1,-1,-1,-1,9106,-1,9200,9300,9151,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endLines": "159,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,149,153,-1,-1,-1,-1,150,-1,152,154,151,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,46,-1,-1,-1,-1,44,-1,52,50,48,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "9755,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,9101,9295,-1,-1,-1,-1,9146,-1,9248,9346,9195,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "40,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "1913,2266,2362,2445,2541,2610,2653,2705,2757,2806,2869,2907,2954,3018,3076,3127,3211,3305,3413,3484,3568,3651,3717,3800,3902,3963,4025,4076,4154,4207,4267,4372,4431,4533,4598,4655,4709,4765,4816,4874,4932,4991,5054,5121,5190,5250,5306,5361,5432,5481,5539,5586,5645,5702,5773,5834,5891,5941,5993,6046,6096,6146,6206,6259,6325,6387,6450,6497,6552,6640,6698,6760,6812,6862,6907,6950,7010,7077,7132,7187,7240,7287,7340,7396,7444,7499,7552,7586,7670,7737,7801,7897,7971,8052,8141,8304,8448,8527,8602,8684,8743,8823,8903,8958,9080,9183,9224,9277,9334,9408,9473,9541,9627,9707,9776,9870,9929,9984,10046,10106,10216",
-                        "endLines": "44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,37,46,63,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,64,56,53,55,50,57,57,58,62,66,68,59,55,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,51,49,44,42,59,66,54,54,52,46,52,55,47,54,52,33,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": "2261,2357,2440,2536,2605,2648,2700,2752,2801,2864,2902,2949,3013,3071,3122,3206,3300,3408,3479,3563,3646,3712,3795,3897,3958,4020,4071,4149,4202,4262,4367,4426,4528,4593,4650,4704,4760,4811,4869,4927,4986,5049,5116,5185,5245,5301,5356,5427,5476,5534,5581,5640,5697,5768,5829,5886,5936,5988,6041,6091,6141,6201,6254,6320,6382,6445,6492,6547,6635,6693,6755,6807,6857,6902,6945,7005,7072,7127,7182,7235,7282,7335,7391,7439,7494,7547,7581,7665,7732,7796,7892,7966,8047,8136,8299,8443,8522,8597,8679,8738,8818,8898,8953,9075,9178,9219,9272,9329,9403,9468,9536,9622,9702,9771,9865,9924,9979,10041,10101,10211,10301"
+                        "startLines": "42,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "2024,2377,2473,2556,2652,2721,2764,2816,2868,2917,2980,3018,3065,3129,3187,3238,3322,3416,3524,3595,3679,3762,3828,3911,4013,4074,4136,4187,4265,4308,4355,4408,4468,4573,4632,4677,4779,4832,4883,4932,4997,5054,5108,5164,5215,5273,5331,5390,5453,5520,5589,5649,5705,5760,5831,5880,5938,5985,6044,6101,6172,6233,6290,6340,6392,6445,6495,6545,6605,6658,6724,6786,6849,6896,6951,7039,7097,7159,7211,7261,7306,7349,7409,7476,7531,7586,7639,7686,7739,7795,7843,7898,7951,7985,8069,8136,8200,8296,8370,8451,8540,8703,8847,8926,9001,9083,9142,9222,9302,9357,9479,9582,9623,9676,9733,9807,9872,9940,10026,10106,10175,10269,10328,10383,10445,10505,10615",
+                        "endLines": "46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172",
+                        "endColumns": "14,95,82,95,68,42,51,51,48,62,37,46,63,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,42,46,52,59,104,58,44,101,52,50,48,64,56,53,55,50,57,57,58,62,66,68,59,55,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,51,49,44,42,59,66,54,54,52,46,52,55,47,54,52,33,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": "2372,2468,2551,2647,2716,2759,2811,2863,2912,2975,3013,3060,3124,3182,3233,3317,3411,3519,3590,3674,3757,3823,3906,4008,4069,4131,4182,4260,4303,4350,4403,4463,4568,4627,4672,4774,4827,4878,4927,4992,5049,5103,5159,5210,5268,5326,5385,5448,5515,5584,5644,5700,5755,5826,5875,5933,5980,6039,6096,6167,6228,6285,6335,6387,6440,6490,6540,6600,6653,6719,6781,6844,6891,6946,7034,7092,7154,7206,7256,7301,7344,7404,7471,7526,7581,7634,7681,7734,7790,7838,7893,7946,7980,8064,8131,8195,8291,8365,8446,8535,8698,8842,8921,8996,9078,9137,9217,9297,9352,9474,9577,9618,9671,9728,9802,9867,9935,10021,10101,10170,10264,10323,10378,10440,10500,10610,10700"
                     }
                 },
                 {
@@ -174,20 +224,17 @@
                 {
                     "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\styles.xml",
                     "from": {
-                        "startLines": "-1,76,-1,-1,66,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "-1,4,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startOffsets": "-1,3030,-1,-1,2507,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endLines": "-1,82,-1,-1,69,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endColumns": "-1,12,-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endOffsets": "-1,3432,-1,-1,2720,-1,-1,-1,-1,-1,-1,-1,-1"
+                        "startLines": "-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",
+                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                     },
                     "to": {
-                        "startLines": "165,170,177,181,185,189,192,196,200,204,208,212,216",
+                        "startLines": "173,178,185,189,193,197,200,204,208,212,216,220,224",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "10306,10584,10991,11199,11410,11575,11735,11918,12103,12288,12491,12697,12880",
-                        "endLines": "169,176,180,184,188,191,195,199,203,207,211,215,219",
+                        "startOffsets": "10705,10983,11390,11598,11809,11974,12134,12317,12502,12687,12890,13096,13279",
+                        "endLines": "177,184,188,192,196,199,203,207,211,215,219,223,227",
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "10579,10986,11194,11405,11570,11730,11913,12098,12283,12486,12692,12875,13076"
+                        "endOffsets": "10978,11385,11593,11804,11969,12129,12312,12497,12682,12885,13091,13274,13475"
                     }
                 },
                 {
@@ -198,11 +245,15 @@
                         "startOffsets": "-1,-1,-1,-1,-1"
                     },
                     "to": {
-                        "startLines": "35,36,37,38,39",
+                        "startLines": "37,38,39,40,41",
                         "startColumns": "4,4,4,4,4",
-                        "startOffsets": "1651,1703,1756,1809,1861",
+                        "startOffsets": "1762,1814,1867,1920,1972",
                         "endColumns": "51,52,52,51,51",
+<<<<<<< HEAD
                         "endOffsets": "1698,1751,1804,1856,1908"
+>>>>>>> a
+=======
+                        "endOffsets": "1809,1862,1915,1967,2019"
 >>>>>>> a
                     }
                 }
diff --git a/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
index 963bbd1..d3bb795 100644
--- a/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
+++ b/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
@@ -24,19 +24,19 @@
                 {
                     "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
                     "from": {
-                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,139,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,137,135,136,-1,-1,-1,-1,-1,133,-1,-1,-1,134,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,138,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,4,4,-1,-1,-1,-1,-1,4,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7525,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7426,7315,7372,-1,-1,-1,-1,-1,7196,-1,-1,-1,7259,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7491,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,37,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,64,56,53,-1,-1,-1,-1,-1,62,-1,-1,-1,55,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,33,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7558,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7486,7367,7421,-1,-1,-1,-1,-1,7254,-1,-1,-1,7310,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7520,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,141,145,-1,-1,-1,142,-1,144,146,143,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "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,4,4,-1,-1,-1,4,-1,4,4,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "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,7586,7776,-1,-1,-1,7629,-1,7723,7823,7674,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,46,-1,-1,-1,44,-1,52,50,48,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7624,7818,-1,-1,-1,7669,-1,7771,7869,7718,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                     },
                     "to": {
-                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,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,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,922,969,1033,1087,1137,1199,1267,1344,1403,1468,1531,1586,1646,1709,1763,1823,1876,1938,2023,2104,2169,2226,2280,2336,2387,2445,2503,2562,2625,2692,2761,2821,2877,2927,2986,3029,3082,3125,3176,3226,3286,3339,3390,3436,3484,3532,3578,3625,3675,3720,3779,3831,3883,3926,3973,4029,4084,4139,4191,4235,4277,4318,4368,4427,4478,4527,4576,4623,4670,4717,4762,4813,4866,4900,4975,5034,5091,5165,5229,5298,5376,5486,5590,5663,5729,5784,5849,5914,5963,6046,6124,6162,6207,6255,6317,6374,6429,6488,6555,6613,6675,6723,6768,6816,6867,6933",
-                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
-                        "endColumns": "14,72,65,72,49,39,47,47,44,56,37,46,63,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,64,56,53,55,50,57,57,58,62,66,68,59,55,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,51,43,41,40,49,58,50,48,48,46,46,46,44,50,52,33,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,917,964,1028,1082,1132,1194,1262,1339,1398,1463,1526,1581,1641,1704,1758,1818,1871,1933,2018,2099,2164,2221,2275,2331,2382,2440,2498,2557,2620,2687,2756,2816,2872,2922,2981,3024,3077,3120,3171,3221,3281,3334,3385,3431,3479,3527,3573,3620,3670,3715,3774,3826,3878,3921,3968,4024,4079,4134,4186,4230,4272,4313,4363,4422,4473,4522,4571,4618,4665,4712,4757,4808,4861,4895,4970,5029,5086,5160,5224,5293,5371,5481,5585,5658,5724,5779,5844,5909,5958,6041,6119,6157,6202,6250,6312,6369,6424,6483,6550,6608,6670,6718,6763,6811,6862,6928,6994"
+                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,922,969,1033,1087,1137,1199,1267,1344,1403,1468,1531,1586,1646,1709,1763,1823,1866,1913,1966,2028,2113,2158,2239,2292,2343,2392,2457,2514,2568,2624,2675,2733,2791,2850,2913,2980,3049,3109,3165,3215,3274,3317,3370,3413,3464,3514,3574,3627,3678,3724,3772,3820,3866,3913,3963,4008,4067,4119,4171,4214,4261,4317,4372,4427,4479,4523,4565,4606,4656,4715,4766,4815,4864,4911,4958,5005,5050,5101,5154,5188,5263,5322,5379,5453,5517,5586,5664,5774,5878,5951,6017,6072,6137,6202,6251,6334,6412,6450,6495,6543,6605,6662,6717,6776,6843,6901,6963,7011,7056,7104,7155,7221",
+                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130",
+                        "endColumns": "14,72,65,72,49,39,47,47,44,56,37,46,63,53,49,61,67,76,58,64,62,54,59,62,53,59,42,46,52,61,84,44,80,52,50,48,64,56,53,55,50,57,57,58,62,66,68,59,55,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,51,43,41,40,49,58,50,48,48,46,46,46,44,50,52,33,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,917,964,1028,1082,1132,1194,1262,1339,1398,1463,1526,1581,1641,1704,1758,1818,1861,1908,1961,2023,2108,2153,2234,2287,2338,2387,2452,2509,2563,2619,2670,2728,2786,2845,2908,2975,3044,3104,3160,3210,3269,3312,3365,3408,3459,3509,3569,3622,3673,3719,3767,3815,3861,3908,3958,4003,4062,4114,4166,4209,4256,4312,4367,4422,4474,4518,4560,4601,4651,4710,4761,4810,4859,4906,4953,5000,5045,5096,5149,5183,5258,5317,5374,5448,5512,5581,5659,5769,5873,5946,6012,6067,6132,6197,6246,6329,6407,6445,6490,6538,6600,6657,6712,6771,6838,6896,6958,7006,7051,7099,7150,7216,7282"
                     }
                 }
             ]
diff --git a/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
index 3ee56d4..8c91565 100644
--- a/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
+++ b/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
@@ -6,6 +6,7 @@
                 {
                     "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\colors.xml",
                     "from": {
+<<<<<<< HEAD
 <<<<<<< HEAD
                         "startLines": "17,19,18,20,21,16",
                         "startColumns": "4,4,4,4,4,4",
@@ -158,6 +159,8 @@
                 {
                     "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\colors.xml",
                     "from": {
+=======
+>>>>>>> a
                         "startLines": "-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",
                         "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
@@ -238,6 +241,94 @@
                     }
                 }
             ]
+        },
+        {
+            "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml",
+            "map": [
+                {
+                    "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\colors.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,42,43,-1",
+                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,4,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1688,1741,-1",
+                        "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,52,57,-1",
+                        "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1736,1794,-1"
+                    },
+                    "to": {
+                        "startLines": "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",
+                        "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",
+                        "startOffsets": "420,471,518,570,623,683,741,795,849,902,955,1008,1062,1115,1174,1229,1283,1338,1395,1451,1504,1549,1594,1647,1705",
+                        "endColumns": "50,46,51,52,59,57,53,53,52,52,52,53,52,58,54,53,54,56,55,52,44,44,52,57,56",
+                        "endOffsets": "466,513,565,618,678,736,790,844,897,950,1003,1057,1110,1169,1224,1278,1333,1390,1446,1499,1544,1589,1642,1700,1757"
+                    }
+                },
+                {
+                    "source": "D:\\gitnote\\notes\\app\\src\\main\\res\\values\\strings.xml",
+                    "from": {
+                        "startLines": "155,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,149,153,-1,-1,-1,-1,150,-1,152,154,151,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,4,-1,-1,-1,-1,4,-1,4,4,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "9351,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,9063,9253,-1,-1,-1,-1,9106,-1,9200,9300,9151,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endLines": "159,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,149,153,-1,-1,-1,-1,150,-1,152,154,151,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,46,-1,-1,-1,-1,44,-1,52,50,48,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "9755,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,9101,9295,-1,-1,-1,-1,9146,-1,9248,9346,9195,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "42,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "2024,2377,2473,2556,2652,2721,2764,2816,2868,2917,2980,3018,3065,3129,3187,3238,3322,3416,3524,3595,3679,3762,3828,3911,4013,4074,4136,4187,4265,4308,4355,4408,4468,4573,4632,4677,4779,4832,4883,4932,4997,5054,5108,5164,5215,5273,5331,5390,5453,5520,5589,5649,5705,5760,5831,5880,5938,5985,6044,6101,6172,6233,6290,6340,6392,6445,6495,6545,6605,6658,6724,6786,6849,6896,6951,7039,7097,7159,7211,7261,7306,7349,7409,7476,7531,7586,7639,7686,7739,7795,7843,7898,7951,7985,8069,8136,8200,8296,8370,8451,8540,8703,8847,8926,9001,9083,9142,9222,9302,9357,9479,9582,9623,9676,9733,9807,9872,9940,10026,10106,10175,10269,10328,10383,10445,10505,10615",
+                        "endLines": "46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172",
+                        "endColumns": "14,95,82,95,68,42,51,51,48,62,37,46,63,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,42,46,52,59,104,58,44,101,52,50,48,64,56,53,55,50,57,57,58,62,66,68,59,55,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,51,49,44,42,59,66,54,54,52,46,52,55,47,54,52,33,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": "2372,2468,2551,2647,2716,2759,2811,2863,2912,2975,3013,3060,3124,3182,3233,3317,3411,3519,3590,3674,3757,3823,3906,4008,4069,4131,4182,4260,4303,4350,4403,4463,4568,4627,4672,4774,4827,4878,4927,4992,5049,5103,5159,5210,5268,5326,5385,5448,5515,5584,5644,5700,5755,5826,5875,5933,5980,6039,6096,6167,6228,6285,6335,6387,6440,6490,6540,6600,6653,6719,6781,6844,6891,6946,7034,7092,7154,7206,7256,7301,7344,7404,7471,7526,7581,7634,7681,7734,7790,7838,7893,7946,7980,8064,8131,8195,8291,8365,8446,8535,8698,8842,8921,8996,9078,9137,9217,9297,9352,9474,9577,9618,9671,9728,9802,9867,9935,10021,10101,10170,10264,10323,10378,10440,10500,10610,10700"
+                    }
+                },
+                {
+                    "source": "D:\\gitnote\\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:\\gitnote\\notes\\app\\src\\main\\res\\values\\styles.xml",
+                    "from": {
+                        "startLines": "-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",
+                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                    },
+                    "to": {
+                        "startLines": "173,178,185,189,193,197,200,204,208,212,216,220,224",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "10705,10983,11390,11598,11809,11974,12134,12317,12502,12687,12890,13096,13279",
+                        "endLines": "177,184,188,192,196,199,203,207,211,215,219,223,227",
+                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12",
+                        "endOffsets": "10978,11385,11593,11804,11969,12129,12312,12497,12682,12885,13091,13274,13475"
+                    }
+                },
+                {
+                    "source": "D:\\gitnote\\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": "37,38,39,40,41",
+                        "startColumns": "4,4,4,4,4",
+                        "startOffsets": "1762,1814,1867,1920,1972",
+                        "endColumns": "51,52,52,51,51",
+                        "endOffsets": "1809,1862,1915,1967,2019"
+                    }
+                }
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/Src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
index 7e59262..7c6600c 100644
--- a/Src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
+++ b/Src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
@@ -156,11 +156,19 @@
         "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_green.png.flat",
         "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_green.png"
     },
+    {
+        "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_dialog_add_user.xml.flat",
+        "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\dialog_add_user.xml"
+    },
     {
         "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_btn_set_color.png.flat",
         "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_btn_set_color.png"
 >>>>>>> a
     },
+    {
+        "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_ic_format_bold.xml.flat",
+        "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\ic_format_bold.xml"
+    },
     {
         "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_primary_text_dark.xml.flat",
         "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\primary_text_dark.xml"
@@ -207,6 +215,7 @@
         "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_normal.png"
     },
     {
+<<<<<<< HEAD
 <<<<<<< HEAD
         "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_blue.9.png.flat",
         "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_blue.9.png"
@@ -219,6 +228,12 @@
         "merged": "net.micode.notes.app-merged_res-5:/color_secondary_text_dark.xml.flat",
         "source": "net.micode.notes.app-main-7:/color/secondary_text_dark.xml"
 =======
+=======
+        "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_ic_format_italic.xml.flat",
+        "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\ic_format_italic.xml"
+    },
+    {
+>>>>>>> a
         "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_single.9.png.flat",
         "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_single.9.png"
     },
@@ -242,6 +257,10 @@
         "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_gesture_verify.xml.flat",
         "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_gesture_verify.xml"
     },
+    {
+        "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_ic_format_strikethrough.xml.flat",
+        "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\ic_format_strikethrough.xml"
+    },
     {
         "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_edit.xml.flat",
         "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_edit.xml"
@@ -255,6 +274,14 @@
         "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list_options.xml.flat",
         "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list_options.xml"
     },
+    {
+        "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_item_user.xml.flat",
+        "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\item_user.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/menu_note_list.xml.flat",
+        "source": "net.micode.notes.app-main-7:/menu/note_list.xml"
+    },
     {
         "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_red.9.png.flat",
         "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_red.9.png"
@@ -283,6 +310,10 @@
         "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_blue.9.png.flat",
         "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_blue.9.png"
     },
+    {
+        "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_ic_format_bullet.xml.flat",
+        "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\ic_format_bullet.xml"
+    },
     {
         "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_yellow.png.flat",
         "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_yellow.png"
@@ -312,6 +343,10 @@
         "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_small.png.flat",
         "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_small.png"
     },
+    {
+        "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_ic_delete.xml.flat",
+        "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\ic_delete.xml"
+    },
     {
         "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_notification.png.flat",
         "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\notification.png"
@@ -342,15 +377,12 @@
         "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\folder_list_item.xml"
 >>>>>>> a
     },
-    {
-        "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_ic_lock_outline.xml.flat",
-        "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\ic_lock_outline.xml"
-    },
     {
         "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_activity_register.xml.flat",
         "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\activity_register.xml"
     },
     {
+<<<<<<< HEAD
 <<<<<<< HEAD
         "merged": "net.micode.notes.app-merged_res-5:/menu_note_list.xml.flat",
         "source": "net.micode.notes.app-main-7:/menu/note_list.xml"
@@ -359,6 +391,12 @@
         "merged": "net.micode.notes.app-merged_res-5:/layout_note_list_footer.xml.flat",
         "source": "net.micode.notes.app-main-7:/layout/note_list_footer.xml"
 =======
+=======
+        "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_ic_lock_outline.xml.flat",
+        "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\ic_lock_outline.xml"
+    },
+    {
+>>>>>>> a
         "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_add_account_text.xml.flat",
         "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\add_account_text.xml"
     },
@@ -399,6 +437,10 @@
         "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_yellow.9.png.flat",
         "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_yellow.9.png"
     },
+    {
+        "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_activity_user_management.xml.flat",
+        "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\activity_user_management.xml"
+    },
     {
         "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_dialog_edit_text.xml.flat",
         "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\dialog_edit_text.xml"
@@ -649,10 +691,6 @@
         "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_toast_background.xml.flat",
         "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\toast_background.xml"
     },
-    {
-        "merged": "net.micode.notes.app-merged_res-5:/layout_note_gesture_verify.xml.flat",
-        "source": "net.micode.notes.app-main-7:/layout/note_gesture_verify.xml"
-    },
     {
         "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_call_record_folder.xml.flat",
         "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\call_record_folder.xml"
@@ -665,6 +703,10 @@
         "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_color_btn_mask.png.flat",
         "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_color_btn_mask.png"
     },
+    {
+        "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_ic_format_color.xml.flat",
+        "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\ic_format_color.xml"
+    },
     {
         "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_edittext_background.xml.flat",
         "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\edittext_background.xml"
@@ -694,6 +736,10 @@
         "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_super.png.flat",
         "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_super.png"
     },
+    {
+        "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_ic_format_underline.xml.flat",
+        "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\ic_format_underline.xml"
+    },
     {
         "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_alert.png.flat",
         "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_alert.png"
diff --git a/Src/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml b/Src/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
index 3f94dc0..9990c6d 100644
--- a/Src/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
+++ b/Src/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
@@ -55,6 +55,11 @@
             android:screenOrientation="portrait"
             android:theme="@style/GestureVerifyTheme"
             android:windowSoftInputMode="stateAlwaysHidden" />
+<<<<<<< HEAD
+>>>>>>> a
+=======
+        <!-- 用户管理的Activity -->
+        <activity android:name="net.micode.notes.login.UserManagementActivity" />
 >>>>>>> a
         <!-- 编辑笔记的Activity -->
         <activity
diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/78a534e9f580b4dfc479b169bca5c13aebb7d9dbcf4f9b66e04be3a4ea91b04f_6.jar b/Src/app/build/intermediates/project_dex_archive/debug/out/78a534e9f580b4dfc479b169bca5c13aebb7d9dbcf4f9b66e04be3a4ea91b04f_6.jar
new file mode 100644
index 0000000..98de8ac
Binary files /dev/null and b/Src/app/build/intermediates/project_dex_archive/debug/out/78a534e9f580b4dfc479b169bca5c13aebb7d9dbcf4f9b66e04be3a4ea91b04f_6.jar differ
diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/78a534e9f580b4dfc479b169bca5c13aebb7d9dbcf4f9b66e04be3a4ea91b04f_9.jar b/Src/app/build/intermediates/project_dex_archive/debug/out/78a534e9f580b4dfc479b169bca5c13aebb7d9dbcf4f9b66e04be3a4ea91b04f_9.jar
new file mode 100644
index 0000000..ce4b3e0
Binary files /dev/null and b/Src/app/build/intermediates/project_dex_archive/debug/out/78a534e9f580b4dfc479b169bca5c13aebb7d9dbcf4f9b66e04be3a4ea91b04f_9.jar differ
diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/8ad6f3fde0bfa215fd05f5ab318490c627ae1c5e6df4b35db4a804ab2b10bc68_6.jar b/Src/app/build/intermediates/project_dex_archive/debug/out/8ad6f3fde0bfa215fd05f5ab318490c627ae1c5e6df4b35db4a804ab2b10bc68_6.jar
deleted file mode 100644
index ccdc144..0000000
Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/8ad6f3fde0bfa215fd05f5ab318490c627ae1c5e6df4b35db4a804ab2b10bc68_6.jar and /dev/null differ
diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/8ad6f3fde0bfa215fd05f5ab318490c627ae1c5e6df4b35db4a804ab2b10bc68_9.jar b/Src/app/build/intermediates/project_dex_archive/debug/out/8ad6f3fde0bfa215fd05f5ab318490c627ae1c5e6df4b35db4a804ab2b10bc68_9.jar
deleted file mode 100644
index e9014b2..0000000
Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/8ad6f3fde0bfa215fd05f5ab318490c627ae1c5e6df4b35db4a804ab2b10bc68_9.jar and /dev/null differ
diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/login/UserListAdapter.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/login/UserListAdapter.dex
new file mode 100644
index 0000000..1df25bd
Binary files /dev/null and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/login/UserListAdapter.dex differ
diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/login/UserManagementActivity.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/login/UserManagementActivity.dex
new file mode 100644
index 0000000..dd69fcf
Binary files /dev/null and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/login/UserManagementActivity.dex differ
diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/ColorPickerDialog$OnColorSelectedListener.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/ColorPickerDialog$OnColorSelectedListener.dex
new file mode 100644
index 0000000..4249a01
Binary files /dev/null and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/ColorPickerDialog$OnColorSelectedListener.dex differ
diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/ColorPickerDialog.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/ColorPickerDialog.dex
new file mode 100644
index 0000000..a7ebb3d
Binary files /dev/null and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/ColorPickerDialog.dex differ
diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LockPatternView$1.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LockPatternView$1.dex
index b999266..356a1c7 100644
Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LockPatternView$1.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LockPatternView$1.dex differ
diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LockPatternView$2.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LockPatternView$2.dex
index 5174cb8..998ecd4 100644
Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LockPatternView$2.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LockPatternView$2.dex differ
diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LockPatternView$OnPatternListener.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LockPatternView$OnPatternListener.dex
index c811c5a..a31a99e 100644
Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LockPatternView$OnPatternListener.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LockPatternView$OnPatternListener.dex differ
diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LockPatternView$Point.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LockPatternView$Point.dex
index 5ce9472..31cfd5b 100644
Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LockPatternView$Point.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LockPatternView$Point.dex differ
diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LockPatternView.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LockPatternView.dex
index 87881ab..d4e75b4 100644
Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LockPatternView.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LockPatternView.dex differ
diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$9.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$9.dex
new file mode 100644
index 0000000..2a2e041
Binary files /dev/null and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$9.dex differ
diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteGesturePasswordActivity$1.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteGesturePasswordActivity$1.dex
index 8c2a4ab..f71ec7b 100644
Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteGesturePasswordActivity$1.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteGesturePasswordActivity$1.dex differ
diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteGesturePasswordActivity.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteGesturePasswordActivity.dex
index 84bd49f..4c0f5f1 100644
Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteGesturePasswordActivity.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteGesturePasswordActivity.dex differ
diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteGestureVerifyActivity$1.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteGestureVerifyActivity$1.dex
index 2d9fc8b..1d65a11 100644
Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteGestureVerifyActivity$1.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteGestureVerifyActivity$1.dex differ
diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteGestureVerifyActivity.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteGestureVerifyActivity.dex
index 117512c..c4e7c20 100644
Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteGestureVerifyActivity.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteGestureVerifyActivity.dex differ
diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/RichEditText.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/RichEditText.dex
new file mode 100644
index 0000000..e86bb4e
Binary files /dev/null and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/RichEditText.dex differ
diff --git a/Src/app/build/intermediates/runtime_symbol_list/debug/R.txt b/Src/app/build/intermediates/runtime_symbol_list/debug/R.txt
index 02cf281..cc8ba39 100644
--- a/Src/app/build/intermediates/runtime_symbol_list/debug/R.txt
+++ b/Src/app/build/intermediates/runtime_symbol_list/debug/R.txt
@@ -4,6 +4,7 @@ int color background_color 0x7f020000
 int color button_color 0x7f020001
 int color button_text_color 0x7f020002
 <<<<<<< HEAD
+<<<<<<< HEAD
 int color hint_color 0x7f020003
 int color primary_text_dark 0x7f020004
 int color secondary_text_dark 0x7f020005
@@ -35,6 +36,33 @@ int color text_color 0x7f020008
 int color text_color_state_list 0x7f020009
 int color user_query_highlight 0x7f02000a
 >>>>>>> a
+=======
+int color gesture_background 0x7f020003
+int color gesture_button_background 0x7f020004
+int color gesture_button_ripple 0x7f020005
+int color gesture_button_text 0x7f020006
+int color gesture_error_color 0x7f020007
+int color gesture_hint_color 0x7f020008
+int color gesture_icon_color 0x7f020009
+int color gesture_line_error 0x7f02000a
+int color gesture_line_normal 0x7f02000b
+int color gesture_link_color 0x7f02000c
+int color gesture_panel_background 0x7f02000d
+int color gesture_panel_border 0x7f02000e
+int color gesture_point_error 0x7f02000f
+int color gesture_point_normal 0x7f020010
+int color gesture_point_selected 0x7f020011
+int color gesture_success_color 0x7f020012
+int color gesture_text_color 0x7f020013
+int color hint_color 0x7f020014
+int color primary_text_dark 0x7f020015
+int color secondary_text_dark 0x7f020016
+int color text_color 0x7f020017
+int color text_color_state_list 0x7f020018
+int color toolbar_background 0x7f020019
+int color toolbar_button_selected 0x7f02001a
+int color user_query_highlight 0x7f02001b
+>>>>>>> a
 int dimen text_font_size_large 0x7f030000
 int dimen text_font_size_medium 0x7f030001
 int dimen text_font_size_normal 0x7f030002
@@ -64,6 +92,7 @@ int drawable font_size_selector_bg 0x7f040014
 int drawable font_small 0x7f040015
 int drawable font_super 0x7f040016
 <<<<<<< HEAD
+<<<<<<< HEAD
 int drawable ic_audio 0x7f040017
 =======
 int drawable gesture_background 0x7f040047
@@ -119,6 +148,67 @@ int drawable widget_4x_green 0x7f040043
 int drawable widget_4x_red 0x7f040044
 int drawable widget_4x_white 0x7f040045
 int drawable widget_4x_yellow 0x7f040046
+=======
+int drawable gesture_background 0x7f040017
+int drawable gesture_button_background 0x7f040018
+int drawable gesture_panel_background 0x7f040019
+int drawable ic_audio 0x7f04001a
+int drawable ic_delete 0x7f04001b
+int drawable ic_format_bold 0x7f04001c
+int drawable ic_format_bullet 0x7f04001d
+int drawable ic_format_color 0x7f04001e
+int drawable ic_format_italic 0x7f04001f
+int drawable ic_format_strikethrough 0x7f040020
+int drawable ic_format_underline 0x7f040021
+int drawable ic_lock_outline 0x7f040022
+int drawable ic_warning 0x7f040023
+int drawable icon_app 0x7f040024
+int drawable list_background 0x7f040025
+int drawable list_blue_down 0x7f040026
+int drawable list_blue_middle 0x7f040027
+int drawable list_blue_single 0x7f040028
+int drawable list_blue_up 0x7f040029
+int drawable list_folder 0x7f04002a
+int drawable list_footer_bg 0x7f04002b
+int drawable list_green_down 0x7f04002c
+int drawable list_green_middle 0x7f04002d
+int drawable list_green_single 0x7f04002e
+int drawable list_green_up 0x7f04002f
+int drawable list_red_down 0x7f040030
+int drawable list_red_middle 0x7f040031
+int drawable list_red_single 0x7f040032
+int drawable list_red_up 0x7f040033
+int drawable list_white_down 0x7f040034
+int drawable list_white_middle 0x7f040035
+int drawable list_white_single 0x7f040036
+int drawable list_white_up 0x7f040037
+int drawable list_yellow_down 0x7f040038
+int drawable list_yellow_middle 0x7f040039
+int drawable list_yellow_single 0x7f04003a
+int drawable list_yellow_up 0x7f04003b
+int drawable menu_delete 0x7f04003c
+int drawable menu_move 0x7f04003d
+int drawable new_note 0x7f04003e
+int drawable new_note_normal 0x7f04003f
+int drawable new_note_pressed 0x7f040040
+int drawable note_edit_color_selector_panel 0x7f040041
+int drawable notification 0x7f040042
+int drawable search_result 0x7f040043
+int drawable selected 0x7f040044
+int drawable title_alert 0x7f040045
+int drawable title_bar_bg 0x7f040046
+int drawable toast_background 0x7f040047
+int drawable widget_2x_blue 0x7f040048
+int drawable widget_2x_green 0x7f040049
+int drawable widget_2x_red 0x7f04004a
+int drawable widget_2x_white 0x7f04004b
+int drawable widget_2x_yellow 0x7f04004c
+int drawable widget_4x_blue 0x7f04004d
+int drawable widget_4x_green 0x7f04004e
+int drawable widget_4x_red 0x7f04004f
+int drawable widget_4x_white 0x7f040050
+int drawable widget_4x_yellow 0x7f040051
+>>>>>>> a
 int id account_dialog_subtitle 0x7f050000
 int id account_dialog_title 0x7f050001
 int id action_select_all 0x7f050002
@@ -128,6 +218,7 @@ int id btnBackToLogin 0x7f050005
 int id btnLogin 0x7f050006
 int id btnRegister 0x7f050007
 <<<<<<< HEAD
+<<<<<<< HEAD
 int id btn_logout 0x7f050008
 int id btn_new_note 0x7f050009
 int id btn_set_bg_color 0x7f05000a
@@ -309,6 +400,128 @@ int layout settings_header 0x7f06000f
 int layout widget_2x 0x7f060010
 int layout widget_4x 0x7f060011
 >>>>>>> a
+=======
+int id btn_add_user 0x7f050008
+int id btn_bold 0x7f050009
+int id btn_bullet 0x7f05000a
+int id btn_confirm 0x7f05000b
+int id btn_confirm_add_user 0x7f05000c
+int id btn_delete_image 0x7f05000d
+int id btn_delete_user 0x7f05000e
+int id btn_italic 0x7f05000f
+int id btn_logout 0x7f050010
+int id btn_new_note 0x7f050011
+int id btn_set_bg_color 0x7f050012
+int id btn_strikethrough 0x7f050013
+int id btn_text_color 0x7f050014
+int id btn_underline 0x7f050015
+int id cb_edit_item 0x7f050016
+int id date 0x7f050017
+int id delete 0x7f050018
+int id dialog_title 0x7f050019
+int id etLoginPassword 0x7f05001a
+int id etLoginUsername 0x7f05001b
+int id etPassword 0x7f05001c
+int id etUsername 0x7f05001d
+int id et_edit_text 0x7f05001e
+int id et_foler_name 0x7f05001f
+int id font_size_selector 0x7f050020
+int id gesture_status 0x7f050021
+int id hour 0x7f050022
+int id imageView 0x7f050023
+int id input_password 0x7f050024
+int id input_username 0x7f050025
+int id iv_alert_icon 0x7f050026
+int id iv_bg_blue 0x7f050027
+int id iv_bg_blue_select 0x7f050028
+int id iv_bg_green 0x7f050029
+int id iv_bg_green_select 0x7f05002a
+int id iv_bg_red 0x7f05002b
+int id iv_bg_red_select 0x7f05002c
+int id iv_bg_white 0x7f05002d
+int id iv_bg_white_select 0x7f05002e
+int id iv_bg_yellow 0x7f05002f
+int id iv_bg_yellow_select 0x7f050030
+int id iv_large_select 0x7f050031
+int id iv_lock_icon 0x7f050032
+int id iv_medium_select 0x7f050033
+int id iv_small_select 0x7f050034
+int id iv_super_select 0x7f050035
+int id list_view_users 0x7f050036
+int id ll_font_large 0x7f050037
+int id ll_font_normal 0x7f050038
+int id ll_font_small 0x7f050039
+int id ll_font_super 0x7f05003a
+int id lock_pattern_view 0x7f05003b
+int id menu_alert 0x7f05003c
+int id menu_delete 0x7f05003d
+int id menu_delete_remind 0x7f05003e
+int id menu_export_text 0x7f05003f
+int id menu_font_size 0x7f050040
+int id menu_list_mode 0x7f050041
+int id menu_manage_users 0x7f050042
+int id menu_new_folder 0x7f050043
+int id menu_new_note 0x7f050044
+int id menu_search 0x7f050045
+int id menu_send_to_desktop 0x7f050046
+int id menu_set_gesture 0x7f050047
+int id menu_setting 0x7f050048
+int id menu_share 0x7f050049
+int id menu_sync 0x7f05004a
+int id minute 0x7f05004b
+int id move 0x7f05004c
+int id navigation_bar 0x7f05004d
+int id note_bg_color_selector 0x7f05004e
+int id note_edit_list 0x7f05004f
+int id note_edit_view 0x7f050050
+int id note_item 0x7f050051
+int id note_title 0x7f050052
+int id notes_list 0x7f050053
+int id prefenerece_sync_status_textview 0x7f050054
+int id preference_sync_button 0x7f050055
+int id record_audio_btn 0x7f050056
+int id selection_menu 0x7f050057
+int id speech_to_text_btn 0x7f050058
+int id sv_note_edit 0x7f050059
+int id textView 0x7f05005a
+int id text_username 0x7f05005b
+int id title_user_management 0x7f05005c
+int id toolbar 0x7f05005d
+int id tvLoginTitle 0x7f05005e
+int id tvRegisterTitle 0x7f05005f
+int id tv_alert_date 0x7f050060
+int id tv_folder_name 0x7f050061
+int id tv_forgot_pattern 0x7f050062
+int id tv_modified_date 0x7f050063
+int id tv_name 0x7f050064
+int id tv_time 0x7f050065
+int id tv_title 0x7f050066
+int id tv_title_bar 0x7f050067
+int id widget_bg_image 0x7f050068
+int id widget_text 0x7f050069
+int layout account_dialog_title 0x7f060000
+int layout activity_login 0x7f060001
+int layout activity_register 0x7f060002
+int layout activity_user_management 0x7f060003
+int layout add_account_text 0x7f060004
+int layout datetime_picker 0x7f060005
+int layout dialog_add_user 0x7f060006
+int layout dialog_edit_text 0x7f060007
+int layout folder_list_item 0x7f060008
+int layout item_user 0x7f060009
+int layout layout_custom_toast 0x7f06000a
+int layout note_edit 0x7f06000b
+int layout note_edit_list_item 0x7f06000c
+int layout note_gesture_password 0x7f06000d
+int layout note_gesture_verify 0x7f06000e
+int layout note_item 0x7f06000f
+int layout note_list 0x7f060010
+int layout note_list_dropdown_menu 0x7f060011
+int layout note_list_footer 0x7f060012
+int layout settings_header 0x7f060013
+int layout widget_2x 0x7f060014
+int layout widget_4x 0x7f060015
+>>>>>>> a
 int menu call_note_edit 0x7f070000
 int menu call_record_folder 0x7f070001
 int menu note_edit 0x7f070002
@@ -328,6 +541,7 @@ int string app_widget4x4 0x7f0a0006
 int string button_delete 0x7f0a0007
 int string call_record_folder_name 0x7f0a0008
 <<<<<<< HEAD
+<<<<<<< HEAD
 int string datetime_dialog_cancel 0x7f0a0009
 int string datetime_dialog_ok 0x7f0a000a
 int string delete_remind_time_message 0x7f0a000b
@@ -548,6 +762,138 @@ int style TextAppearancePrimaryItem 0x7f0b0008
 int style TextAppearanceSecondaryItem 0x7f0b0009
 int style TextAppearanceSuper 0x7f0b000a
 int style TextAppearanceUnderMenuIcon 0x7f0b000b
+=======
+int string cancel 0x7f0a0009
+int string confirm_gesture 0x7f0a000a
+int string confirm_gesture_pattern 0x7f0a000b
+int string datetime_dialog_cancel 0x7f0a000c
+int string datetime_dialog_ok 0x7f0a000d
+int string delete_remind_time_message 0x7f0a000e
+int string error_note_empty_for_clock 0x7f0a000f
+int string error_note_empty_for_send_to_desktop 0x7f0a0010
+int string error_note_not_exist 0x7f0a0011
+int string error_sdcard_export 0x7f0a0012
+int string error_sdcard_unmounted 0x7f0a0013
+int string error_sync_cancelled 0x7f0a0014
+int string error_sync_internal 0x7f0a0015
+int string error_sync_network 0x7f0a0016
+int string failed_sdcard_export 0x7f0a0017
+int string file_name_txt_format 0x7f0a0018
+int string file_path 0x7f0a0019
+int string folder_exist 0x7f0a001a
+int string format_bold 0x7f0a001b
+int string format_bullet 0x7f0a001c
+int string format_date_ymd 0x7f0a001d
+int string format_datetime_mdhm 0x7f0a001e
+int string format_exported_file_location 0x7f0a001f
+int string format_folder_files_count 0x7f0a0020
+int string format_italic 0x7f0a0021
+int string format_move_notes_to_folder 0x7f0a0022
+int string format_strikethrough 0x7f0a0023
+int string format_text_color 0x7f0a0024
+int string format_underline 0x7f0a0025
+int string gesture_forgot_message 0x7f0a0026
+int string gesture_forgot_pattern 0x7f0a0027
+int string gesture_forgot_title 0x7f0a0028
+int string gesture_instruction 0x7f0a0029
+int string gesture_matched 0x7f0a002a
+int string gesture_not_matched 0x7f0a002b
+int string gesture_password_set 0x7f0a002c
+int string gesture_too_short 0x7f0a002d
+int string gesture_verify_error 0x7f0a002e
+int string gesture_verify_fail_max 0x7f0a002f
+int string gesture_verify_fail_tries 0x7f0a0030
+int string gesture_verify_hint 0x7f0a0031
+int string gesture_verify_success 0x7f0a0032
+int string hint_foler_name 0x7f0a0033
+int string info_note_enter_desktop 0x7f0a0034
+int string menu_alert 0x7f0a0035
+int string menu_create_folder 0x7f0a0036
+int string menu_delete 0x7f0a0037
+int string menu_deselect_all 0x7f0a0038
+int string menu_export_text 0x7f0a0039
+int string menu_folder_change_name 0x7f0a003a
+int string menu_folder_delete 0x7f0a003b
+int string menu_folder_view 0x7f0a003c
+int string menu_font_large 0x7f0a003d
+int string menu_font_normal 0x7f0a003e
+int string menu_font_size 0x7f0a003f
+int string menu_font_small 0x7f0a0040
+int string menu_font_super 0x7f0a0041
+int string menu_list_mode 0x7f0a0042
+int string menu_move 0x7f0a0043
+int string menu_move_parent_folder 0x7f0a0044
+int string menu_normal_mode 0x7f0a0045
+int string menu_remove_remind 0x7f0a0046
+int string menu_search 0x7f0a0047
+int string menu_select_all 0x7f0a0048
+int string menu_select_none 0x7f0a0049
+int string menu_select_title 0x7f0a004a
+int string menu_send_to_desktop 0x7f0a004b
+int string menu_set_gesture 0x7f0a004c
+int string menu_setting 0x7f0a004d
+int string menu_share 0x7f0a004e
+int string menu_sync 0x7f0a004f
+int string menu_sync_cancel 0x7f0a0050
+int string menu_title_select_folder 0x7f0a0051
+int string note_alert_expired 0x7f0a0052
+int string note_link_email 0x7f0a0053
+int string note_link_other 0x7f0a0054
+int string note_link_tel 0x7f0a0055
+int string note_link_web 0x7f0a0056
+int string notealert_enter 0x7f0a0057
+int string notealert_ok 0x7f0a0058
+int string notelist_menu_new 0x7f0a0059
+int string notelist_string_info 0x7f0a005a
+int string ok 0x7f0a005b
+int string preferences_account_summary 0x7f0a005c
+int string preferences_account_title 0x7f0a005d
+int string preferences_add_account 0x7f0a005e
+int string preferences_bg_random_appear_title 0x7f0a005f
+int string preferences_button_sync_cancel 0x7f0a0060
+int string preferences_button_sync_immediately 0x7f0a0061
+int string preferences_dialog_change_account_title 0x7f0a0062
+int string preferences_dialog_change_account_warn_msg 0x7f0a0063
+int string preferences_dialog_select_account_tips 0x7f0a0064
+int string preferences_dialog_select_account_title 0x7f0a0065
+int string preferences_last_sync_time 0x7f0a0066
+int string preferences_last_sync_time_format 0x7f0a0067
+int string preferences_menu_cancel 0x7f0a0068
+int string preferences_menu_change_account 0x7f0a0069
+int string preferences_menu_remove_account 0x7f0a006a
+int string preferences_title 0x7f0a006b
+int string preferences_toast_cannot_change_account 0x7f0a006c
+int string preferences_toast_success_set_accout 0x7f0a006d
+int string search 0x7f0a006e
+int string search_hint 0x7f0a006f
+int string search_label 0x7f0a0070
+int string search_setting_description 0x7f0a0071
+int string set_remind_time_message 0x7f0a0072
+int string success_sdcard_export 0x7f0a0073
+int string success_sync_account 0x7f0a0074
+int string sync_progress_init_list 0x7f0a0075
+int string sync_progress_login 0x7f0a0076
+int string sync_progress_syncing 0x7f0a0077
+int string ticker_cancel 0x7f0a0078
+int string ticker_fail 0x7f0a0079
+int string ticker_success 0x7f0a007a
+int string ticker_syncing 0x7f0a007b
+int string widget_havenot_content 0x7f0a007c
+int string widget_under_visit_mode 0x7f0a007d
+int style CustomEditTextStyle 0x7f0b0000
+int style GestureVerifyTheme 0x7f0b0001
+int style HighlightTextAppearancePrimary 0x7f0b0002
+int style HighlightTextAppearanceSecondary 0x7f0b0003
+int style NoteActionBarStyle 0x7f0b0004
+int style NoteTheme 0x7f0b0005
+int style TextAppearanceLarge 0x7f0b0006
+int style TextAppearanceMedium 0x7f0b0007
+int style TextAppearanceNormal 0x7f0b0008
+int style TextAppearancePrimaryItem 0x7f0b0009
+int style TextAppearanceSecondaryItem 0x7f0b000a
+int style TextAppearanceSuper 0x7f0b000b
+int style TextAppearanceUnderMenuIcon 0x7f0b000c
+>>>>>>> a
 int xml preferences 0x7f0c0000
 int xml searchable 0x7f0c0001
 int xml widget_2x_info 0x7f0c0002
diff --git a/Src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/Src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
index e4ab46b..a61febd 100644
--- a/Src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
+++ b/Src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
@@ -1,6 +1,18 @@
-net.micode.notes:string/gesture_verify_success = 0x7f0a0076
-net.micode.notes:color/gesture_link_color = 0x7f020014
+net.micode.notes:layout/activity_user_management = 0x7f060013
+net.micode.notes:id/menu_manage_users = 0x7f050063
+net.micode.notes:id/list_view_users = 0x7f050062
+net.micode.notes:id/input_username = 0x7f050061
+net.micode.notes:id/input_password = 0x7f050060
+net.micode.notes:id/btn_add_user = 0x7f05005e
+net.micode.notes:string/format_move_notes_to_folder = 0x7f0a0022
+net.micode.notes:style/TextAppearanceLarge = 0x7f0b0006
+net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a0060
+net.micode.notes:string/preferences_menu_change_account = 0x7f0a0069
+net.micode.notes:style/NoteActionBarStyle = 0x7f0b0004
+net.micode.notes:string/menu_create_folder = 0x7f0a0036
+net.micode.notes:id/menu_share = 0x7f050041
 net.micode.notes:layout/layout_custom_toast = 0x7f060007
+<<<<<<< HEAD
 net.micode.notes:color/gesture_button_ripple = 0x7f02000d
 net.micode.notes:string/gesture_verify_error = 0x7f0a0075
 net.micode.notes:string/gesture_verify_fail_tries = 0x7f0a006f
@@ -661,12 +673,388 @@ net.micode.notes:id/iv_bg_red_select = 0x7f050020
 net.micode.notes:id/tv_title_bar = 0x7f050050
 net.micode.notes:color/text_color = 0x7f020008
 net.micode.notes:id/navigation_bar = 0x7f05003c
+=======
+net.micode.notes:string/menu_move = 0x7f0a0043
+net.micode.notes:menu/note_edit = 0x7f070002
+net.micode.notes:string/preferences_menu_remove_account = 0x7f0a006a
+net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a0063
+net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0002
+net.micode.notes:string/menu_sync = 0x7f0a004f
+net.micode.notes:layout/dialog_edit_text = 0x7f060005
+net.micode.notes:string/sync_progress_syncing = 0x7f0a0077
+net.micode.notes:string/menu_deselect_all = 0x7f0a0038
+net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a0065
+net.micode.notes:string/format_folder_files_count = 0x7f0a0020
+net.micode.notes:string/delete_remind_time_message = 0x7f0a000e
+net.micode.notes:style/TextAppearanceNormal = 0x7f0b0008
+net.micode.notes:layout/add_account_text = 0x7f060003
+net.micode.notes:string/preferences_title = 0x7f0a006b
+net.micode.notes:string/format_underline = 0x7f0a0025
+net.micode.notes:id/tv_folder_name = 0x7f050055
+net.micode.notes:string/search_label = 0x7f0a0070
+net.micode.notes:string/datetime_dialog_cancel = 0x7f0a000c
+net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b000a
+net.micode.notes:string/notelist_menu_new = 0x7f0a0059
+net.micode.notes:menu/sub_folder = 0x7f070006
+net.micode.notes:string/menu_share = 0x7f0a004e
+net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0003
+net.micode.notes:string/ticker_cancel = 0x7f0a0078
+net.micode.notes:string/ok = 0x7f0a005b
+net.micode.notes:string/notealert_ok = 0x7f0a0058
+net.micode.notes:string/app_widget4x4 = 0x7f0a0006
+net.micode.notes:string/note_link_web = 0x7f0a0056
+net.micode.notes:string/note_link_tel = 0x7f0a0055
+net.micode.notes:id/widget_text = 0x7f05005d
+net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002
+net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a006c
+net.micode.notes:string/note_link_email = 0x7f0a0053
+net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000f
+net.micode.notes:string/menu_list_mode = 0x7f0a0042
+net.micode.notes:string/note_alert_expired = 0x7f0a0052
+net.micode.notes:string/note_link_other = 0x7f0a0054
+net.micode.notes:string/file_path = 0x7f0a0019
+net.micode.notes:string/format_strikethrough = 0x7f0a0023
+net.micode.notes:string/ticker_syncing = 0x7f0a007b
+net.micode.notes:string/menu_export_text = 0x7f0a0039
+net.micode.notes:layout/activity_login = 0x7f060001
+net.micode.notes:layout/note_list = 0x7f06000d
+net.micode.notes:string/menu_set_gesture = 0x7f0a004c
+net.micode.notes:xml/widget_4x_info = 0x7f0c0003
+net.micode.notes:string/menu_normal_mode = 0x7f0a0045
+net.micode.notes:style/TextAppearanceMedium = 0x7f0b0007
+net.micode.notes:string/menu_select_none = 0x7f0a0049
+net.micode.notes:id/menu_send_to_desktop = 0x7f05003e
+net.micode.notes:string/widget_under_visit_mode = 0x7f0a007d
+net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a006d
+net.micode.notes:string/gesture_verify_fail_tries = 0x7f0a0030
+net.micode.notes:string/gesture_verify_error = 0x7f0a002e
+net.micode.notes:id/btn_set_bg_color = 0x7f05000f
+net.micode.notes:string/menu_folder_change_name = 0x7f0a003a
+net.micode.notes:string/gesture_forgot_pattern = 0x7f0a0027
+net.micode.notes:string/menu_remove_remind = 0x7f0a0046
+net.micode.notes:string/menu_move_parent_folder = 0x7f0a0044
+net.micode.notes:string/format_italic = 0x7f0a0021
+net.micode.notes:string/success_sdcard_export = 0x7f0a0073
+net.micode.notes:string/notelist_string_info = 0x7f0a005a
+net.micode.notes:string/format_datetime_mdhm = 0x7f0a001e
+net.micode.notes:string/format_date_ymd = 0x7f0a001d
+net.micode.notes:string/format_bullet = 0x7f0a001c
+net.micode.notes:string/datetime_dialog_ok = 0x7f0a000d
+net.micode.notes:layout/note_edit = 0x7f060008
+net.micode.notes:id/notes_list = 0x7f05004b
+net.micode.notes:string/widget_havenot_content = 0x7f0a007c
+net.micode.notes:string/confirm_gesture = 0x7f0a000a
+net.micode.notes:xml/preferences = 0x7f0c0000
+net.micode.notes:string/gesture_not_matched = 0x7f0a002b
+net.micode.notes:string/failed_sdcard_export = 0x7f0a0017
+net.micode.notes:id/tv_title_bar = 0x7f05005b
+net.micode.notes:string/notealert_enter = 0x7f0a0057
+net.micode.notes:string/error_note_not_exist = 0x7f0a0011
+net.micode.notes:id/menu_new_folder = 0x7f05003b
+net.micode.notes:string/set_remind_time_message = 0x7f0a0072
+net.micode.notes:string/error_sync_network = 0x7f0a0016
+net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0013
+net.micode.notes:id/speech_to_text_btn = 0x7f050050
+net.micode.notes:string/app_widget2x2 = 0x7f0a0005
+net.micode.notes:string/menu_select_title = 0x7f0a004a
+net.micode.notes:string/alert_title_delete = 0x7f0a0003
+net.micode.notes:string/gesture_verify_success = 0x7f0a0032
+net.micode.notes:xml/widget_2x_info = 0x7f0c0002
+net.micode.notes:layout/datetime_picker = 0x7f060004
+net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000
+net.micode.notes:string/sync_progress_init_list = 0x7f0a0075
+net.micode.notes:string/format_exported_file_location = 0x7f0a001f
+net.micode.notes:string/menu_font_normal = 0x7f0a003e
+net.micode.notes:raw/introduction = 0x7f090000
+net.micode.notes:menu/note_list_dropdown = 0x7f070004
+net.micode.notes:string/app_name = 0x7f0a0004
+net.micode.notes:menu/note_list = 0x7f070003
+net.micode.notes:style/CustomEditTextStyle = 0x7f0b0000
+net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a005f
+net.micode.notes:layout/widget_2x = 0x7f060011
+net.micode.notes:id/etLoginUsername = 0x7f050017
+net.micode.notes:string/format_bold = 0x7f0a001b
+net.micode.notes:string/ticker_success = 0x7f0a007a
+net.micode.notes:layout/note_gesture_password = 0x7f06000a
+>>>>>>> a
 net.micode.notes:layout/note_edit_list_item = 0x7f060009
 net.micode.notes:layout/account_dialog_title = 0x7f060000
-net.micode.notes:array/format_for_exported_note = 0x7f010000
-net.micode.notes:layout/note_gesture_password = 0x7f06000a
-net.micode.notes:drawable/list_yellow_middle = 0x7f04002e
-net.micode.notes:color/button_color = 0x7f020001
+net.micode.notes:layout/folder_list_item = 0x7f060006
+net.micode.notes:string/menu_search = 0x7f0a0047
+net.micode.notes:id/tv_modified_date = 0x7f050057
+net.micode.notes:id/tv_forgot_pattern = 0x7f050056
+net.micode.notes:color/gesture_icon_color = 0x7f020009
+net.micode.notes:id/menu_search = 0x7f05003d
+net.micode.notes:id/tv_name = 0x7f050058
+net.micode.notes:id/toolbar = 0x7f050053
+net.micode.notes:string/menu_font_super = 0x7f0a0041
+net.micode.notes:id/textView = 0x7f050052
+net.micode.notes:string/error_sdcard_export = 0x7f0a0012
+net.micode.notes:id/preference_sync_button = 0x7f05004d
+net.micode.notes:id/menu_list_mode = 0x7f05003a
+net.micode.notes:id/iv_medium_select = 0x7f05002d
+net.micode.notes:id/menu_export_text = 0x7f050038
+net.micode.notes:string/menu_folder_view = 0x7f0a003c
+net.micode.notes:id/menu_delete = 0x7f050036
+net.micode.notes:layout/activity_register = 0x7f060002
+net.micode.notes:drawable/edit_blue = 0x7f040007
+net.micode.notes:id/prefenerece_sync_status_textview = 0x7f05004c
+net.micode.notes:id/menu_alert = 0x7f050035
+net.micode.notes:string/menu_font_size = 0x7f0a003f
+net.micode.notes:drawable/edit_title_yellow = 0x7f04000e
+net.micode.notes:string/menu_alert = 0x7f0a0035
+net.micode.notes:id/lock_pattern_view = 0x7f050034
+net.micode.notes:style/GestureVerifyTheme = 0x7f0b0001
+net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a0010
+net.micode.notes:id/record_audio_btn = 0x7f05004e
+net.micode.notes:id/date = 0x7f050014
+net.micode.notes:id/ll_font_super = 0x7f050033
+net.micode.notes:string/success_sync_account = 0x7f0a0074
+net.micode.notes:id/etLoginPassword = 0x7f050016
+net.micode.notes:id/ll_font_normal = 0x7f050031
+net.micode.notes:menu/call_record_folder = 0x7f070001
+net.micode.notes:id/ll_font_large = 0x7f050030
+net.micode.notes:string/gesture_forgot_message = 0x7f0a0026
+net.micode.notes:drawable/list_green_down = 0x7f04002c
+net.micode.notes:id/menu_new_note = 0x7f05003c
+net.micode.notes:id/iv_lock_icon = 0x7f05002c
+net.micode.notes:dimen/text_font_size_medium = 0x7f030001
+net.micode.notes:string/menu_setting = 0x7f0a004d
+net.micode.notes:id/iv_bg_yellow = 0x7f050029
+net.micode.notes:string/error_sync_cancelled = 0x7f0a0014
+net.micode.notes:id/iv_bg_white_select = 0x7f050028
+net.micode.notes:drawable/widget_4x_blue = 0x7f04004d
+net.micode.notes:id/iv_large_select = 0x7f05002b
+net.micode.notes:string/menu_font_large = 0x7f0a003d
+net.micode.notes:id/iv_bg_green_select = 0x7f050024
+net.micode.notes:id/widget_bg_image = 0x7f05005c
+net.micode.notes:id/amPm = 0x7f050004
+net.micode.notes:id/iv_bg_green = 0x7f050023
+net.micode.notes:layout/settings_header = 0x7f060010
+net.micode.notes:id/iv_bg_blue = 0x7f050021
+net.micode.notes:drawable/new_note_pressed = 0x7f040040
+net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040041
+net.micode.notes:id/hour = 0x7f05001e
+net.micode.notes:style/NoteTheme = 0x7f0b0005
+net.micode.notes:layout/dialog_add_user = 0x7f060014
+net.micode.notes:id/font_size_selector = 0x7f05001c
+net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a0064
+net.micode.notes:layout/note_gesture_verify = 0x7f06000b
+net.micode.notes:id/btn_bullet = 0x7f050009
+net.micode.notes:id/et_edit_text = 0x7f05001a
+net.micode.notes:string/hint_foler_name = 0x7f0a0033
+net.micode.notes:id/etUsername = 0x7f050019
+net.micode.notes:string/folder_exist = 0x7f0a001a
+net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0009
+net.micode.notes:id/ll_font_small = 0x7f050032
+net.micode.notes:id/etPassword = 0x7f050018
+net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000c
+net.micode.notes:id/delete = 0x7f050015
+net.micode.notes:string/search = 0x7f0a006e
+net.micode.notes:id/cb_edit_item = 0x7f050013
+net.micode.notes:string/gesture_forgot_title = 0x7f0a0028
+net.micode.notes:drawable/widget_2x_yellow = 0x7f04004c
+net.micode.notes:id/btn_text_color = 0x7f050011
+net.micode.notes:id/imageView = 0x7f05001f
+net.micode.notes:color/button_text_color = 0x7f020002
+net.micode.notes:id/btn_strikethrough = 0x7f050010
+net.micode.notes:id/menu_font_size = 0x7f050039
+net.micode.notes:string/search_hint = 0x7f0a006f
+net.micode.notes:id/btn_bold = 0x7f050008
+net.micode.notes:id/btn_new_note = 0x7f05000e
+net.micode.notes:layout/note_list_footer = 0x7f06000f
+net.micode.notes:drawable/list_red_single = 0x7f040032
+net.micode.notes:string/menu_send_to_desktop = 0x7f0a004b
+net.micode.notes:id/btn_delete_image = 0x7f05000b
+net.micode.notes:id/btn_confirm = 0x7f05000a
+net.micode.notes:id/btnRegister = 0x7f050007
+net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a0062
+net.micode.notes:drawable/menu_move = 0x7f04003d
+net.micode.notes:drawable/widget_4x_white = 0x7f040050
+net.micode.notes:id/btnLogin = 0x7f050006
+net.micode.notes:id/selection_menu = 0x7f05004f
+net.micode.notes:string/info_note_enter_desktop = 0x7f0a0034
+net.micode.notes:id/add_img_btn = 0x7f050003
+net.micode.notes:id/account_dialog_title = 0x7f050001
+net.micode.notes:id/account_dialog_subtitle = 0x7f050000
+net.micode.notes:id/iv_bg_blue_select = 0x7f050022
+net.micode.notes:color/gesture_panel_background = 0x7f02000d
+net.micode.notes:drawable/widget_4x_red = 0x7f04004f
+net.micode.notes:string/gesture_matched = 0x7f0a002a
+net.micode.notes:drawable/widget_4x_green = 0x7f04004e
+net.micode.notes:drawable/widget_2x_red = 0x7f04004a
+net.micode.notes:color/gesture_point_normal = 0x7f020010
+net.micode.notes:drawable/widget_2x_green = 0x7f040049
+net.micode.notes:id/tv_time = 0x7f050059
+net.micode.notes:drawable/widget_2x_blue = 0x7f040048
+net.micode.notes:drawable/title_bar_bg = 0x7f040046
+net.micode.notes:id/note_title = 0x7f05004a
+net.micode.notes:drawable/title_alert = 0x7f040045
+net.micode.notes:plurals/search_results_title = 0x7f080000
+net.micode.notes:dimen/text_font_size_super = 0x7f030004
+net.micode.notes:drawable/selected = 0x7f040044
+net.micode.notes:id/iv_super_select = 0x7f05002f
+net.micode.notes:drawable/search_result = 0x7f040043
+net.micode.notes:string/menu_title_select_folder = 0x7f0a0051
+net.micode.notes:string/menu_select_all = 0x7f0a0048
+net.micode.notes:drawable/toast_background = 0x7f040047
+net.micode.notes:drawable/gesture_button_background = 0x7f040018
+net.micode.notes:id/menu_set_gesture = 0x7f05003f
+net.micode.notes:string/gesture_instruction = 0x7f0a0029
+net.micode.notes:id/iv_bg_red_select = 0x7f050026
+net.micode.notes:id/sv_note_edit = 0x7f050051
+net.micode.notes:drawable/new_note = 0x7f04003e
+net.micode.notes:drawable/list_yellow_single = 0x7f04003a
+net.micode.notes:drawable/list_yellow_down = 0x7f040038
+net.micode.notes:layout/widget_4x = 0x7f060012
+net.micode.notes:color/gesture_line_normal = 0x7f02000b
+net.micode.notes:id/et_foler_name = 0x7f05001b
+net.micode.notes:drawable/edit_green = 0x7f040008
+net.micode.notes:drawable/clock = 0x7f040004
+net.micode.notes:drawable/list_white_up = 0x7f040037
+net.micode.notes:layout/note_item = 0x7f06000c
+net.micode.notes:drawable/list_white_single = 0x7f040036
+net.micode.notes:color/text_color_state_list = 0x7f020018
+net.micode.notes:color/user_query_highlight = 0x7f02001b
+net.micode.notes:drawable/list_white_down = 0x7f040034
+net.micode.notes:drawable/widget_4x_yellow = 0x7f040051
+net.micode.notes:drawable/list_red_up = 0x7f040033
+net.micode.notes:drawable/list_green_middle = 0x7f04002d
+net.micode.notes:string/menu_delete = 0x7f0a0037
+net.micode.notes:drawable/list_folder = 0x7f04002a
+net.micode.notes:drawable/list_blue_up = 0x7f040029
+net.micode.notes:string/search_setting_description = 0x7f0a0071
+net.micode.notes:drawable/list_blue_single = 0x7f040028
+net.micode.notes:drawable/ic_warning = 0x7f040023
+net.micode.notes:drawable/list_blue_middle = 0x7f040027
+net.micode.notes:color/gesture_point_error = 0x7f02000f
+net.micode.notes:string/gesture_password_set = 0x7f0a002c
+net.micode.notes:drawable/list_background = 0x7f040025
+net.micode.notes:drawable/icon_app = 0x7f040024
+net.micode.notes:id/btn_italic = 0x7f05000c
+net.micode.notes:id/btn_underline = 0x7f050012
+net.micode.notes:drawable/font_super = 0x7f040016
+net.micode.notes:id/menu_sync = 0x7f050042
+net.micode.notes:drawable/ic_format_underline = 0x7f040021
+net.micode.notes:drawable/call_record = 0x7f040003
+net.micode.notes:drawable/ic_lock_outline = 0x7f040022
+net.micode.notes:string/menu_font_small = 0x7f0a0040
+net.micode.notes:drawable/ic_format_strikethrough = 0x7f040020
+net.micode.notes:drawable/font_normal = 0x7f040013
+net.micode.notes:id/minute = 0x7f050043
+net.micode.notes:string/gesture_verify_hint = 0x7f0a0031
+net.micode.notes:dimen/text_font_size_normal = 0x7f030002
+net.micode.notes:drawable/ic_delete = 0x7f04001b
+net.micode.notes:style/TextAppearanceSuper = 0x7f0b000b
+net.micode.notes:menu/call_note_edit = 0x7f070000
+net.micode.notes:color/secondary_text_dark = 0x7f020016
+net.micode.notes:id/move = 0x7f050044
+net.micode.notes:id/iv_bg_yellow_select = 0x7f05002a
+net.micode.notes:color/gesture_error_color = 0x7f020007
+net.micode.notes:drawable/gesture_panel_background = 0x7f040019
+net.micode.notes:drawable/font_small = 0x7f040015
+net.micode.notes:string/menu_sync_cancel = 0x7f0a0050
+net.micode.notes:drawable/ic_audio = 0x7f04001a
+net.micode.notes:id/text_username = 0x7f050064
+net.micode.notes:color/primary_text_dark = 0x7f020015
+net.micode.notes:drawable/font_size_selector_bg = 0x7f040014
+net.micode.notes:string/call_record_folder_name = 0x7f0a0008
+net.micode.notes:drawable/list_green_up = 0x7f04002f
+net.micode.notes:id/btnBackToLogin = 0x7f050005
+net.micode.notes:color/gesture_link_color = 0x7f02000c
+net.micode.notes:drawable/font_large = 0x7f040012
+net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a0067
+net.micode.notes:id/note_edit_view = 0x7f050048
+net.micode.notes:drawable/edittext_background = 0x7f040011
+net.micode.notes:drawable/delete = 0x7f040005
+net.micode.notes:drawable/edit_yellow = 0x7f040010
+net.micode.notes:id/note_item = 0x7f050049
+net.micode.notes:menu/note_list_options = 0x7f070005
+net.micode.notes:id/iv_small_select = 0x7f05002e
+net.micode.notes:color/gesture_panel_border = 0x7f02000e
+net.micode.notes:string/preferences_account_title = 0x7f0a005d
+net.micode.notes:drawable/list_white_middle = 0x7f040035
+net.micode.notes:drawable/edit_white = 0x7f04000f
+net.micode.notes:drawable/edit_title_white = 0x7f04000d
+net.micode.notes:string/button_delete = 0x7f0a0007
+net.micode.notes:drawable/new_note_normal = 0x7f04003f
+net.micode.notes:xml/searchable = 0x7f0c0001
+net.micode.notes:string/menu_folder_delete = 0x7f0a003b
+net.micode.notes:string/gesture_too_short = 0x7f0a002d
+net.micode.notes:drawable/dropdown_icon = 0x7f040006
+net.micode.notes:drawable/list_yellow_up = 0x7f04003b
+net.micode.notes:id/note_bg_color_selector = 0x7f050046
+net.micode.notes:drawable/list_footer_bg = 0x7f04002b
+net.micode.notes:drawable/edit_title_green = 0x7f04000b
+net.micode.notes:string/preferences_add_account = 0x7f0a005e
+net.micode.notes:drawable/bg_btn_set_color = 0x7f040000
+net.micode.notes:color/gesture_hint_color = 0x7f020008
+net.micode.notes:string/cancel = 0x7f0a0009
+net.micode.notes:dimen/text_font_size_small = 0x7f030003
+net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a0061
+net.micode.notes:drawable/ic_format_italic = 0x7f04001f
+net.micode.notes:string/gesture_verify_fail_max = 0x7f0a002f
+net.micode.notes:id/iv_bg_red = 0x7f050025
+net.micode.notes:drawable/notification = 0x7f040042
+net.micode.notes:id/tv_alert_date = 0x7f050054
+net.micode.notes:dimen/text_font_size_large = 0x7f030000
+net.micode.notes:layout/item_user = 0x7f060015
+net.micode.notes:color/toolbar_button_selected = 0x7f02001a
+net.micode.notes:drawable/ic_format_color = 0x7f04001e
+net.micode.notes:color/toolbar_background = 0x7f020019
+net.micode.notes:drawable/edit_title_red = 0x7f04000c
+net.micode.notes:id/note_edit_list = 0x7f050047
+net.micode.notes:id/iv_alert_icon = 0x7f050020
+net.micode.notes:drawable/edit_red = 0x7f040009
+net.micode.notes:color/text_color = 0x7f020017
+net.micode.notes:id/menu_setting = 0x7f050040
+net.micode.notes:string/preferences_menu_cancel = 0x7f0a0068
+net.micode.notes:drawable/ic_format_bullet = 0x7f04001d
+net.micode.notes:id/iv_bg_white = 0x7f050027
+net.micode.notes:id/btn_delete_user = 0x7f05005f
+net.micode.notes:drawable/gesture_background = 0x7f040017
+net.micode.notes:id/btn_logout = 0x7f05000d
+net.micode.notes:drawable/button_background = 0x7f040002
+net.micode.notes:string/preferences_last_sync_time = 0x7f0a0066
+net.micode.notes:color/gesture_button_background = 0x7f020004
+net.micode.notes:color/gesture_text_color = 0x7f020013
+net.micode.notes:id/action_select_all = 0x7f050002
+net.micode.notes:color/gesture_point_selected = 0x7f020011
+net.micode.notes:layout/note_list_dropdown_menu = 0x7f06000e
+net.micode.notes:drawable/list_blue_down = 0x7f040026
+net.micode.notes:drawable/list_red_middle = 0x7f040031
+net.micode.notes:drawable/list_red_down = 0x7f040030
 net.micode.notes:string/alert_message_delete_note = 0x7f0a0001
+<<<<<<< HEAD
 net.micode.notes:drawable/list_green_single = 0x7f040023
 >>>>>>> a
+=======
+net.micode.notes:drawable/list_green_single = 0x7f04002e
+net.micode.notes:string/format_text_color = 0x7f0a0024
+net.micode.notes:id/tv_title = 0x7f05005a
+net.micode.notes:color/gesture_success_color = 0x7f020012
+net.micode.notes:string/preferences_account_summary = 0x7f0a005c
+net.micode.notes:color/gesture_line_error = 0x7f02000a
+net.micode.notes:array/format_for_exported_note = 0x7f010000
+net.micode.notes:drawable/ic_format_bold = 0x7f04001c
+net.micode.notes:color/gesture_background = 0x7f020003
+net.micode.notes:string/ticker_fail = 0x7f0a0079
+net.micode.notes:string/file_name_txt_format = 0x7f0a0018
+net.micode.notes:id/gesture_status = 0x7f05001d
+net.micode.notes:color/gesture_button_text = 0x7f020006
+net.micode.notes:color/gesture_button_ripple = 0x7f020005
+net.micode.notes:string/error_sync_internal = 0x7f0a0015
+net.micode.notes:drawable/menu_delete = 0x7f04003c
+net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001
+net.micode.notes:id/menu_delete_remind = 0x7f050037
+net.micode.notes:drawable/widget_2x_white = 0x7f04004b
+net.micode.notes:string/confirm_gesture_pattern = 0x7f0a000b
+net.micode.notes:color/hint_color = 0x7f020014
+net.micode.notes:string/sync_progress_login = 0x7f0a0076
+net.micode.notes:array/menu_share_ways = 0x7f010001
+net.micode.notes:drawable/edit_title_blue = 0x7f04000a
+net.micode.notes:id/navigation_bar = 0x7f050045
+net.micode.notes:color/background_color = 0x7f020000
+net.micode.notes:drawable/list_yellow_middle = 0x7f040039
+net.micode.notes:color/button_color = 0x7f020001
+>>>>>>> a
diff --git a/Src/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt b/Src/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt
index af0fec5..90b84f8 100644
--- a/Src/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt
+++ b/Src/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt
@@ -29,6 +29,8 @@ color primary_text_dark
 color secondary_text_dark
 color text_color
 color text_color_state_list
+color toolbar_background
+color toolbar_button_selected
 color user_query_highlight
 dimen text_font_size_large
 dimen text_font_size_medium
@@ -65,6 +67,13 @@ drawable gesture_background
 drawable gesture_button_background
 drawable gesture_panel_background
 drawable ic_audio
+drawable ic_delete
+drawable ic_format_bold
+drawable ic_format_bullet
+drawable ic_format_color
+drawable ic_format_italic
+drawable ic_format_strikethrough
+drawable ic_format_underline
 drawable ic_lock_outline
 >>>>>>> a
 drawable ic_warning
@@ -123,15 +132,30 @@ id btnBackToLogin
 id btnLogin
 id btnRegister
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+id btn_confirm
+>>>>>>> a
 =======
+id btn_add_user
+id btn_bold
+id btn_bullet
 id btn_confirm
+id btn_confirm_add_user
+id btn_delete_image
+id btn_delete_user
+id btn_italic
 >>>>>>> a
 id btn_logout
 id btn_new_note
 id btn_set_bg_color
+id btn_strikethrough
+id btn_text_color
+id btn_underline
 id cb_edit_item
 id date
 id delete
+id dialog_title
 id etLoginPassword
 id etLoginUsername
 id etPassword
@@ -145,6 +169,8 @@ id gesture_status
 >>>>>>> a
 id hour
 id imageView
+id input_password
+id input_username
 id iv_alert_icon
 id iv_bg_blue
 id iv_bg_blue_select
@@ -164,6 +190,7 @@ id iv_lock_icon
 id iv_medium_select
 id iv_small_select
 id iv_super_select
+id list_view_users
 id ll_font_large
 id ll_font_normal
 id ll_font_small
@@ -178,6 +205,7 @@ id menu_delete_remind
 id menu_export_text
 id menu_font_size
 id menu_list_mode
+id menu_manage_users
 id menu_new_folder
 id menu_new_note
 id menu_search
@@ -205,6 +233,11 @@ id selection_menu
 id speech_to_text_btn
 id sv_note_edit
 id textView
+id text_username
+id title_user_management
+id toolbar
+id tvLoginTitle
+id tvRegisterTitle
 id tv_alert_date
 id tv_folder_name
 <<<<<<< HEAD
@@ -221,10 +254,13 @@ id widget_text
 layout account_dialog_title
 layout activity_login
 layout activity_register
+layout activity_user_management
 layout add_account_text
 layout datetime_picker
+layout dialog_add_user
 layout dialog_edit_text
 layout folder_list_item
+layout item_user
 layout layout_custom_toast
 layout note_edit
 layout note_edit_list_item
@@ -279,13 +315,22 @@ string failed_sdcard_export
 string file_name_txt_format
 string file_path
 string folder_exist
+string format_bold
+string format_bullet
 string format_date_ymd
 string format_datetime_mdhm
 string format_exported_file_location
 string format_folder_files_count
+string format_italic
 string format_move_notes_to_folder
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
 =======
+string format_strikethrough
+string format_text_color
+string format_underline
+>>>>>>> a
 string gesture_forgot_message
 string gesture_forgot_pattern
 string gesture_forgot_title
diff --git a/Src/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk b/Src/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk
index 33e9842..fb29860 100644
Binary files a/Src/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk and b/Src/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk differ
diff --git a/Src/app/build/outputs/apk/debug/output-metadata.json b/Src/app/build/outputs/apk/debug/output-metadata.json
new file mode 100644
index 0000000..b2231b9
--- /dev/null
+++ b/Src/app/build/outputs/apk/debug/output-metadata.json
@@ -0,0 +1,20 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "net.micode.notes",
+  "variantName": "debug",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 1,
+      "versionName": "0.1",
+      "outputFile": "app-debug.apk"
+    }
+  ],
+  "elementType": "File"
+}
\ No newline at end of file
diff --git a/Src/app/build/outputs/logs/manifest-merger-debug-report.txt b/Src/app/build/outputs/logs/manifest-merger-debug-report.txt
index 1b5fd7c..f1d4f4d 100644
--- a/Src/app/build/outputs/logs/manifest-merger-debug-report.txt
+++ b/Src/app/build/outputs/logs/manifest-merger-debug-report.txt
@@ -1,6 +1,7 @@
 -- Merging decision tree log ---
 manifest
 <<<<<<< HEAD
+<<<<<<< HEAD
 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-138:12
 INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-138:12
 INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-138:12
@@ -18,6 +19,16 @@ MERGED from [com.alphacephei:vosk-android:0.3.38] D:\Notes\caches\transforms-3\5
 INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-146:12
 INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-146:12
 INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-146:12
+>>>>>>> a
+=======
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-148:12
+INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-148:12
+INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-148:12
+INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-148:12
+MERGED from [com.alphacephei:vosk-android:0.3.38] D:\Notes\caches\transforms-3\56c56b617d8c6655fd5dde2ec0086806\transformed\vosk-android-0.3.38\AndroidManifest.xml:2:1-9:12
+INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-148:12
+INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-148:12
+INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:2:1-148:12
 >>>>>>> a
 	package
 		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:4:5-31
@@ -65,9 +76,13 @@ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:15:5-81
 		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:15:22-78
 application
 <<<<<<< HEAD
+<<<<<<< HEAD
 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:17:5-137:19
 =======
 ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:17:5-145:19
+>>>>>>> a
+=======
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:17:5-147:19
 >>>>>>> a
 	android:label
 		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:19:9-41
@@ -257,137 +272,145 @@ ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:45:9-49:63
 		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:47:13-54
 	android:name
 		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:46:13-57
+activity#net.micode.notes.login.UserManagementActivity
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:51:9-65
+	android:name
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:51:19-63
 activity#net.micode.notes.ui.NoteEditActivity
-ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:51:9-77:20
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:53:9-79:20
 	android:launchMode
-		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:54:13-43
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:56:13-43
 	android:configChanges
-		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:53:13-74
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:55:13-74
 	android:theme
-		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:55:13-45
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:57:13-45
 	android:name
-		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:52:13-48
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:54:13-48
 intent-filter#action:name:android.intent.action.VIEW+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:\gitnote\notes\app\src\main\AndroidManifest.xml:56:13-63:29
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:58:13-65:29
 	android:scheme
-		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:57:17-38
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:59:17-38
 	tools:ignore
-		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:58:17-47
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:60:17-47
 action#android.intent.action.VIEW
-ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:59:17-69
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:61:17-69
 	android:name
-		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:59:25-66
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:61:25-66
 category#android.intent.category.DEFAULT
-ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:60:17-76
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:62:17-76
 	android:name
-		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:60:27-73
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:62:27-73
 data
-ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:61:17-78
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:63:17-78
 	android:mimeType
-		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:61:23-75
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:63: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:\gitnote\notes\app\src\main\AndroidManifest.xml:64:13-69:29
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:66:13-71:29
 action#android.intent.action.INSERT_OR_EDIT
-ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:65:17-79
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:67:17-79
 	android:name
-		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:65:25-76
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:67:25-76
 intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT
-ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:70:13-73:29
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:72:13-75:29
 action#android.intent.action.SEARCH
-ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:71:17-71
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:73:17-71
 	android:name
-		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:71:25-68
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:73:25-68
 meta-data#android.app.searchable
-ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:74:13-76:54
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:76:13-78:54
 	android:resource
-		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:76:17-51
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:78:17-51
 	android:name
-		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:75:17-54
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:77:17-54
 provider#net.micode.notes.data.NotesProvider
-ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:80:9-83:43
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:82:9-85:43
 	android:authorities
-		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:82:13-47
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:84:13-47
 	android:multiprocess
-		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:83:13-40
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:85:13-40
 	android:name
-		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:81:13-63
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:83:13-63
 receiver#net.micode.notes.widget.NoteWidgetProvider_2x
-ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:86:9-96:20
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:88:9-98:20
 	android:label
-		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:88:13-50
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:90:13-50
 	android:name
-		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:87:13-57
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:89:13-57
 intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE
-ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:89:13-92:29
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:91:13-94:29
 action#android.appwidget.action.APPWIDGET_UPDATE
-ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:90:17-84
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:92:17-84
 	android:name
-		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:90:25-81
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:92:25-81
 action#android.appwidget.action.APPWIDGET_DELETED
-ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:91:17-85
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:93:17-85
 	android:name
-		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:91:25-82
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:93:25-82
 meta-data#android.appwidget.provider
-ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:93:13-95:58
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:95:13-97:58
 	android:resource
-		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:95:17-55
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:97:17-55
 	android:name
-		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:94:17-58
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:96:17-58
 receiver#net.micode.notes.widget.NoteWidgetProvider_4x
-ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:98:9-108:20
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:100:9-110:20
 	android:label
-		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:100:13-50
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:102:13-50
 	android:name
-		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:99:13-57
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:101:13-57
 receiver#net.micode.notes.ui.AlarmInitReceiver
-ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:111:9-115:20
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:113:9-117:20
 	android:name
-		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:111:19-55
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:113:19-55
 intent-filter#action:name:android.intent.action.BOOT_COMPLETED
-ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:112:13-114:29
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:114:13-116:29
 action#android.intent.action.BOOT_COMPLETED
-ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:113:17-79
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:115:17-79
 	android:name
-		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:113:25-76
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:115:25-76
 receiver#net.micode.notes.ui.AlarmReceiver
-ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:118:9-120:41
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:120:9-122:41
 	android:process
-		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:120:13-38
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:122:13-38
 	android:name
-		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:119:13-61
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:121:13-61
 activity#net.micode.notes.ui.AlarmAlertActivity
-ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:123:9-127:87
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:125:9-129:87
 	android:label
-		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:125:13-45
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:127:13-45
 	android:launchMode
-		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:126:13-48
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:128:13-48
 	android:theme
-		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:127:13-75
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:129:13-75
 	android:name
-		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:124:13-50
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:126:13-50
 activity#net.micode.notes.ui.NotesPreferenceActivity
-ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:130:9-134:72
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:132:9-136:72
 	android:label
-		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:132:13-54
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:134:13-54
 	android:launchMode
-		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:133:13-43
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:135:13-43
 	android:theme
-		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:134:13-60
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:136:13-60
 	android:name
-		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:131:13-71
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:133:13-71
 service#net.micode.notes.gtask.remote.GTaskSyncService
-ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:137:9-139:40
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:139:9-141:40
 	android:exported
-		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:139:13-37
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:141:13-37
 	android:name
-		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:138:13-74
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:140:13-74
 meta-data#android.app.default_searchable
-ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:142:9-144:52
+ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:144:9-146:52
 	android:value
-		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:144:13-49
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:146:13-49
 	android:name
+<<<<<<< HEAD
 		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:143:13-58
 >>>>>>> a
+=======
+		ADDED from D:\gitnote\notes\app\src\main\AndroidManifest.xml:145:13-58
+>>>>>>> a
 uses-sdk
 INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml reason: use-sdk injection requested
 INJECTED from D:\gitnote\notes\app\src\main\AndroidManifest.xml
diff --git a/Src/app/src/main/AndroidManifest.xml b/Src/app/src/main/AndroidManifest.xml
index 924cb26..a370850 100644
--- a/Src/app/src/main/AndroidManifest.xml
+++ b/Src/app/src/main/AndroidManifest.xml
@@ -69,6 +69,8 @@
             android:theme="@style/GestureVerifyTheme"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateAlwaysHidden" />
+        <!-- 用户管理的Activity -->
+        <activity android:name=".login.UserManagementActivity"/>
         <!-- 编辑笔记的Activity -->
         <activity
             android:name=".ui.NoteEditActivity"
diff --git a/Src/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/Src/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
index 9a2b6ab..1807edb 100644
--- a/Src/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
+++ b/Src/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
@@ -7,6 +7,7 @@ package net.micode.notes.data;
 
 import android.content.ContentValues;
 import android.content.Context;
+import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.util.Log;
@@ -69,10 +70,14 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
                     NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +// 原始父ID
                     NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," +        // Google任务ID
                     NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0," +        // 笔记版本号
+<<<<<<< HEAD
                     NoteColumns.IMAGE_PATH + " TEXT," + // 新增列存储图片路径
 <<<<<<< HEAD
                     NoteColumns.AUDIO_PATH + " TEXT" + //新增列存储音频路径
 =======
+=======
+                    NoteColumns.IMAGE_PATH + " TEXT DEFAULT NULL," + // 新增列存储图片路径
+>>>>>>> a
                     NoteColumns.AUDIO_PATH + " TEXT," + //新增列存储音频路径
                     NoteColumns.GESTURE_PASSWORD + " TEXT" + // 新增手势密码字段
 >>>>>>> a
@@ -411,7 +416,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
             createUserTable(db); // 确保调用创建用户表的方法
         }
         if (oldVersion < 6) { // 增加照片路径新列
-            db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.IMAGE_PATH + " TEXT");
+            db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.IMAGE_PATH + " TEXT DEFAULT NULL");
         }
         if(oldVersion < 7){
             db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN "+ NoteColumns.USER_ID + "INTEGER NOT NULL DEFAULT -1");
@@ -486,5 +491,23 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION
                 + " INTEGER NOT NULL DEFAULT 0");
     }
+    public Cursor getAllUsers() {
+        SQLiteDatabase db = this.getReadableDatabase();
+        return db.query(TABLE.USER, null, null, null, null, null, null);
+    }
+
+    public long addUser(String username, String password) {
+        SQLiteDatabase db = this.getWritableDatabase();
+        ContentValues values = new ContentValues();
+        values.put(TABLE.USERNAME_COLUMN, username);
+        values.put(TABLE.PASSWORD_COLUMN, password);
+        return db.insert(TABLE.USER, null, values);
+    }
+
+    public int deleteUser(String username) {
+        SQLiteDatabase db = this.getWritableDatabase();
+        return db.delete(TABLE.USER, TABLE.USERNAME_COLUMN + "=?", new String[]{username});
+    }
+
 
 }
diff --git a/Src/app/src/main/java/net/micode/notes/login/UserListAdapter.java b/Src/app/src/main/java/net/micode/notes/login/UserListAdapter.java
new file mode 100644
index 0000000..2a24494
--- /dev/null
+++ b/Src/app/src/main/java/net/micode/notes/login/UserListAdapter.java
@@ -0,0 +1,69 @@
+package net.micode.notes.login;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.Button;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import net.micode.notes.R;
+import net.micode.notes.data.NotesDatabaseHelper;
+
+public class UserListAdapter extends BaseAdapter {
+
+    private Context context;
+    private Cursor cursor;
+    private NotesDatabaseHelper dbHelper;
+
+    public UserListAdapter(Context context, Cursor cursor, NotesDatabaseHelper dbHelper) {
+        this.context = context;
+        this.cursor = cursor;
+        this.dbHelper = dbHelper;
+    }
+
+    @Override
+    public int getCount() {
+        return cursor.getCount();
+    }
+
+    @Override
+    public Object getItem(int position) {
+        cursor.moveToPosition(position);
+        return cursor;
+    }
+
+    @Override
+    public long getItemId(int position) {
+        cursor.moveToPosition(position);
+        return cursor.getLong(cursor.getColumnIndex("id"));
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        if (convertView == null) {
+            convertView = LayoutInflater.from(context).inflate(R.layout.item_user, parent, false);
+        }
+
+        TextView usernameTextView = (TextView) convertView.findViewById(R.id.text_username);
+        Button deleteButton = (Button) convertView.findViewById(R.id.btn_delete_user);
+
+        if (cursor.moveToPosition(position)) {
+            String username = cursor.getString(cursor.getColumnIndex("username"));
+            usernameTextView.setText(username);
+
+            deleteButton.setOnClickListener(v -> {
+                dbHelper.deleteUser(username);
+                Toast.makeText(context, "用户已删除", Toast.LENGTH_SHORT).show();
+                cursor.requery(); // 刷新数据
+                notifyDataSetChanged(); // 更新列表
+            });
+        }
+
+        return convertView;
+    }
+}
+
diff --git a/Src/app/src/main/java/net/micode/notes/login/UserManagementActivity.java b/Src/app/src/main/java/net/micode/notes/login/UserManagementActivity.java
new file mode 100644
index 0000000..2f5bf2f
--- /dev/null
+++ b/Src/app/src/main/java/net/micode/notes/login/UserManagementActivity.java
@@ -0,0 +1,73 @@
+package net.micode.notes.login;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.ListView;
+import android.widget.Toast;
+
+
+
+import net.micode.notes.R;
+import net.micode.notes.data.NotesDatabaseHelper;
+
+public class UserManagementActivity extends Activity {
+
+    private NotesDatabaseHelper dbHelper;
+    private ListView userListView;
+    private UserListAdapter userListAdapter;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_user_management);
+
+        dbHelper = new NotesDatabaseHelper(this);
+
+        userListView = (ListView) findViewById(R.id.list_view_users);
+
+        loadUsers();
+
+        findViewById(R.id.btn_add_user).setOnClickListener(v -> showAddUserDialog());
+    }
+
+    private void loadUsers() {
+        Cursor cursor = dbHelper.getAllUsers();
+        userListAdapter = new UserListAdapter(this, cursor, dbHelper);
+        userListView.setAdapter(userListAdapter);
+    }
+
+    private void showAddUserDialog() {
+        View view = LayoutInflater.from(this).inflate(R.layout.dialog_add_user, null);
+        EditText usernameInput = (EditText) view.findViewById(R.id.input_username);
+        EditText passwordInput = (EditText) view.findViewById(R.id.input_password);
+
+
+        new AlertDialog.Builder(this)
+                .setTitle("添加用户")
+                .setView(view)
+                .setPositiveButton("添加", (dialog, which) -> {
+                    String username = usernameInput.getText().toString();
+                    String password = passwordInput.getText().toString();
+
+                    if (TextUtils.isEmpty(username) || TextUtils.isEmpty(password)) {
+                        Toast.makeText(this, "用户名和密码不能为空", Toast.LENGTH_SHORT).show();
+                    } else {
+                        long result = dbHelper.addUser(username, password);
+                        if (result != -1) {
+                            Toast.makeText(this, "用户添加成功", Toast.LENGTH_SHORT).show();
+                            loadUsers();
+                        } else {
+                            Toast.makeText(this, "添加失败，用户名可能已存在", Toast.LENGTH_SHORT).show();
+                        }
+                    }
+                })
+                .setNegativeButton("取消", null)
+                .show();
+    }
+}
diff --git a/Src/app/src/main/java/net/micode/notes/model/Note.java b/Src/app/src/main/java/net/micode/notes/model/Note.java
index 1a5f714..d9cf8c3 100644
--- a/Src/app/src/main/java/net/micode/notes/model/Note.java
+++ b/Src/app/src/main/java/net/micode/notes/model/Note.java
@@ -16,6 +16,8 @@
 
 package net.micode.notes.model;
 
+import static java.sql.Types.NULL;
+
 import android.content.ContentProviderOperation;
 import android.content.ContentProviderResult;
 import android.content.ContentUris;
@@ -61,7 +63,7 @@ public class Note {
 
         Uri uri = context.getContentResolver().insert(Notes.CONTENT_NOTE_URI, values);
 
-        long noteId = 0;
+        long noteId;
         try {
             noteId = Long.valueOf(uri.getPathSegments().get(1));
         } catch (NumberFormatException e) {
diff --git a/Src/app/src/main/java/net/micode/notes/model/WorkingNote.java b/Src/app/src/main/java/net/micode/notes/model/WorkingNote.java
index 5545a5a..db46b56 100644
--- a/Src/app/src/main/java/net/micode/notes/model/WorkingNote.java
+++ b/Src/app/src/main/java/net/micode/notes/model/WorkingNote.java
@@ -76,6 +76,7 @@ public class WorkingNote {
     // 标记笔记是否被删除
     private boolean mIsDeleted;
 
+
     // 笔记设置变化监听器
     private NoteSettingChangedListener mNoteSettingStatusListener;
 
@@ -268,6 +269,24 @@ public class WorkingNote {
         // 创建一个新的 WorkingNote 实例，指定所属文件夹ID
         WorkingNote note = new WorkingNote(context, folderId);
 
+        // 获取当前用户的 userId
+        SharedPreferences prefs = context.getSharedPreferences("user_session", Context.MODE_PRIVATE);
+        int userId = prefs.getInt("user_id", -1);
+
+        if (userId == -1) {
+            Log.e(TAG, "无法创建新便签：用户未登录");
+            return null; // 用户未登录，返回 null
+        }
+
+        // 在创建实例时生成新的 noteId
+        long noteId = Note.getNewNoteId(context, folderId, userId);
+        if (noteId <= 0) {
+            Log.e(TAG, "无法创建新便签：noteId 无效");
+            return null; // 生成 noteId 失败，返回 null
+        }
+        // 设置 noteId 和其他属性
+        note.mNoteId = noteId;
+
         // 设置笔记的默认背景颜色
         note.setBgColorId(defaultBgColorId);
 
@@ -276,7 +295,6 @@ public class WorkingNote {
 
         // 设置与笔记关联的小部件类型
         note.setWidgetType(widgetType);
-
         // 返回初始化好的空笔记对象
         return note;
     }
@@ -306,22 +324,25 @@ public class WorkingNote {
         if (isWorthSaving()) {
             // 检查笔记是否已存在于数据库中
             if (!existInDatabase()) {
-                // 获取当前登录用户的 user_id
-                SharedPreferences prefs = mContext.getSharedPreferences("user_session", Context.MODE_PRIVATE);
+                // 如果笔记已经在创建时生成了 noteId，不再重复生成
+                if (mNoteId <= 0) {
+                    // 获取当前登录用户的 user_id
+                    SharedPreferences prefs = mContext.getSharedPreferences("user_session", Context.MODE_PRIVATE);
 
-                int userId = prefs.getInt("user_id", -1); // -1 表示未登录
-                Log.d("WorkingNote", "Saving note with userId: " + userId);
+                    int userId = prefs.getInt("user_id", -1); // -1 表示未登录
+                    Log.d("WorkingNote", "Saving note with userId: " + userId);
 
-                if (userId == -1) {
-                    Log.e(TAG, "无法保存笔记，因为用户未登录");
-                    return false; // 未登录时不保存
-                }
+                    if (userId == -1) {
+                        Log.e(TAG, "无法保存笔记，因为用户未登录");
+                        return false; // 未登录时不保存
+                    }
 
-                // 如果笔记不在数据库中，为该笔记生成一个新的ID，并关联 user_id
-                if ((mNoteId = Note.getNewNoteId(mContext, mFolderId, userId)) == 0) {
-                    // 若生成新ID失败，记录日志并返回 false 表示保存失败
-                    Log.e(TAG, "创建新便签失败:" + mNoteId);
-                    return false;
+                    mNoteId = Note.getNewNoteId(mContext, mFolderId, userId);
+                    // 如果笔记不在数据库中，为该笔记生成一个新的ID，并关联 user_id
+                    if (mNoteId <= 0) {
+                        Log.e(TAG, "创建新便签失败：" + mNoteId);
+                        return false;
+                    }
                 }
             }
 
@@ -717,13 +738,27 @@ public class WorkingNote {
         }
         return null;
     }
+    public void deleteImagePathFromDatabase() {
+        // 清除 IMAGE_PATH 列中存储的路径
+        mNote.setNoteValue(NoteColumns.IMAGE_PATH, null);
+        mNote.syncNote(mContext, mNoteId);
+    }
+
     public Bitmap loadImageFromFile(String imagePath) {
-        File imgFile = new File(imagePath);
-        if (imgFile.exists()) {
-            return BitmapFactory.decodeFile(imgFile.getAbsolutePath());
+        if (TextUtils.isEmpty(imagePath)) {
+            Log.e(TAG, "Image path is empty or null");
+            return null;
         }
-        return null;
+
+        File imageFile = new File(imagePath);
+        if (!imageFile.exists()) {
+            Log.e(TAG, "Image file does not exist: " + imagePath);
+            return null;
+        }
+
+        return BitmapFactory.decodeFile(imagePath);
     }
+
     // 获取音频路径
     public String getAudioPathFromDatabase() {
         Cursor cursor = mContext.getContentResolver().query(
@@ -762,6 +797,20 @@ public class WorkingNote {
             mNote.setNoteValue(NoteColumns.GESTURE_PASSWORD, mGesturePassword);
         }
     }
+<<<<<<< HEAD
+>>>>>>> a
+=======
+    // 添加方法，将 HTML 格式的内容保存到数据库
+    public void setRichTextContent(String htmlContent) {
+        if (!TextUtils.equals(mContent, htmlContent)) {
+            mContent = htmlContent;
+            mNote.setTextData(DataColumns.CONTENT, mContent); // 保存 HTML 格式的内容
+        }
+    }
+    // 从数据库加载富文本内容
+    public String getRichTextContent() {
+        return mContent; // 从数据库中获取 HTML 格式的内容
+    }
 >>>>>>> a
 
 }
diff --git a/Src/app/src/main/java/net/micode/notes/ui/ColorPickerDialog.java b/Src/app/src/main/java/net/micode/notes/ui/ColorPickerDialog.java
new file mode 100644
index 0000000..2b0c8d5
--- /dev/null
+++ b/Src/app/src/main/java/net/micode/notes/ui/ColorPickerDialog.java
@@ -0,0 +1,52 @@
+package net.micode.notes.ui;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.graphics.Color;
+import android.view.ViewGroup;
+import android.widget.GridLayout;
+import android.widget.ImageView;
+
+public class ColorPickerDialog extends Dialog {
+
+    public interface OnColorSelectedListener {
+        void onColorSelected(int color);
+    }
+
+    private static final int[] COLORS = {
+            Color.BLACK,
+            Color.RED,
+            Color.GREEN,
+            Color.BLUE,
+            Color.CYAN,
+            Color.MAGENTA,
+            Color.YELLOW,
+            Color.GRAY
+    };
+
+    public ColorPickerDialog(Context context, OnColorSelectedListener listener) {
+        super(context);
+
+        GridLayout layout = new GridLayout(context);
+        layout.setColumnCount(4);
+
+        for (int color : COLORS) {
+            ImageView colorView = new ImageView(context);
+            colorView.setBackgroundColor(color);
+            GridLayout.LayoutParams params = new GridLayout.LayoutParams();
+            params.width = 100;
+            params.height = 100;
+            params.setMargins(10, 10, 10, 10);
+            colorView.setLayoutParams(params);
+
+            colorView.setOnClickListener(v -> {
+                listener.onColorSelected(color);
+                dismiss();
+            });
+
+            layout.addView(colorView);
+        }
+
+        setContentView(layout);
+    }
+}
\ No newline at end of file
diff --git a/Src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/Src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
index aa3e48d..82055dc 100644
--- a/Src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
+++ b/Src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
@@ -44,6 +44,7 @@ import android.media.MediaRecorder;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.provider.DocumentsContract;
 import android.provider.MediaStore;
@@ -52,6 +53,7 @@ import android.text.Editable;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.TextUtils;
+import android.text.TextWatcher;
 import android.text.format.DateUtils;
 import android.text.method.LinkMovementMethod;
 import android.text.style.BackgroundColorSpan;
@@ -126,7 +128,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
      * 背景选择按钮与其对应选中状态图标的映射。
      */
     private static final Map<Integer, Integer> sBgSelectorBtnsMap = new HashMap<Integer, Integer>();
-
+    private View mToolbar;
     static {
         // 初始化背景选择按钮映射
         sBgSelectorBtnsMap.put(R.id.iv_bg_yellow, ResourceParser.YELLOW);
@@ -186,7 +188,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
 
     private View mFontSizeSelector; // 字号选择器
 
-    private EditText mNoteEditor; // 笔记编辑器
+    private RichEditText mNoteEditor; // 笔记编辑器
 
     private View mNoteEditorPanel; // 笔记编辑器面板
 
@@ -245,6 +247,10 @@ public class NoteEditActivity extends Activity implements OnClickListener,
 
         //根据id获取添加图片按钮
         final ImageButton add_img_btn = (ImageButton) findViewById(R.id.add_img_btn);
+        final ImageButton deleteImageButton = (ImageButton) findViewById(R.id.btn_delete_image);
+        deleteImageButton.setOnClickListener(v -> {
+            deleteImageFromNote(); // 调用删除图片方法
+        });
         //为点击图片按钮设置监听器
         add_img_btn.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -306,6 +312,51 @@ public class NoteEditActivity extends Activity implements OnClickListener,
                 startSpeechToText();
             }
         });
+        // 初始化富文本编辑器
+        mNoteEditor = (RichEditText) findViewById(R.id.note_edit_view);
+        mToolbar = findViewById(R.id.toolbar); // 工具栏布局
+        // 工具栏始终可见
+        mToolbar.setVisibility(View.VISIBLE);
+        // 设置光标监听
+        setupCursorListener();
+        // 初始化工具栏按钮
+        initFormatButtons();
+    }
+    private void initFormatButtons() {
+        // 加粗按钮
+        findViewById(R.id.btn_bold).setOnClickListener(v -> {
+            mNoteEditor.toggleBold();
+        });
+
+        // 斜体按钮
+        findViewById(R.id.btn_italic).setOnClickListener(v -> {
+            mNoteEditor.toggleItalic();
+        });
+
+        // 下划线按钮
+        findViewById(R.id.btn_underline).setOnClickListener(v -> {
+            mNoteEditor.toggleUnderline();
+        });
+
+        // 删除线按钮
+        findViewById(R.id.btn_strikethrough).setOnClickListener(v -> {
+            mNoteEditor.toggleStrikethrough();
+        });
+
+        // 项目符号按钮
+        findViewById(R.id.btn_bullet).setOnClickListener(v -> {
+            mNoteEditor.toggleBullet();
+        });
+
+        // 文字颜色按钮
+        findViewById(R.id.btn_text_color).setOnClickListener(v -> {
+            showColorPicker();
+        });
+    }
+    private void showColorPicker() {
+        new ColorPickerDialog(this, color -> {
+            mNoteEditor.setTextColor(color);
+        }).show();
     }
 
     private void copyAssetsFolder(String assetDir, File outDir) throws IOException {
@@ -451,6 +502,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
             finish();
             return false;
         }
+
         // 设置笔记状态改变的监听器
         mWorkingNote.setOnSettingStatusChangedListener(this);
         return true;
@@ -521,33 +573,36 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         if (!isPatternVerified()) {
             checkNotePassword(mWorkingNote.getNoteId());
         }
+<<<<<<< HEAD
 >>>>>>> a
 
+=======
+        // 加载富文本内容
+        String htmlContent = mWorkingNote.getRichTextContent(); // 从 WorkingNote 加载 HTML 内容
+        if (!TextUtils.isEmpty(htmlContent)) {
+            mNoteEditor.fromHtml(htmlContent); // 加载到编辑器
+        }
+>>>>>>> a
         // 初始化笔记界面
         initNoteScreen();
 
         // 获取图片路径并插入图片
         String imagePath = mWorkingNote.getImagePathFromDatabase();
         String audioPath = mWorkingNote.getAudioPathFromDatabase();
-        if (imagePath != null) {
-            // 从文件加载图像
-            Bitmap bitmap = mWorkingNote.loadImageFromFile(imagePath);
-            if (bitmap != null) {
-                // 创建一个 ImageSpan
-                ImageSpan imageSpan = new ImageSpan(this, bitmap);
-                SpannableString spannableString = new SpannableString(" "); // 使用占位符
-                spannableString.setSpan(imageSpan, 0, 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-
-                // 找到笔记编辑器并插入图片
-                NoteEditText noteEditText = (NoteEditText) findViewById(R.id.note_edit_view);
-                int index = noteEditText.getSelectionStart(); // 获取光标位置
-                noteEditText.getEditableText().insert(index, spannableString);
-            } else {
-                Log.e(TAG, "Failed to load image from file: " + imagePath);
+        if (!TextUtils.isEmpty(imagePath)) {
+            File imageFile = new File(imagePath);
+            if (imageFile.exists()) {
+                Bitmap bitmap = BitmapFactory.decodeFile(imagePath);
+                if (bitmap != null) {
+                    ImageSpan imageSpan = new ImageSpan(this, bitmap);
+                    SpannableString spannableString = new SpannableString(" ");
+                    spannableString.setSpan(imageSpan, 0, 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+                    mNoteEditor.getEditableText().insert(mNoteEditor.getSelectionStart(), spannableString);
+                }
             }
-        }
-        else {
-            Log.e(TAG, "Image path is null. Can't load image.");
+        } else {
+            Log.d(TAG, "新建便签没有图片，跳过加载");
         }
     }
     private MediaPlayer mediaPlayer;
@@ -731,7 +786,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         mNoteHeaderHolder.ibSetBgColor = (ImageView) findViewById(R.id.btn_set_bg_color);
         mNoteHeaderHolder.ibSetBgColor.setOnClickListener(this);
         // 初始化编辑器和相关组件
-        mNoteEditor = (EditText) findViewById(R.id.note_edit_view);
+        mNoteEditor = (RichEditText) findViewById(R.id.note_edit_view);
         mNoteEditorPanel = findViewById(R.id.sv_note_edit);
         mNoteBgColorSelector = findViewById(R.id.note_bg_color_selector);
         // 设置背景选择器按钮点击监听器
@@ -764,6 +819,8 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     @Override
     protected void onPause() {
         super.onPause();
+        String htmlContent = mNoteEditor.toHtml(); // 将富文本内容转换为 HTML
+        mWorkingNote.setRichTextContent(htmlContent); // 保存到 WorkingNote
         // 保存笔记数据
         if (saveNote()) {
             Log.d(TAG, "Note data was saved with length:" + mWorkingNote.getContent().length());
@@ -976,7 +1033,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
                 Intent intent = new Intent(this, NoteGesturePasswordActivity.class);
                 intent.putExtra("note_id", mWorkingNote.getNoteId());
                 startActivityForResult(intent, REQUEST_SET_PATTERN);
-                return true;
+                break;
             default:
                 break;
         }
@@ -1266,6 +1323,8 @@ public class NoteEditActivity extends Activity implements OnClickListener,
      * @param index   列表项索引。
      * @param hasText 列表项是否包含文本。
      */
+    private final Handler mHandler = new Handler();
+    private final Runnable updateToolbarRunnable = this::updateToolbarPosition;
     public void onTextChange(int index, boolean hasText) {
         if (index >= mEditTextList.getChildCount()) {
             Log.e(TAG, "Wrong index, should not happen");
@@ -1277,6 +1336,8 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         } else {
             mEditTextList.getChildAt(index).findViewById(R.id.cb_edit_item).setVisibility(View.GONE);
         }
+        mHandler.removeCallbacks(updateToolbarRunnable);
+        mHandler.postDelayed(updateToolbarRunnable, 100); // 延迟 100ms 更新工具栏位置
     }
 
     /**
@@ -1307,29 +1368,41 @@ public class NoteEditActivity extends Activity implements OnClickListener,
      * @return 是否有已选中的列表项。
      */
     private boolean getWorkingText() {
-        boolean hasChecked = false;
-        if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
-            StringBuilder sb = new StringBuilder();
-            for (int i = 0; i < mEditTextList.getChildCount(); i++) {
-                View view = mEditTextList.getChildAt(i);
-                NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text);
-                // 构建带有选中状态前缀的文本
-                if (!TextUtils.isEmpty(edit.getText())) {
-                    if (((CheckBox) view.findViewById(R.id.cb_edit_item)).isChecked()) {
-                        sb.append(TAG_CHECKED).append(" ").append(edit.getText()).append("\n");
-                        hasChecked = true;
-                    } else {
-                        sb.append(TAG_UNCHECKED).append(" ").append(edit.getText()).append("\n");
-                    }
-                }
+        if (mNoteEditor.getVisibility() == View.VISIBLE) {
+            // 获取编辑器中的 HTML 格式内容
+            String htmlContent = mNoteEditor.toHtml();
+
+            if (htmlContent != null) {
+                // 设置到 WorkingNote 中
+                mWorkingNote.setRichTextContent(htmlContent);
+                return true; // 成功获取内容
+            } else {
+                return false; // 获取内容失败
             }
-            mWorkingNote.setWorkingText(sb.toString());
         } else {
-            mWorkingNote.setWorkingText(mNoteEditor.getText().toString());
+            StringBuilder content = new StringBuilder();
+            int count = mEditTextList.getChildCount();
+
+            for (int i = 0; i < count; i++) {
+                NoteEditText edit = (NoteEditText) mEditTextList.getChildAt(i).findViewById(R.id.et_edit_text);
+                content.append(edit.getText());
+
+                if (i != count - 1) {
+                    content.append("\n");
+                }
+            }
+
+            // 设置文本内容到 WorkingNote
+            if (content.length() > 0) {
+                mWorkingNote.setWorkingText(content.toString());
+                return true; // 成功获取内容
+            } else {
+                return false; // 内容为空或失败
+            }
         }
-        return hasChecked;
     }
 
+
     /**
      * 保存笔记。
      * 更新笔记内容并保存。
@@ -1338,6 +1411,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
      */
     private boolean saveNote() {
         getWorkingText();
+
         boolean saved = mWorkingNote.saveNote();
         if (saved) {
             // 设置结果为成功，以便外部调用者知道保存操作的状态
@@ -1763,10 +1837,34 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         spannableString.setSpan(imageSpan, 0, 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
 
         // 将图片插入到EditText中
-        NoteEditText noteEditText = (NoteEditText) findViewById(R.id.note_edit_view);
+        RichEditText noteEditText = (RichEditText) findViewById(R.id.note_edit_view);
         int index = noteEditText.getSelectionStart(); // 获取光标所在位置
         noteEditText.getEditableText().insert(index, spannableString);
     }
+    private void deleteImageFromNote() {
+        // 从编辑器中移除图片
+        Editable editable = mNoteEditor.getEditableText();
+        ImageSpan[] imageSpans = editable.getSpans(0, editable.length(), ImageSpan.class);
+
+        for (ImageSpan imageSpan : imageSpans) {
+            int start = editable.getSpanStart(imageSpan);
+            int end = editable.getSpanEnd(imageSpan);
+            editable.removeSpan(imageSpan); // 删除图片的 ImageSpan
+            editable.delete(start, end);   // 删除图片占位符
+        }
+
+        // 清空数据库中的图片路径
+        mWorkingNote.deleteImagePathFromDatabase();
+
+        // 更新富文本内容到数据库
+        String htmlContent = mNoteEditor.toHtml();
+        mWorkingNote.setRichTextContent(htmlContent);
+        mWorkingNote.saveNote();
+
+        // 提示用户删除成功
+        Toast.makeText(this, "图片已删除", Toast.LENGTH_SHORT).show();
+    }
+
 
 
     private MediaRecorder mediaRecorder;
@@ -1801,7 +1899,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
             String audioPath = audioFilePath;
 
             // 插入到光标位置
-            NoteEditText noteEditText = (NoteEditText) findViewById(R.id.note_edit_view);
+            RichEditText noteEditText = (RichEditText) findViewById(R.id.note_edit_view);
             int cursorPosition = noteEditText.getSelectionStart(); // 获取光标位置
             SpannableString spannableString = new SpannableString("[Audio]");
             spannableString.setSpan(new ImageSpan(this, R.drawable.ic_audio), 0, 7, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
@@ -1924,6 +2022,52 @@ public class NoteEditActivity extends Activity implements OnClickListener,
             }
         }
     }
+<<<<<<< HEAD
+>>>>>>> a
+=======
+    private void setupCursorListener() {
+        mNoteEditor.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                updateToolbarPosition();
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {}
+        });
+
+        mNoteEditor.setOnFocusChangeListener((v, hasFocus) -> {
+            if (hasFocus) {
+                updateToolbarPosition();
+            }
+        });
+    }
+
+    private void updateToolbarPosition() {
+        int[] cursorCoordinates = mNoteEditor.getCursorCoordinates();
+
+        // 获取工具栏的宽度和屏幕宽度
+        int screenWidth = getWindow().getDecorView().getWidth();
+        int toolbarWidth = mToolbar.getWidth();
+
+        // 工具栏的 X 坐标
+        int toolbarX = cursorCoordinates[0] - toolbarWidth / 2;
+        toolbarX = Math.max(0, Math.min(toolbarX, screenWidth - toolbarWidth)); // 确保工具栏在屏幕范围内
+
+        // 工具栏的 Y 坐标（光标下方偏移量 16dp）
+        int toolbarY = cursorCoordinates[1] + 16;
+
+        // 设置工具栏位置
+        mToolbar.setX(toolbarX);
+        mToolbar.setY(toolbarY);
+    }
+
+
+
+
 >>>>>>> a
 }
 
diff --git a/Src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/Src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
index fb2f7ce..58cfb0a 100644
--- a/Src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
+++ b/Src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
@@ -65,6 +65,7 @@ import net.micode.notes.data.Notes;
 import net.micode.notes.data.Notes.NoteColumns;
 import net.micode.notes.gtask.remote.GTaskSyncService;
 import net.micode.notes.login.LoginActivity;
+import net.micode.notes.login.UserManagementActivity;
 import net.micode.notes.model.WorkingNote;
 import net.micode.notes.tool.BackupUtils;
 import net.micode.notes.tool.DataUtils;
@@ -1148,6 +1149,11 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
             case R.id.menu_search:
                 onSearchRequested(); // 触发搜索请求
                 break;
+            case R.id.menu_manage_users: {
+                Intent intent = new Intent(this, UserManagementActivity.class);
+                startActivity(intent);
+                break;
+            }
             default:
                 break;
         }
diff --git a/Src/app/src/main/java/net/micode/notes/ui/RichEditText.java b/Src/app/src/main/java/net/micode/notes/ui/RichEditText.java
new file mode 100644
index 0000000..e87a3c0
--- /dev/null
+++ b/Src/app/src/main/java/net/micode/notes/ui/RichEditText.java
@@ -0,0 +1,168 @@
+package net.micode.notes.ui;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.text.Editable;
+import android.text.Layout;
+import android.text.Spannable;
+import android.text.SpannableStringBuilder;
+import android.text.style.BackgroundColorSpan;
+import android.text.style.BulletSpan;
+import android.text.style.ForegroundColorSpan;
+import android.text.style.StrikethroughSpan;
+import android.text.style.StyleSpan;
+import android.text.style.UnderlineSpan;
+import android.util.AttributeSet;
+
+import android.graphics.Typeface;
+import android.widget.EditText;
+
+public class RichEditText extends EditText {
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+
+        // 确保在初始化时，内容为空，避免默认插入图片或其他格式化内容
+        if (getText() == null || getText().length() == 0) {
+            setText(""); // 初始化为空文本
+        }
+    }
+
+    public RichEditText(Context context) {
+        super(context);
+    }
+
+    public RichEditText(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public RichEditText(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public void toggleBold() {
+        toggleStyle(Typeface.BOLD);
+    }
+
+    public void toggleItalic() {
+        toggleStyle(Typeface.ITALIC);
+    }
+
+    public void toggleUnderline() {
+        toggleSpan(new UnderlineSpan());
+    }
+
+    public void toggleStrikethrough() {
+        toggleSpan(new StrikethroughSpan());
+    }
+
+    public void toggleBullet() {
+        toggleSpan(new BulletSpan(20, Color.BLACK));
+    }
+
+    public void setTextColor(int color) {
+        int start = getSelectionStart();
+        int end = getSelectionEnd();
+
+        if (start < end) {
+            Editable editable = getText();
+            ForegroundColorSpan[] spans = editable.getSpans(start, end, ForegroundColorSpan.class);
+
+            for (ForegroundColorSpan span : spans) {
+                editable.removeSpan(span);
+            }
+
+            editable.setSpan(new ForegroundColorSpan(color), start, end,
+                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }
+    }
+
+    private void toggleStyle(int style) {
+        int start = getSelectionStart();
+        int end = getSelectionEnd();
+
+        if (start < end) {
+            Editable editable = getText();
+            StyleSpan[] spans = editable.getSpans(start, end, StyleSpan.class);
+            boolean hasStyle = false;
+
+            for (StyleSpan span : spans) {
+                if (span.getStyle() == style) {
+                    editable.removeSpan(span);
+                    hasStyle = true;
+                }
+            }
+
+            if (!hasStyle) {
+                editable.setSpan(new StyleSpan(style), start, end,
+                        Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            }
+        }
+    }
+
+    private void toggleSpan(Object span) {
+        int start = getSelectionStart();
+        int end = getSelectionEnd();
+
+        if (start < end) {
+            Editable editable = getText();
+            Object[] spans = editable.getSpans(start, end, span.getClass());
+            boolean hasSpan = spans.length > 0;
+
+            for (Object existingSpan : spans) {
+                editable.removeSpan(existingSpan);
+            }
+
+            if (!hasSpan) {
+                editable.setSpan(span, start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            }
+        }
+    }
+    public int[] getCursorCoordinates() {
+        int[] location = new int[2];
+        getLocationOnScreen(location); // 获取 `RichEditText` 在屏幕上的位置
+
+        int cursorPosition = getSelectionStart();
+        Layout layout = getLayout();
+        if (layout != null) {
+            int line = layout.getLineForOffset(cursorPosition);
+            int baseline = layout.getLineBaseline(line);
+
+            int x = (int) layout.getPrimaryHorizontal(cursorPosition) + location[0];
+            int y = baseline + layout.getLineTop(line) + location[1];
+
+            return new int[]{x, y};
+        }
+        return location; // 如果布局未加载，返回编辑器位置
+    }
+    // 将富文本转换为HTML
+    public String toHtml() {
+        Editable text = getText();
+        if (text == null || text.length() == 0) {
+            return ""; // 如果内容为空，返回空字符串
+        }
+
+        // 使用旧版 Html API
+        return android.text.Html.toHtml(text)
+                .replaceAll("<p dir=\"ltr\">", "") // 去掉多余的段落标签
+                .replaceAll("</p>", "")
+                .trim();
+    }
+
+
+
+
+    // 从HTML加载富文本
+    public void fromHtml(String html) {
+        if (html == null || html.isEmpty()) {
+            setText(""); // 如果 HTML 内容为空，设置为空字符串
+            return;
+        }
+
+        // 使用 Html.fromHtml 保留样式信息并直接设置
+        setText(android.text.Html.fromHtml(html));
+    }
+
+
+}
\ No newline at end of file
diff --git a/Src/app/src/main/res/drawable/ic_delete.xml b/Src/app/src/main/res/drawable/ic_delete.xml
new file mode 100644
index 0000000..883bcaa
--- /dev/null
+++ b/Src/app/src/main/res/drawable/ic_delete.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
+    
+</vector>
diff --git a/Src/app/src/main/res/drawable/ic_format_bold.xml b/Src/app/src/main/res/drawable/ic_format_bold.xml
new file mode 100644
index 0000000..c7e3c22
--- /dev/null
+++ b/Src/app/src/main/res/drawable/ic_format_bold.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15.6,10.79c0.97,-0.67 1.65,-1.77 1.65,-2.79 0,-2.26 -1.75,-4 -4,-4L7,4v14h7.04c2.09,0 3.71,-1.7 3.71,-3.79 0,-1.52 -0.86,-2.82 -2.15,-3.42zM10,6.5h3c0.83,0 1.5,0.67 1.5,1.5s-0.67,1.5 -1.5,1.5h-3v-3zM13.5,15.5L10,15.5v-3h3.5c0.83,0 1.5,0.67 1.5,1.5s-0.67,1.5 -1.5,1.5z"/>
+</vector>
\ No newline at end of file
diff --git a/Src/app/src/main/res/drawable/ic_format_bullet.xml b/Src/app/src/main/res/drawable/ic_format_bullet.xml
new file mode 100644
index 0000000..5d107f4
--- /dev/null
+++ b/Src/app/src/main/res/drawable/ic_format_bullet.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M4,10.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM4,4.5c-0.83,0 -1.5,0.67 -1.5,1.5S3.17,7.5 4,7.5 5.5,6.83 5.5,6 4.83,4.5 4,4.5zM4,16.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM7,19h14v-2L7,17v2zM7,13h14v-2L7,11v2zM7,5v2h14L21,5L7,5z"/>
+</vector>
\ No newline at end of file
diff --git a/Src/app/src/main/res/drawable/ic_format_color.xml b/Src/app/src/main/res/drawable/ic_format_color.xml
new file mode 100644
index 0000000..bee425c
--- /dev/null
+++ b/Src/app/src/main/res/drawable/ic_format_color.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M2,20h20v4H2v-4zm3.49,-3h2.42l1.27,-3.58h5.65L16.09,17h2.42L13.25,3h-2.5L5.49,17zM9.91,11.39l2.03,-5.79h0.12l2.03,5.79H9.91z"/>
+</vector>
\ No newline at end of file
diff --git a/Src/app/src/main/res/drawable/ic_format_italic.xml b/Src/app/src/main/res/drawable/ic_format_italic.xml
new file mode 100644
index 0000000..1e07d3d
--- /dev/null
+++ b/Src/app/src/main/res/drawable/ic_format_italic.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M10,4v3h2.21l-3.42,8H6v3h8v-3h-2.21l3.42,-8H18V4z"/>
+</vector>
\ No newline at end of file
diff --git a/Src/app/src/main/res/drawable/ic_format_strikethrough.xml b/Src/app/src/main/res/drawable/ic_format_strikethrough.xml
new file mode 100644
index 0000000..8f025fb
--- /dev/null
+++ b/Src/app/src/main/res/drawable/ic_format_strikethrough.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M10,19h4v-3h-4v3zM5,4v3h5v3h4V7h5V4H5zM3,14h18v-2H3v2z"/>
+</vector>
\ No newline at end of file
diff --git a/Src/app/src/main/res/drawable/ic_format_underline.xml b/Src/app/src/main/res/drawable/ic_format_underline.xml
new file mode 100644
index 0000000..84a3aab
--- /dev/null
+++ b/Src/app/src/main/res/drawable/ic_format_underline.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,17c3.31,0 6,-2.69 6,-6V3h-2.5v8c0,1.93 -1.57,3.5 -3.5,3.5S8.5,12.93 8.5,11V3H6v8c0,3.31 2.69,6 6,6zM5,19v2h14v-2H5z"/>
+</vector>
\ No newline at end of file
diff --git a/Src/app/src/main/res/layout/activity_login.xml b/Src/app/src/main/res/layout/activity_login.xml
index e777037..8222c88 100644
--- a/Src/app/src/main/res/layout/activity_login.xml
+++ b/Src/app/src/main/res/layout/activity_login.xml
@@ -6,16 +6,27 @@
     android:orientation="vertical"
     android:padding="16dp"
     android:background="@color/background_color"> <!-- 设置背景颜色 -->
+    <!-- 登录界面标题 -->
+    <TextView
+        android:id="@+id/tvLoginTitle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="欢迎登录"
+        android:textSize="24sp"
+        android:textStyle="bold"
+        android:gravity="center"
+        android:layout_marginBottom="24dp"
+        android:textColor="@android:color/black" />
 
     <EditText
         android:id="@+id/etLoginUsername"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="用户名"
-        android:minHeight="48dp"
-        android:padding="8dp"
-        android:textSize="16sp"
+        android:padding="12dp"
+        android:layout_marginBottom="16dp"
         android:background="@drawable/edittext_background"
+        android:textSize="16sp"
         style="@style/CustomEditTextStyle"/> <!-- 设置EditText背景 -->
 
     <EditText
@@ -24,10 +35,10 @@
         android:layout_height="wrap_content"
         android:hint="密码"
         android:inputType="textPassword"
-        android:minHeight="48dp"
-        android:padding="8dp"
-        android:textSize="16sp"
+        android:padding="12dp"
+        android:layout_marginBottom="24dp"
         android:background="@drawable/edittext_background"
+        android:textSize="16sp"
         style="@style/CustomEditTextStyle"/> <!-- 设置EditText背景 -->
 
     <Button
@@ -39,7 +50,7 @@
         android:textColor="@color/button_text_color"
         android:background="@drawable/button_background"
         android:elevation="2dp"
-        android:layout_marginTop="8dp" />
+        android:layout_marginTop="12dp" />
 
     <Button
         android:id="@+id/btnRegister"
diff --git a/Src/app/src/main/res/layout/activity_register.xml b/Src/app/src/main/res/layout/activity_register.xml
index 87fbe57..33afddd 100644
--- a/Src/app/src/main/res/layout/activity_register.xml
+++ b/Src/app/src/main/res/layout/activity_register.xml
@@ -6,6 +6,17 @@
     android:orientation="vertical"
     android:padding="16dp"
     android:background="@color/background_color"> <!-- 设置背景颜色 -->
+    <!-- 注册界面标题 -->
+    <TextView
+        android:id="@+id/tvRegisterTitle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="用户注册"
+        android:textSize="24sp"
+        android:textStyle="bold"
+        android:gravity="center"
+        android:layout_marginBottom="24dp"
+        android:textColor="@android:color/black" />
 
     <EditText
         android:id="@+id/etUsername"
@@ -13,8 +24,10 @@
         android:layout_height="wrap_content"
         android:hint="用户名"
         android:padding="12dp"
-        android:layout_marginBottom="8dp"
-        android:background="@drawable/edittext_background" /> <!-- 设置EditText背景 -->
+        android:layout_marginBottom="16dp"
+        android:background="@drawable/edittext_background"
+        android:textSize="16sp"
+        style="@style/CustomEditTextStyle"/>
 
     <EditText
         android:id="@+id/etPassword"
@@ -23,8 +36,10 @@
         android:hint="密码"
         android:inputType="textPassword"
         android:padding="12dp"
-        android:layout_marginBottom="8dp"
-        android:background="@drawable/edittext_background" /> <!-- 设置EditText背景 -->
+        android:layout_marginBottom="24dp"
+        android:background="@drawable/edittext_background"
+        android:textSize="16sp"
+        style="@style/CustomEditTextStyle"/>
 
     <Button
         android:id="@+id/btnRegister"
@@ -34,7 +49,8 @@
         android:textSize="18sp"
         android:textColor="@color/button_text_color"
         android:background="@drawable/button_background"
-        android:layout_marginBottom="8dp" />
+        android:elevation="2dp"
+        android:layout_marginBottom="12dp" />
 
     <Button
         android:id="@+id/btnBackToLogin"
@@ -43,5 +59,6 @@
         android:text="返回"
         android:textSize="18sp"
         android:textColor="@color/button_text_color"
-        android:background="@drawable/button_background" />
+        android:background="@drawable/button_background"
+        android:elevation="2dp" />
 </LinearLayout>
\ No newline at end of file
diff --git a/Src/app/src/main/res/layout/activity_user_management.xml b/Src/app/src/main/res/layout/activity_user_management.xml
new file mode 100644
index 0000000..2accb5d
--- /dev/null
+++ b/Src/app/src/main/res/layout/activity_user_management.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="@android:color/white"
+    android:padding="16dp">
+
+    <!-- 标题 -->
+    <TextView
+        android:id="@+id/title_user_management"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="用户管理"
+        android:textSize="20sp"
+        android:textStyle="bold"
+        android:layout_marginBottom="16dp"
+        android:textColor="@android:color/black" />
+
+    <!-- 添加用户按钮 -->
+    <Button
+        android:id="@+id/btn_add_user"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        android:backgroundTint="@android:color/holo_blue_light"
+        android:text="添加用户"
+        android:textColor="@android:color/white"
+        android:textStyle="bold" />
+
+    <!-- 用户列表 -->
+    <ListView
+        android:id="@+id/list_view_users"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:divider="@android:color/darker_gray"
+        android:dividerHeight="1dp"
+        android:background="@android:color/white" />
+</LinearLayout>
diff --git a/Src/app/src/main/res/layout/dialog_add_user.xml b/Src/app/src/main/res/layout/dialog_add_user.xml
new file mode 100644
index 0000000..008b2cc
--- /dev/null
+++ b/Src/app/src/main/res/layout/dialog_add_user.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:background="@android:color/white"
+    android:padding="16dp"
+    android:elevation="4dp">
+
+    <!-- 标题 -->
+    <TextView
+        android:id="@+id/dialog_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="添加新用户"
+        android:textSize="18sp"
+        android:textStyle="bold"
+        android:gravity="center"
+        android:layout_marginBottom="12dp"
+        android:textColor="@android:color/black" />
+
+    <!-- 用户名输入框 -->
+    <EditText
+        android:id="@+id/input_username"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="请输入用户名"
+        android:inputType="text"
+        android:padding="10dp"
+        android:background="@android:drawable/edit_text"
+        android:textColor="@android:color/black"
+        android:textColorHint="@android:color/darker_gray"
+        android:layout_marginBottom="8dp" />
+
+    <!-- 密码输入框 -->
+    <EditText
+        android:id="@+id/input_password"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="请输入密码"
+        android:inputType="textPassword"
+        android:padding="10dp"
+        android:background="@android:drawable/edit_text"
+        android:textColor="@android:color/black"
+        android:textColorHint="@android:color/darker_gray"
+        android:layout_marginBottom="16dp" />
+
+    <!-- 确认按钮 -->
+    <Button
+        android:id="@+id/btn_confirm_add_user"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:backgroundTint="@android:color/holo_green_light"
+        android:text="确认"
+        android:textColor="@android:color/white"
+        android:textStyle="bold" />
+</LinearLayout>
diff --git a/Src/app/src/main/res/layout/item_user.xml b/Src/app/src/main/res/layout/item_user.xml
new file mode 100644
index 0000000..1043267
--- /dev/null
+++ b/Src/app/src/main/res/layout/item_user.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:padding="8dp"
+    android:gravity="center_vertical">
+
+    <!-- 用户名显示 -->
+    <TextView
+        android:id="@+id/text_username"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:text="用户名"
+        android:textSize="16sp"
+        android:ellipsize="end"
+        android:singleLine="true" />
+
+    <!-- 删除按钮 -->
+    <Button
+        android:id="@+id/btn_delete_user"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="删除" />
+</LinearLayout>
diff --git a/Src/app/src/main/res/layout/note_edit.xml b/Src/app/src/main/res/layout/note_edit.xml
index 186c27f..52de982 100644
--- a/Src/app/src/main/res/layout/note_edit.xml
+++ b/Src/app/src/main/res/layout/note_edit.xml
@@ -15,11 +15,10 @@
      limitations under the License.
 -->
 
-<FrameLayout
+<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"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    android:layout_height="match_parent"
+    android:background="@drawable/list_background">
 
     <LinearLayout
         android:layout_width="fill_parent"
@@ -35,9 +34,9 @@
                 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:layout_weight="1"
                 android:textAppearance="@style/TextAppearanceSecondaryItem" />
 
             <ImageView
@@ -74,38 +73,110 @@
                 android:layout_width="fill_parent"
                 android:layout_height="7dip"
                 android:background="@drawable/bg_color_btn_mask" />
+            <!-- 工具栏 -->
+            <HorizontalScrollView
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:elevation="10dp"
+                android:background="@color/toolbar_background"
+                android:visibility="visible">
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="48dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:padding="4dp">
+
+                    <!-- 加粗 -->
+                    <ImageButton
+                        android:id="@+id/btn_bold"
+                        android:layout_width="40dp"
+                        android:layout_height="40dp"
+                        android:background="?android:attr/selectableItemBackground"
+                        android:contentDescription="@string/format_bold"
+                        android:src="@drawable/ic_format_bold" />
+
+                    <!-- 斜体 -->
+                    <ImageButton
+                        android:id="@+id/btn_italic"
+                        android:layout_width="40dp"
+                        android:layout_height="40dp"
+                        android:background="?android:attr/selectableItemBackground"
+                        android:contentDescription="@string/format_italic"
+                        android:src="@drawable/ic_format_italic" />
+
+                    <!-- 下划线 -->
+                    <ImageButton
+                        android:id="@+id/btn_underline"
+                        android:layout_width="40dp"
+                        android:layout_height="40dp"
+                        android:background="?android:attr/selectableItemBackground"
+                        android:contentDescription="@string/format_underline"
+                        android:src="@drawable/ic_format_underline" />
+
+                    <!-- 删除线 -->
+                    <ImageButton
+                        android:id="@+id/btn_strikethrough"
+                        android:layout_width="40dp"
+                        android:layout_height="40dp"
+                        android:background="?android:attr/selectableItemBackground"
+                        android:contentDescription="@string/format_strikethrough"
+                        android:src="@drawable/ic_format_strikethrough" />
+
+                    <!-- 项目符号 -->
+                    <ImageButton
+                        android:id="@+id/btn_bullet"
+                        android:layout_width="40dp"
+                        android:layout_height="40dp"
+                        android:background="?android:attr/selectableItemBackground"
+                        android:contentDescription="@string/format_bullet"
+                        android:src="@drawable/ic_format_bullet" />
+
+                    <!-- 文字颜色 -->
+                    <ImageButton
+                        android:id="@+id/btn_text_color"
+                        android:layout_width="40dp"
+                        android:layout_height="40dp"
+                        android:background="?android:attr/selectableItemBackground"
+                        android:contentDescription="@string/format_text_color"
+                        android:src="@drawable/ic_format_color" />
+
+                </LinearLayout>
+            </HorizontalScrollView>
 
             <ScrollView
                 android:layout_width="fill_parent"
                 android:layout_height="0dip"
+                android:layout_gravity="left|top"
                 android:layout_weight="1"
-                android:scrollbars="none"
+                android:fadingEdgeLength="0dip"
                 android:overScrollMode="never"
-                android:layout_gravity="left|top"
-                android:fadingEdgeLength="0dip">
+                android:scrollbars="none">
 
                 <LinearLayout
                     android:layout_width="fill_parent"
                     android:layout_height="fill_parent">
 
-                    <net.micode.notes.ui.NoteEditText
+                    <net.micode.notes.ui.RichEditText
                         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:background="@null"
+                        android:gravity="left|top"
+                        android:lineSpacingMultiplier="1.2"
                         android:linksClickable="false"
                         android:minLines="12"
-                        android:textAppearance="@style/TextAppearancePrimaryItem"
-                        android:lineSpacingMultiplier="1.2" />
+                        android:textAppearance="@style/TextAppearancePrimaryItem" />
 
                     <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:orientation="vertical"
                         android:visibility="gone" />
                 </LinearLayout>
             </ScrollView>
@@ -117,6 +188,7 @@
         </LinearLayout>
 
     </LinearLayout>
+
     <ImageButton
         android:id="@+id/add_img_btn"
         android:layout_width="wrap_content"
@@ -125,6 +197,16 @@
         android:layout_marginTop="600dp"
         android:layout_marginBottom="7dp"
         android:src="@android:drawable/ic_menu_gallery" />
+
+    <ImageButton
+        android:id="@+id/btn_delete_image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="80dp"
+        android:layout_marginTop="600dp"
+        android:layout_marginBottom="7dp"
+        android:src="@drawable/ic_delete" />
+
     <!-- 录音按钮 -->
     <ImageButton
         android:id="@+id/record_audio_btn"
@@ -133,8 +215,8 @@
         android:layout_marginLeft="350dp"
         android:layout_marginTop="600dp"
         android:layout_marginBottom="7dp"
-        android:src="@android:drawable/ic_btn_speak_now"
-        android:contentDescription="Record Audio" />
+        android:contentDescription="Record Audio"
+        android:src="@android:drawable/ic_btn_speak_now" />
 
     <!-- 语音转文字按钮 -->
     <ImageButton
@@ -144,27 +226,27 @@
         android:layout_marginLeft="300dp"
         android:layout_marginTop="600dp"
         android:layout_marginBottom="7dp"
-        android:src="@android:drawable/ic_menu_sort_by_size"
-        android:contentDescription="Speech to Text"/>
+        android:contentDescription="Speech to Text"
+        android:src="@android:drawable/ic_menu_sort_by_size" />
 
 
     <!-- 背景颜色设置按钮 -->
     <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" />
+        android:layout_height="43dip"
+        android:layout_gravity="top|right"
+        android:background="@drawable/bg_color_btn_mask" />
 
     <!-- 背景颜色选择器 -->
     <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_gravity="top|right"
         android:layout_marginTop="30dip"
         android:layout_marginRight="8dip"
-        android:layout_gravity="top|right"
+        android:background="@drawable/note_edit_color_selector_panel"
         android:visibility="gone">
 
         <FrameLayout
@@ -184,8 +266,8 @@
                 android:layout_gravity="bottom|right"
                 android:layout_marginRight="5dip"
                 android:focusable="false"
-                android:visibility="gone"
-                android:src="@drawable/selected" />
+                android:src="@drawable/selected"
+                android:visibility="gone" />
         </FrameLayout>
 
         <FrameLayout
@@ -203,10 +285,10 @@
                 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" />
+                android:focusable="false"
+                android:src="@drawable/selected"
+                android:visibility="gone" />
         </FrameLayout>
 
         <FrameLayout
@@ -224,10 +306,10 @@
                 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" />
+                android:focusable="false"
+                android:src="@drawable/selected"
+                android:visibility="gone" />
         </FrameLayout>
 
         <FrameLayout
@@ -246,8 +328,8 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom|right"
                 android:focusable="false"
-                android:visibility="gone"
-                android:src="@drawable/selected" />
+                android:src="@drawable/selected"
+                android:visibility="gone" />
         </FrameLayout>
 
         <FrameLayout
@@ -266,8 +348,8 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom|right"
                 android:focusable="false"
-                android:visibility="gone"
-                android:src="@drawable/selected" />
+                android:src="@drawable/selected"
+                android:visibility="gone" />
         </FrameLayout>
     </LinearLayout>
 
@@ -275,8 +357,8 @@
         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:background="@drawable/font_size_selector_bg"
         android:visibility="gone">
 
         <FrameLayout
@@ -288,15 +370,15 @@
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
                 android:layout_gravity="center"
-                android:gravity="center">
+                android:gravity="center"
+                android:orientation="vertical">
 
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/font_small"
-                    android:layout_marginBottom="5dip" />
+                    android:layout_marginBottom="5dip"
+                    android:src="@drawable/font_small" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -313,8 +395,8 @@
                 android:layout_marginRight="6dip"
                 android:layout_marginBottom="-7dip"
                 android:focusable="false"
-                android:visibility="gone"
-                android:src="@drawable/selected" />
+                android:src="@drawable/selected"
+                android:visibility="gone" />
         </FrameLayout>
 
         <FrameLayout
@@ -326,15 +408,15 @@
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
                 android:layout_gravity="center"
-                android:gravity="center">
+                android:gravity="center"
+                android:orientation="vertical">
 
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/font_normal"
-                    android:layout_marginBottom="5dip" />
+                    android:layout_marginBottom="5dip"
+                    android:src="@drawable/font_normal" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -348,11 +430,11 @@
                 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" />
+                android:focusable="false"
+                android:src="@drawable/selected"
+                android:visibility="gone" />
         </FrameLayout>
 
         <FrameLayout
@@ -364,15 +446,15 @@
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
                 android:layout_gravity="center"
-                android:gravity="center">
+                android:gravity="center"
+                android:orientation="vertical">
 
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/font_large"
-                    android:layout_marginBottom="5dip" />
+                    android:layout_marginBottom="5dip"
+                    android:src="@drawable/font_large" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -386,11 +468,11 @@
                 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" />
+                android:focusable="false"
+                android:src="@drawable/selected"
+                android:visibility="gone" />
         </FrameLayout>
 
         <FrameLayout
@@ -402,15 +484,15 @@
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
                 android:layout_gravity="center"
-                android:gravity="center">
+                android:gravity="center"
+                android:orientation="vertical">
 
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/font_super"
-                    android:layout_marginBottom="5dip" />
+                    android:layout_marginBottom="5dip"
+                    android:src="@drawable/font_super" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -424,11 +506,11 @@
                 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" />
+                android:focusable="false"
+                android:src="@drawable/selected"
+                android:visibility="gone" />
         </FrameLayout>
     </LinearLayout>
 </FrameLayout>
diff --git a/Src/app/src/main/res/menu/note_list.xml b/Src/app/src/main/res/menu/note_list.xml
index 8fff161..9293c75 100644
--- a/Src/app/src/main/res/menu/note_list.xml
+++ b/Src/app/src/main/res/menu/note_list.xml
@@ -41,5 +41,8 @@
     <item
         android:id="@+id/menu_search"
         android:title="@string/menu_search"/>
+    <item
+        android:id="@+id/menu_manage_users"
+        android:title="管理用户"/>
 </menu>
 
diff --git a/Src/app/src/main/res/values-zh-rCN/strings.xml b/Src/app/src/main/res/values-zh-rCN/strings.xml
index be67ce6..af79448 100644
--- a/Src/app/src/main/res/values-zh-rCN/strings.xml
+++ b/Src/app/src/main/res/values-zh-rCN/strings.xml
@@ -138,6 +138,13 @@
     <string name="gesture_forgot_message">您可以通过其他方式重置密码</string>
     <string name="ok">确定</string>
     <string name="cancel">取消</string>
+    <!-- 富文本编辑器工具栏 -->
+    <string name="format_bold">加粗</string>
+    <string name="format_italic">斜体</string>
+    <string name="format_underline">下划线</string>
+    <string name="format_strikethrough">删除线</string>
+    <string name="format_bullet">项目符号</string>
+    <string name="format_text_color">文字颜色</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>
diff --git a/Src/app/src/main/res/values/colors.xml b/Src/app/src/main/res/values/colors.xml
index 85c7e73..7e66346 100644
--- a/Src/app/src/main/res/values/colors.xml
+++ b/Src/app/src/main/res/values/colors.xml
@@ -41,6 +41,12 @@
     <color name="gesture_error_color">#F44336</color>
     <color name="gesture_success_color">#4CAF50</color>
     <color name="gesture_hint_color">#757575</color>
+<<<<<<< HEAD
+>>>>>>> a
+=======
+    <!-- 工具栏相关颜色 -->
+    <color name="toolbar_background">#F5F5F5</color>
+    <color name="toolbar_button_selected">#E0E0E0</color>
 >>>>>>> a
 </resources>
 
diff --git a/Src/app/src/main/res/values/strings.xml b/Src/app/src/main/res/values/strings.xml
index 62f2f67..f194f27 100644
--- a/Src/app/src/main/res/values/strings.xml
+++ b/Src/app/src/main/res/values/strings.xml
@@ -146,6 +146,13 @@
     <string name="gesture_forgot_message">您可以通过其他方式重置密码</string>
     <string name="ok">确定</string>
     <string name="cancel">取消</string>
+    <!-- 富文本编辑器工具栏 -->
+    <string name="format_bold">加粗</string>
+    <string name="format_italic">斜体</string>
+    <string name="format_underline">下划线</string>
+    <string name="format_strikethrough">删除线</string>
+    <string name="format_bullet">项目符号</string>
+    <string name="format_text_color">文字颜色</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. -->