first

9 months ago · 995c8ce271
parent 61f0181fec
commit 995c8ce271
250 changed files with 1108 additions and 1337 deletions
--- a/.gradle/8.0/checksums/checksums.lock
+++ b/.gradle/8.0/checksums/checksums.lock
--- a/.gradle/8.0/checksums/md5-checksums.bin
+++ b/.gradle/8.0/checksums/md5-checksums.bin
--- a/.gradle/8.0/checksums/sha1-checksums.bin
+++ b/.gradle/8.0/checksums/sha1-checksums.bin
--- a/.gradle/8.0/dependencies-accessors/dependencies-accessors.lock
+++ b/.gradle/8.0/dependencies-accessors/dependencies-accessors.lock
--- a/.gradle/8.0/executionHistory/executionHistory.bin
+++ b/.gradle/8.0/executionHistory/executionHistory.bin
--- a/.gradle/8.0/executionHistory/executionHistory.lock
+++ b/.gradle/8.0/executionHistory/executionHistory.lock
--- a/.gradle/8.0/fileHashes/fileHashes.bin
+++ b/.gradle/8.0/fileHashes/fileHashes.bin
--- a/.gradle/8.0/fileHashes/fileHashes.lock
+++ b/.gradle/8.0/fileHashes/fileHashes.lock
--- a/.gradle/8.4/checksums/checksums.lock
+++ b/.gradle/8.4/checksums/checksums.lock
--- a/.gradle/8.4/checksums/sha1-checksums.bin
+++ b/.gradle/8.4/checksums/sha1-checksums.bin
--- a/.gradle/8.4/dependencies-accessors/dependencies-accessors.lock
+++ b/.gradle/8.4/dependencies-accessors/dependencies-accessors.lock
--- a/.gradle/8.4/dependencies-accessors/gc.properties
+++ b/.gradle/8.4/dependencies-accessors/gc.properties
--- a/.gradle/8.4/fileChanges/last-build.bin
+++ b/.gradle/8.4/fileChanges/last-build.bin
--- a/.gradle/8.4/fileHashes/fileHashes.lock
+++ b/.gradle/8.4/fileHashes/fileHashes.lock
--- a/.gradle/8.4/gc.properties
+++ b/.gradle/8.4/gc.properties
--- a/.gradle/8.6/checksums/checksums.lock
+++ b/.gradle/8.6/checksums/checksums.lock
--- a/.gradle/8.6/checksums/md5-checksums.bin
+++ b/.gradle/8.6/checksums/md5-checksums.bin
--- a/.gradle/8.6/checksums/sha1-checksums.bin
+++ b/.gradle/8.6/checksums/sha1-checksums.bin
--- a/.gradle/8.6/dependencies-accessors/gc.properties
+++ b/.gradle/8.6/dependencies-accessors/gc.properties
--- a/.gradle/8.6/executionHistory/executionHistory.bin
+++ b/.gradle/8.6/executionHistory/executionHistory.bin
--- a/.gradle/8.6/executionHistory/executionHistory.lock
+++ b/.gradle/8.6/executionHistory/executionHistory.lock
--- a/.gradle/8.6/fileChanges/last-build.bin
+++ b/.gradle/8.6/fileChanges/last-build.bin
--- a/.gradle/8.6/fileHashes/fileHashes.bin
+++ b/.gradle/8.6/fileHashes/fileHashes.bin
--- a/.gradle/8.6/fileHashes/fileHashes.lock
+++ b/.gradle/8.6/fileHashes/fileHashes.lock
--- a/.gradle/8.6/fileHashes/resourceHashesCache.bin
+++ b/.gradle/8.6/fileHashes/resourceHashesCache.bin
--- a/.gradle/8.6/gc.properties
+++ b/.gradle/8.6/gc.properties
--- a/.gradle/8.7/checksums/checksums.lock
+++ b/.gradle/8.7/checksums/checksums.lock
--- a/.gradle/8.7/checksums/md5-checksums.bin
+++ b/.gradle/8.7/checksums/md5-checksums.bin
--- a/.gradle/8.7/checksums/sha1-checksums.bin
+++ b/.gradle/8.7/checksums/sha1-checksums.bin
--- a/.gradle/8.7/dependencies-accessors/gc.properties
+++ b/.gradle/8.7/dependencies-accessors/gc.properties
--- a/.gradle/8.7/executionHistory/executionHistory.lock
+++ b/.gradle/8.7/executionHistory/executionHistory.lock
--- a/.gradle/8.7/fileChanges/last-build.bin
+++ b/.gradle/8.7/fileChanges/last-build.bin
--- a/.gradle/8.7/fileHashes/fileHashes.bin
+++ b/.gradle/8.7/fileHashes/fileHashes.bin
--- a/.gradle/8.7/fileHashes/fileHashes.lock
+++ b/.gradle/8.7/fileHashes/fileHashes.lock
--- a/.gradle/8.7/fileHashes/resourceHashesCache.bin
+++ b/.gradle/8.7/fileHashes/resourceHashesCache.bin
--- a/.gradle/8.7/gc.properties
+++ b/.gradle/8.7/gc.properties
--- a/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+++ b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
--- a/.gradle/buildOutputCleanup/cache.properties
+++ b/.gradle/buildOutputCleanup/cache.properties
@ -1,2 +1,2 @@
-#Mon Sep 25 19:53:35 CST 2023
-gradle.version=8.0
+#Wed May 15 01:28:25 CST 2024
+gradle.version=8.6
--- a/.gradle/buildOutputCleanup/outputFiles.bin
+++ b/.gradle/buildOutputCleanup/outputFiles.bin
--- a/.gradle/config.properties
+++ b/.gradle/config.properties
@ -0,0 +1,2 @@
+#Wed Dec 20 23:17:28 CST 2023
+java.home=C\:\\Users\\Lenovo\\AppData\\Local\\Programs\\Android Studio\\jbr
--- a/.gradle/file-system.probe
+++ b/.gradle/file-system.probe
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <value>
+      <entry key="app">
+        <State />
+      </entry>
+    </value>
+  </component>
+</project>
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@ -4,16 +4,15 @@
  <component name="GradleSettings">
    <option name="linkedExternalProjectsSettings">
      <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="jbr-17" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
        <option name="modules">
          <set>
            <option value="$PROJECT_DIR$" />
            <option value="$PROJECT_DIR$/app" />
          </set>
        </option>
+        <option name="resolveExternalAnnotations" value="false" />
      </GradleProjectSettings>
    </option>
  </component>
--- a/.idea/migrations.xml
+++ b/.idea/migrations.xml
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectMigrations">
+    <option name="MigrateToGradleLocalJavaHome">
+      <set>
+        <option value="$PROJECT_DIR$" />
+      </set>
+    </option>
+  </component>
+</project>
--- a/.idea/runConfigurations/app.xml
+++ b/.idea/runConfigurations/app.xml
@ -0,0 +1,68 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="app" type="AndroidRunConfigurationType" factoryName="Android App">
+    <option name="DEPLOY" value="true" />
+    <option name="DEPLOY_APK_FROM_BUNDLE" value="true" />
+    <option name="DEPLOY_AS_INSTANT" value="false" />
+    <option name="ARTIFACT_NAME" value="" />
+    <option name="PM_INSTALL_OPTIONS" value="" />
+    <option name="ALL_USERS" value="false" />
+    <option name="ALWAYS_INSTALL_WITH_PM" value="false" />
+    <option name="CLEAR_APP_STORAGE" value="false" />
+    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
+    <option name="ACTIVITY_EXTRA_FLAGS" value="" />
+    <option name="MODE" value="default_activity" />
+    <option name="CLEAR_LOGCAT" value="false" />
+    <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
+    <option name="INSPECTION_WITHOUT_ACTIVITY_RESTART" value="false" />
+    <option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
+    <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
+    <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
+    <option name="DEBUGGER_TYPE" value="Auto" />
+    <Auto>
+      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
+      <option name="SHOW_STATIC_VARS" value="true" />
+      <option name="WORKING_DIR" value="" />
+      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+      <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+      <option name="DEBUG_SANDBOX_SDK" value="false" />
+    </Auto>
+    <Hybrid>
+      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
+      <option name="SHOW_STATIC_VARS" value="true" />
+      <option name="WORKING_DIR" value="" />
+      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+      <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+      <option name="DEBUG_SANDBOX_SDK" value="false" />
+    </Hybrid>
+    <Java>
+      <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+      <option name="DEBUG_SANDBOX_SDK" value="false" />
+    </Java>
+    <Native>
+      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
+      <option name="SHOW_STATIC_VARS" value="true" />
+      <option name="WORKING_DIR" value="" />
+      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+      <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+      <option name="DEBUG_SANDBOX_SDK" value="false" />
+    </Native>
+    <Profilers>
+      <option name="ADVANCED_PROFILING_ENABLED" value="false" />
+      <option name="STARTUP_PROFILING_ENABLED" value="false" />
+      <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
+      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Java/Kotlin Method Sample (legacy)" />
+      <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
+      <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
+    </Profilers>
+    <option name="DEEP_LINK" value="" />
+    <option name="ACTIVITY_CLASS" value="" />
+    <option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="false" />
+    <option name="SKIP_ACTIVITY_VALIDATION" value="false" />
+    <method v="2">
+      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+    </method>
+  </configuration>
+</component>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@ -2,5 +2,6 @@
 <project version="4">
  <component name="VcsDirectoryMappings">
    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/Notes-master" vcs="Git" />
  </component>
 </project>
--- a/app/build.gradle
+++ b/app/build.gradle
@ -2,12 +2,14 @@ apply plugin: 'com.android.application'

 android {
    namespace "net.micode.notes"
-    compileSdkVersion 30
+    compileSdkVersion 34
    buildToolsVersion "34.0.0"
+
    useLibrary 'org.apache.http.legacy'
    defaultConfig {
        applicationId "net.micode.notes"
        minSdkVersion 14
+        //noinspection ExpiredTargetSdkVersion
        targetSdkVersion 29
    }

@ -18,3 +20,4 @@ android {
        }
    }
 }
+
--- a/app/build/intermediates/apk/debug/app-debug.apk
+++ b/app/build/intermediates/apk/debug/app-debug.apk
--- a/app/build/intermediates/app_metadata/debug/app-metadata.properties
+++ b/app/build/intermediates/app_metadata/debug/app-metadata.properties
@ -1,2 +1,2 @@
 appMetadataVersion=1.1
-androidGradlePluginVersion=8.1.1
+androidGradlePluginVersion=8.2.2
--- a/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
+++ b/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
--- a/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
+++ b/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
--- a/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
+++ b/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
--- a/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
+++ b/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
@ -1,9 +1,11 @@
-#Mon Oct 02 22:46:47 CST 2023
+#Sat May 18 18:31:47 CST 2024
 net.micode.notes.app-main-6\:/color/primary_text_dark.xml=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
 net.micode.notes.app-main-6\:/color/secondary_text_dark.xml=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/bck.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bck.png.flat
 net.micode.notes.app-main-6\:/drawable-hdpi/bg_btn_set_color.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
 net.micode.notes.app-main-6\:/drawable-hdpi/bg_color_btn_mask.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
 net.micode.notes.app-main-6\:/drawable-hdpi/call_record.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/chock.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_chock.png.flat
 net.micode.notes.app-main-6\:/drawable-hdpi/clock.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
 net.micode.notes.app-main-6\:/drawable-hdpi/delete.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
 net.micode.notes.app-main-6\:/drawable-hdpi/dropdown_icon.9.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
@ -54,6 +56,7 @@ net.micode.notes.app-main-6\:/drawable-hdpi/note_edit_color_selector_panel.png=C
 net.micode.notes.app-main-6\:/drawable-hdpi/notification.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
 net.micode.notes.app-main-6\:/drawable-hdpi/search_result.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
 net.micode.notes.app-main-6\:/drawable-hdpi/selected.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/sky.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_sky.png.flat
 net.micode.notes.app-main-6\:/drawable-hdpi/title_alert.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
 net.micode.notes.app-main-6\:/drawable-hdpi/title_bar_bg.9.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
 net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_blue.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
@ -66,6 +69,7 @@ net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_green.png=C\:\\Users\\Leno
 net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_red.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
 net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_white.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
 net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_yellow.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/xiaomei.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_xiaomei.png.flat
 net.micode.notes.app-main-6\:/drawable/new_note.xml=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
 net.micode.notes.app-main-6\:/layout/account_dialog_title.xml=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
 net.micode.notes.app-main-6\:/layout/add_account_text.xml=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
--- a/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
+++ b/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
-    <string-array name="menu_share_ways">
-        <item>短信</item>
-        <item>邮件</item>
-    </string-array>
-    <plurals name="search_results_title">
-        <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 条符合“<ns1:g id="SEARCH">%2$s</ns1:g>”的搜索结果</item>
-    </plurals>
-    <string name="alert_message_delete_folder">确认删除文件夹及所包含的便签吗？</string>
-    <string name="alert_message_delete_note">确认要删除该条便签吗?</string>
-    <string name="alert_message_delete_notes">确认要删除所选的 %d 条便签吗?</string>
-    <string name="alert_title_delete">删除</string>
-    <string name="app_name">便签</string>
-    <string name="app_widget2x2">便签2x2</string>
-    <string name="app_widget4x4">便签4x4</string>
-    <string name="button_delete">删除</string>
-    <string name="call_record_folder_name">通话便签</string>
-    <string name="datetime_dialog_cancel">取消</string>
-    <string name="datetime_dialog_ok">设置</string>
-    <string name="delete_remind_time_message">成功删除提醒</string>
-    <string name="error_note_empty_for_clock">不能为空便签设置闹钟提醒</string>
-    <string name="error_note_empty_for_send_to_desktop">不能将空便签发送到桌面</string>
-    <string name="error_note_not_exist">要查看的便签不存在</string>
-    <string name="error_sdcard_export">导出文本时发生错误，请检查SD卡</string>
-    <string name="error_sdcard_unmounted">SD卡被占用，不能操作</string>
-    <string name="error_sync_cancelled">同步已取消</string>
-    <string name="error_sync_internal">同步失败，发生内部错误</string>
-    <string name="error_sync_network">同步失败，请检查网络和帐号设置</string>
-    <string name="failed_sdcard_export">导出失败</string>
-    <string name="folder_exist">文件夹 %1$s 已存在，请重新命名</string>
-    <string name="format_date_ymd">yyyyMMdd</string>
-    <string name="format_datetime_mdhm">MM月dd日 kk:mm</string>
-    <string name="format_exported_file_location">已将文本文件(%1$s)输出至SD卡(%2$s)目录</string>
-    <string name="format_move_notes_to_folder">已将所选 %1$d 条便签移到 %2$s 文件夹</string>
-    <string name="hint_foler_name">请输入名称</string>
-    <string name="info_note_enter_desktop">已添加到桌面</string>
-    <string name="menu_alert">提醒我</string>
-    <string name="menu_create_folder">新建文件夹</string>
-    <string name="menu_delete">删除</string>
-    <string name="menu_deselect_all">取消全选</string>
-    <string name="menu_export_text">导出文本</string>
-    <string name="menu_folder_change_name">修改文件夹名称</string>
-    <string name="menu_folder_delete">刪除文件夹</string>
-    <string name="menu_folder_view">查看文件夹</string>
-    <string name="menu_font_large">大</string>
-    <string name="menu_font_normal">正常</string>
-    <string name="menu_font_size">文字大小</string>
-    <string name="menu_font_small">小</string>
-    <string name="menu_font_super">超大</string>
-    <string name="menu_list_mode">进入清单模式</string>
-    <string name="menu_move">移动到文件夹</string>
-    <string name="menu_move_parent_folder">上一级文件夹</string>
-    <string name="menu_normal_mode">退出清单模式</string>
-    <string name="menu_remove_remind">删除提醒</string>
-    <string name="menu_search">搜索</string>
-    <string name="menu_select_all">全选</string>
-    <string name="menu_select_none">没有选中项，操作无效</string>
-    <string name="menu_select_title">选中了 %d 项</string>
-    <string name="menu_send_to_desktop">发送到桌面</string>
-    <string name="menu_setting">设置</string>
-    <string name="menu_share">分享</string>
-    <string name="menu_sync">同步</string>
-    <string name="menu_sync_cancel">取消同步</string>
-    <string name="menu_title_select_folder">选择文件夹</string>
-    <string name="note_alert_expired">已过期</string>
-    <string name="note_link_email">发送邮件</string>
-    <string name="note_link_other">打开地图</string>
-    <string name="note_link_tel">呼叫电话</string>
-    <string name="note_link_web">浏览网页</string>
-    <string name="notealert_enter">查看</string>
-    <string name="notealert_ok">知道了</string>
-    <string name="notelist_menu_new">新建便签</string>
-    <string name="notelist_string_info">...</string>
-    <string name="preferences_account_summary">与google task同步便签记录</string>
-    <string name="preferences_account_title">同步账号</string>
-    <string name="preferences_add_account">添加账号</string>
-    <string name="preferences_bg_random_appear_title">新建便签背景颜色随机</string>
-    <string name="preferences_button_sync_cancel">取消同步</string>
-    <string name="preferences_button_sync_immediately">立即同步</string>
-    <string name="preferences_dialog_change_account_title">当前帐号 %1$s</string>
-    <string name="preferences_dialog_change_account_warn_msg">如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复</string>
-    <string name="preferences_dialog_select_account_tips">请选择google帐号，便签将与该帐号的google task内容同步。</string>
-    <string name="preferences_dialog_select_account_title">同步便签</string>
-    <string name="preferences_last_sync_time">上次同步于 %1$s</string>
-    <string name="preferences_menu_cancel">取消</string>
-    <string name="preferences_menu_change_account">更换账号</string>
-    <string name="preferences_menu_remove_account">删除账号</string>
-    <string name="preferences_title">设置</string>
-    <string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帐号</string>
-    <string name="preferences_toast_success_set_accout">同步帐号已设置为%1$s</string>
-    <string name="search">便签</string>
-    <string name="search_hint">搜索便签</string>
-    <string name="search_label">正在搜索便签</string>
-    <string name="search_setting_description">便签中的文字</string>
-    <string name="set_remind_time_message">创建提醒</string>
-    <string name="success_sdcard_export">导出成功</string>
-    <string name="success_sync_account">与%1$s同步成功</string>
-    <string name="sync_progress_init_list">正在获取服务器便签列表...</string>
-    <string name="sync_progress_login">登录%1$s...</string>
-    <string name="sync_progress_syncing">正在同步本地便签...</string>
-    <string name="ticker_cancel">同步已取消</string>
-    <string name="ticker_fail">同步失败</string>
-    <string name="ticker_success">同步成功</string>
-    <string name="ticker_syncing">同步便签...</string>
-    <string name="widget_havenot_content">没有关联内容，点击新建便签。</string>
-    <string name="widget_under_visit_mode">访客模式下，便签内容不可见</string>
-</resources>
--- a/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
+++ b/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
-    <string-array name="menu_share_ways">
-        <item>短信</item>
-        <item>郵件</item>
-    </string-array>
-    <plurals name="search_results_title">
-        <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 條符合”<ns1:g id="SEARCH">%2$s</ns1:g>“的搜尋結果</item>
-    </plurals>
-    <string name="alert_message_delete_folder">確認刪除檔夾及所包含的便簽嗎？</string>
-    <string name="alert_message_delete_note">确认要删除該條便籤嗎?</string>
-    <string name="alert_message_delete_notes">确认要刪除所選的 %d 條便籤嗎?</string>
-    <string name="alert_title_delete">刪除</string>
-    <string name="app_name">便簽</string>
-    <string name="app_widget2x2">便簽2x2</string>
-    <string name="app_widget4x4">便簽4x4</string>
-    <string name="button_delete">刪除</string>
-    <string name="call_record_folder_name">通話便籤</string>
-    <string name="datetime_dialog_cancel">取消</string>
-    <string name="datetime_dialog_ok">設置</string>
-    <string name="delete_remind_time_message">成功刪除提醒</string>
-    <string name="error_note_empty_for_clock">不能爲空便籤設置鬧鐘提醒</string>
-    <string name="error_note_empty_for_send_to_desktop">不能將空便籤發送到桌面</string>
-    <string name="error_note_not_exist">要查看的便籤不存在</string>
-    <string name="error_sdcard_export">導出TXT時發生錯誤，請檢查SD卡</string>
-    <string name="error_sdcard_unmounted">SD卡被佔用，不能操作</string>
-    <string name="error_sync_cancelled">同步已取消</string>
-    <string name="error_sync_internal">同步失敗，發生內部錯誤</string>
-    <string name="error_sync_network">同步失敗，請檢查網絡和帳號設置</string>
-    <string name="failed_sdcard_export">導出失敗</string>
-    <string name="folder_exist">文件夾 %1$s 已存在，請重新命名</string>
-    <string name="format_date_ymd">yyyyMMdd</string>
-    <string name="format_datetime_mdhm">MM月dd日 kk:mm</string>
-    <string name="format_exported_file_location">已將文本文件(%1$s)導出至SD(%2$s)目錄</string>
-    <string name="format_move_notes_to_folder">已將所選 %1$d 便籤移到 %2$s 文件夾</string>
-    <string name="hint_foler_name">請輸入名稱</string>
-    <string name="info_note_enter_desktop">已添加到桌面</string>
-    <string name="menu_alert">提醒我</string>
-    <string name="menu_create_folder">新建文件夾</string>
-    <string name="menu_delete">刪除</string>
-    <string name="menu_deselect_all">取消全選</string>
-    <string name="menu_export_text">導出文本</string>
-    <string name="menu_folder_change_name">修改文件夾名稱</string>
-    <string name="menu_folder_delete">刪除文件夾</string>
-    <string name="menu_folder_view">查看文件夾</string>
-    <string name="menu_font_large">大</string>
-    <string name="menu_font_normal">正常</string>
-    <string name="menu_font_size">文字大小</string>
-    <string name="menu_font_small">小</string>
-    <string name="menu_font_super">超大</string>
-    <string name="menu_list_mode">進入清單模式</string>
-    <string name="menu_move">移動到文件夾</string>
-    <string name="menu_move_parent_folder">上一級文件夾</string>
-    <string name="menu_normal_mode">退出清單模式</string>
-    <string name="menu_remove_remind">刪除提醒</string>
-    <string name="menu_search">搜尋</string>
-    <string name="menu_select_all">全選</string>
-    <string name="menu_select_none">沒有選中項，操作無效</string>
-    <string name="menu_select_title">選中了 %d 項</string>
-    <string name="menu_send_to_desktop">發送到桌面</string>
-    <string name="menu_setting">設置</string>
-    <string name="menu_share">分享</string>
-    <string name="menu_sync">同步</string>
-    <string name="menu_sync_cancel">取消同步</string>
-    <string name="menu_title_select_folder">選擇文件夾</string>
-    <string name="note_alert_expired">已過期</string>
-    <string name="note_link_email">發送郵件</string>
-    <string name="note_link_other">打開地圖</string>
-    <string name="note_link_tel">呼叫電話</string>
-    <string name="note_link_web">浏覽網頁</string>
-    <string name="notealert_enter">查看</string>
-    <string name="notealert_ok">知道了</string>
-    <string name="notelist_menu_new">新建便簽</string>
-    <string name="notelist_string_info">...</string>
-    <string name="preferences_account_summary">与google task同步便簽記錄</string>
-    <string name="preferences_account_title">同步賬號</string>
-    <string name="preferences_add_account">添加賬號</string>
-    <string name="preferences_bg_random_appear_title">新建便籤背景顏色隨機</string>
-    <string name="preferences_button_sync_cancel">取消同步</string>
-    <string name="preferences_button_sync_immediately">立即同步</string>
-    <string name="preferences_dialog_change_account_title">當前帳號 %1$s</string>
-    <string name="preferences_dialog_change_account_warn_msg">如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復</string>
-    <string name="preferences_dialog_select_account_tips">請選擇google帳號，便簽將與該帳號的google task內容同步。</string>
-    <string name="preferences_dialog_select_account_title">同步便簽</string>
-    <string name="preferences_last_sync_time">上次同步于 %1$s</string>
-    <string name="preferences_menu_cancel">取消</string>
-    <string name="preferences_menu_change_account">更換賬號</string>
-    <string name="preferences_menu_remove_account">刪除賬號</string>
-    <string name="preferences_title">設置</string>
-    <string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帳號</string>
-    <string name="preferences_toast_success_set_accout">同步帳號已設置為%1$s</string>
-    <string name="search">便籤</string>
-    <string name="search_hint">搜索便籤</string>
-    <string name="search_label">正在搜索便籤</string>
-    <string name="search_setting_description">便籤中的文字</string>
-    <string name="set_remind_time_message">創建提醒</string>
-    <string name="success_sdcard_export">導出成功</string>
-    <string name="success_sync_account">與%1$s同步成功</string>
-    <string name="sync_progress_init_list">正在獲取服務器便籤列表...</string>
-    <string name="sync_progress_login">登陸%1$s...</string>
-    <string name="sync_progress_syncing">正在同步本地便籤...</string>
-    <string name="ticker_cancel">同步已取消</string>
-    <string name="ticker_fail">同步失敗</string>
-    <string name="ticker_success">同步成功</string>
-    <string name="ticker_syncing">同步便簽...</string>
-    <string name="widget_havenot_content">沒有關聯內容，點擊新建便簽。</string>
-    <string name="widget_under_visit_mode">訪客模式下，便籤內容不可見</string>
-</resources>
--- a/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
+++ b/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
-    <string-array name="format_for_exported_note">
-        <item>-%s</item>      
-        <item>--%s</item>     
-        <item>--%s</item>     
-        <item>--%s</item>     
-    </string-array>
-    <string-array name="menu_share_ways">
-        <item>Messaging</item>
-        <item>Email</item>
-    </string-array>
-    <color name="user_query_highlight">#335b5b5b</color>
-    <dimen name="text_font_size_large">26sp</dimen>
-    <dimen name="text_font_size_medium">20sp</dimen>
-    <dimen name="text_font_size_normal">17sp</dimen>
-    <dimen name="text_font_size_small">14sp</dimen>
-    <dimen name="text_font_size_super">33sp</dimen>
-    <plurals name="search_results_title">
-         <item quantity="one"><ns1:g example="1" id="number">%1$s</ns1:g> result for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
-        
-        <item quantity="other"><ns1:g example="15" id="number">%1$s</ns1:g> results for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
-    </plurals>
-    <string name="alert_message_delete_folder">Confirm to delete folder and its notes?</string>
-    <string name="alert_message_delete_note">Confirm to delete this note?</string>
-    <string name="alert_message_delete_notes">Confirm to delete the selected %d notes?</string>
-    <string name="alert_title_delete">Delete selected notes</string>
-    <string name="app_name">Notes</string>
-    <string name="app_widget2x2">Notes 2x2</string>
-    <string name="app_widget4x4">Notes 4x4</string>
-    <string name="button_delete">Delete</string>
-    <string name="call_record_folder_name">Call notes</string>
-    <string name="datetime_dialog_cancel">cancel</string>
-    <string name="datetime_dialog_ok">set</string>
-    <string name="delete_remind_time_message">Delete reminder successfully</string>
-    <string name="error_note_empty_for_clock">Sorry, can not set clock on empty note</string>
-    <string name="error_note_empty_for_send_to_desktop">Sorry, can not send and empty note to home</string>
-    <string name="error_note_not_exist">The note is not exist</string>
-    <string name="error_sdcard_export">Export failed, please check SD card</string>
-    <string name="error_sdcard_unmounted">SD card busy, not available now</string>
-    <string name="error_sync_cancelled">Sync is canceled</string>
-    <string name="error_sync_internal">Sync failed, internal error occurs</string>
-    <string name="error_sync_network">Sync failed, please check network and account settings</string>
-    <string name="failed_sdcard_export">Export fail</string>
-    <string name="file_name_txt_format">notes_%s.txt</string>
-    <string name="file_path">/MIUI/notes/</string>
-    <string name="folder_exist">The folder %1$s exist, please rename</string>
-    <string name="format_date_ymd">yyyyMMdd</string>
-    <string name="format_datetime_mdhm">MMMd kk:mm</string>
-    <string name="format_exported_file_location">Export text file (%1$s) to SD (%2$s) directory</string>
-    <string name="format_folder_files_count">(%d)</string>
-    <string name="format_move_notes_to_folder">Have moved selected %1$d notes to %2$s folder</string>
-    <string name="hint_foler_name">Input name</string>
-    <string name="info_note_enter_desktop">Note added to home</string>
-    <string name="menu_alert">Remind me</string>
-    <string name="menu_create_folder">New Folder</string>
-    <string name="menu_delete">Delete</string>
-    <string name="menu_deselect_all">Deselect all</string>
-    <string name="menu_export_text">Export text</string>
-    <string name="menu_folder_change_name">Change folder name</string>
-    <string name="menu_folder_delete">Delete folder</string>
-    <string name="menu_folder_view">View folder</string>
-    <string name="menu_font_large">Large</string>
-    <string name="menu_font_normal">Medium</string>
-    <string name="menu_font_size">Font size</string>
-    <string name="menu_font_small">Small</string>
-    <string name="menu_font_super">Super</string>
-    <string name="menu_list_mode">Enter check list</string>
-    <string name="menu_move">Move to folder</string>
-    <string name="menu_move_parent_folder">Parent folder</string>
-    <string name="menu_normal_mode">Leave check list</string>
-    <string name="menu_remove_remind">Delete reminder</string>
-    <string name="menu_search">Search</string>
-    <string name="menu_select_all">Select all</string>
-    <string name="menu_select_none">Nothing selected, the operation is invalid</string>
-    <string name="menu_select_title">%d selected</string>
-    <string name="menu_send_to_desktop">Send to home</string>
-    <string name="menu_setting">Settings</string>
-    <string name="menu_share">Share</string>
-    <string name="menu_sync">Sync</string>
-    <string name="menu_sync_cancel">Cancel syncing</string>
-    <string name="menu_title_select_folder">Select folder</string>
-    <string name="note_alert_expired">Expired</string>
-    <string name="note_link_email">Send email</string>
-    <string name="note_link_other">Open map</string>
-    <string name="note_link_tel">Call</string>
-    <string name="note_link_web">Browse web</string>
-    <string name="notealert_enter">Take a look</string>
-    <string name="notealert_ok">Got it</string>
-    <string name="notelist_menu_new">Add note</string>
-    <string name="notelist_string_info">...</string>
-    <string name="preferences_account_summary">Sync notes with google task</string>
-    <string name="preferences_account_title">Sync account</string>
-    <string name="preferences_add_account">Add account</string>
-    <string name="preferences_bg_random_appear_title">New note background color random</string>
-    <string name="preferences_button_sync_cancel">Cancel syncing</string>
-    <string name="preferences_button_sync_immediately">Sync immediately</string>
-    <string name="preferences_dialog_change_account_title">Current account %1$s</string>
-    <string name="preferences_dialog_change_account_warn_msg">All sync related information will be deleted, which may result in duplicated items sometime</string>
-    <string name="preferences_dialog_select_account_tips">Please select a google account. Local notes will be synced with google task.</string>
-    <string name="preferences_dialog_select_account_title">Sync notes</string>
-    <string name="preferences_last_sync_time">Last sync time %1$s</string>
-    <string name="preferences_last_sync_time_format">yyyy-MM-dd hh:mm:ss</string>
-    <string name="preferences_menu_cancel">Cancel</string>
-    <string name="preferences_menu_change_account">Change sync account</string>
-    <string name="preferences_menu_remove_account">Remove sync account</string>
-    <string name="preferences_title">Settings</string>
-    <string name="preferences_toast_cannot_change_account">Cannot change the account because sync is in progress</string>
-    <string name="preferences_toast_success_set_accout">%1$s has been set as the sync account</string>
-    <string name="search">Notes</string>
-    <string name="search_hint">Search notes</string>
-    <string name="search_label">Searching Notes</string>
-    <string name="search_setting_description">Text in your notes</string>
-    <string name="set_remind_time_message">Set reminder</string>
-    <string name="success_sdcard_export">Export successful</string>
-    <string name="success_sync_account">Sync is successful with account %1$s</string>
-    <string name="sync_progress_init_list">Getting remote note list...</string>
-    <string name="sync_progress_login">Logging into %1$s...</string>
-    <string name="sync_progress_syncing">Synchronize local notes with Google Task...</string>
-    <string name="ticker_cancel">Sync is canceled</string>
-    <string name="ticker_fail">Sync is failed</string>
-    <string name="ticker_success">Sync is successful</string>
-    <string name="ticker_syncing">Syncing notes...</string>
-    <string name="widget_havenot_content">No associated note found, click to create associated note.</string>
-    <string name="widget_under_visit_mode">Privacy mode，can not see note content</string>
-    <style name="HighlightTextAppearancePrimary">
-    <item name="android:textSize">@dimen/text_font_size_normal</item>
-        <item name="android:textColor">@color/primary_text_dark</item>
-    </style>
-    <style name="HighlightTextAppearanceSecondary">
-        <item name="android:textSize">@dimen/text_font_size_small</item>
-        <item name="android:textColor">@color/secondary_text_dark</item>
-    </style>
-    <style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
-        <item name="android:displayOptions"/>
-        <item name="android:visibility">gone</item>
-    </style>
-    <style name="NoteTheme" parent="@android:style/Theme.Holo.Light">
-        <item name="android:actionBarStyle">@style/NoteActionBarStyle</item>
-    </style>
-    <style name="TextAppearanceLarge">
-        <item name="android:textSize">@dimen/text_font_size_large</item>
-        <item name="android:textColorLink">#0000ff</item>
-    </style>
-    <style name="TextAppearanceMedium">
-        <item name="android:textSize">@dimen/text_font_size_medium</item>
-        <item name="android:textColorLink">#0000ff</item>
-    </style>
-    <style name="TextAppearanceNormal">
-        <item name="android:textSize">@dimen/text_font_size_normal</item>
-        <item name="android:textColorLink">#0000ff</item>
-    </style>
-    <style name="TextAppearancePrimaryItem">
-        <item name="android:textSize">@dimen/text_font_size_normal</item>
-        <item name="android:textColor">@color/primary_text_dark</item>
-    </style>
-    <style name="TextAppearanceSecondaryItem">
-        <item name="android:textSize">@dimen/text_font_size_small</item>
-        <item name="android:textColor">@color/secondary_text_dark</item>
-    </style>
-    <style name="TextAppearanceSuper">
-        <item name="android:textSize">@dimen/text_font_size_super</item>
-        <item name="android:textColorLink">#0000ff</item>
-    </style>
-    <style name="TextAppearanceUnderMenuIcon">
-        <item name="android:textSize">@dimen/text_font_size_normal</item>
-        <item name="android:textColor">@android:color/black</item>
-    </style>
-</resources>
--- a/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
+++ b/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
--- a/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
+++ b/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
@ -1,9 +1,11 @@
-#Mon Oct 02 22:46:49 CST 2023
+#Sat May 18 18:31:47 CST 2024
 net.micode.notes.app-main-5\:/color/primary_text_dark.xml=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml
 net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml
+net.micode.notes.app-main-5\:/drawable-hdpi/bck.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bck.png
 net.micode.notes.app-main-5\:/drawable-hdpi/bg_btn_set_color.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_btn_set_color.png
 net.micode.notes.app-main-5\:/drawable-hdpi/bg_color_btn_mask.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_color_btn_mask.png
 net.micode.notes.app-main-5\:/drawable-hdpi/call_record.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\call_record.png
+net.micode.notes.app-main-5\:/drawable-hdpi/chock.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\chock.png
 net.micode.notes.app-main-5\:/drawable-hdpi/clock.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\clock.png
 net.micode.notes.app-main-5\:/drawable-hdpi/delete.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\delete.png
 net.micode.notes.app-main-5\:/drawable-hdpi/dropdown_icon.9.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\dropdown_icon.9.png
@ -54,6 +56,7 @@ net.micode.notes.app-main-5\:/drawable-hdpi/note_edit_color_selector_panel.png=C
 net.micode.notes.app-main-5\:/drawable-hdpi/notification.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\notification.png
 net.micode.notes.app-main-5\:/drawable-hdpi/search_result.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\search_result.png
 net.micode.notes.app-main-5\:/drawable-hdpi/selected.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\selected.png
+net.micode.notes.app-main-5\:/drawable-hdpi/sky.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\sky.png
 net.micode.notes.app-main-5\:/drawable-hdpi/title_alert.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_alert.png
 net.micode.notes.app-main-5\:/drawable-hdpi/title_bar_bg.9.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_bar_bg.9.png
 net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_blue.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_blue.png
@ -66,6 +69,7 @@ net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_green.png=C\:\\Users\\Leno
 net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_red.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_red.png
 net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_white.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_white.png
 net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_yellow.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_yellow.png
+net.micode.notes.app-main-5\:/drawable-hdpi/xiaomei.png=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\xiaomei.png
 net.micode.notes.app-main-5\:/drawable/new_note.xml=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\new_note.xml
 net.micode.notes.app-main-5\:/layout/account_dialog_title.xml=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\account_dialog_title.xml
 net.micode.notes.app-main-5\:/layout/add_account_text.xml=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\add_account_text.xml
--- a/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
+++ b/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
-    <string-array name="menu_share_ways">
-        <item>短信</item>
-        <item>邮件</item>
-    </string-array>
-    <plurals name="search_results_title">
-        <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 条符合“<ns1:g id="SEARCH">%2$s</ns1:g>”的搜索结果</item>
-    </plurals>
-    <string name="alert_message_delete_folder">确认删除文件夹及所包含的便签吗？</string>
-    <string name="alert_message_delete_note">确认要删除该条便签吗?</string>
-    <string name="alert_message_delete_notes">确认要删除所选的 %d 条便签吗?</string>
-    <string name="alert_title_delete">删除</string>
-    <string name="app_name">便签</string>
-    <string name="app_widget2x2">便签2x2</string>
-    <string name="app_widget4x4">便签4x4</string>
-    <string name="button_delete">删除</string>
-    <string name="call_record_folder_name">通话便签</string>
-    <string name="datetime_dialog_cancel">取消</string>
-    <string name="datetime_dialog_ok">设置</string>
-    <string name="delete_remind_time_message">成功删除提醒</string>
-    <string name="error_note_empty_for_clock">不能为空便签设置闹钟提醒</string>
-    <string name="error_note_empty_for_send_to_desktop">不能将空便签发送到桌面</string>
-    <string name="error_note_not_exist">要查看的便签不存在</string>
-    <string name="error_sdcard_export">导出文本时发生错误，请检查SD卡</string>
-    <string name="error_sdcard_unmounted">SD卡被占用，不能操作</string>
-    <string name="error_sync_cancelled">同步已取消</string>
-    <string name="error_sync_internal">同步失败，发生内部错误</string>
-    <string name="error_sync_network">同步失败，请检查网络和帐号设置</string>
-    <string name="failed_sdcard_export">导出失败</string>
-    <string name="folder_exist">文件夹 %1$s 已存在，请重新命名</string>
-    <string name="format_date_ymd">yyyyMMdd</string>
-    <string name="format_datetime_mdhm">MM月dd日 kk:mm</string>
-    <string name="format_exported_file_location">已将文本文件(%1$s)输出至SD卡(%2$s)目录</string>
-    <string name="format_move_notes_to_folder">已将所选 %1$d 条便签移到 %2$s 文件夹</string>
-    <string name="hint_foler_name">请输入名称</string>
-    <string name="info_note_enter_desktop">已添加到桌面</string>
-    <string name="menu_alert">提醒我</string>
-    <string name="menu_create_folder">新建文件夹</string>
-    <string name="menu_delete">删除</string>
-    <string name="menu_deselect_all">取消全选</string>
-    <string name="menu_export_text">导出文本</string>
-    <string name="menu_folder_change_name">修改文件夹名称</string>
-    <string name="menu_folder_delete">刪除文件夹</string>
-    <string name="menu_folder_view">查看文件夹</string>
-    <string name="menu_font_large">大</string>
-    <string name="menu_font_normal">正常</string>
-    <string name="menu_font_size">文字大小</string>
-    <string name="menu_font_small">小</string>
-    <string name="menu_font_super">超大</string>
-    <string name="menu_list_mode">进入清单模式</string>
-    <string name="menu_move">移动到文件夹</string>
-    <string name="menu_move_parent_folder">上一级文件夹</string>
-    <string name="menu_normal_mode">退出清单模式</string>
-    <string name="menu_remove_remind">删除提醒</string>
-    <string name="menu_search">搜索</string>
-    <string name="menu_select_all">全选</string>
-    <string name="menu_select_none">没有选中项，操作无效</string>
-    <string name="menu_select_title">选中了 %d 项</string>
-    <string name="menu_send_to_desktop">发送到桌面</string>
-    <string name="menu_setting">设置</string>
-    <string name="menu_share">分享</string>
-    <string name="menu_sync">同步</string>
-    <string name="menu_sync_cancel">取消同步</string>
-    <string name="menu_title_select_folder">选择文件夹</string>
-    <string name="note_alert_expired">已过期</string>
-    <string name="note_link_email">发送邮件</string>
-    <string name="note_link_other">打开地图</string>
-    <string name="note_link_tel">呼叫电话</string>
-    <string name="note_link_web">浏览网页</string>
-    <string name="notealert_enter">查看</string>
-    <string name="notealert_ok">知道了</string>
-    <string name="notelist_menu_new">新建便签</string>
-    <string name="notelist_string_info">...</string>
-    <string name="preferences_account_summary">与google task同步便签记录</string>
-    <string name="preferences_account_title">同步账号</string>
-    <string name="preferences_add_account">添加账号</string>
-    <string name="preferences_bg_random_appear_title">新建便签背景颜色随机</string>
-    <string name="preferences_button_sync_cancel">取消同步</string>
-    <string name="preferences_button_sync_immediately">立即同步</string>
-    <string name="preferences_dialog_change_account_title">当前帐号 %1$s</string>
-    <string name="preferences_dialog_change_account_warn_msg">如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复</string>
-    <string name="preferences_dialog_select_account_tips">请选择google帐号，便签将与该帐号的google task内容同步。</string>
-    <string name="preferences_dialog_select_account_title">同步便签</string>
-    <string name="preferences_last_sync_time">上次同步于 %1$s</string>
-    <string name="preferences_menu_cancel">取消</string>
-    <string name="preferences_menu_change_account">更换账号</string>
-    <string name="preferences_menu_remove_account">删除账号</string>
-    <string name="preferences_title">设置</string>
-    <string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帐号</string>
-    <string name="preferences_toast_success_set_accout">同步帐号已设置为%1$s</string>
-    <string name="search">便签</string>
-    <string name="search_hint">搜索便签</string>
-    <string name="search_label">正在搜索便签</string>
-    <string name="search_setting_description">便签中的文字</string>
-    <string name="set_remind_time_message">创建提醒</string>
-    <string name="success_sdcard_export">导出成功</string>
-    <string name="success_sync_account">与%1$s同步成功</string>
-    <string name="sync_progress_init_list">正在获取服务器便签列表...</string>
-    <string name="sync_progress_login">登录%1$s...</string>
-    <string name="sync_progress_syncing">正在同步本地便签...</string>
-    <string name="ticker_cancel">同步已取消</string>
-    <string name="ticker_fail">同步失败</string>
-    <string name="ticker_success">同步成功</string>
-    <string name="ticker_syncing">同步便签...</string>
-    <string name="widget_havenot_content">没有关联内容，点击新建便签。</string>
-    <string name="widget_under_visit_mode">访客模式下，便签内容不可见</string>
-</resources>
--- a/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
+++ b/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
-    <string-array name="menu_share_ways">
-        <item>短信</item>
-        <item>郵件</item>
-    </string-array>
-    <plurals name="search_results_title">
-        <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 條符合”<ns1:g id="SEARCH">%2$s</ns1:g>“的搜尋結果</item>
-    </plurals>
-    <string name="alert_message_delete_folder">確認刪除檔夾及所包含的便簽嗎？</string>
-    <string name="alert_message_delete_note">确认要删除該條便籤嗎?</string>
-    <string name="alert_message_delete_notes">确认要刪除所選的 %d 條便籤嗎?</string>
-    <string name="alert_title_delete">刪除</string>
-    <string name="app_name">便簽</string>
-    <string name="app_widget2x2">便簽2x2</string>
-    <string name="app_widget4x4">便簽4x4</string>
-    <string name="button_delete">刪除</string>
-    <string name="call_record_folder_name">通話便籤</string>
-    <string name="datetime_dialog_cancel">取消</string>
-    <string name="datetime_dialog_ok">設置</string>
-    <string name="delete_remind_time_message">成功刪除提醒</string>
-    <string name="error_note_empty_for_clock">不能爲空便籤設置鬧鐘提醒</string>
-    <string name="error_note_empty_for_send_to_desktop">不能將空便籤發送到桌面</string>
-    <string name="error_note_not_exist">要查看的便籤不存在</string>
-    <string name="error_sdcard_export">導出TXT時發生錯誤，請檢查SD卡</string>
-    <string name="error_sdcard_unmounted">SD卡被佔用，不能操作</string>
-    <string name="error_sync_cancelled">同步已取消</string>
-    <string name="error_sync_internal">同步失敗，發生內部錯誤</string>
-    <string name="error_sync_network">同步失敗，請檢查網絡和帳號設置</string>
-    <string name="failed_sdcard_export">導出失敗</string>
-    <string name="folder_exist">文件夾 %1$s 已存在，請重新命名</string>
-    <string name="format_date_ymd">yyyyMMdd</string>
-    <string name="format_datetime_mdhm">MM月dd日 kk:mm</string>
-    <string name="format_exported_file_location">已將文本文件(%1$s)導出至SD(%2$s)目錄</string>
-    <string name="format_move_notes_to_folder">已將所選 %1$d 便籤移到 %2$s 文件夾</string>
-    <string name="hint_foler_name">請輸入名稱</string>
-    <string name="info_note_enter_desktop">已添加到桌面</string>
-    <string name="menu_alert">提醒我</string>
-    <string name="menu_create_folder">新建文件夾</string>
-    <string name="menu_delete">刪除</string>
-    <string name="menu_deselect_all">取消全選</string>
-    <string name="menu_export_text">導出文本</string>
-    <string name="menu_folder_change_name">修改文件夾名稱</string>
-    <string name="menu_folder_delete">刪除文件夾</string>
-    <string name="menu_folder_view">查看文件夾</string>
-    <string name="menu_font_large">大</string>
-    <string name="menu_font_normal">正常</string>
-    <string name="menu_font_size">文字大小</string>
-    <string name="menu_font_small">小</string>
-    <string name="menu_font_super">超大</string>
-    <string name="menu_list_mode">進入清單模式</string>
-    <string name="menu_move">移動到文件夾</string>
-    <string name="menu_move_parent_folder">上一級文件夾</string>
-    <string name="menu_normal_mode">退出清單模式</string>
-    <string name="menu_remove_remind">刪除提醒</string>
-    <string name="menu_search">搜尋</string>
-    <string name="menu_select_all">全選</string>
-    <string name="menu_select_none">沒有選中項，操作無效</string>
-    <string name="menu_select_title">選中了 %d 項</string>
-    <string name="menu_send_to_desktop">發送到桌面</string>
-    <string name="menu_setting">設置</string>
-    <string name="menu_share">分享</string>
-    <string name="menu_sync">同步</string>
-    <string name="menu_sync_cancel">取消同步</string>
-    <string name="menu_title_select_folder">選擇文件夾</string>
-    <string name="note_alert_expired">已過期</string>
-    <string name="note_link_email">發送郵件</string>
-    <string name="note_link_other">打開地圖</string>
-    <string name="note_link_tel">呼叫電話</string>
-    <string name="note_link_web">浏覽網頁</string>
-    <string name="notealert_enter">查看</string>
-    <string name="notealert_ok">知道了</string>
-    <string name="notelist_menu_new">新建便簽</string>
-    <string name="notelist_string_info">...</string>
-    <string name="preferences_account_summary">与google task同步便簽記錄</string>
-    <string name="preferences_account_title">同步賬號</string>
-    <string name="preferences_add_account">添加賬號</string>
-    <string name="preferences_bg_random_appear_title">新建便籤背景顏色隨機</string>
-    <string name="preferences_button_sync_cancel">取消同步</string>
-    <string name="preferences_button_sync_immediately">立即同步</string>
-    <string name="preferences_dialog_change_account_title">當前帳號 %1$s</string>
-    <string name="preferences_dialog_change_account_warn_msg">如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復</string>
-    <string name="preferences_dialog_select_account_tips">請選擇google帳號，便簽將與該帳號的google task內容同步。</string>
-    <string name="preferences_dialog_select_account_title">同步便簽</string>
-    <string name="preferences_last_sync_time">上次同步于 %1$s</string>
-    <string name="preferences_menu_cancel">取消</string>
-    <string name="preferences_menu_change_account">更換賬號</string>
-    <string name="preferences_menu_remove_account">刪除賬號</string>
-    <string name="preferences_title">設置</string>
-    <string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帳號</string>
-    <string name="preferences_toast_success_set_accout">同步帳號已設置為%1$s</string>
-    <string name="search">便籤</string>
-    <string name="search_hint">搜索便籤</string>
-    <string name="search_label">正在搜索便籤</string>
-    <string name="search_setting_description">便籤中的文字</string>
-    <string name="set_remind_time_message">創建提醒</string>
-    <string name="success_sdcard_export">導出成功</string>
-    <string name="success_sync_account">與%1$s同步成功</string>
-    <string name="sync_progress_init_list">正在獲取服務器便籤列表...</string>
-    <string name="sync_progress_login">登陸%1$s...</string>
-    <string name="sync_progress_syncing">正在同步本地便籤...</string>
-    <string name="ticker_cancel">同步已取消</string>
-    <string name="ticker_fail">同步失敗</string>
-    <string name="ticker_success">同步成功</string>
-    <string name="ticker_syncing">同步便簽...</string>
-    <string name="widget_havenot_content">沒有關聯內容，點擊新建便簽。</string>
-    <string name="widget_under_visit_mode">訪客模式下，便籤內容不可見</string>
-</resources>
--- a/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml
+++ b/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml
@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
-    <string-array name="format_for_exported_note">
-        <item>-%s</item>      
-        <item>--%s</item>     
-        <item>--%s</item>     
-        <item>--%s</item>     
-    </string-array>
-    <string-array name="menu_share_ways">
-        <item>Messaging</item>
-        <item>Email</item>
-    </string-array>
-    <color name="user_query_highlight">#335b5b5b</color>
-    <dimen name="text_font_size_large">26sp</dimen>
-    <dimen name="text_font_size_medium">20sp</dimen>
-    <dimen name="text_font_size_normal">17sp</dimen>
-    <dimen name="text_font_size_small">14sp</dimen>
-    <dimen name="text_font_size_super">33sp</dimen>
-    <plurals name="search_results_title">
-         <item quantity="one"><ns1:g example="1" id="number">%1$s</ns1:g> result for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
-        
-        <item quantity="other"><ns1:g example="15" id="number">%1$s</ns1:g> results for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
-    </plurals>
-    <string name="alert_message_delete_folder">Confirm to delete folder and its notes?</string>
-    <string name="alert_message_delete_note">Confirm to delete this note?</string>
-    <string name="alert_message_delete_notes">Confirm to delete the selected %d notes?</string>
-    <string name="alert_title_delete">Delete selected notes</string>
-    <string name="app_name">Notes</string>
-    <string name="app_widget2x2">Notes 2x2</string>
-    <string name="app_widget4x4">Notes 4x4</string>
-    <string name="button_delete">Delete</string>
-    <string name="call_record_folder_name">Call notes</string>
-    <string name="datetime_dialog_cancel">cancel</string>
-    <string name="datetime_dialog_ok">set</string>
-    <string name="delete_remind_time_message">Delete reminder successfully</string>
-    <string name="error_note_empty_for_clock">Sorry, can not set clock on empty note</string>
-    <string name="error_note_empty_for_send_to_desktop">Sorry, can not send and empty note to home</string>
-    <string name="error_note_not_exist">The note is not exist</string>
-    <string name="error_sdcard_export">Export failed, please check SD card</string>
-    <string name="error_sdcard_unmounted">SD card busy, not available now</string>
-    <string name="error_sync_cancelled">Sync is canceled</string>
-    <string name="error_sync_internal">Sync failed, internal error occurs</string>
-    <string name="error_sync_network">Sync failed, please check network and account settings</string>
-    <string name="failed_sdcard_export">Export fail</string>
-    <string name="file_name_txt_format">notes_%s.txt</string>
-    <string name="file_path">/MIUI/notes/</string>
-    <string name="folder_exist">The folder %1$s exist, please rename</string>
-    <string name="format_date_ymd">yyyyMMdd</string>
-    <string name="format_datetime_mdhm">MMMd kk:mm</string>
-    <string name="format_exported_file_location">Export text file (%1$s) to SD (%2$s) directory</string>
-    <string name="format_folder_files_count">(%d)</string>
-    <string name="format_move_notes_to_folder">Have moved selected %1$d notes to %2$s folder</string>
-    <string name="hint_foler_name">Input name</string>
-    <string name="info_note_enter_desktop">Note added to home</string>
-    <string name="menu_alert">Remind me</string>
-    <string name="menu_create_folder">New Folder</string>
-    <string name="menu_delete">Delete</string>
-    <string name="menu_deselect_all">Deselect all</string>
-    <string name="menu_export_text">Export text</string>
-    <string name="menu_folder_change_name">Change folder name</string>
-    <string name="menu_folder_delete">Delete folder</string>
-    <string name="menu_folder_view">View folder</string>
-    <string name="menu_font_large">Large</string>
-    <string name="menu_font_normal">Medium</string>
-    <string name="menu_font_size">Font size</string>
-    <string name="menu_font_small">Small</string>
-    <string name="menu_font_super">Super</string>
-    <string name="menu_list_mode">Enter check list</string>
-    <string name="menu_move">Move to folder</string>
-    <string name="menu_move_parent_folder">Parent folder</string>
-    <string name="menu_normal_mode">Leave check list</string>
-    <string name="menu_remove_remind">Delete reminder</string>
-    <string name="menu_search">Search</string>
-    <string name="menu_select_all">Select all</string>
-    <string name="menu_select_none">Nothing selected, the operation is invalid</string>
-    <string name="menu_select_title">%d selected</string>
-    <string name="menu_send_to_desktop">Send to home</string>
-    <string name="menu_setting">Settings</string>
-    <string name="menu_share">Share</string>
-    <string name="menu_sync">Sync</string>
-    <string name="menu_sync_cancel">Cancel syncing</string>
-    <string name="menu_title_select_folder">Select folder</string>
-    <string name="note_alert_expired">Expired</string>
-    <string name="note_link_email">Send email</string>
-    <string name="note_link_other">Open map</string>
-    <string name="note_link_tel">Call</string>
-    <string name="note_link_web">Browse web</string>
-    <string name="notealert_enter">Take a look</string>
-    <string name="notealert_ok">Got it</string>
-    <string name="notelist_menu_new">Add note</string>
-    <string name="notelist_string_info">...</string>
-    <string name="preferences_account_summary">Sync notes with google task</string>
-    <string name="preferences_account_title">Sync account</string>
-    <string name="preferences_add_account">Add account</string>
-    <string name="preferences_bg_random_appear_title">New note background color random</string>
-    <string name="preferences_button_sync_cancel">Cancel syncing</string>
-    <string name="preferences_button_sync_immediately">Sync immediately</string>
-    <string name="preferences_dialog_change_account_title">Current account %1$s</string>
-    <string name="preferences_dialog_change_account_warn_msg">All sync related information will be deleted, which may result in duplicated items sometime</string>
-    <string name="preferences_dialog_select_account_tips">Please select a google account. Local notes will be synced with google task.</string>
-    <string name="preferences_dialog_select_account_title">Sync notes</string>
-    <string name="preferences_last_sync_time">Last sync time %1$s</string>
-    <string name="preferences_last_sync_time_format">yyyy-MM-dd hh:mm:ss</string>
-    <string name="preferences_menu_cancel">Cancel</string>
-    <string name="preferences_menu_change_account">Change sync account</string>
-    <string name="preferences_menu_remove_account">Remove sync account</string>
-    <string name="preferences_title">Settings</string>
-    <string name="preferences_toast_cannot_change_account">Cannot change the account because sync is in progress</string>
-    <string name="preferences_toast_success_set_accout">%1$s has been set as the sync account</string>
-    <string name="search">Notes</string>
-    <string name="search_hint">Search notes</string>
-    <string name="search_label">Searching Notes</string>
-    <string name="search_setting_description">Text in your notes</string>
-    <string name="set_remind_time_message">Set reminder</string>
-    <string name="success_sdcard_export">Export successful</string>
-    <string name="success_sync_account">Sync is successful with account %1$s</string>
-    <string name="sync_progress_init_list">Getting remote note list...</string>
-    <string name="sync_progress_login">Logging into %1$s...</string>
-    <string name="sync_progress_syncing">Synchronize local notes with Google Task...</string>
-    <string name="ticker_cancel">Sync is canceled</string>
-    <string name="ticker_fail">Sync is failed</string>
-    <string name="ticker_success">Sync is successful</string>
-    <string name="ticker_syncing">Syncing notes...</string>
-    <string name="widget_havenot_content">No associated note found, click to create associated note.</string>
-    <string name="widget_under_visit_mode">Privacy mode，can not see note content</string>
-    <style name="HighlightTextAppearancePrimary">
-    <item name="android:textSize">@dimen/text_font_size_normal</item>
-        <item name="android:textColor">@color/primary_text_dark</item>
-    </style>
-    <style name="HighlightTextAppearanceSecondary">
-        <item name="android:textSize">@dimen/text_font_size_small</item>
-        <item name="android:textColor">@color/secondary_text_dark</item>
-    </style>
-    <style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
-        <item name="android:displayOptions"/>
-        <item name="android:visibility">gone</item>
-    </style>
-    <style name="NoteTheme" parent="@android:style/Theme.Holo.Light">
-        <item name="android:actionBarStyle">@style/NoteActionBarStyle</item>
-    </style>
-    <style name="TextAppearanceLarge">
-        <item name="android:textSize">@dimen/text_font_size_large</item>
-        <item name="android:textColorLink">#0000ff</item>
-    </style>
-    <style name="TextAppearanceMedium">
-        <item name="android:textSize">@dimen/text_font_size_medium</item>
-        <item name="android:textColorLink">#0000ff</item>
-    </style>
-    <style name="TextAppearanceNormal">
-        <item name="android:textSize">@dimen/text_font_size_normal</item>
-        <item name="android:textColorLink">#0000ff</item>
-    </style>
-    <style name="TextAppearancePrimaryItem">
-        <item name="android:textSize">@dimen/text_font_size_normal</item>
-        <item name="android:textColor">@color/primary_text_dark</item>
-    </style>
-    <style name="TextAppearanceSecondaryItem">
-        <item name="android:textSize">@dimen/text_font_size_small</item>
-        <item name="android:textColor">@color/secondary_text_dark</item>
-    </style>
-    <style name="TextAppearanceSuper">
-        <item name="android:textSize">@dimen/text_font_size_super</item>
-        <item name="android:textColorLink">#0000ff</item>
-    </style>
-    <style name="TextAppearanceUnderMenuIcon">
-        <item name="android:textSize">@dimen/text_font_size_normal</item>
-        <item name="android:textColor">@android:color/black</item>
-    </style>
-</resources>
--- a/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml
+++ b/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml
--- a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@ -1,4 +1,4 @@
-#Mon Oct 02 22:46:54 CST 2023
+#Sat May 18 18:31:48 CST 2024
 base.0=C\:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
 path.0=classes.dex
 renamed.0=classes.dex
--- a/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
+++ b/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
--- a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/DefaultHttpClient.class
+++ b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/DefaultHttpClient.class
--- a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class
+++ b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class
--- a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class
+++ b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class
--- a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class
+++ b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class
--- a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class
+++ b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class
--- a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$12.class
+++ b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$12.class
--- a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$13.class
+++ b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$13.class
--- a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class
+++ b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class
--- a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class
+++ b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class
--- a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class
+++ b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class
--- a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class
+++ b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class
--- a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class
+++ b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class
--- a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class
+++ b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class
--- a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
+++ b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
--- a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class
+++ b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class
--- a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class
+++ b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class
--- a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class
+++ b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class
--- a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class
+++ b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class
--- a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class
+++ b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class
--- a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class
+++ b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class
--- a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class
+++ b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class
--- a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
+++ b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
--- a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
+++ b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
--- a/app/build/intermediates/local_only_symbol_list/debug/R-def.txt
+++ b/app/build/intermediates/local_only_symbol_list/debug/R-def.txt
@ -10,9 +10,11 @@ dimen text_font_size_medium
 dimen text_font_size_normal
 dimen text_font_size_small
 dimen text_font_size_super
+drawable bck
 drawable bg_btn_set_color
 drawable bg_color_btn_mask
 drawable call_record
+drawable chock
 drawable clock
 drawable delete
 drawable dropdown_icon
@ -64,6 +66,7 @@ drawable note_edit_color_selector_panel
 drawable notification
 drawable search_result
 drawable selected
+drawable sky
 drawable title_alert
 drawable title_bar_bg
 drawable widget_2x_blue
@ -76,6 +79,7 @@ drawable widget_4x_green
 drawable widget_4x_red
 drawable widget_4x_white
 drawable widget_4x_yellow
+drawable xiaomei
 id account_dialog_subtitle
 id account_dialog_title
 id action_select_all
@ -109,6 +113,8 @@ id ll_font_normal
 id ll_font_small
 id ll_font_super
 id menu_alert
+id menu_bck
+id menu_chock
 id menu_delete
 id menu_delete_remind
 id menu_export_text
@ -116,11 +122,15 @@ id menu_font_size
 id menu_list_mode
 id menu_new_folder
 id menu_new_note
+id menu_quit_secret
 id menu_search
+id menu_secret
 id menu_send_to_desktop
 id menu_setting
 id menu_share
+id menu_sky
 id menu_sync
+id menu_xiaomei
 id minute
 id move
 id navigation_bar
@ -198,6 +208,8 @@ string format_move_notes_to_folder
 string hint_foler_name
 string info_note_enter_desktop
 string menu_alert
+string menu_bck
+string menu_chock
 string menu_create_folder
 string menu_delete
 string menu_deselect_all
@ -214,17 +226,21 @@ string menu_list_mode
 string menu_move
 string menu_move_parent_folder
 string menu_normal_mode
+string menu_quit_secret
 string menu_remove_remind
 string menu_search
+string menu_secret
 string menu_select_all
 string menu_select_none
 string menu_select_title
 string menu_send_to_desktop
 string menu_setting
 string menu_share
+string menu_sky
 string menu_sync
 string menu_sync_cancel
 string menu_title_select_folder
+string menu_xiaomei
 string note_alert_expired
 string note_link_email
 string note_link_other
--- a/app/build/intermediates/merged_res/debug/drawable-hdpi_bck.png.flat
+++ b/app/build/intermediates/merged_res/debug/drawable-hdpi_bck.png.flat
--- a/app/build/intermediates/merged_res/debug/drawable-hdpi_chock.png.flat
+++ b/app/build/intermediates/merged_res/debug/drawable-hdpi_chock.png.flat
--- a/app/build/intermediates/merged_res/debug/drawable-hdpi_sky.png.flat
+++ b/app/build/intermediates/merged_res/debug/drawable-hdpi_sky.png.flat
--- a/app/build/intermediates/merged_res/debug/drawable-hdpi_xiaomei.png.flat
+++ b/app/build/intermediates/merged_res/debug/drawable-hdpi_xiaomei.png.flat
--- a/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat
+++ b/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat
--- a/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat
+++ b/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat
--- a/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat
+++ b/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat
--- a/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat
+++ b/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat
--- a/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat
+++ b/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat
--- a/app/build/intermediates/merged_res/debug/values_values.arsc.flat
+++ b/app/build/intermediates/merged_res/debug/values_values.arsc.flat
--- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
+++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
@ -1,50 +1,7 @@
 {
    "logs": [
        {
-            "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rCN_values-zh-rCN.arsc.flat",
-            "map": [
-                {
-                    "source": "C:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
-                    "from": {
-                        "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029",
-                        "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
-                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
-                    },
-                    "to": {
-                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925",
-                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
-                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
-                    }
-                },
-                {
-                    "source": "C:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
-                    "from": {
-                        "startLines": "18",
-                        "startColumns": "4",
-                        "startOffsets": "712",
-                        "endLines": "21",
-                        "endColumns": "19",
-                        "endOffsets": "817"
-                    },
-                    "to": {
-                        "startLines": "2",
-                        "startColumns": "4",
-                        "startOffsets": "105",
-                        "endLines": "5",
-                        "endColumns": "19",
-                        "endOffsets": "210"
-                    }
-                }
-            ]
-        },
-        {
-            "outputFile": "net.micode.notes.app-merged_res-4:/values_values.arsc.flat",
+            "outputFile": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\values_values.arsc.flat",
            "map": [
                {
                    "source": "C:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
@ -68,20 +25,20 @@
                {
                    "source": "C:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
                    "from": {
-                        "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084",
-                        "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169"
+                        "startLines": "130,74,77,76,75,19,20,21,120,121,129,128,26,83,84,82,81,80,96,95,94,86,39,38,66,29,30,87,43,78,122,73,69,44,50,55,45,65,64,63,59,58,56,57,60,61,51,72,62,42,70,49,41,54,53,52,68,48,67,46,47,71,28,34,36,33,35,32,31,25,24,103,102,106,118,111,110,112,113,115,114,104,105,109,107,108,101,116,117,127,125,124,126,27,85,93,98,97,99,92,91,90,89,22,23",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "8208,4077,4338,4242,4173,827,870,922,7706,7755,8150,8099,1282,4792,4886,4721,4637,4554,5753,5670,5568,5062,2025,1953,3576,1486,1539,5123,2255,4421,7818,4006,3761,2335,2650,2951,2393,3505,3444,3387,3165,3113,3010,3063,3215,3265,2697,3940,3325,2192,3810,2603,2139,2896,2808,2750,3699,2553,3654,2450,2493,3873,1431,1750,1858,1703,1805,1647,1599,1227,1174,6209,6142,6471,7609,6835,6754,6909,6998,7240,7161,6293,6368,6695,6535,6615,6087,7384,7506,8058,7931,7874,7984,1366,4994,5482,5888,5819,5968,5423,5368,5306,5246,974,1084",
+                        "endLines": "135,74,77,76,75,19,20,21,120,121,129,128,26,83,84,82,81,80,96,95,94,86,39,38,66,29,30,87,43,78,122,73,69,44,50,55,45,65,64,63,59,58,56,57,60,61,51,72,62,42,70,49,41,54,53,52,68,48,67,46,47,71,28,34,36,33,35,32,31,25,24,103,102,106,118,111,110,112,113,115,114,104,105,109,107,108,101,116,117,127,125,124,126,27,85,93,98,97,99,92,91,90,89,22,23",
+                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,82,71,77,52,59,104,79,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,62,46,52,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,102,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+                        "endOffsets": "8621,4168,4416,4333,4237,865,917,969,7750,7813,8203,8145,1361,4881,4989,4787,4716,4632,5814,5748,5665,5118,2103,2020,3649,1534,1594,5223,2330,4518,7868,4072,3805,2388,2692,3005,2445,3571,3500,3439,3210,3160,3058,3108,3260,3320,2745,4001,3382,2250,3868,2645,2187,2946,2891,2803,3756,2598,3694,2488,2548,3935,1481,1800,1906,1745,1853,1698,1642,1277,1222,6288,6204,6530,7700,6904,6830,6993,7156,7379,7235,6363,6466,6749,6610,6690,6137,7501,7604,8094,7979,7926,8053,1426,5057,5563,5963,5883,6057,5477,5418,5363,5301,1079,1169"
                    },
                    "to": {
-                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034",
-                        "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119"
+                        "startLines": "18,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",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "739,1101,1197,1280,1376,1445,1488,1540,1592,1641,1704,1762,1813,1897,1991,2099,2170,2254,2337,2403,2486,2588,2649,2732,2804,2882,2935,2995,3100,3180,3282,3337,3408,3457,3515,3562,3621,3678,3749,3810,3867,3917,3969,4022,4072,4122,4182,4235,4301,4363,4426,4489,4536,4589,4644,4732,4790,4852,4902,4947,4990,5050,5117,5172,5227,5280,5327,5380,5436,5484,5539,5592,5676,5743,5807,5903,5977,6058,6147,6310,6454,6533,6608,6711,6770,6850,6930,6985,7107,7210,7251,7304,7361,7435,7500,7568,7654,7734,7803,7897,7956,8011,8073,8133,8243",
+                        "endLines": "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",
+                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,82,71,77,52,59,104,79,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,62,46,52,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,102,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+                        "endOffsets": "1096,1192,1275,1371,1440,1483,1535,1587,1636,1699,1757,1808,1892,1986,2094,2165,2249,2332,2398,2481,2583,2644,2727,2799,2877,2930,2990,3095,3175,3277,3332,3403,3452,3510,3557,3616,3673,3744,3805,3862,3912,3964,4017,4067,4117,4177,4230,4296,4358,4421,4484,4531,4584,4639,4727,4785,4847,4897,4942,4985,5045,5112,5167,5222,5275,5322,5375,5431,5479,5534,5587,5671,5738,5802,5898,5972,6053,6142,6305,6449,6528,6603,6706,6765,6845,6925,6980,7102,7205,7246,7299,7356,7430,7495,7563,7649,7729,7798,7892,7951,8006,8068,8128,8238,8328"
                    }
                },
                {
@ -109,15 +66,15 @@
                        "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
                        "endLines": "53,58,67,62,25,29,33,38,43,21,48",
                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056"
+                        "endOffsets": "2261,2473,2846,2634,1073,1258,1443,1647,1854,890,2056"
                    },
                    "to": {
-                        "startLines": "125,129,133,137,140,144,148,152,156,160,164",
+                        "startLines": "128,132,136,140,143,147,151,155,159,163,167",
                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051",
-                        "endLines": "128,132,136,139,143,147,151,155,159,163,167",
+                        "startOffsets": "8333,8537,8748,8958,9118,9301,9486,9671,9874,10080,10263",
+                        "endLines": "131,135,139,142,146,150,154,158,162,166,170",
                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247"
+                        "endOffsets": "8532,8743,8953,9113,9296,9481,9666,9869,10075,10258,10459"
                    }
                },
                {
@ -140,25 +97,111 @@
            ]
        },
        {
-            "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rTW_values-zh-rTW.arsc.flat",
+            "outputFile": "net.micode.notes.app-merged_res-4:/values_values.arsc.flat",
+            "map": [
+                {
+                    "source": "C:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
+                    "from": {
+                        "startLines": "-1,-1",
+                        "startColumns": "-1,-1",
+                        "startOffsets": "-1,-1"
+                    },
+                    "to": {
+                        "startLines": "2,8",
+                        "startColumns": "4,4",
+                        "startOffsets": "105,300",
+                        "endLines": "7,11",
+                        "endColumns": "19,19",
+                        "endOffsets": "295,415"
+                    }
+                },
+                {
+                    "source": "C:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
+                    "from": {
+                        "startLines": "135,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,43,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,41,-1,-1,-1,44,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,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,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,-1,-1,-1",
+                        "startOffsets": "8429,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2191,2243,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2139,-1,-1,-1,2299,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endLines": "140,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,41,-1,-1,-1,44,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,51,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,51,-1,-1,-1,59,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8842,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2238,2294,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2186,-1,-1,-1,2354,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                    },
+                    "to": {
+                        "startLines": "18,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "739,1101,1197,1280,1376,1445,1488,1540,1592,1641,1704,1762,1813,1897,1991,2099,2170,2254,2337,2403,2486,2588,2649,2732,2804,2882,2935,2995,3100,3180,3282,3337,3408,3457,3509,3565,3623,3670,3729,3786,3857,3918,3975,4025,4077,4130,4180,4230,4290,4343,4409,4471,4534,4597,4644,4697,4752,4840,4898,4960,5010,5055,5107,5150,5210,5277,5337,5392,5447,5500,5547,5600,5656,5704,5759,5812,5896,5963,6027,6123,6197,6278,6367,6530,6674,6753,6828,6931,6990,7070,7150,7205,7327,7430,7471,7524,7581,7655,7720,7788,7874,7954,8023,8117,8176,8231,8293,8353,8463",
+                        "endLines": "23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131",
+                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,82,71,77,52,59,104,79,101,54,70,48,51,55,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,62,46,52,54,87,57,61,49,44,51,42,59,66,59,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,102,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+                        "endOffsets": "1096,1192,1275,1371,1440,1483,1535,1587,1636,1699,1757,1808,1892,1986,2094,2165,2249,2332,2398,2481,2583,2644,2727,2799,2877,2930,2990,3095,3175,3277,3332,3403,3452,3504,3560,3618,3665,3724,3781,3852,3913,3970,4020,4072,4125,4175,4225,4285,4338,4404,4466,4529,4592,4639,4692,4747,4835,4893,4955,5005,5050,5102,5145,5205,5272,5332,5387,5442,5495,5542,5595,5651,5699,5754,5807,5891,5958,6022,6118,6192,6273,6362,6525,6669,6748,6823,6926,6985,7065,7145,7200,7322,7425,7466,7519,7576,7650,7715,7783,7869,7949,8018,8112,8171,8226,8288,8348,8458,8548"
+                    }
+                },
+                {
+                    "source": "C:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\src\\main\\res\\values\\colors.xml",
+                    "from": {
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
+                    },
+                    "to": {
+                        "startLines": "12",
+                        "startColumns": "4",
+                        "startOffsets": "420",
+                        "endColumns": "56",
+                        "endOffsets": "472"
+                    }
+                },
+                {
+                    "source": "C:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\src\\main\\res\\values\\styles.xml",
+                    "from": {
+                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                    },
+                    "to": {
+                        "startLines": "132,136,140,144,147,151,155,159,163,167,171",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "8553,8757,8968,9178,9338,9521,9706,9891,10094,10300,10483",
+                        "endLines": "135,139,143,146,150,154,158,162,166,170,174",
+                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+                        "endOffsets": "8752,8963,9173,9333,9516,9701,9886,10089,10295,10478,10679"
+                    }
+                },
+                {
+                    "source": "C:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml",
+                    "from": {
+                        "startLines": "-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1"
+                    },
+                    "to": {
+                        "startLines": "13,14,15,16,17",
+                        "startColumns": "4,4,4,4,4",
+                        "startOffsets": "477,529,582,635,687",
+                        "endColumns": "51,52,52,51,51",
+                        "endOffsets": "524,577,630,682,734"
+                    }
+                }
+            ]
+        },
+        {
+            "outputFile": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\values-zh-rTW_values-zh-rTW.arsc.flat",
            "map": [
                {
                    "source": "C:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
                    "from": {
-                        "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029",
-                        "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
-                        "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090"
+                        "startLines": "124,74,73,72,71,19,20,21,114,115,123,122,26,78,79,77,76,75,91,90,89,81,63,29,30,82,37,116,70,66,41,47,52,42,62,61,60,56,55,53,54,57,58,48,69,59,40,67,46,39,51,50,49,65,45,64,43,44,68,28,34,36,33,35,32,31,25,24,98,97,100,112,105,104,106,107,109,108,99,103,101,102,96,110,111,121,119,118,120,27,80,88,93,92,94,87,86,85,84,22,23",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "6604,3672,3606,3533,3483,827,867,915,6154,6199,6550,6500,1199,3932,4000,3873,3807,3744,4662,4602,4539,4132,3054,1369,1422,4186,1768,6256,3424,3211,1975,2256,2502,2028,2994,2941,2890,2695,2647,2553,2601,2741,2788,2299,3365,2838,1923,3254,2213,1878,2455,2399,2344,3156,2169,3114,2078,2119,3306,1318,1623,1719,1576,1672,1529,1484,1148,1095,5037,4978,5178,6079,5489,5420,5553,5631,5814,5741,5112,5365,5235,5300,4929,5918,6001,6462,6355,6307,6400,1261,4077,4480,4775,4717,4842,4432,4387,4339,4288,963,1029",
+                        "endLines": "126,74,73,72,71,19,20,21,114,115,123,122,26,78,79,77,76,75,91,90,89,81,63,29,30,82,37,116,70,66,41,47,52,42,62,61,60,56,55,53,54,57,58,48,69,59,40,67,46,39,51,50,49,65,45,64,43,44,68,28,34,36,33,35,32,31,25,24,98,97,100,112,105,104,106,107,109,108,99,103,101,102,96,110,111,121,119,118,120,27,80,88,93,92,94,87,86,85,84,22,23",
+                        "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,51,42,44,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "6776,3739,3667,3601,3528,862,910,958,6194,6251,6599,6545,1256,3995,4072,3927,3868,3802,4712,4657,4597,4181,3109,1417,1479,4265,1843,6301,3478,3249,2023,2294,2548,2073,3049,2989,2936,2736,2690,2596,2642,2783,2833,2339,3419,2885,1970,3301,2251,1918,2497,2450,2394,3206,2208,3151,2114,2164,3360,1364,1667,1763,1618,1714,1571,1524,1194,1143,5107,5032,5230,6148,5548,5484,5626,5736,5913,5809,5173,5415,5295,5360,4973,5996,6074,6495,6395,6350,6457,1313,4127,4534,4837,4770,4899,4475,4427,4382,4334,1024,1090"
                    },
                    "to": {
-                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923",
-                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
-                        "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984"
+                        "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",
+                        "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",
+                        "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3011,3054,3099,3146,3202,3257,3312,3356,3398,3439,3489,3548,3599,3648,3697,3744,3791,3838,3883,3934,3987,4062,4121,4178,4252,4316,4385,4463,4573,4677,4750,4816,4871,4936,5001,5050,5133,5211,5249,5294,5342,5404,5461,5516,5575,5642,5700,5762,5810,5855,5903,5954,6020",
+                        "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",
+                        "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,51,42,44,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,3006,3049,3094,3141,3197,3252,3307,3351,3393,3434,3484,3543,3594,3643,3692,3739,3786,3833,3878,3929,3982,4057,4116,4173,4247,4311,4380,4458,4568,4672,4745,4811,4866,4931,4996,5045,5128,5206,5244,5289,5337,5399,5456,5511,5570,5637,5695,5757,5805,5850,5898,5949,6015,6081"
                    }
                },
                {
@ -181,6 +224,49 @@
                    }
                }
            ]
+        },
+        {
+            "outputFile": "C:\\Users\\Lenovo\\.gradle\\daemon\\8.6\\net.micode.notes.app-merged_res-4:\\values-zh-rCN_values-zh-rCN.arsc.flat",
+            "map": [
+                {
+                    "source": "C:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+                    "from": {
+                        "startLines": "123,73,72,71,70,19,20,21,114,115,122,121,26,79,80,78,77,76,92,91,90,82,62,29,30,83,74,116,69,65,40,46,51,41,61,60,59,55,54,52,53,56,57,47,68,58,39,66,45,38,50,49,48,64,44,63,42,43,67,28,34,36,33,35,32,31,25,24,99,98,101,113,106,105,107,108,110,109,100,104,102,103,97,111,112,120,118,117,119,27,81,89,94,93,95,88,87,86,85,22,23",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "6629,3592,3526,3453,3403,827,867,915,6180,6225,6575,6525,1199,3958,4026,3899,3834,3771,4689,4629,4566,4158,2974,1369,1422,4212,3665,6282,3344,3131,1895,2176,2422,1948,2914,2861,2810,2615,2567,2473,2521,2661,2708,2219,3285,2758,1843,3174,2133,1798,2375,2319,2264,3076,2089,3034,1998,2039,3226,1318,1623,1719,1576,1672,1529,1484,1148,1095,5064,5005,5205,6106,5516,5447,5580,5658,5841,5768,5139,5392,5262,5327,4956,5945,6028,6487,6380,6332,6425,1261,4103,4507,4802,4744,4869,4459,4414,4366,4315,963,1029",
+                        "endLines": "125,73,72,71,70,19,20,21,114,115,122,121,26,79,80,78,77,76,92,91,90,82,62,29,30,83,74,116,69,65,40,46,51,41,61,60,59,55,54,52,53,56,57,47,68,58,39,66,45,38,50,49,48,64,44,63,42,43,67,28,34,36,33,35,32,31,25,24,99,98,101,113,106,105,107,108,110,109,100,104,102,103,97,111,112,120,118,117,119,27,81,89,94,93,95,88,87,86,85,22,23",
+                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,51,42,44,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "6801,3660,3587,3521,3448,862,910,958,6220,6277,6624,6570,1256,4021,4098,3953,3894,3829,4739,4684,4624,4207,3029,1417,1479,4292,3741,6327,3398,3169,1943,2214,2468,1993,2969,2909,2856,2656,2610,2516,2562,2703,2753,2259,3339,2805,1890,3221,2171,1838,2417,2370,2314,3126,2128,3071,2034,2084,3280,1364,1667,1763,1618,1714,1571,1524,1194,1143,5134,5059,5257,6175,5575,5511,5653,5763,5940,5836,5200,5442,5322,5387,5000,6023,6101,6520,6420,6375,6482,1313,4153,4561,4864,4797,4926,4502,4454,4409,4361,1024,1090"
+                    },
+                    "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",
+                        "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",
+                        "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3013,3056,3101,3148,3204,3259,3314,3358,3400,3441,3491,3550,3601,3650,3699,3746,3793,3840,3885,3936,3989,4064,4123,4180,4254,4318,4387,4465,4575,4679,4752,4818,4873,4938,5003,5052,5135,5213,5251,5296,5344,5406,5463,5518,5577,5644,5702,5764,5812,5857,5905,5956,6022",
+                        "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",
+                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,51,42,44,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,3008,3051,3096,3143,3199,3254,3309,3353,3395,3436,3486,3545,3596,3645,3694,3741,3788,3835,3880,3931,3984,4059,4118,4175,4249,4313,4382,4460,4570,4674,4747,4813,4868,4933,4998,5047,5130,5208,5246,5291,5339,5401,5458,5513,5572,5639,5697,5759,5807,5852,5900,5951,6017,6083"
+                    }
+                },
+                {
+                    "source": "C:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+                    "from": {
+                        "startLines": "18",
+                        "startColumns": "4",
+                        "startOffsets": "712",
+                        "endLines": "21",
+                        "endColumns": "19",
+                        "endOffsets": "817"
+                    },
+                    "to": {
+                        "startLines": "2",
+                        "startColumns": "4",
+                        "startOffsets": "105",
+                        "endLines": "5",
+                        "endColumns": "19",
+                        "endOffsets": "210"
+                    }
+                }
+            ]
        }
    ]
 }
--- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
+++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
@ -6,20 +6,20 @@
                {
                    "source": "C:\\Users\\Lenovo\\Desktop\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
                    "from": {
-                        "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029",
-                        "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
-                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
+                        "startLines": "123,73,72,71,70,19,20,21,114,115,122,121,26,79,80,78,77,76,92,91,90,82,62,29,30,83,74,116,69,65,40,46,51,41,61,60,59,55,54,52,53,56,57,47,68,58,39,66,45,38,50,49,48,64,44,63,42,43,67,28,34,36,33,35,32,31,25,24,99,98,101,113,106,105,107,108,110,109,100,104,102,103,97,111,112,120,118,117,119,27,81,89,94,93,95,88,87,86,85,22,23",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "6629,3592,3526,3453,3403,827,867,915,6180,6225,6575,6525,1199,3958,4026,3899,3834,3771,4689,4629,4566,4158,2974,1369,1422,4212,3665,6282,3344,3131,1895,2176,2422,1948,2914,2861,2810,2615,2567,2473,2521,2661,2708,2219,3285,2758,1843,3174,2133,1798,2375,2319,2264,3076,2089,3034,1998,2039,3226,1318,1623,1719,1576,1672,1529,1484,1148,1095,5064,5005,5205,6106,5516,5447,5580,5658,5841,5768,5139,5392,5262,5327,4956,5945,6028,6487,6380,6332,6425,1261,4103,4507,4802,4744,4869,4459,4414,4366,4315,963,1029",
+                        "endLines": "125,73,72,71,70,19,20,21,114,115,122,121,26,79,80,78,77,76,92,91,90,82,62,29,30,83,74,116,69,65,40,46,51,41,61,60,59,55,54,52,53,56,57,47,68,58,39,66,45,38,50,49,48,64,44,63,42,43,67,28,34,36,33,35,32,31,25,24,99,98,101,113,106,105,107,108,110,109,100,104,102,103,97,111,112,120,118,117,119,27,81,89,94,93,95,88,87,86,85,22,23",
+                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,51,42,44,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "6801,3660,3587,3521,3448,862,910,958,6220,6277,6624,6570,1256,4021,4098,3953,3894,3829,4739,4684,4624,4207,3029,1417,1479,4292,3741,6327,3398,3169,1943,2214,2468,1993,2969,2909,2856,2656,2610,2516,2562,2703,2753,2259,3339,2805,1890,3221,2171,1838,2417,2370,2314,3126,2128,3071,2034,2084,3280,1364,1667,1763,1618,1714,1571,1524,1194,1143,5134,5059,5257,6175,5575,5511,5653,5763,5940,5836,5200,5442,5322,5387,5000,6023,6101,6520,6420,6375,6482,1313,4153,4561,4864,4797,4926,4502,4454,4409,4361,1024,1090"
                    },
                    "to": {
-                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925",
-                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
-                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
+                        "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",
+                        "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",
+                        "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3013,3056,3101,3148,3204,3259,3314,3358,3400,3441,3491,3550,3601,3650,3699,3746,3793,3840,3885,3936,3989,4064,4123,4180,4254,4318,4387,4465,4575,4679,4752,4818,4873,4938,5003,5052,5135,5213,5251,5296,5344,5406,5463,5518,5577,5644,5702,5764,5812,5857,5905,5956,6022",
+                        "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",
+                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,51,42,44,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,3008,3051,3096,3143,3199,3254,3309,3353,3395,3436,3486,3545,3596,3645,3694,3741,3788,3835,3880,3931,3984,4059,4118,4175,4249,4313,4382,4460,4570,4674,4747,4813,4868,4933,4998,5047,5130,5208,5246,5291,5339,5401,5458,5513,5572,5639,5697,5759,5807,5852,5900,5951,6017,6083"
                    }
                },
                {
--- a/Show More
+++ b/Show More