diff --git a/src/Notes-master/-Dsonar.login b/src/Notes-master/-Dsonar.login
new file mode 100644
index 0000000..e69de29
diff --git a/src/Notes-master/.gradle/6.1.1/executionHistory/executionHistory.bin b/src/Notes-master/.gradle/6.1.1/executionHistory/executionHistory.bin
index 3ec2f13..5d08e9d 100644
Binary files a/src/Notes-master/.gradle/6.1.1/executionHistory/executionHistory.bin and b/src/Notes-master/.gradle/6.1.1/executionHistory/executionHistory.bin differ
diff --git a/src/Notes-master/.gradle/6.1.1/executionHistory/executionHistory.lock b/src/Notes-master/.gradle/6.1.1/executionHistory/executionHistory.lock
index 8eca694..b4f360f 100644
Binary files a/src/Notes-master/.gradle/6.1.1/executionHistory/executionHistory.lock and b/src/Notes-master/.gradle/6.1.1/executionHistory/executionHistory.lock differ
diff --git a/src/Notes-master/.gradle/6.1.1/fileHashes/fileHashes.bin b/src/Notes-master/.gradle/6.1.1/fileHashes/fileHashes.bin
index 214e7a2..ede4381 100644
Binary files a/src/Notes-master/.gradle/6.1.1/fileHashes/fileHashes.bin and b/src/Notes-master/.gradle/6.1.1/fileHashes/fileHashes.bin differ
diff --git a/src/Notes-master/.gradle/6.1.1/fileHashes/fileHashes.lock b/src/Notes-master/.gradle/6.1.1/fileHashes/fileHashes.lock
index 0f13036..b04b89c 100644
Binary files a/src/Notes-master/.gradle/6.1.1/fileHashes/fileHashes.lock and b/src/Notes-master/.gradle/6.1.1/fileHashes/fileHashes.lock differ
diff --git a/src/Notes-master/.gradle/6.1.1/fileHashes/resourceHashesCache.bin b/src/Notes-master/.gradle/6.1.1/fileHashes/resourceHashesCache.bin
index 81e270d..b1b4919 100644
Binary files a/src/Notes-master/.gradle/6.1.1/fileHashes/resourceHashesCache.bin and b/src/Notes-master/.gradle/6.1.1/fileHashes/resourceHashesCache.bin differ
diff --git a/src/Notes-master/.gradle/6.1.1/javaCompile/classAnalysis.bin b/src/Notes-master/.gradle/6.1.1/javaCompile/classAnalysis.bin
index 8cffd33..47590cb 100644
Binary files a/src/Notes-master/.gradle/6.1.1/javaCompile/classAnalysis.bin and b/src/Notes-master/.gradle/6.1.1/javaCompile/classAnalysis.bin differ
diff --git a/src/Notes-master/.gradle/6.1.1/javaCompile/jarAnalysis.bin b/src/Notes-master/.gradle/6.1.1/javaCompile/jarAnalysis.bin
index 729d01e..6ef8841 100644
Binary files a/src/Notes-master/.gradle/6.1.1/javaCompile/jarAnalysis.bin and b/src/Notes-master/.gradle/6.1.1/javaCompile/jarAnalysis.bin differ
diff --git a/src/Notes-master/.gradle/6.1.1/javaCompile/javaCompile.lock b/src/Notes-master/.gradle/6.1.1/javaCompile/javaCompile.lock
index f346000..039c1b5 100644
Binary files a/src/Notes-master/.gradle/6.1.1/javaCompile/javaCompile.lock and b/src/Notes-master/.gradle/6.1.1/javaCompile/javaCompile.lock differ
diff --git a/src/Notes-master/.gradle/6.1.1/javaCompile/taskHistory.bin b/src/Notes-master/.gradle/6.1.1/javaCompile/taskHistory.bin
index 84251f8..8ddf8e7 100644
Binary files a/src/Notes-master/.gradle/6.1.1/javaCompile/taskHistory.bin and b/src/Notes-master/.gradle/6.1.1/javaCompile/taskHistory.bin differ
diff --git a/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index c4fc2c4..44c7f95 100644
Binary files a/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin
index 2a4453e..a3284f3 100644
Binary files a/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin and b/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/src/Notes-master/.gradle/checksums/checksums.lock b/src/Notes-master/.gradle/checksums/checksums.lock
index 539238d..e1edf95 100644
Binary files a/src/Notes-master/.gradle/checksums/checksums.lock and b/src/Notes-master/.gradle/checksums/checksums.lock differ
diff --git a/src/Notes-master/.gradle/checksums/md5-checksums.bin b/src/Notes-master/.gradle/checksums/md5-checksums.bin
index de0e47b..857e889 100644
Binary files a/src/Notes-master/.gradle/checksums/md5-checksums.bin and b/src/Notes-master/.gradle/checksums/md5-checksums.bin differ
diff --git a/src/Notes-master/.gradle/checksums/sha1-checksums.bin b/src/Notes-master/.gradle/checksums/sha1-checksums.bin
index ad05be2..5d80f55 100644
Binary files a/src/Notes-master/.gradle/checksums/sha1-checksums.bin and b/src/Notes-master/.gradle/checksums/sha1-checksums.bin differ
diff --git a/src/Notes-master/.idea/caches/build_file_checksums.ser b/src/Notes-master/.idea/caches/build_file_checksums.ser
index 8f5e9ed..8c78e4c 100644
Binary files a/src/Notes-master/.idea/caches/build_file_checksums.ser and b/src/Notes-master/.idea/caches/build_file_checksums.ser differ
diff --git a/src/Notes-master/.idea/codeStyles/Project.xml b/src/Notes-master/.idea/codeStyles/Project.xml
index 681f41a..fb22c1d 100644
--- a/src/Notes-master/.idea/codeStyles/Project.xml
+++ b/src/Notes-master/.idea/codeStyles/Project.xml
@@ -1,5 +1,53 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <DBN-PSQL>
+      <case-options enabled="true">
+        <option name="KEYWORD_CASE" value="lower" />
+        <option name="FUNCTION_CASE" value="lower" />
+        <option name="PARAMETER_CASE" value="lower" />
+        <option name="DATATYPE_CASE" value="lower" />
+        <option name="OBJECT_CASE" value="preserve" />
+      </case-options>
+      <formatting-settings enabled="false" />
+    </DBN-PSQL>
+    <DBN-SQL>
+      <case-options enabled="true">
+        <option name="KEYWORD_CASE" value="lower" />
+        <option name="FUNCTION_CASE" value="lower" />
+        <option name="PARAMETER_CASE" value="lower" />
+        <option name="DATATYPE_CASE" value="lower" />
+        <option name="OBJECT_CASE" value="preserve" />
+      </case-options>
+      <formatting-settings enabled="false">
+        <option name="STATEMENT_SPACING" value="one_line" />
+        <option name="CLAUSE_CHOP_DOWN" value="chop_down_if_statement_long" />
+        <option name="ITERATION_ELEMENTS_WRAPPING" value="chop_down_if_not_single" />
+      </formatting-settings>
+    </DBN-SQL>
+    <DBN-PSQL>
+      <case-options enabled="true">
+        <option name="KEYWORD_CASE" value="lower" />
+        <option name="FUNCTION_CASE" value="lower" />
+        <option name="PARAMETER_CASE" value="lower" />
+        <option name="DATATYPE_CASE" value="lower" />
+        <option name="OBJECT_CASE" value="preserve" />
+      </case-options>
+      <formatting-settings enabled="false" />
+    </DBN-PSQL>
+    <DBN-SQL>
+      <case-options enabled="true">
+        <option name="KEYWORD_CASE" value="lower" />
+        <option name="FUNCTION_CASE" value="lower" />
+        <option name="PARAMETER_CASE" value="lower" />
+        <option name="DATATYPE_CASE" value="lower" />
+        <option name="OBJECT_CASE" value="preserve" />
+      </case-options>
+      <formatting-settings enabled="false">
+        <option name="STATEMENT_SPACING" value="one_line" />
+        <option name="CLAUSE_CHOP_DOWN" value="chop_down_if_statement_long" />
+        <option name="ITERATION_ELEMENTS_WRAPPING" value="chop_down_if_not_single" />
+      </formatting-settings>
+    </DBN-SQL>
     <codeStyleSettings language="XML">
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
diff --git a/src/Notes-master/.idea/dbnavigator.xml b/src/Notes-master/.idea/dbnavigator.xml
new file mode 100644
index 0000000..81094c5
--- /dev/null
+++ b/src/Notes-master/.idea/dbnavigator.xml
@@ -0,0 +1,560 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DBNavigator.Project.DataEditorManager">
+    <record-view-column-sorting-type value="BY_INDEX" />
+    <value-preview-text-wrapping value="false" />
+    <value-preview-pinned value="false" />
+  </component>
+  <component name="DBNavigator.Project.DataExportManager">
+    <export-instructions>
+      <create-header value="true" />
+      <quote-values-containing-separator value="true" />
+      <quote-all-values value="false" />
+      <value-separator value="" />
+      <file-name value="" />
+      <file-location value="" />
+      <scope value="GLOBAL" />
+      <destination value="FILE" />
+      <format value="EXCEL" />
+      <charset value="GBK" />
+    </export-instructions>
+  </component>
+  <component name="DBNavigator.Project.DatabaseBrowserManager">
+    <autoscroll-to-editor value="false" />
+    <autoscroll-from-editor value="true" />
+    <show-object-properties value="true" />
+    <loaded-nodes />
+  </component>
+  <component name="DBNavigator.Project.DatabaseConsoleManager">
+    <connection id="dcef11c1-c7e5-433c-abda-d283db0c61c4">
+      <console name="Connection" type="STANDARD" schema="main" session="Main"><![CDATA[select * from main.data]]></console>
+    </connection>
+  </component>
+  <component name="DBNavigator.Project.DatabaseFileManager">
+    <open-files />
+  </component>
+  <component name="DBNavigator.Project.DatabaseSessionManager">
+    <connection id="dcef11c1-c7e5-433c-abda-d283db0c61c4" />
+  </component>
+  <component name="DBNavigator.Project.DatasetFilterManager">
+    <filter-actions connection-id="dcef11c1-c7e5-433c-abda-d283db0c61c4" dataset="main.data" active-filter-id="333cba40-0e0d-4ad2-bd0d-83861b49f56d">
+      <filter id="333cba40-0e0d-4ad2-bd0d-83861b49f56d" name="Filter" temporary="false" custom-name="false" type="basic" join-type="AND" />
+    </filter-actions>
+    <filter-actions connection-id="dcef11c1-c7e5-433c-abda-d283db0c61c4" dataset="main.note" active-filter-id="" />
+    <filter-actions connection-id="dcef11c1-c7e5-433c-abda-d283db0c61c4" dataset="main.android_metadata" active-filter-id="" />
+  </component>
+  <component name="DBNavigator.Project.EditorStateManager">
+    <last-used-providers />
+  </component>
+  <component name="DBNavigator.Project.MethodExecutionManager">
+    <method-browser />
+    <execution-history>
+      <group-entries value="true" />
+      <execution-inputs />
+    </execution-history>
+    <argument-values-cache />
+  </component>
+  <component name="DBNavigator.Project.ObjectDependencyManager">
+    <last-used-dependency-type value="INCOMING" />
+  </component>
+  <component name="DBNavigator.Project.ObjectQuickFilterManager">
+    <last-used-operator value="EQUAL" />
+    <filters />
+  </component>
+  <component name="DBNavigator.Project.ScriptExecutionManager" clear-outputs="true">
+    <recently-used-interfaces />
+  </component>
+  <component name="DBNavigator.Project.Settings">
+    <connections>
+      <connection id="dcef11c1-c7e5-433c-abda-d283db0c61c4" active="true">
+        <database>
+          <name value="Connection" />
+          <description value="" />
+          <database-type value="SQLITE" />
+          <config-type value="BASIC" />
+          <database-version value="3.21" />
+          <driver-source value="BUILTIN" />
+          <driver-library value="" />
+          <driver value="" />
+          <url-type value="FILE" />
+          <host value="localhost" />
+          <port value="1234" />
+          <database value="database" />
+          <files>
+            <file path="D:\Lessons\Software engineering\database\note.db" schema="main" />
+          </files>
+          <type value="NONE" />
+          <user value="" />
+          <deprecated-pwd value="" />
+        </database>
+        <properties>
+          <auto-commit value="false" />
+        </properties>
+        <ssh-settings>
+          <active value="false" />
+          <proxy-host value="" />
+          <proxy-port value="22" />
+          <proxy-user value="" />
+          <deprecated-proxy-pwd value="" />
+          <auth-type value="PASSWORD" />
+          <key-file value="" />
+          <key-passphrase value="" />
+        </ssh-settings>
+        <ssl-settings>
+          <active value="false" />
+          <certificate-authority-file value="" />
+          <client-certificate-file value="" />
+          <client-key-file value="" />
+        </ssl-settings>
+        <details>
+          <charset value="UTF-8" />
+          <session-management value="true" />
+          <ddl-file-binding value="true" />
+          <database-logging value="false" />
+          <connect-automatically value="true" />
+          <restore-workspace value="true" />
+          <restore-workspace-deep value="true" />
+          <environment-type value="default" />
+          <idle-time-to-disconnect value="30" />
+          <idle-time-to-disconnect-pool value="5" />
+          <credential-expiry-time value="10" />
+          <max-connection-pool-size value="7" />
+          <alternative-statement-delimiter value="" />
+        </details>
+        <object-filters hide-empty-schemas="false" hide-pseudo-columns="false">
+          <object-type-filter use-master-settings="true">
+            <object-type name="SCHEMA" enabled="true" />
+            <object-type name="USER" enabled="true" />
+            <object-type name="ROLE" enabled="true" />
+            <object-type name="PRIVILEGE" enabled="true" />
+            <object-type name="CHARSET" enabled="true" />
+            <object-type name="TABLE" enabled="true" />
+            <object-type name="VIEW" enabled="true" />
+            <object-type name="MATERIALIZED_VIEW" enabled="true" />
+            <object-type name="NESTED_TABLE" enabled="true" />
+            <object-type name="COLUMN" enabled="true" />
+            <object-type name="INDEX" enabled="true" />
+            <object-type name="CONSTRAINT" enabled="true" />
+            <object-type name="DATASET_TRIGGER" enabled="true" />
+            <object-type name="DATABASE_TRIGGER" enabled="true" />
+            <object-type name="SYNONYM" enabled="true" />
+            <object-type name="SEQUENCE" enabled="true" />
+            <object-type name="PROCEDURE" enabled="true" />
+            <object-type name="FUNCTION" enabled="true" />
+            <object-type name="PACKAGE" enabled="true" />
+            <object-type name="TYPE" enabled="true" />
+            <object-type name="TYPE_ATTRIBUTE" enabled="true" />
+            <object-type name="ARGUMENT" enabled="true" />
+            <object-type name="DIMENSION" enabled="true" />
+            <object-type name="CLUSTER" enabled="true" />
+            <object-type name="DBLINK" enabled="true" />
+          </object-type-filter>
+          <object-name-filters />
+        </object-filters>
+      </connection>
+    </connections>
+    <browser-settings>
+      <general>
+        <display-mode value="TABBED" />
+        <navigation-history-size value="100" />
+        <show-object-details value="false" />
+      </general>
+      <filters>
+        <object-type-filter>
+          <object-type name="SCHEMA" enabled="true" />
+          <object-type name="USER" enabled="true" />
+          <object-type name="ROLE" enabled="true" />
+          <object-type name="PRIVILEGE" enabled="true" />
+          <object-type name="CHARSET" enabled="true" />
+          <object-type name="TABLE" enabled="true" />
+          <object-type name="VIEW" enabled="true" />
+          <object-type name="MATERIALIZED_VIEW" enabled="true" />
+          <object-type name="NESTED_TABLE" enabled="true" />
+          <object-type name="COLUMN" enabled="true" />
+          <object-type name="INDEX" enabled="true" />
+          <object-type name="CONSTRAINT" enabled="true" />
+          <object-type name="DATASET_TRIGGER" enabled="true" />
+          <object-type name="DATABASE_TRIGGER" enabled="true" />
+          <object-type name="SYNONYM" enabled="true" />
+          <object-type name="SEQUENCE" enabled="true" />
+          <object-type name="PROCEDURE" enabled="true" />
+          <object-type name="FUNCTION" enabled="true" />
+          <object-type name="PACKAGE" enabled="true" />
+          <object-type name="TYPE" enabled="true" />
+          <object-type name="TYPE_ATTRIBUTE" enabled="true" />
+          <object-type name="ARGUMENT" enabled="true" />
+          <object-type name="DIMENSION" enabled="true" />
+          <object-type name="CLUSTER" enabled="true" />
+          <object-type name="DBLINK" enabled="true" />
+        </object-type-filter>
+      </filters>
+      <sorting>
+        <object-type name="COLUMN" sorting-type="NAME" />
+        <object-type name="FUNCTION" sorting-type="NAME" />
+        <object-type name="PROCEDURE" sorting-type="NAME" />
+        <object-type name="ARGUMENT" sorting-type="POSITION" />
+      </sorting>
+      <default-editors>
+        <object-type name="VIEW" editor-type="SELECTION" />
+        <object-type name="PACKAGE" editor-type="SELECTION" />
+        <object-type name="TYPE" editor-type="SELECTION" />
+      </default-editors>
+    </browser-settings>
+    <navigation-settings>
+      <lookup-filters>
+        <lookup-objects>
+          <object-type name="SCHEMA" enabled="true" />
+          <object-type name="USER" enabled="false" />
+          <object-type name="ROLE" enabled="false" />
+          <object-type name="PRIVILEGE" enabled="false" />
+          <object-type name="CHARSET" enabled="false" />
+          <object-type name="TABLE" enabled="true" />
+          <object-type name="VIEW" enabled="true" />
+          <object-type name="MATERIALIZED VIEW" enabled="true" />
+          <object-type name="NESTED TABLE" enabled="false" />
+          <object-type name="COLUMN" enabled="false" />
+          <object-type name="INDEX" enabled="true" />
+          <object-type name="CONSTRAINT" enabled="true" />
+          <object-type name="DATASET TRIGGER" enabled="true" />
+          <object-type name="DATABASE TRIGGER" enabled="true" />
+          <object-type name="SYNONYM" enabled="false" />
+          <object-type name="SEQUENCE" enabled="true" />
+          <object-type name="PROCEDURE" enabled="true" />
+          <object-type name="FUNCTION" enabled="true" />
+          <object-type name="PACKAGE" enabled="true" />
+          <object-type name="TYPE" enabled="true" />
+          <object-type name="TYPE ATTRIBUTE" enabled="false" />
+          <object-type name="ARGUMENT" enabled="false" />
+          <object-type name="DIMENSION" enabled="false" />
+          <object-type name="CLUSTER" enabled="false" />
+          <object-type name="DBLINK" enabled="true" />
+        </lookup-objects>
+        <force-database-load value="false" />
+        <prompt-connection-selection value="true" />
+        <prompt-schema-selection value="true" />
+      </lookup-filters>
+    </navigation-settings>
+    <dataset-grid-settings>
+      <general>
+        <enable-zooming value="true" />
+        <enable-column-tooltip value="true" />
+      </general>
+      <sorting>
+        <nulls-first value="true" />
+        <max-sorting-columns value="4" />
+      </sorting>
+      <tracking-columns>
+        <columnNames value="" />
+        <visible value="true" />
+        <editable value="false" />
+      </tracking-columns>
+    </dataset-grid-settings>
+    <dataset-editor-settings>
+      <text-editor-popup>
+        <active value="false" />
+        <active-if-empty value="false" />
+        <data-length-threshold value="100" />
+        <popup-delay value="1000" />
+      </text-editor-popup>
+      <values-actions-popup>
+        <show-popup-button value="true" />
+        <element-count-threshold value="1000" />
+        <data-length-threshold value="250" />
+      </values-actions-popup>
+      <general>
+        <fetch-block-size value="100" />
+        <fetch-timeout value="30" />
+        <trim-whitespaces value="true" />
+        <convert-empty-strings-to-null value="true" />
+        <select-content-on-cell-edit value="true" />
+        <large-value-preview-active value="true" />
+      </general>
+      <filters>
+        <prompt-filter-dialog value="true" />
+        <default-filter-type value="BASIC" />
+      </filters>
+      <qualified-text-editor text-length-threshold="300">
+        <content-types>
+          <content-type name="Text" enabled="true" />
+          <content-type name="Properties" enabled="true" />
+          <content-type name="XML" enabled="true" />
+          <content-type name="DTD" enabled="true" />
+          <content-type name="HTML" enabled="true" />
+          <content-type name="XHTML" enabled="true" />
+          <content-type name="Java" enabled="true" />
+          <content-type name="SQL" enabled="true" />
+          <content-type name="PL/SQL" enabled="true" />
+          <content-type name="JSON" enabled="true" />
+          <content-type name="JSON5" enabled="true" />
+          <content-type name="Groovy" enabled="true" />
+          <content-type name="AIDL" enabled="true" />
+          <content-type name="YAML" enabled="true" />
+          <content-type name="Manifest" enabled="true" />
+        </content-types>
+      </qualified-text-editor>
+      <record-navigation>
+        <navigation-target value="VIEWER" />
+      </record-navigation>
+    </dataset-editor-settings>
+    <code-editor-settings>
+      <general>
+        <show-object-navigation-gutter value="false" />
+        <show-spec-declaration-navigation-gutter value="true" />
+        <enable-spellchecking value="true" />
+        <enable-reference-spellchecking value="false" />
+      </general>
+      <confirmations>
+        <save-changes value="false" />
+        <revert-changes value="true" />
+      </confirmations>
+    </code-editor-settings>
+    <code-completion-settings>
+      <filters>
+        <basic-filter>
+          <filter-element type="RESERVED_WORD" id="keyword" selected="true" />
+          <filter-element type="RESERVED_WORD" id="function" selected="true" />
+          <filter-element type="RESERVED_WORD" id="parameter" selected="true" />
+          <filter-element type="RESERVED_WORD" id="datatype" selected="true" />
+          <filter-element type="RESERVED_WORD" id="exception" selected="true" />
+          <filter-element type="OBJECT" id="schema" selected="true" />
+          <filter-element type="OBJECT" id="role" selected="true" />
+          <filter-element type="OBJECT" id="user" selected="true" />
+          <filter-element type="OBJECT" id="privilege" selected="true" />
+          <user-schema>
+            <filter-element type="OBJECT" id="table" selected="true" />
+            <filter-element type="OBJECT" id="view" selected="true" />
+            <filter-element type="OBJECT" id="materialized view" selected="true" />
+            <filter-element type="OBJECT" id="index" selected="true" />
+            <filter-element type="OBJECT" id="constraint" selected="true" />
+            <filter-element type="OBJECT" id="trigger" selected="true" />
+            <filter-element type="OBJECT" id="synonym" selected="false" />
+            <filter-element type="OBJECT" id="sequence" selected="true" />
+            <filter-element type="OBJECT" id="procedure" selected="true" />
+            <filter-element type="OBJECT" id="function" selected="true" />
+            <filter-element type="OBJECT" id="package" selected="true" />
+            <filter-element type="OBJECT" id="type" selected="true" />
+            <filter-element type="OBJECT" id="dimension" selected="true" />
+            <filter-element type="OBJECT" id="cluster" selected="true" />
+            <filter-element type="OBJECT" id="dblink" selected="true" />
+          </user-schema>
+          <public-schema>
+            <filter-element type="OBJECT" id="table" selected="false" />
+            <filter-element type="OBJECT" id="view" selected="false" />
+            <filter-element type="OBJECT" id="materialized view" selected="false" />
+            <filter-element type="OBJECT" id="index" selected="false" />
+            <filter-element type="OBJECT" id="constraint" selected="false" />
+            <filter-element type="OBJECT" id="trigger" selected="false" />
+            <filter-element type="OBJECT" id="synonym" selected="false" />
+            <filter-element type="OBJECT" id="sequence" selected="false" />
+            <filter-element type="OBJECT" id="procedure" selected="false" />
+            <filter-element type="OBJECT" id="function" selected="false" />
+            <filter-element type="OBJECT" id="package" selected="false" />
+            <filter-element type="OBJECT" id="type" selected="false" />
+            <filter-element type="OBJECT" id="dimension" selected="false" />
+            <filter-element type="OBJECT" id="cluster" selected="false" />
+            <filter-element type="OBJECT" id="dblink" selected="false" />
+          </public-schema>
+          <any-schema>
+            <filter-element type="OBJECT" id="table" selected="true" />
+            <filter-element type="OBJECT" id="view" selected="true" />
+            <filter-element type="OBJECT" id="materialized view" selected="true" />
+            <filter-element type="OBJECT" id="index" selected="true" />
+            <filter-element type="OBJECT" id="constraint" selected="true" />
+            <filter-element type="OBJECT" id="trigger" selected="true" />
+            <filter-element type="OBJECT" id="synonym" selected="true" />
+            <filter-element type="OBJECT" id="sequence" selected="true" />
+            <filter-element type="OBJECT" id="procedure" selected="true" />
+            <filter-element type="OBJECT" id="function" selected="true" />
+            <filter-element type="OBJECT" id="package" selected="true" />
+            <filter-element type="OBJECT" id="type" selected="true" />
+            <filter-element type="OBJECT" id="dimension" selected="true" />
+            <filter-element type="OBJECT" id="cluster" selected="true" />
+            <filter-element type="OBJECT" id="dblink" selected="true" />
+          </any-schema>
+        </basic-filter>
+        <extended-filter>
+          <filter-element type="RESERVED_WORD" id="keyword" selected="true" />
+          <filter-element type="RESERVED_WORD" id="function" selected="true" />
+          <filter-element type="RESERVED_WORD" id="parameter" selected="true" />
+          <filter-element type="RESERVED_WORD" id="datatype" selected="true" />
+          <filter-element type="RESERVED_WORD" id="exception" selected="true" />
+          <filter-element type="OBJECT" id="schema" selected="true" />
+          <filter-element type="OBJECT" id="user" selected="true" />
+          <filter-element type="OBJECT" id="role" selected="true" />
+          <filter-element type="OBJECT" id="privilege" selected="true" />
+          <user-schema>
+            <filter-element type="OBJECT" id="table" selected="true" />
+            <filter-element type="OBJECT" id="view" selected="true" />
+            <filter-element type="OBJECT" id="materialized view" selected="true" />
+            <filter-element type="OBJECT" id="index" selected="true" />
+            <filter-element type="OBJECT" id="constraint" selected="true" />
+            <filter-element type="OBJECT" id="trigger" selected="true" />
+            <filter-element type="OBJECT" id="synonym" selected="true" />
+            <filter-element type="OBJECT" id="sequence" selected="true" />
+            <filter-element type="OBJECT" id="procedure" selected="true" />
+            <filter-element type="OBJECT" id="function" selected="true" />
+            <filter-element type="OBJECT" id="package" selected="true" />
+            <filter-element type="OBJECT" id="type" selected="true" />
+            <filter-element type="OBJECT" id="dimension" selected="true" />
+            <filter-element type="OBJECT" id="cluster" selected="true" />
+            <filter-element type="OBJECT" id="dblink" selected="true" />
+          </user-schema>
+          <public-schema>
+            <filter-element type="OBJECT" id="table" selected="true" />
+            <filter-element type="OBJECT" id="view" selected="true" />
+            <filter-element type="OBJECT" id="materialized view" selected="true" />
+            <filter-element type="OBJECT" id="index" selected="true" />
+            <filter-element type="OBJECT" id="constraint" selected="true" />
+            <filter-element type="OBJECT" id="trigger" selected="true" />
+            <filter-element type="OBJECT" id="synonym" selected="true" />
+            <filter-element type="OBJECT" id="sequence" selected="true" />
+            <filter-element type="OBJECT" id="procedure" selected="true" />
+            <filter-element type="OBJECT" id="function" selected="true" />
+            <filter-element type="OBJECT" id="package" selected="true" />
+            <filter-element type="OBJECT" id="type" selected="true" />
+            <filter-element type="OBJECT" id="dimension" selected="true" />
+            <filter-element type="OBJECT" id="cluster" selected="true" />
+            <filter-element type="OBJECT" id="dblink" selected="true" />
+          </public-schema>
+          <any-schema>
+            <filter-element type="OBJECT" id="table" selected="true" />
+            <filter-element type="OBJECT" id="view" selected="true" />
+            <filter-element type="OBJECT" id="materialized view" selected="true" />
+            <filter-element type="OBJECT" id="index" selected="true" />
+            <filter-element type="OBJECT" id="constraint" selected="true" />
+            <filter-element type="OBJECT" id="trigger" selected="true" />
+            <filter-element type="OBJECT" id="synonym" selected="true" />
+            <filter-element type="OBJECT" id="sequence" selected="true" />
+            <filter-element type="OBJECT" id="procedure" selected="true" />
+            <filter-element type="OBJECT" id="function" selected="true" />
+            <filter-element type="OBJECT" id="package" selected="true" />
+            <filter-element type="OBJECT" id="type" selected="true" />
+            <filter-element type="OBJECT" id="dimension" selected="true" />
+            <filter-element type="OBJECT" id="cluster" selected="true" />
+            <filter-element type="OBJECT" id="dblink" selected="true" />
+          </any-schema>
+        </extended-filter>
+      </filters>
+      <sorting enabled="true">
+        <sorting-element type="RESERVED_WORD" id="keyword" />
+        <sorting-element type="RESERVED_WORD" id="datatype" />
+        <sorting-element type="OBJECT" id="column" />
+        <sorting-element type="OBJECT" id="table" />
+        <sorting-element type="OBJECT" id="view" />
+        <sorting-element type="OBJECT" id="materialized view" />
+        <sorting-element type="OBJECT" id="index" />
+        <sorting-element type="OBJECT" id="constraint" />
+        <sorting-element type="OBJECT" id="trigger" />
+        <sorting-element type="OBJECT" id="synonym" />
+        <sorting-element type="OBJECT" id="sequence" />
+        <sorting-element type="OBJECT" id="procedure" />
+        <sorting-element type="OBJECT" id="function" />
+        <sorting-element type="OBJECT" id="package" />
+        <sorting-element type="OBJECT" id="type" />
+        <sorting-element type="OBJECT" id="dimension" />
+        <sorting-element type="OBJECT" id="cluster" />
+        <sorting-element type="OBJECT" id="dblink" />
+        <sorting-element type="OBJECT" id="schema" />
+        <sorting-element type="OBJECT" id="role" />
+        <sorting-element type="OBJECT" id="user" />
+        <sorting-element type="RESERVED_WORD" id="function" />
+        <sorting-element type="RESERVED_WORD" id="parameter" />
+      </sorting>
+      <format>
+        <enforce-code-style-case value="true" />
+      </format>
+    </code-completion-settings>
+    <execution-engine-settings>
+      <statement-execution>
+        <fetch-block-size value="100" />
+        <execution-timeout value="20" />
+        <debug-execution-timeout value="600" />
+        <focus-result value="false" />
+        <prompt-execution value="false" />
+      </statement-execution>
+      <script-execution>
+        <command-line-interfaces />
+        <execution-timeout value="300" />
+      </script-execution>
+      <method-execution>
+        <execution-timeout value="30" />
+        <debug-execution-timeout value="600" />
+        <parameter-history-size value="10" />
+      </method-execution>
+    </execution-engine-settings>
+    <operation-settings>
+      <transactions>
+        <uncommitted-changes>
+          <on-project-close value="ASK" />
+          <on-disconnect value="ASK" />
+          <on-autocommit-toggle value="ASK" />
+        </uncommitted-changes>
+        <multiple-uncommitted-changes>
+          <on-commit value="ASK" />
+          <on-rollback value="ASK" />
+        </multiple-uncommitted-changes>
+      </transactions>
+      <session-browser>
+        <disconnect-session value="ASK" />
+        <kill-session value="ASK" />
+        <reload-on-filter-change value="false" />
+      </session-browser>
+      <compiler>
+        <compile-type value="KEEP" />
+        <compile-dependencies value="ASK" />
+        <always-show-controls value="false" />
+      </compiler>
+      <debugger>
+        <debugger-type value="ASK" />
+        <use-generic-runners value="true" />
+      </debugger>
+    </operation-settings>
+    <ddl-file-settings>
+      <extensions>
+        <mapping file-type-id="VIEW" extensions="vw" />
+        <mapping file-type-id="TRIGGER" extensions="trg" />
+        <mapping file-type-id="PROCEDURE" extensions="prc" />
+        <mapping file-type-id="FUNCTION" extensions="fnc" />
+        <mapping file-type-id="PACKAGE" extensions="pkg" />
+        <mapping file-type-id="PACKAGE_SPEC" extensions="pks" />
+        <mapping file-type-id="PACKAGE_BODY" extensions="pkb" />
+        <mapping file-type-id="TYPE" extensions="tpe" />
+        <mapping file-type-id="TYPE_SPEC" extensions="tps" />
+        <mapping file-type-id="TYPE_BODY" extensions="tpb" />
+      </extensions>
+      <general>
+        <lookup-ddl-files value="true" />
+        <create-ddl-files value="false" />
+        <synchronize-ddl-files value="true" />
+        <use-qualified-names value="false" />
+        <make-scripts-rerunnable value="true" />
+      </general>
+    </ddl-file-settings>
+    <general-settings>
+      <regional-settings>
+        <date-format value="MEDIUM" />
+        <number-format value="UNGROUPED" />
+        <locale value="SYSTEM_DEFAULT" />
+        <use-custom-formats value="false" />
+      </regional-settings>
+      <environment>
+        <environment-types>
+          <environment-type id="development" name="Development" description="Development environment" color="-2430209/-12296320" readonly-code="false" readonly-data="false" />
+          <environment-type id="integration" name="Integration" description="Integration environment" color="-2621494/-12163514" readonly-code="true" readonly-data="false" />
+          <environment-type id="production" name="Production" description="Productive environment" color="-11574/-10271420" readonly-code="true" readonly-data="true" />
+          <environment-type id="other" name="Other" description="" color="-1576/-10724543" readonly-code="false" readonly-data="false" />
+        </environment-types>
+        <visibility-settings>
+          <connection-tabs value="true" />
+          <dialog-headers value="true" />
+          <object-editor-tabs value="true" />
+          <script-editor-tabs value="false" />
+          <execution-result-tabs value="true" />
+        </visibility-settings>
+      </environment>
+    </general-settings>
+  </component>
+  <component name="DBNavigator.Project.StatementExecutionManager">
+    <execution-variables />
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/Notes-master/.idea/libraries/Gradle__jp_wasabeef_richeditor_android_1_2_2_aar.xml b/src/Notes-master/.idea/libraries/Gradle__jp_wasabeef_richeditor_android_1_2_2_aar.xml
new file mode 100644
index 0000000..a0e7e8c
--- /dev/null
+++ b/src/Notes-master/.idea/libraries/Gradle__jp_wasabeef_richeditor_android_1_2_2_aar.xml
@@ -0,0 +1,15 @@
+<component name="libraryTable">
+  <library name="Gradle: jp.wasabeef:richeditor-android:1.2.2@aar">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/effe5a587e2d2e96d8d7c6f547b1a0bf/richeditor-android-1.2.2/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/effe5a587e2d2e96d8d7c6f547b1a0bf/richeditor-android-1.2.2/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/effe5a587e2d2e96d8d7c6f547b1a0bf/richeditor-android-1.2.2/res" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/jp.wasabeef/richeditor-android/1.2.2/f827275a0b999d3373819410038b95c2b79c6339/richeditor-android-1.2.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/jp.wasabeef/richeditor-android/1.2.2/28a075493692400476744b92053bc9d6a6e3ef82/richeditor-android-1.2.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/src/Notes-master/.idea/modules/app/app.iml b/src/Notes-master/.idea/modules/app/app.iml
index c821eeb..3d3e353 100644
--- a/src/Notes-master/.idea/modules/app/app.iml
+++ b/src/Notes-master/.idea/modules/app/app.iml
@@ -90,5 +90,6 @@
     <orderEntry type="library" name="Gradle: ./../Lessons/APPS/httpcomponents-client-4.5.12-bin/lib/httpclient-osgi-4.5.12.jar" level="project" />
     <orderEntry type="library" name="Gradle: ./../Lessons/APPS/httpcomponents-client-4.5.12-bin/lib/httpclient-win-4.5.12.jar" level="project" />
     <orderEntry type="library" name="Gradle: ./../Lessons/APPS/httpcomponents-client-4.5.12-bin/lib/httpcore-4.4.13.jar" level="project" />
+    <orderEntry type="library" name="Gradle: jp.wasabeef:richeditor-android:1.2.2@aar" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/src/Notes-master/.idea/workspace.xml b/src/Notes-master/.idea/workspace.xml
index 5ba42b1..5ec811d 100644
--- a/src/Notes-master/.idea/workspace.xml
+++ b/src/Notes-master/.idea/workspace.xml
@@ -1,10 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="AndroidConfiguredLogFilters">
+    <filters>
+      <filter>
+        <option name="logLevel" value="verbose" />
+        <option name="logMessagePattern" value="" />
+        <option name="logTagPattern" value="^(?!eglCodecCommon)" />
+        <option name="name" value="Unnamed-0" />
+        <option name="packageNamePattern" value="" />
+        <option name="pid" value="" />
+      </filter>
+    </filters>
+  </component>
   <component name="AndroidLayouts">
     <shared>
       <config />
     </shared>
   </component>
+  <component name="AndroidLogFilters">
+    <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Unnamed-0" />
+  </component>
   <component name="ChangeListManager">
     <list default="true" id="3ae2cdad-619b-45ef-8f1c-670f1a08e5a1" name="Default Changelist" comment="" />
     <option name="SHOW_DIALOG" value="false" />
@@ -23,13 +38,29 @@
       <state>
         <projects_view>
           <tree_state>
-            <expand />
+            <expand>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="Notes-master" type="f1a62948:ProjectNode" />
+              </path>
+            </expand>
             <select />
           </tree_state>
         </projects_view>
       </state>
     </system>
   </component>
+  <component name="FavoritesManager">
+    <favorites_list name="Notes-master" />
+  </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="resourceFile" />
+        <option value="Class" />
+      </list>
+    </option>
+  </component>
   <component name="ProjectId" id="1hsB5rG2sL1ByCCo6UAt3bWmo46" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
@@ -39,10 +70,16 @@
   <component name="PropertiesComponent">
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="android.sdk.path" value="$PROJECT_DIR$/../Program Files/Android/Sdk" />
-    <property name="settings.editor.selected.configurable" value="IntelliLang.Advanced" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../Lessons/Software engineering/database" />
+    <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
     <property name="show.do.not.copy.http.proxy.settings.to.gradle" value="true" />
     <property name="show.inlinked.gradle.project.popup" value="false" />
   </component>
+  <component name="RecentsManager">
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="D:\Notes-master\app\src\main\res\layout" />
+    </key>
+  </component>
   <component name="RunManager">
     <configuration default="true" type="AndroidJUnit" factoryName="Android JUnit">
       <option name="TEST_OBJECT" value="class" />
@@ -117,41 +154,140 @@
     <servers />
   </component>
   <component name="WindowStateProjectService">
+    <state x="947" y="256" key="#HTTP_Proxy" timestamp="1604318681773">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="947" y="256" key="#HTTP_Proxy/0.0.1920.1040@0.0.1920.1040" timestamp="1604318681773" />
     <state x="416" y="97" key="#Notifications" timestamp="1600790557836">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state x="416" y="97" key="#Notifications/0.0.1920.1040@0.0.1920.1040" timestamp="1600790557836" />
-    <state x="865" y="369" key="FileChooserDialogImpl" timestamp="1600830149941">
+    <state x="1142" y="372" key="#com.intellij.fileTypes.FileTypeChooser" timestamp="1604319856717">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="1142" y="372" key="#com.intellij.fileTypes.FileTypeChooser/0.0.1920.1040@0.0.1920.1040" timestamp="1604319856717" />
+    <state x="753" y="236" key="#com.intellij.ide.util.MemberChooser" timestamp="1605626592880">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="753" y="236" key="#com.intellij.ide.util.MemberChooser/0.0.1920.1040@0.0.1920.1040" timestamp="1605626592880" />
+    <state x="690" y="266" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1605233644380">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="690" y="266" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1605233644380" />
+    <state x="952" y="406" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1" timestamp="1601126245710">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="952" y="406" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/0.0.1920.1040@0.0.1920.1040" timestamp="1601126245710" />
+    <state x="297" y="323" key="AndroidCreateResourceFileDialog" timestamp="1605105931866">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="297" y="323" key="AndroidCreateResourceFileDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1605105931866" />
+    <state x="811" y="332" key="AndroidCreateXmlResourceDialog" timestamp="1605539327637">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="811" y="332" key="AndroidCreateXmlResourceDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1605539327637" />
+    <state x="335" y="288" key="AndroidProcessChooserDialog" timestamp="1605972573677">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="335" y="288" key="AndroidProcessChooserDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1605972573677" />
+    <state x="536" y="225" key="DBNavigator.DatasetFilterDialog" timestamp="1605702918747">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="536" y="225" key="DBNavigator.DatasetFilterDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1605702918747" />
+    <state x="937" y="226" key="DBNavigator.ProjectSettingsDialog" timestamp="1604320030781">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="937" y="226" key="DBNavigator.ProjectSettingsDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1604320030781" />
+    <state x="865" y="369" key="FileChooserDialogImpl" timestamp="1605579672038">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="865" y="369" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1605579672038" />
+    <state width="939" height="227" key="GridCell.Tab.0.bottom" timestamp="1606321984622">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state width="939" height="227" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1606321984622" />
+    <state width="939" height="227" key="GridCell.Tab.0.center" timestamp="1606321984622">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state width="939" height="227" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1606321984622" />
+    <state width="939" height="227" key="GridCell.Tab.0.left" timestamp="1606321984621">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state width="939" height="227" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1606321984621" />
+    <state width="939" height="227" key="GridCell.Tab.0.right" timestamp="1606321984622">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state x="865" y="369" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1600830149941" />
-    <state width="1157" height="210" key="GridCell.Tab.0.bottom" timestamp="1600831352589">
+    <state width="939" height="227" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1606321984622" />
+    <state width="1157" height="304" key="GridCell.Tab.1.bottom" timestamp="1605944764558">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1157" height="210" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1600831352589" />
-    <state width="1157" height="210" key="GridCell.Tab.0.center" timestamp="1600831352589">
+    <state width="1157" height="304" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1605944764558" />
+    <state width="1157" height="304" key="GridCell.Tab.1.center" timestamp="1605944764558">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1157" height="210" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1600831352589" />
-    <state width="1157" height="210" key="GridCell.Tab.0.left" timestamp="1600831352589">
+    <state width="1157" height="304" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1605944764558" />
+    <state width="1157" height="304" key="GridCell.Tab.1.left" timestamp="1605944764558">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1157" height="210" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1600831352589" />
-    <state width="1157" height="210" key="GridCell.Tab.0.right" timestamp="1600831352589">
+    <state width="1157" height="304" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1605944764558" />
+    <state width="1157" height="304" key="GridCell.Tab.1.right" timestamp="1605944764558">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1157" height="210" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1600831352589" />
-    <state x="649" y="239" key="SettingsEditor" timestamp="1600843745444">
+    <state width="1157" height="304" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1605944764558" />
+    <state x="539" y="293" width="998" height="708" key="SettingsEditor" timestamp="1605196322483">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state x="649" y="239" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1600843745444" />
-    <state x="665" y="358" width="1017" height="630" key="com.android.tools.idea.avdmanager.AvdListDialog" timestamp="1600835728853">
+    <state x="539" y="293" width="998" height="708" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1605196322483" />
+    <state x="511" y="330" width="1017" height="630" key="com.android.tools.idea.avdmanager.AvdListDialog" timestamp="1605710993534">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state x="665" y="358" width="1017" height="630" key="com.android.tools.idea.avdmanager.AvdListDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1600835728853" />
-    <state x="505" y="263" key="com.intellij.ide.util.TipDialog" timestamp="1600830377887">
+    <state x="511" y="330" width="1017" height="630" key="com.android.tools.idea.avdmanager.AvdListDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1605710993534" />
+    <state x="505" y="263" key="com.intellij.ide.util.TipDialog" timestamp="1606377854011">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state x="505" y="263" key="com.intellij.ide.util.TipDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1600830377887" />
+    <state x="505" y="263" key="com.intellij.ide.util.TipDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1606377854011" />
+    <state x="127" y="222" width="1054" height="568" key="com.intellij.xdebugger.impl.breakpoints.ui.BreakpointsDialogFactory$2" timestamp="1602924455339">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="127" y="222" width="1054" height="568" key="com.intellij.xdebugger.impl.breakpoints.ui.BreakpointsDialogFactory$2/0.0.1920.1040@0.0.1920.1040" timestamp="1602924455339" />
+    <state x="715" y="362" key="edit.logcat.filter.dialog.dimensions" timestamp="1605830899874">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="715" y="362" key="edit.logcat.filter.dialog.dimensions/0.0.1920.1040@0.0.1920.1040" timestamp="1605830899874" />
+    <state x="702" y="147" key="refactoring.ChangeSignatureDialog" timestamp="1605230777534">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="702" y="147" key="refactoring.ChangeSignatureDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1605230777534" />
+    <state x="420" y="226" key="run.anything.popup" timestamp="1603245703530">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="420" y="226" key="run.anything.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1603245703530" />
+    <state x="904" y="414" width="881" height="678" key="search.everywhere.popup" timestamp="1606224466831">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="904" y="414" width="881" height="678" key="search.everywhere.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1606224466831" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint suspend="THREAD" type="java-line">
+          <url>file://$PROJECT_DIR$/../Program Files/Android/Sdk/sources/android-22/android/app/Activity.java</url>
+          <option name="timeStamp" value="1" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="java-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java</url>
+          <line>379</line>
+          <option name="timeStamp" value="105" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="java-method">
+          <url>file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java</url>
+          <line>48</line>
+          <properties class="net.micode.notes.widget.NoteWidgetProvider" method="onDeleted">
+            <option name="EMULATED" value="true" />
+          </properties>
+          <option name="timeStamp" value="90" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
   </component>
 </project>
\ No newline at end of file
diff --git a/src/Notes-master/app/build.gradle b/src/Notes-master/app/build.gradle
index 72f6788..020ae99 100644
--- a/src/Notes-master/app/build.gradle
+++ b/src/Notes-master/app/build.gradle
@@ -28,4 +28,5 @@ dependencies {
     implementation files("D:\\Lessons\\APPS\\httpcomponents-client-4.5.12-bin\\lib\\httpclient-osgi-4.5.12.jar")
     implementation files("D:\\Lessons\\APPS\\httpcomponents-client-4.5.12-bin\\lib\\httpclient-win-4.5.12.jar")
     implementation files("D:\\Lessons\\APPS\\httpcomponents-client-4.5.12-bin\\lib\\httpcore-4.4.13.jar")
+    implementation 'jp.wasabeef:richeditor-android:1.2.2'//新增依赖
 }
\ No newline at end of file
diff --git a/src/Notes-master/app/build/generated/source/buildConfig/androidTest/debug/net/micode/notes/test/BuildConfig.java b/src/Notes-master/app/build/generated/source/buildConfig/androidTest/debug/net/micode/notes/test/BuildConfig.java
new file mode 100644
index 0000000..19ee943
--- /dev/null
+++ b/src/Notes-master/app/build/generated/source/buildConfig/androidTest/debug/net/micode/notes/test/BuildConfig.java
@@ -0,0 +1,12 @@
+/**
+ * Automatically generated file. DO NOT MODIFY
+ */
+package net.micode.notes.test;
+
+public final class BuildConfig {
+  public static final boolean DEBUG = Boolean.parseBoolean("true");
+  public static final String APPLICATION_ID = "net.micode.notes.test";
+  public static final String BUILD_TYPE = "debug";
+  public static final int VERSION_CODE = -1;
+  public static final String VERSION_NAME = "";
+}
diff --git a/src/Notes-master/app/build/intermediates/annotation_processor_list/debugAndroidTest/annotationProcessors.json b/src/Notes-master/app/build/intermediates/annotation_processor_list/debugAndroidTest/annotationProcessors.json
new file mode 100644
index 0000000..9e26dfe
--- /dev/null
+++ b/src/Notes-master/app/build/intermediates/annotation_processor_list/debugAndroidTest/annotationProcessors.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/annotation_processor_list/debugUnitTest/annotationProcessors.json b/src/Notes-master/app/build/intermediates/annotation_processor_list/debugUnitTest/annotationProcessors.json
new file mode 100644
index 0000000..9e26dfe
--- /dev/null
+++ b/src/Notes-master/app/build/intermediates/annotation_processor_list/debugUnitTest/annotationProcessors.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/app_classes/debug/classes.jar b/src/Notes-master/app/build/intermediates/app_classes/debug/classes.jar
new file mode 100644
index 0000000..4ff09d1
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/app_classes/debug/classes.jar differ
diff --git a/src/Notes-master/app/build/intermediates/blame/res/debug/multi-v2/debug.json b/src/Notes-master/app/build/intermediates/blame/res/debug/multi-v2/debug.json
index b4dd6e9..449fbfb 100644
--- a/src/Notes-master/app/build/intermediates/blame/res/debug/multi-v2/debug.json
+++ b/src/Notes-master/app/build/intermediates/blame/res/debug/multi-v2/debug.json
@@ -13,11 +13,11 @@
                         "endOffsets": "811,864,917,969,759"
                     },
                     "to": {
-                        "startLines": "13,14,15,16,17",
+                        "startLines": "28,29,30,31,32",
                         "startColumns": "4,4,4,4,4",
-                        "startOffsets": "589,641,694,747,799",
+                        "startOffsets": "1005,1057,1110,1163,1215",
                         "endColumns": "51,52,52,51,51",
-                        "endOffsets": "636,689,742,794,846"
+                        "endOffsets": "1052,1105,1158,1210,1262"
                     }
                 },
                 {
@@ -30,30 +30,30 @@
                         "endOffsets": "764"
                     },
                     "to": {
-                        "startLines": "12",
+                        "startLines": "27",
                         "startColumns": "4",
-                        "startOffsets": "532",
+                        "startOffsets": "948",
                         "endColumns": "56",
-                        "endOffsets": "584"
+                        "endOffsets": "1000"
                     }
                 },
                 {
                     "source": "D:\\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": "132,76,79,78,77,19,20,21,122,123,42,131,130,26,85,86,84,83,82,98,97,96,88,39,38,68,29,30,89,45,80,43,124,75,71,46,52,57,47,67,66,65,61,60,58,59,62,63,53,74,64,72,44,51,56,55,54,70,50,69,48,49,73,28,34,36,33,35,32,31,25,24,105,104,108,120,113,112,114,115,117,116,106,107,111,109,110,103,118,119,129,127,126,128,27,87,95,100,99,101,94,93,92,91,41,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,4,4",
+                        "startOffsets": "8276,4166,4427,4331,4262,827,870,922,7774,7823,2145,8218,8167,1282,4881,4975,4810,4726,4643,5842,5759,5657,5151,2004,1953,3665,1486,1539,5212,2344,4510,2216,7886,4095,3850,2424,2739,3040,2482,3594,3533,3476,3254,3202,3099,3152,3304,3354,2786,4029,3414,3899,2297,2692,2985,2897,2839,3788,2642,3743,2539,2582,3962,1431,1750,1858,1703,1805,1647,1599,1227,1174,6298,6231,6539,7677,6903,6822,6977,7066,7308,7229,6382,6457,6763,6603,6683,6176,7452,7574,8126,7999,7942,8052,1366,5083,5571,5977,5908,6057,5512,5457,5395,5335,2097,974,1084",
+                        "endLines": "136,76,79,78,77,19,20,21,122,123,42,131,130,26,85,86,84,83,82,98,97,96,88,39,38,68,29,30,89,45,80,43,124,75,71,46,52,57,47,67,66,65,61,60,58,59,62,63,53,74,64,72,44,51,56,55,54,70,50,69,48,49,73,28,34,36,33,35,32,31,25,24,105,104,108,120,113,112,114,115,117,116,106,107,111,109,110,103,118,119,129,127,126,128,27,87,95,100,99,101,94,93,92,91,41,22,23",
+                        "endColumns": "14,95,82,95,68,42,51,51,48,62,70,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,79,101,80,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,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,47,109,89",
+                        "endOffsets": "8680,4257,4505,4422,4326,865,917,969,7818,7881,2211,8271,8213,1361,4970,5078,4876,4805,4721,5903,5837,5754,5207,2061,1999,3738,1534,1594,5312,2419,4607,2292,7936,4161,3894,2477,2781,3094,2534,3660,3589,3528,3299,3249,3147,3197,3349,3409,2834,4090,3471,3957,2339,2734,3035,2980,2892,3845,2687,3783,2577,2637,4024,1481,1800,1906,1745,1853,1698,1642,1277,1222,6377,6293,6598,7768,6972,6898,7061,7224,7447,7303,6452,6534,6817,6678,6758,6226,7569,7672,8162,8047,7994,8121,1426,5146,5652,6052,5972,6146,5566,5507,5452,5390,2140,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": "851,1244,1340,1423,1519,1588,1631,1683,1735,1784,1847,1905,1956,2040,2134,2242,2313,2397,2480,2546,2629,2731,2792,2854,2905,2983,3036,3096,3201,3260,3362,3417,3488,3537,3595,3642,3701,3758,3829,3890,3947,3997,4049,4102,4152,4202,4262,4315,4381,4443,4506,4553,4608,4696,4754,4816,4866,4911,4954,5014,5081,5136,5191,5244,5291,5344,5400,5448,5503,5556,5640,5707,5771,5867,5941,6022,6111,6274,6418,6497,6572,6654,6713,6793,6873,6928,7050,7153,7194,7247,7304,7378,7443,7511,7597,7677,7746,7840,7899,7954,8016,8076,8186",
-                        "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "1239,1335,1418,1514,1583,1626,1678,1730,1779,1842,1900,1951,2035,2129,2237,2308,2392,2475,2541,2624,2726,2787,2849,2900,2978,3031,3091,3196,3255,3357,3412,3483,3532,3590,3637,3696,3753,3824,3885,3942,3992,4044,4097,4147,4197,4257,4310,4376,4438,4501,4548,4603,4691,4749,4811,4861,4906,4949,5009,5076,5131,5186,5239,5286,5339,5395,5443,5498,5551,5635,5702,5766,5862,5936,6017,6106,6269,6413,6492,6567,6649,6708,6788,6868,6923,7045,7148,7189,7242,7299,7373,7438,7506,7592,7672,7741,7835,7894,7949,8011,8071,8181,8271"
+                        "startLines": "33,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "1267,1660,1756,1839,1935,2004,2047,2099,2151,2200,2263,2334,2392,2443,2527,2621,2729,2800,2884,2967,3033,3116,3218,3279,3341,3392,3470,3523,3583,3688,3768,3870,3951,4006,4077,4126,4184,4231,4290,4347,4418,4479,4536,4586,4638,4691,4741,4791,4851,4904,4970,5032,5095,5142,5189,5244,5332,5390,5452,5502,5547,5590,5650,5717,5772,5827,5880,5927,5980,6036,6084,6139,6192,6276,6343,6407,6503,6577,6658,6747,6910,7054,7133,7208,7290,7349,7429,7509,7564,7686,7789,7830,7883,7940,8014,8079,8147,8233,8313,8382,8476,8535,8590,8652,8712,8760,8870",
+                        "endLines": "37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143",
+                        "endColumns": "14,95,82,95,68,42,51,51,48,62,70,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,79,101,80,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,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,47,109,89",
+                        "endOffsets": "1655,1751,1834,1930,1999,2042,2094,2146,2195,2258,2329,2387,2438,2522,2616,2724,2795,2879,2962,3028,3111,3213,3274,3336,3387,3465,3518,3578,3683,3763,3865,3946,4001,4072,4121,4179,4226,4285,4342,4413,4474,4531,4581,4633,4686,4736,4786,4846,4899,4965,5027,5090,5137,5184,5239,5327,5385,5447,5497,5542,5585,5645,5712,5767,5822,5875,5922,5975,6031,6079,6134,6187,6271,6338,6402,6498,6572,6653,6742,6905,7049,7128,7203,7285,7344,7424,7504,7559,7681,7784,7825,7878,7935,8009,8074,8142,8228,8308,8377,8471,8530,8585,8647,8707,8755,8865,8955"
                     }
                 },
                 {
@@ -64,34 +64,34 @@
                         "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,2800,2634,1073,1258,1443,1647,1854,890,2056"
                     },
                     "to": {
-                        "startLines": "125,129,133,137,140,144,148,152,156,160,164",
+                        "startLines": "144,148,152,156,159,163,167,171,175,179,183",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8276,8480,8691,8898,9058,9241,9426,9611,9814,10020,10203",
-                        "endLines": "128,132,136,139,143,147,151,155,159,163,167",
+                        "startOffsets": "8960,9164,9375,9540,9700,9883,10068,10253,10456,10662,10845",
+                        "endLines": "147,151,155,158,162,166,170,174,178,182,186",
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8475,8686,8893,9053,9236,9421,9606,9809,10015,10198,10399"
+                        "endOffsets": "9159,9370,9535,9695,9878,10063,10248,10451,10657,10840,11041"
                     }
                 },
                 {
                     "source": "D:\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
                     "from": {
-                        "startLines": "19,26",
-                        "startColumns": "4,4",
-                        "startOffsets": "739,1047",
-                        "endLines": "24,29",
-                        "endColumns": "19,19",
-                        "endOffsets": "1041,1162"
+                        "startLines": "19,26,30,39",
+                        "startColumns": "4,4,4,4",
+                        "startOffsets": "739,1047,1167,1394",
+                        "endLines": "24,29,37,45",
+                        "endColumns": "19,19,19,19",
+                        "endOffsets": "1041,1162,1388,1579"
                     },
                     "to": {
-                        "startLines": "2,8",
-                        "startColumns": "4,4",
-                        "startOffsets": "105,412",
-                        "endLines": "7,11",
-                        "endColumns": "19,19",
-                        "endOffsets": "407,527"
+                        "startLines": "2,8,12,20",
+                        "startColumns": "4,4,4,4",
+                        "startOffsets": "105,412,532,758",
+                        "endLines": "7,11,19,26",
+                        "endColumns": "19,19,19,19",
+                        "endOffsets": "407,527,753,943"
                     }
                 }
             ]
@@ -102,39 +102,39 @@
                 {
                     "source": "D:\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
                     "from": {
-                        "startLines": "18",
-                        "startColumns": "4",
-                        "startOffsets": "712",
-                        "endLines": "21",
-                        "endColumns": "19",
-                        "endOffsets": "817"
+                        "startLines": "18,22,31",
+                        "startColumns": "4,4,4",
+                        "startOffsets": "712,822,1022",
+                        "endLines": "21,29,37",
+                        "endColumns": "19,19,19",
+                        "endOffsets": "817,1016,1189"
                     },
                     "to": {
-                        "startLines": "2",
-                        "startColumns": "4",
-                        "startOffsets": "105",
-                        "endLines": "5",
-                        "endColumns": "19",
-                        "endOffsets": "210"
+                        "startLines": "2,6,14",
+                        "startColumns": "4,4,4",
+                        "startOffsets": "105,215,414",
+                        "endLines": "5,13,20",
+                        "endColumns": "19,19,19",
+                        "endOffsets": "210,409,581"
                     }
                 },
                 {
                     "source": "D:\\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": "125,75,74,73,72,19,20,21,116,117,39,124,123,26,81,82,80,79,78,94,93,92,84,64,29,30,85,76,40,118,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,41,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,103,115,108,107,109,110,112,111,102,106,104,105,99,113,114,122,120,119,121,27,83,91,96,95,97,90,89,88,87,38,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": "6737,3700,3634,3561,3511,827,867,915,6288,6333,1844,6683,6633,1199,4066,4134,4007,3942,3879,4797,4737,4674,4266,3082,1369,1422,4320,3773,1897,6390,3452,3239,2003,2284,2530,2056,3022,2969,2918,2723,2675,2581,2629,2769,2816,2327,3393,2866,3282,1960,2241,2483,2427,2372,3184,2197,3142,2106,2147,3334,1318,1623,1719,1576,1672,1529,1484,1148,1095,5172,5113,5313,6214,5624,5555,5688,5766,5949,5876,5247,5500,5370,5435,5064,6053,6136,6595,6488,6440,6533,1261,4211,4615,4910,4852,4977,4567,4522,4474,4423,1798,963,1029",
+                        "endLines": "127,75,74,73,72,19,20,21,116,117,39,124,123,26,81,82,80,79,78,94,93,92,84,64,29,30,85,76,40,118,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,41,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,103,115,108,107,109,110,112,111,102,106,104,105,99,113,114,122,120,119,121,27,83,91,96,95,97,90,89,88,87,38,22,23",
+                        "endColumns": "14,72,65,72,49,39,47,47,44,56,52,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,62,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,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,45,65,65",
+                        "endOffsets": "6909,3768,3695,3629,3556,862,910,958,6328,6385,1892,6732,6678,1256,4129,4206,4061,4002,3937,4847,4792,4732,4315,3137,1417,1479,4400,3849,1955,6435,3506,3277,2051,2322,2576,2101,3077,3017,2964,2764,2718,2624,2670,2811,2861,2367,3447,2913,3329,1998,2279,2525,2478,2422,3234,2236,3179,2142,2192,3388,1364,1667,1763,1618,1714,1571,1524,1194,1143,5242,5167,5365,6283,5683,5619,5761,5871,6048,5944,5308,5550,5430,5495,5108,6131,6209,6628,6528,6483,6590,1313,4261,4669,4972,4905,5034,4610,4562,4517,4469,1839,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": "21,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",
+                        "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": "586,755,828,894,967,1017,1057,1105,1153,1198,1255,1308,1362,1412,1474,1542,1619,1678,1743,1806,1861,1921,1984,2038,2098,2151,2213,2298,2379,2442,2492,2551,2594,2647,2690,2741,2791,2851,2904,2955,3001,3049,3097,3143,3190,3240,3285,3344,3396,3448,3491,3534,3581,3637,3692,3747,3791,3833,3874,3924,3983,4034,4083,4132,4179,4226,4273,4318,4369,4422,4497,4556,4613,4687,4751,4820,4898,5008,5112,5185,5251,5306,5371,5436,5485,5568,5646,5684,5729,5777,5839,5896,5951,6010,6077,6135,6197,6245,6290,6338,6389,6435,6501",
+                        "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",
+                        "endColumns": "14,72,65,72,49,39,47,47,44,56,52,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,62,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,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,45,65,65",
+                        "endOffsets": "750,823,889,962,1012,1052,1100,1148,1193,1250,1303,1357,1407,1469,1537,1614,1673,1738,1801,1856,1916,1979,2033,2093,2146,2208,2293,2374,2437,2487,2546,2589,2642,2685,2736,2786,2846,2899,2950,2996,3044,3092,3138,3185,3235,3280,3339,3391,3443,3486,3529,3576,3632,3687,3742,3786,3828,3869,3919,3978,4029,4078,4127,4174,4221,4268,4313,4364,4417,4492,4551,4608,4682,4746,4815,4893,5003,5107,5180,5246,5301,5366,5431,5480,5563,5641,5679,5724,5772,5834,5891,5946,6005,6072,6130,6192,6240,6285,6333,6384,6430,6496,6562"
                     }
                 }
             ]
@@ -145,20 +145,20 @@
                 {
                     "source": "D:\\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": "126,76,75,74,73,19,20,21,116,117,40,125,124,26,80,81,79,78,77,93,92,91,83,65,29,30,84,37,41,118,72,68,43,49,54,44,64,63,62,58,57,55,56,59,60,50,71,61,69,42,48,53,52,51,67,47,66,45,46,70,28,34,36,33,35,32,31,25,24,100,99,102,114,107,106,108,109,111,110,101,105,103,104,98,112,113,123,121,120,122,27,82,90,95,94,96,89,88,87,86,39,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": "6710,3778,3712,3639,3589,827,867,915,6260,6305,1924,6656,6606,1199,4038,4106,3979,3913,3850,4768,4708,4645,4238,3160,1369,1422,4292,1768,1975,6362,3530,3317,2081,2362,2608,2134,3100,3047,2996,2801,2753,2659,2707,2847,2894,2405,3471,2944,3360,2038,2319,2561,2505,2450,3262,2275,3220,2184,2225,3412,1318,1623,1719,1576,1672,1529,1484,1148,1095,5143,5084,5284,6185,5595,5526,5659,5737,5920,5847,5218,5471,5341,5406,5035,6024,6107,6568,6461,6413,6506,1261,4183,4586,4881,4823,4948,4538,4493,4445,4394,1878,963,1029",
+                        "endLines": "128,76,75,74,73,19,20,21,116,117,40,125,124,26,80,81,79,78,77,93,92,91,83,65,29,30,84,37,41,118,72,68,43,49,54,44,64,63,62,58,57,55,56,59,60,50,71,61,69,42,48,53,52,51,67,47,66,45,46,70,28,34,36,33,35,32,31,25,24,100,99,102,114,107,106,108,109,111,110,101,105,103,104,98,112,113,123,121,120,122,27,82,90,95,94,96,89,88,87,86,39,22,23",
+                        "endColumns": "14,71,65,72,49,39,47,47,44,56,50,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,62,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,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,45,65,65",
+                        "endOffsets": "6882,3845,3773,3707,3634,862,910,958,6300,6357,1970,6705,6651,1256,4101,4178,4033,3974,3908,4818,4763,4703,4287,3215,1417,1479,4371,1843,2033,6407,3584,3355,2129,2400,2654,2179,3155,3095,3042,2842,2796,2702,2748,2889,2939,2445,3525,2991,3407,2076,2357,2603,2556,2500,3312,2314,3257,2220,2270,3466,1364,1667,1763,1618,1714,1571,1524,1194,1143,5213,5138,5336,6254,5654,5590,5732,5842,6019,5915,5279,5521,5401,5466,5079,6102,6180,6601,6501,6456,6563,1313,4233,4640,4943,4876,5005,4581,4533,4488,4440,1919,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,109,110",
+                        "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": "215,384,456,522,595,645,685,733,781,826,883,934,988,1038,1100,1168,1245,1304,1370,1433,1488,1548,1611,1665,1725,1778,1840,1924,2004,2067,2117,2176,2219,2272,2315,2366,2416,2476,2529,2580,2626,2674,2722,2768,2815,2865,2910,2969,3021,3073,3116,3159,3206,3262,3317,3372,3416,3458,3499,3549,3608,3659,3708,3757,3804,3851,3898,3943,3994,4047,4122,4181,4238,4312,4376,4445,4523,4633,4737,4810,4876,4931,4996,5061,5110,5193,5271,5309,5354,5402,5464,5521,5576,5635,5702,5760,5822,5870,5915,5963,6014,6060,6126",
+                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110",
+                        "endColumns": "14,71,65,72,49,39,47,47,44,56,50,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,62,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,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,45,65,65",
+                        "endOffsets": "379,451,517,590,640,680,728,776,821,878,929,983,1033,1095,1163,1240,1299,1365,1428,1483,1543,1606,1660,1720,1773,1835,1919,1999,2062,2112,2171,2214,2267,2310,2361,2411,2471,2524,2575,2621,2669,2717,2763,2810,2860,2905,2964,3016,3068,3111,3154,3201,3257,3312,3367,3411,3453,3494,3544,3603,3654,3703,3752,3799,3846,3893,3938,3989,4042,4117,4176,4233,4307,4371,4440,4518,4628,4732,4805,4871,4926,4991,5056,5105,5188,5266,5304,5349,5397,5459,5516,5571,5630,5697,5755,5817,5865,5910,5958,6009,6055,6121,6187"
                     }
                 },
                 {
diff --git a/src/Notes-master/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rCN.json b/src/Notes-master/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rCN.json
index 9b84656..d3fab69 100644
--- a/src/Notes-master/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rCN.json
+++ b/src/Notes-master/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rCN.json
@@ -6,39 +6,39 @@
                 {
                     "source": "D:\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
                     "from": {
-                        "startLines": "18",
-                        "startColumns": "4",
-                        "startOffsets": "712",
-                        "endLines": "21",
-                        "endColumns": "19",
-                        "endOffsets": "817"
+                        "startLines": "18,22,31",
+                        "startColumns": "4,4,4",
+                        "startOffsets": "712,822,1022",
+                        "endLines": "21,29,37",
+                        "endColumns": "19,19,19",
+                        "endOffsets": "817,1016,1189"
                     },
                     "to": {
-                        "startLines": "2",
-                        "startColumns": "4",
-                        "startOffsets": "105",
-                        "endLines": "5",
-                        "endColumns": "19",
-                        "endOffsets": "210"
+                        "startLines": "2,6,14",
+                        "startColumns": "4,4,4",
+                        "startOffsets": "105,215,414",
+                        "endLines": "5,13,20",
+                        "endColumns": "19,19,19",
+                        "endOffsets": "210,409,581"
                     }
                 },
                 {
                     "source": "D:\\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": "125,75,74,73,72,19,20,21,116,117,39,124,123,26,81,82,80,79,78,94,93,92,84,64,29,30,85,76,40,118,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,41,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,103,115,108,107,109,110,112,111,102,106,104,105,99,113,114,122,120,119,121,27,83,91,96,95,97,90,89,88,87,38,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": "6737,3700,3634,3561,3511,827,867,915,6288,6333,1844,6683,6633,1199,4066,4134,4007,3942,3879,4797,4737,4674,4266,3082,1369,1422,4320,3773,1897,6390,3452,3239,2003,2284,2530,2056,3022,2969,2918,2723,2675,2581,2629,2769,2816,2327,3393,2866,3282,1960,2241,2483,2427,2372,3184,2197,3142,2106,2147,3334,1318,1623,1719,1576,1672,1529,1484,1148,1095,5172,5113,5313,6214,5624,5555,5688,5766,5949,5876,5247,5500,5370,5435,5064,6053,6136,6595,6488,6440,6533,1261,4211,4615,4910,4852,4977,4567,4522,4474,4423,1798,963,1029",
+                        "endLines": "127,75,74,73,72,19,20,21,116,117,39,124,123,26,81,82,80,79,78,94,93,92,84,64,29,30,85,76,40,118,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,41,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,103,115,108,107,109,110,112,111,102,106,104,105,99,113,114,122,120,119,121,27,83,91,96,95,97,90,89,88,87,38,22,23",
+                        "endColumns": "14,72,65,72,49,39,47,47,44,56,52,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,62,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,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,45,65,65",
+                        "endOffsets": "6909,3768,3695,3629,3556,862,910,958,6328,6385,1892,6732,6678,1256,4129,4206,4061,4002,3937,4847,4792,4732,4315,3137,1417,1479,4400,3849,1955,6435,3506,3277,2051,2322,2576,2101,3077,3017,2964,2764,2718,2624,2670,2811,2861,2367,3447,2913,3329,1998,2279,2525,2478,2422,3234,2236,3179,2142,2192,3388,1364,1667,1763,1618,1714,1571,1524,1194,1143,5242,5167,5365,6283,5683,5619,5761,5871,6048,5944,5308,5550,5430,5495,5108,6131,6209,6628,6528,6483,6590,1313,4261,4669,4972,4905,5034,4610,4562,4517,4469,1839,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": "21,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",
+                        "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": "586,755,828,894,967,1017,1057,1105,1153,1198,1255,1308,1362,1412,1474,1542,1619,1678,1743,1806,1861,1921,1984,2038,2098,2151,2213,2298,2379,2442,2492,2551,2594,2647,2690,2741,2791,2851,2904,2955,3001,3049,3097,3143,3190,3240,3285,3344,3396,3448,3491,3534,3581,3637,3692,3747,3791,3833,3874,3924,3983,4034,4083,4132,4179,4226,4273,4318,4369,4422,4497,4556,4613,4687,4751,4820,4898,5008,5112,5185,5251,5306,5371,5436,5485,5568,5646,5684,5729,5777,5839,5896,5951,6010,6077,6135,6197,6245,6290,6338,6389,6435,6501",
+                        "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",
+                        "endColumns": "14,72,65,72,49,39,47,47,44,56,52,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,62,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,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,45,65,65",
+                        "endOffsets": "750,823,889,962,1012,1052,1100,1148,1193,1250,1303,1357,1407,1469,1537,1614,1673,1738,1801,1856,1916,1979,2033,2093,2146,2208,2293,2374,2437,2487,2546,2589,2642,2685,2736,2786,2846,2899,2950,2996,3044,3092,3138,3185,3235,3280,3339,3391,3443,3486,3529,3576,3632,3687,3742,3786,3828,3869,3919,3978,4029,4078,4127,4174,4221,4268,4313,4364,4417,4492,4551,4608,4682,4746,4815,4893,5003,5107,5180,5246,5301,5366,5431,5480,5563,5641,5679,5724,5772,5834,5891,5946,6005,6072,6130,6192,6240,6285,6333,6384,6430,6496,6562"
                     }
                 }
             ]
diff --git a/src/Notes-master/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rTW.json b/src/Notes-master/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rTW.json
index c5dad2c..7f6fde1 100644
--- a/src/Notes-master/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rTW.json
+++ b/src/Notes-master/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rTW.json
@@ -6,20 +6,20 @@
                 {
                     "source": "D:\\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": "126,76,75,74,73,19,20,21,116,117,40,125,124,26,80,81,79,78,77,93,92,91,83,65,29,30,84,37,41,118,72,68,43,49,54,44,64,63,62,58,57,55,56,59,60,50,71,61,69,42,48,53,52,51,67,47,66,45,46,70,28,34,36,33,35,32,31,25,24,100,99,102,114,107,106,108,109,111,110,101,105,103,104,98,112,113,123,121,120,122,27,82,90,95,94,96,89,88,87,86,39,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": "6710,3778,3712,3639,3589,827,867,915,6260,6305,1924,6656,6606,1199,4038,4106,3979,3913,3850,4768,4708,4645,4238,3160,1369,1422,4292,1768,1975,6362,3530,3317,2081,2362,2608,2134,3100,3047,2996,2801,2753,2659,2707,2847,2894,2405,3471,2944,3360,2038,2319,2561,2505,2450,3262,2275,3220,2184,2225,3412,1318,1623,1719,1576,1672,1529,1484,1148,1095,5143,5084,5284,6185,5595,5526,5659,5737,5920,5847,5218,5471,5341,5406,5035,6024,6107,6568,6461,6413,6506,1261,4183,4586,4881,4823,4948,4538,4493,4445,4394,1878,963,1029",
+                        "endLines": "128,76,75,74,73,19,20,21,116,117,40,125,124,26,80,81,79,78,77,93,92,91,83,65,29,30,84,37,41,118,72,68,43,49,54,44,64,63,62,58,57,55,56,59,60,50,71,61,69,42,48,53,52,51,67,47,66,45,46,70,28,34,36,33,35,32,31,25,24,100,99,102,114,107,106,108,109,111,110,101,105,103,104,98,112,113,123,121,120,122,27,82,90,95,94,96,89,88,87,86,39,22,23",
+                        "endColumns": "14,71,65,72,49,39,47,47,44,56,50,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,62,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,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,45,65,65",
+                        "endOffsets": "6882,3845,3773,3707,3634,862,910,958,6300,6357,1970,6705,6651,1256,4101,4178,4033,3974,3908,4818,4763,4703,4287,3215,1417,1479,4371,1843,2033,6407,3584,3355,2129,2400,2654,2179,3155,3095,3042,2842,2796,2702,2748,2889,2939,2445,3525,2991,3407,2076,2357,2603,2556,2500,3312,2314,3257,2220,2270,3466,1364,1667,1763,1618,1714,1571,1524,1194,1143,5213,5138,5336,6254,5654,5590,5732,5842,6019,5915,5279,5521,5401,5466,5079,6102,6180,6601,6501,6456,6563,1313,4233,4640,4943,4876,5005,4581,4533,4488,4440,1919,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,109,110",
+                        "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": "215,384,456,522,595,645,685,733,781,826,883,934,988,1038,1100,1168,1245,1304,1370,1433,1488,1548,1611,1665,1725,1778,1840,1924,2004,2067,2117,2176,2219,2272,2315,2366,2416,2476,2529,2580,2626,2674,2722,2768,2815,2865,2910,2969,3021,3073,3116,3159,3206,3262,3317,3372,3416,3458,3499,3549,3608,3659,3708,3757,3804,3851,3898,3943,3994,4047,4122,4181,4238,4312,4376,4445,4523,4633,4737,4810,4876,4931,4996,5061,5110,5193,5271,5309,5354,5402,5464,5521,5576,5635,5702,5760,5822,5870,5915,5963,6014,6060,6126",
+                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110",
+                        "endColumns": "14,71,65,72,49,39,47,47,44,56,50,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,62,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,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,45,65,65",
+                        "endOffsets": "379,451,517,590,640,680,728,776,821,878,929,983,1033,1095,1163,1240,1299,1365,1428,1483,1543,1606,1660,1720,1773,1835,1919,1999,2062,2112,2171,2214,2267,2310,2361,2411,2471,2524,2575,2621,2669,2717,2763,2810,2860,2905,2964,3016,3068,3111,3154,3201,3257,3312,3367,3411,3453,3494,3544,3603,3654,3703,3752,3799,3846,3893,3938,3989,4042,4117,4176,4233,4307,4371,4440,4518,4628,4732,4805,4871,4926,4991,5056,5105,5188,5266,5304,5349,5397,5459,5516,5571,5630,5697,5755,5817,5865,5910,5958,6009,6055,6121,6187"
                     }
                 },
                 {
diff --git a/src/Notes-master/app/build/intermediates/blame/res/debug/multi-v2/values.json b/src/Notes-master/app/build/intermediates/blame/res/debug/multi-v2/values.json
index 828dbfc..9ecd4d6 100644
--- a/src/Notes-master/app/build/intermediates/blame/res/debug/multi-v2/values.json
+++ b/src/Notes-master/app/build/intermediates/blame/res/debug/multi-v2/values.json
@@ -13,11 +13,11 @@
                         "endOffsets": "811,864,917,969,759"
                     },
                     "to": {
-                        "startLines": "13,14,15,16,17",
+                        "startLines": "28,29,30,31,32",
                         "startColumns": "4,4,4,4,4",
-                        "startOffsets": "589,641,694,747,799",
+                        "startOffsets": "1005,1057,1110,1163,1215",
                         "endColumns": "51,52,52,51,51",
-                        "endOffsets": "636,689,742,794,846"
+                        "endOffsets": "1052,1105,1158,1210,1262"
                     }
                 },
                 {
@@ -30,30 +30,30 @@
                         "endOffsets": "764"
                     },
                     "to": {
-                        "startLines": "12",
+                        "startLines": "27",
                         "startColumns": "4",
-                        "startOffsets": "532",
+                        "startOffsets": "948",
                         "endColumns": "56",
-                        "endOffsets": "584"
+                        "endOffsets": "1000"
                     }
                 },
                 {
                     "source": "D:\\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": "132,76,79,78,77,19,20,21,122,123,42,131,130,26,85,86,84,83,82,98,97,96,88,39,38,68,29,30,89,45,80,43,124,75,71,46,52,57,47,67,66,65,61,60,58,59,62,63,53,74,64,72,44,51,56,55,54,70,50,69,48,49,73,28,34,36,33,35,32,31,25,24,105,104,108,120,113,112,114,115,117,116,106,107,111,109,110,103,118,119,129,127,126,128,27,87,95,100,99,101,94,93,92,91,41,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,4,4",
+                        "startOffsets": "8276,4166,4427,4331,4262,827,870,922,7774,7823,2145,8218,8167,1282,4881,4975,4810,4726,4643,5842,5759,5657,5151,2004,1953,3665,1486,1539,5212,2344,4510,2216,7886,4095,3850,2424,2739,3040,2482,3594,3533,3476,3254,3202,3099,3152,3304,3354,2786,4029,3414,3899,2297,2692,2985,2897,2839,3788,2642,3743,2539,2582,3962,1431,1750,1858,1703,1805,1647,1599,1227,1174,6298,6231,6539,7677,6903,6822,6977,7066,7308,7229,6382,6457,6763,6603,6683,6176,7452,7574,8126,7999,7942,8052,1366,5083,5571,5977,5908,6057,5512,5457,5395,5335,2097,974,1084",
+                        "endLines": "136,76,79,78,77,19,20,21,122,123,42,131,130,26,85,86,84,83,82,98,97,96,88,39,38,68,29,30,89,45,80,43,124,75,71,46,52,57,47,67,66,65,61,60,58,59,62,63,53,74,64,72,44,51,56,55,54,70,50,69,48,49,73,28,34,36,33,35,32,31,25,24,105,104,108,120,113,112,114,115,117,116,106,107,111,109,110,103,118,119,129,127,126,128,27,87,95,100,99,101,94,93,92,91,41,22,23",
+                        "endColumns": "14,95,82,95,68,42,51,51,48,62,70,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,79,101,80,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,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,47,109,89",
+                        "endOffsets": "8680,4257,4505,4422,4326,865,917,969,7818,7881,2211,8271,8213,1361,4970,5078,4876,4805,4721,5903,5837,5754,5207,2061,1999,3738,1534,1594,5312,2419,4607,2292,7936,4161,3894,2477,2781,3094,2534,3660,3589,3528,3299,3249,3147,3197,3349,3409,2834,4090,3471,3957,2339,2734,3035,2980,2892,3845,2687,3783,2577,2637,4024,1481,1800,1906,1745,1853,1698,1642,1277,1222,6377,6293,6598,7768,6972,6898,7061,7224,7447,7303,6452,6534,6817,6678,6758,6226,7569,7672,8162,8047,7994,8121,1426,5146,5652,6052,5972,6146,5566,5507,5452,5390,2140,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": "851,1244,1340,1423,1519,1588,1631,1683,1735,1784,1847,1905,1956,2040,2134,2242,2313,2397,2480,2546,2629,2731,2792,2854,2905,2983,3036,3096,3201,3260,3362,3417,3488,3537,3595,3642,3701,3758,3829,3890,3947,3997,4049,4102,4152,4202,4262,4315,4381,4443,4506,4553,4608,4696,4754,4816,4866,4911,4954,5014,5081,5136,5191,5244,5291,5344,5400,5448,5503,5556,5640,5707,5771,5867,5941,6022,6111,6274,6418,6497,6572,6654,6713,6793,6873,6928,7050,7153,7194,7247,7304,7378,7443,7511,7597,7677,7746,7840,7899,7954,8016,8076,8186",
-                        "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "1239,1335,1418,1514,1583,1626,1678,1730,1779,1842,1900,1951,2035,2129,2237,2308,2392,2475,2541,2624,2726,2787,2849,2900,2978,3031,3091,3196,3255,3357,3412,3483,3532,3590,3637,3696,3753,3824,3885,3942,3992,4044,4097,4147,4197,4257,4310,4376,4438,4501,4548,4603,4691,4749,4811,4861,4906,4949,5009,5076,5131,5186,5239,5286,5339,5395,5443,5498,5551,5635,5702,5766,5862,5936,6017,6106,6269,6413,6492,6567,6649,6708,6788,6868,6923,7045,7148,7189,7242,7299,7373,7438,7506,7592,7672,7741,7835,7894,7949,8011,8071,8181,8271"
+                        "startLines": "33,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "1267,1660,1756,1839,1935,2004,2047,2099,2151,2200,2263,2334,2392,2443,2527,2621,2729,2800,2884,2967,3033,3116,3218,3279,3341,3392,3470,3523,3583,3688,3768,3870,3951,4006,4077,4126,4184,4231,4290,4347,4418,4479,4536,4586,4638,4691,4741,4791,4851,4904,4970,5032,5095,5142,5189,5244,5332,5390,5452,5502,5547,5590,5650,5717,5772,5827,5880,5927,5980,6036,6084,6139,6192,6276,6343,6407,6503,6577,6658,6747,6910,7054,7133,7208,7290,7349,7429,7509,7564,7686,7789,7830,7883,7940,8014,8079,8147,8233,8313,8382,8476,8535,8590,8652,8712,8760,8870",
+                        "endLines": "37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143",
+                        "endColumns": "14,95,82,95,68,42,51,51,48,62,70,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,79,101,80,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,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,47,109,89",
+                        "endOffsets": "1655,1751,1834,1930,1999,2042,2094,2146,2195,2258,2329,2387,2438,2522,2616,2724,2795,2879,2962,3028,3111,3213,3274,3336,3387,3465,3518,3578,3683,3763,3865,3946,4001,4072,4121,4179,4226,4285,4342,4413,4474,4531,4581,4633,4686,4736,4786,4846,4899,4965,5027,5090,5137,5184,5239,5327,5385,5447,5497,5542,5585,5645,5712,5767,5822,5875,5922,5975,6031,6079,6134,6187,6271,6338,6402,6498,6572,6653,6742,6905,7049,7128,7203,7285,7344,7424,7504,7559,7681,7784,7825,7878,7935,8009,8074,8142,8228,8308,8377,8471,8530,8585,8647,8707,8755,8865,8955"
                     }
                 },
                 {
@@ -64,34 +64,34 @@
                         "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,2800,2634,1073,1258,1443,1647,1854,890,2056"
                     },
                     "to": {
-                        "startLines": "125,129,133,137,140,144,148,152,156,160,164",
+                        "startLines": "144,148,152,156,159,163,167,171,175,179,183",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8276,8480,8691,8898,9058,9241,9426,9611,9814,10020,10203",
-                        "endLines": "128,132,136,139,143,147,151,155,159,163,167",
+                        "startOffsets": "8960,9164,9375,9540,9700,9883,10068,10253,10456,10662,10845",
+                        "endLines": "147,151,155,158,162,166,170,174,178,182,186",
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8475,8686,8893,9053,9236,9421,9606,9809,10015,10198,10399"
+                        "endOffsets": "9159,9370,9535,9695,9878,10063,10248,10451,10657,10840,11041"
                     }
                 },
                 {
                     "source": "D:\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
                     "from": {
-                        "startLines": "19,26",
-                        "startColumns": "4,4",
-                        "startOffsets": "739,1047",
-                        "endLines": "24,29",
-                        "endColumns": "19,19",
-                        "endOffsets": "1041,1162"
+                        "startLines": "19,26,30,39",
+                        "startColumns": "4,4,4,4",
+                        "startOffsets": "739,1047,1167,1394",
+                        "endLines": "24,29,37,45",
+                        "endColumns": "19,19,19,19",
+                        "endOffsets": "1041,1162,1388,1579"
                     },
                     "to": {
-                        "startLines": "2,8",
-                        "startColumns": "4,4",
-                        "startOffsets": "105,412",
-                        "endLines": "7,11",
-                        "endColumns": "19,19",
-                        "endOffsets": "407,527"
+                        "startLines": "2,8,12,20",
+                        "startColumns": "4,4,4,4",
+                        "startOffsets": "105,412,532,758",
+                        "endLines": "7,11,19,26",
+                        "endColumns": "19,19,19,19",
+                        "endOffsets": "407,527,753,943"
                     }
                 }
             ]
diff --git a/src/Notes-master/app/build/intermediates/blame/res/debug/single/debug.json b/src/Notes-master/app/build/intermediates/blame/res/debug/single/debug.json
index ff51567..951a78f 100644
--- a/src/Notes-master/app/build/intermediates/blame/res/debug/single/debug.json
+++ b/src/Notes-master/app/build/intermediates/blame/res/debug/single/debug.json
@@ -3,18 +3,6 @@
         "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_green.9.png.flat",
         "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png"
     },
-    {
-        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_middle.9.png.flat",
-        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png"
-    },
-    {
-        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_up.9.png.flat",
-        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png"
-    },
-    {
-        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_dropdown_icon.9.png.flat",
-        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png"
-    },
     {
         "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_options.xml.flat",
         "source": "D:\\Notes-master\\app\\src\\main\\res\\menu\\note_list_options.xml"
@@ -23,10 +11,6 @@
         "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_normal.png.flat",
         "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png"
     },
-    {
-        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit_list_item.xml.flat",
-        "source": "D:\\Notes-master\\app\\src\\main\\res\\layout\\note_edit_list_item.xml"
-    },
     {
         "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_btn_set_color.png.flat",
         "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png"
@@ -35,6 +19,10 @@
         "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_middle.9.png.flat",
         "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png"
     },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_strike_through.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\strike_through.png"
+    },
     {
         "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_bar_bg.9.png.flat",
         "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png"
@@ -44,73 +32,257 @@
         "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png"
     },
     {
-        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_white.png.flat",
-        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png"
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_insert_numbers.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\insert_numbers.png"
     },
     {
         "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_up.9.png.flat",
         "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png"
     },
     {
-        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_app.png.flat",
-        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png"
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_insert_img.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\insert_img.png"
     },
     {
-        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_preferences.xml.flat",
-        "source": "D:\\Notes-master\\app\\src\\main\\res\\xml\\preferences.xml"
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_app.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png"
     },
     {
         "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_red.9.png.flat",
         "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png"
     },
-    {
-        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_down.9.png.flat",
-        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png"
-    },
     {
         "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_4x.xml.flat",
         "source": "D:\\Notes-master\\app\\src\\main\\res\\layout\\widget_4x.xml"
     },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_down.9.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png"
+    },
     {
         "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_add_account_text.xml.flat",
         "source": "D:\\Notes-master\\app\\src\\main\\res\\layout\\add_account_text.xml"
     },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_folder_list_item.xml.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\layout\\folder_list_item.xml"
+    },
     {
         "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_folder.9.png.flat",
         "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png"
     },
     {
-        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_folder_list_item.xml.flat",
-        "source": "D:\\Notes-master\\app\\src\\main\\res\\layout\\folder_list_item.xml"
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_single.9.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_white.9.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\raw-zh-rCN_introduction.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\raw-zh-rCN\\introduction"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_lock.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\lock.png"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_action_underline.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\action_underline.png"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_up.9.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_single.9.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_yellow.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_superscript.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\superscript.png"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_red.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_large.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_large.png"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_down.9.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_yellow.9.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_action_align_left.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\action_align_left.png"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_edit.xml.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\menu\\note_edit.xml"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_normal.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_subscript.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\subscript.png"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_action_bold.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\action_bold.png"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_account_dialog_title.xml.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\layout\\account_dialog_title.xml"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\color_primary_text_dark.xml.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\color\\primary_text_dark.xml"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_blue.9.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list.xml.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\layout\\note_list.xml"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_selected.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\selected.png"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit.xml.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\layout\\note_edit.xml"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_red.9.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_record_folder.xml.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\menu\\call_record_folder.xml"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_action_align_center.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\action_align_center.png"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_footer_bg.9.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_indent.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\indent.png"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_yellow.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_single.9.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_small.png"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_up.9.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_down.9.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_white.9.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_blue.9.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list.xml.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\menu\\note_list.xml"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_middle.9.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_up.9.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_html.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\html.png"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_dropdown_icon.9.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit_list_item.xml.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\layout\\note_edit_list_item.xml"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_white.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_insert_bullets.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\insert_bullets.png"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_preferences.xml.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\xml\\preferences.xml"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_text_color.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\bg_text_color.png"
     },
     {
         "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_red.png.flat",
         "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png"
     },
     {
-        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_single.9.png.flat",
-        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png"
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_set_bg.jpg.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\new_set_bg.jpg"
     },
     {
         "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_move.png.flat",
         "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png"
     },
     {
-        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_4x_info.xml.flat",
-        "source": "D:\\Notes-master\\app\\src\\main\\res\\xml\\widget_4x_info.xml"
-    },
-    {
-        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_white.9.png.flat",
-        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png"
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_action_redo.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\action_redo.png"
     },
     {
-        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\raw-zh-rCN_introduction.flat",
-        "source": "D:\\Notes-master\\app\\src\\main\\res\\raw-zh-rCN\\introduction"
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_4x_info.xml.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\xml\\widget_4x_info.xml"
     },
     {
         "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_settings_header.xml.flat",
         "source": "D:\\Notes-master\\app\\src\\main\\res\\layout\\settings_header.xml"
     },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_action_italic.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\action_italic.png"
+    },
     {
         "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_footer.xml.flat",
         "source": "D:\\Notes-master\\app\\src\\main\\res\\layout\\note_list_footer.xml"
@@ -132,16 +304,8 @@
         "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png"
     },
     {
-        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_up.9.png.flat",
-        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png"
-    },
-    {
-        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_single.9.png.flat",
-        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png"
-    },
-    {
-        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_yellow.png.flat",
-        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png"
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_text_color.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\text_color.png"
     },
     {
         "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_green.png.flat",
@@ -179,6 +343,10 @@
         "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_background.png.flat",
         "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_background.png"
     },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_unlock.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\unlock.png"
+    },
     {
         "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_2x.xml.flat",
         "source": "D:\\Notes-master\\app\\src\\main\\res\\layout\\widget_2x.xml"
@@ -192,29 +360,21 @@
         "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png"
     },
     {
-        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_red.png.flat",
-        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png"
-    },
-    {
-        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_large.png.flat",
-        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_large.png"
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_link.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\link.png"
     },
     {
         "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable_new_note.xml.flat",
         "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable\\new_note.xml"
     },
-    {
-        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_down.9.png.flat",
-        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png"
-    },
-    {
-        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_yellow.9.png.flat",
-        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png"
-    },
     {
         "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_datetime_picker.xml.flat",
         "source": "D:\\Notes-master\\app\\src\\main\\res\\layout\\datetime_picker.xml"
     },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_action_undo.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\action_undo.png"
+    },
     {
         "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_super.png.flat",
         "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_super.png"
@@ -251,30 +411,10 @@
         "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_delete.png.flat",
         "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\delete.png"
     },
-    {
-        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_edit.xml.flat",
-        "source": "D:\\Notes-master\\app\\src\\main\\res\\menu\\note_edit.xml"
-    },
     {
         "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_item.xml.flat",
         "source": "D:\\Notes-master\\app\\src\\main\\res\\layout\\note_item.xml"
     },
-    {
-        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_normal.png.flat",
-        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png"
-    },
-    {
-        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_account_dialog_title.xml.flat",
-        "source": "D:\\Notes-master\\app\\src\\main\\res\\layout\\account_dialog_title.xml"
-    },
-    {
-        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\color_primary_text_dark.xml.flat",
-        "source": "D:\\Notes-master\\app\\src\\main\\res\\color\\primary_text_dark.xml"
-    },
-    {
-        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_blue.9.png.flat",
-        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png"
-    },
     {
         "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_clock.png.flat",
         "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\clock.png"
@@ -287,29 +427,17 @@
         "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat",
         "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png"
     },
-    {
-        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list.xml.flat",
-        "source": "D:\\Notes-master\\app\\src\\main\\res\\layout\\note_list.xml"
-    },
     {
         "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_single.9.png.flat",
         "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png"
     },
-    {
-        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_selected.png.flat",
-        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\selected.png"
-    },
     {
         "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_single.9.png.flat",
         "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png"
     },
     {
-        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit.xml.flat",
-        "source": "D:\\Notes-master\\app\\src\\main\\res\\layout\\note_edit.xml"
-    },
-    {
-        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_red.9.png.flat",
-        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png"
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_outdent.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\outdent.png"
     },
     {
         "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_dialog_edit_text.xml.flat",
@@ -320,8 +448,12 @@
         "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png"
     },
     {
-        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_record_folder.xml.flat",
-        "source": "D:\\Notes-master\\app\\src\\main\\res\\menu\\call_record_folder.xml"
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_action_align_right.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\action_align_right.png"
+    },
+    {
+        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_check_box.png.flat",
+        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\check_box.png"
     },
     {
         "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_notification.png.flat",
@@ -335,48 +467,12 @@
         "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_up.9.png.flat",
         "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png"
     },
-    {
-        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_footer_bg.9.png.flat",
-        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png"
-    },
     {
         "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_down.9.png.flat",
         "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png"
     },
-    {
-        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_yellow.png.flat",
-        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png"
-    },
-    {
-        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_single.9.png.flat",
-        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png"
-    },
     {
         "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_searchable.xml.flat",
         "source": "D:\\Notes-master\\app\\src\\main\\res\\xml\\searchable.xml"
-    },
-    {
-        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat",
-        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_small.png"
-    },
-    {
-        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_up.9.png.flat",
-        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png"
-    },
-    {
-        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_down.9.png.flat",
-        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png"
-    },
-    {
-        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_white.9.png.flat",
-        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png"
-    },
-    {
-        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_blue.9.png.flat",
-        "source": "D:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png"
-    },
-    {
-        "merged": "D:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list.xml.flat",
-        "source": "D:\\Notes-master\\app\\src\\main\\res\\menu\\note_list.xml"
     }
 ]
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml b/src/Notes-master/app/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml
index f237bf5..d45daaa 100644
--- a/src/Notes-master/app/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml
+++ b/src/Notes-master/app/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml
@@ -23,6 +23,7 @@
         android:minSdkVersion="14"
         android:targetSdkVersion="14" />
 
+    <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -36,7 +37,7 @@
     <application
         android:debuggable="true"
         android:icon="@drawable/icon_app"
-        android:label="@string/app_name"
+        android:label="Notes"
         android:testOnly="true" >
         <activity
             android:name="net.micode.notes.ui.NotesListActivity"
@@ -44,7 +45,6 @@
             android:label="@string/app_name"
             android:launchMode="singleTop"
             android:theme="@style/NoteTheme"
-            android:uiOptions="splitActionBarWhenNarrow"
             android:windowSoftInputMode="adjustPan" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/src/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
index 017706b..25f6efb 100644
Binary files a/src/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/src/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ
diff --git a/src/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debugAndroidTest/R.jar b/src/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debugAndroidTest/R.jar
new file mode 100644
index 0000000..1b37bfc
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debugAndroidTest/R.jar differ
diff --git a/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
index c924fa4..1590090 100644
Binary files a/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ
diff --git a/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
index e131ff9..ea0bcee 100644
Binary files a/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ
diff --git a/src/Notes-master/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex b/src/Notes-master/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex
index 153f2d1..524f96d 100644
Binary files a/src/Notes-master/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex and b/src/Notes-master/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state
index 6b683e0..c20db3e 100644
Binary files a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/+MScIYOrhbW4tzJS1tRe96Ayqvo= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/+MScIYOrhbW4tzJS1tRe96Ayqvo=
new file mode 100644
index 0000000..cd930cd
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/+MScIYOrhbW4tzJS1tRe96Ayqvo= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/31K6hJsy79aDrJ5dIJeqSapPQ4A= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/31K6hJsy79aDrJ5dIJeqSapPQ4A=
new file mode 100644
index 0000000..5137d2e
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/31K6hJsy79aDrJ5dIJeqSapPQ4A= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/BlRORrBtrwgkdxdgmsFl_RA48m8= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/BlRORrBtrwgkdxdgmsFl_RA48m8=
new file mode 100644
index 0000000..97d6311
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/BlRORrBtrwgkdxdgmsFl_RA48m8= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CA0T1nR3kIC_BsxM3TfBmI2rSw8= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CA0T1nR3kIC_BsxM3TfBmI2rSw8=
new file mode 100644
index 0000000..f27829e
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CA0T1nR3kIC_BsxM3TfBmI2rSw8= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CjcL+LqMvEhTUHCWKrW+XRxvquo= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CjcL+LqMvEhTUHCWKrW+XRxvquo=
new file mode 100644
index 0000000..39ea80b
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CjcL+LqMvEhTUHCWKrW+XRxvquo= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/EPHtd9rb5RYvVyAZlXrWGu3MdaY= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/EPHtd9rb5RYvVyAZlXrWGu3MdaY=
new file mode 100644
index 0000000..5405370
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/EPHtd9rb5RYvVyAZlXrWGu3MdaY= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/EvRbkWcXwWHcAdNu58WP09a1MUY= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/EvRbkWcXwWHcAdNu58WP09a1MUY=
new file mode 100644
index 0000000..b2dda36
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/EvRbkWcXwWHcAdNu58WP09a1MUY= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GNgQ8__ra9y5WSmp2zi9glMZhmA= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GNgQ8__ra9y5WSmp2zi9glMZhmA=
new file mode 100644
index 0000000..810547b
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GNgQ8__ra9y5WSmp2zi9glMZhmA= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GsfMsbE8B1aMHqj_oFtMmjihxyM= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GsfMsbE8B1aMHqj_oFtMmjihxyM=
new file mode 100644
index 0000000..ee0fc38
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GsfMsbE8B1aMHqj_oFtMmjihxyM= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GvVb_iA3FTOp6wwtFOL8iFiFq18= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GvVb_iA3FTOp6wwtFOL8iFiFq18=
new file mode 100644
index 0000000..3aad90c
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GvVb_iA3FTOp6wwtFOL8iFiFq18= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Hc+2nunvOIcBmziRArO6olDYGkE= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Hc+2nunvOIcBmziRArO6olDYGkE=
new file mode 100644
index 0000000..d03b977
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Hc+2nunvOIcBmziRArO6olDYGkE= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/JFZRpasTAbv7cgav7h_RHGiNlHQ= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/JFZRpasTAbv7cgav7h_RHGiNlHQ=
new file mode 100644
index 0000000..f821693
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/JFZRpasTAbv7cgav7h_RHGiNlHQ= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/LEtcs1fUMMNp5AlrgKyUApVvXdA= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/LEtcs1fUMMNp5AlrgKyUApVvXdA=
new file mode 100644
index 0000000..a20288b
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/LEtcs1fUMMNp5AlrgKyUApVvXdA= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/MzBFfU_0KHSP0UJoima8REIuZ_I= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/MzBFfU_0KHSP0UJoima8REIuZ_I=
new file mode 100644
index 0000000..f3ed40b
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/MzBFfU_0KHSP0UJoima8REIuZ_I= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NiSyuJZ0DlfKkgCIE7v8ZD4s6V8= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NiSyuJZ0DlfKkgCIE7v8ZD4s6V8=
new file mode 100644
index 0000000..f570eb5
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NiSyuJZ0DlfKkgCIE7v8ZD4s6V8= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/OIJimEVvb3u+ge8zyZi6p+686jI= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/OIJimEVvb3u+ge8zyZi6p+686jI=
new file mode 100644
index 0000000..3402ba5
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/OIJimEVvb3u+ge8zyZi6p+686jI= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/PfJZCnX20fySYzHilr0wDXy3zIE= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/PfJZCnX20fySYzHilr0wDXy3zIE=
new file mode 100644
index 0000000..8190f88
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/PfJZCnX20fySYzHilr0wDXy3zIE= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SZZNrJPuQWS+BLfPQ7v7kp8atT8= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SZZNrJPuQWS+BLfPQ7v7kp8atT8=
new file mode 100644
index 0000000..b2d8fa0
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SZZNrJPuQWS+BLfPQ7v7kp8atT8= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SaOD5PginW20zmjKpMbj53fvO9I= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SaOD5PginW20zmjKpMbj53fvO9I=
new file mode 100644
index 0000000..46d3cb3
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SaOD5PginW20zmjKpMbj53fvO9I= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SunMUpJCtdLTdZG+g_LFAChNc7E= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SunMUpJCtdLTdZG+g_LFAChNc7E=
new file mode 100644
index 0000000..3b85954
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SunMUpJCtdLTdZG+g_LFAChNc7E= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Vbfj4_B8t5t7ID91IfCjt+i6cyw= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Vbfj4_B8t5t7ID91IfCjt+i6cyw=
new file mode 100644
index 0000000..e40b65d
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Vbfj4_B8t5t7ID91IfCjt+i6cyw= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/aKCWWQGiWdBD2+OqW5vJ337V3bw= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/aKCWWQGiWdBD2+OqW5vJ337V3bw=
new file mode 100644
index 0000000..5afb9b4
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/aKCWWQGiWdBD2+OqW5vJ337V3bw= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/aTmHJuaXU+Jh+J6dMqfK28VFAYU= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/aTmHJuaXU+Jh+J6dMqfK28VFAYU=
new file mode 100644
index 0000000..9b2e38b
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/aTmHJuaXU+Jh+J6dMqfK28VFAYU= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/anLHtgUu_6CLf75TjWSwb5sZ6Fg= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/anLHtgUu_6CLf75TjWSwb5sZ6Fg=
new file mode 100644
index 0000000..eb369f4
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/anLHtgUu_6CLf75TjWSwb5sZ6Fg= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/bCLVpxBLQI8yTcZ7TE4udQ47_PQ= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/bCLVpxBLQI8yTcZ7TE4udQ47_PQ=
new file mode 100644
index 0000000..2e46a7c
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/bCLVpxBLQI8yTcZ7TE4udQ47_PQ= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/bm_5KnVqBmhh+67U0ZlNy7nK9Lc= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/bm_5KnVqBmhh+67U0ZlNy7nK9Lc=
new file mode 100644
index 0000000..42c4de2
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/bm_5KnVqBmhh+67U0ZlNy7nK9Lc= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/bv89kRZj5AgSGCjM2lci5ti8L9w= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/bv89kRZj5AgSGCjM2lci5ti8L9w=
new file mode 100644
index 0000000..042f968
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/bv89kRZj5AgSGCjM2lci5ti8L9w= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/c59q3+vUioDeDAOwF7oPOBXSlVE= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/c59q3+vUioDeDAOwF7oPOBXSlVE=
new file mode 100644
index 0000000..a784a12
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/c59q3+vUioDeDAOwF7oPOBXSlVE= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ckrubCa9ZEkdSCXAuYMuH5jMhbc= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ckrubCa9ZEkdSCXAuYMuH5jMhbc=
new file mode 100644
index 0000000..0d4a161
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ckrubCa9ZEkdSCXAuYMuH5jMhbc= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/dxmjKVKlMm3XCFkQ31srMU5XC9A= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/dxmjKVKlMm3XCFkQ31srMU5XC9A=
new file mode 100644
index 0000000..ca492e8
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/dxmjKVKlMm3XCFkQ31srMU5XC9A= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/eYcwk0OGYegKd+3pa8bz_HNqDjw= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/eYcwk0OGYegKd+3pa8bz_HNqDjw=
new file mode 100644
index 0000000..9c5f03a
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/eYcwk0OGYegKd+3pa8bz_HNqDjw= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/f8YzlVnpw6+uqPwOxshMv44uNdU= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/f8YzlVnpw6+uqPwOxshMv44uNdU=
new file mode 100644
index 0000000..93b769e
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/f8YzlVnpw6+uqPwOxshMv44uNdU= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/gPT5YXC8A50nw7L5M3SarNK0Mxs= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/gPT5YXC8A50nw7L5M3SarNK0Mxs=
new file mode 100644
index 0000000..b5e5cbc
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/gPT5YXC8A50nw7L5M3SarNK0Mxs= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/gbARQMMj_k7iWYPrN3vL5g2BETE= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/gbARQMMj_k7iWYPrN3vL5g2BETE=
new file mode 100644
index 0000000..2400090
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/gbARQMMj_k7iWYPrN3vL5g2BETE= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ggxVwI4Lg_GITKKEOnIZXsbiavg= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ggxVwI4Lg_GITKKEOnIZXsbiavg=
new file mode 100644
index 0000000..1f8cc12
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ggxVwI4Lg_GITKKEOnIZXsbiavg= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/i4Cbya+bZ290knR0OwCVayIqCSQ= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/i4Cbya+bZ290knR0OwCVayIqCSQ=
new file mode 100644
index 0000000..091b6b6
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/i4Cbya+bZ290knR0OwCVayIqCSQ= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/j6WtN1qc1YiEOsJRRZAs9UUMdtI= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/j6WtN1qc1YiEOsJRRZAs9UUMdtI=
new file mode 100644
index 0000000..127ead7
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/j6WtN1qc1YiEOsJRRZAs9UUMdtI= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jvG3GquJ2cnjsQ5trzoeoJWz3nk= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jvG3GquJ2cnjsQ5trzoeoJWz3nk=
new file mode 100644
index 0000000..2b28058
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jvG3GquJ2cnjsQ5trzoeoJWz3nk= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lfseyot+KBd2vdhur0Halveh6Yw= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lfseyot+KBd2vdhur0Halveh6Yw=
new file mode 100644
index 0000000..7a59601
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lfseyot+KBd2vdhur0Halveh6Yw= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/oP71HiGFHqSa6n1Gjdy1iJzuE28= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/oP71HiGFHqSa6n1Gjdy1iJzuE28=
new file mode 100644
index 0000000..85e5545
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/oP71HiGFHqSa6n1Gjdy1iJzuE28= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/oVkzNSdsZzUqdZnOF4QnfX0hSpE= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/oVkzNSdsZzUqdZnOF4QnfX0hSpE=
new file mode 100644
index 0000000..b2cd286
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/oVkzNSdsZzUqdZnOF4QnfX0hSpE= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/oeVviuptD14R1idQpD2Qyl3Fywc= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/oeVviuptD14R1idQpD2Qyl3Fywc=
new file mode 100644
index 0000000..9f562b5
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/oeVviuptD14R1idQpD2Qyl3Fywc= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/owzD39jDisMVTGs0I0dUs1mGDgI= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/owzD39jDisMVTGs0I0dUs1mGDgI=
new file mode 100644
index 0000000..b322a60
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/owzD39jDisMVTGs0I0dUs1mGDgI= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/scdJTy8yQFLmphoGv75tMlmsKyw= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/scdJTy8yQFLmphoGv75tMlmsKyw=
new file mode 100644
index 0000000..172691b
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/scdJTy8yQFLmphoGv75tMlmsKyw= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/sgFQOBc7T9gqrqTkxjyIXtj5kdw= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/sgFQOBc7T9gqrqTkxjyIXtj5kdw=
new file mode 100644
index 0000000..1d6c424
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/sgFQOBc7T9gqrqTkxjyIXtj5kdw= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tdIbYkNGSWhzsK9iILrJfdMJAt8= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tdIbYkNGSWhzsK9iILrJfdMJAt8=
new file mode 100644
index 0000000..3e3acf4
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tdIbYkNGSWhzsK9iILrJfdMJAt8= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/uDDAH5UXv20fzrOvTKm_cY_TboQ= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/uDDAH5UXv20fzrOvTKm_cY_TboQ=
new file mode 100644
index 0000000..775415c
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/uDDAH5UXv20fzrOvTKm_cY_TboQ= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vhh_1vdh0hIisd0SBYNFOi_ySOA= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vhh_1vdh0hIisd0SBYNFOi_ySOA=
new file mode 100644
index 0000000..ea6f509
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vhh_1vdh0hIisd0SBYNFOi_ySOA= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vyvmLj9jMtG_YbfVKnEos+AhCAg= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vyvmLj9jMtG_YbfVKnEos+AhCAg=
new file mode 100644
index 0000000..cb3b8e8
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vyvmLj9jMtG_YbfVKnEos+AhCAg= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wj9XEkGNji2UWbKASKq1vvCt2qo= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wj9XEkGNji2UWbKASKq1vvCt2qo=
new file mode 100644
index 0000000..6a09445
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wj9XEkGNji2UWbKASKq1vvCt2qo= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/x9OlHa3RHddtQkbthfnj9UzuNmo= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/x9OlHa3RHddtQkbthfnj9UzuNmo=
new file mode 100644
index 0000000..0562ebf
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/x9OlHa3RHddtQkbthfnj9UzuNmo= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zRW+bforctSvNKgykoscMk66cVc= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zRW+bforctSvNKgykoscMk66cVc=
new file mode 100644
index 0000000..a8a7530
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zRW+bforctSvNKgykoscMk66cVc= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/merge-state b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/merge-state
index d8d4c04..156c4b8 100644
Binary files a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/merge-state and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/merge-state differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/+MScIYOrhbW4tzJS1tRe96Ayqvo= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/+MScIYOrhbW4tzJS1tRe96Ayqvo=
new file mode 100644
index 0000000..cd930cd
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/+MScIYOrhbW4tzJS1tRe96Ayqvo= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/31K6hJsy79aDrJ5dIJeqSapPQ4A= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/31K6hJsy79aDrJ5dIJeqSapPQ4A=
new file mode 100644
index 0000000..5137d2e
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/31K6hJsy79aDrJ5dIJeqSapPQ4A= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/BlRORrBtrwgkdxdgmsFl_RA48m8= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/BlRORrBtrwgkdxdgmsFl_RA48m8=
new file mode 100644
index 0000000..97d6311
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/BlRORrBtrwgkdxdgmsFl_RA48m8= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/CA0T1nR3kIC_BsxM3TfBmI2rSw8= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/CA0T1nR3kIC_BsxM3TfBmI2rSw8=
new file mode 100644
index 0000000..f27829e
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/CA0T1nR3kIC_BsxM3TfBmI2rSw8= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/CjcL+LqMvEhTUHCWKrW+XRxvquo= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/CjcL+LqMvEhTUHCWKrW+XRxvquo=
new file mode 100644
index 0000000..39ea80b
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/CjcL+LqMvEhTUHCWKrW+XRxvquo= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/EPHtd9rb5RYvVyAZlXrWGu3MdaY= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/EPHtd9rb5RYvVyAZlXrWGu3MdaY=
new file mode 100644
index 0000000..5405370
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/EPHtd9rb5RYvVyAZlXrWGu3MdaY= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/EvRbkWcXwWHcAdNu58WP09a1MUY= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/EvRbkWcXwWHcAdNu58WP09a1MUY=
new file mode 100644
index 0000000..b2dda36
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/EvRbkWcXwWHcAdNu58WP09a1MUY= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/GNgQ8__ra9y5WSmp2zi9glMZhmA= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/GNgQ8__ra9y5WSmp2zi9glMZhmA=
new file mode 100644
index 0000000..810547b
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/GNgQ8__ra9y5WSmp2zi9glMZhmA= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/GsfMsbE8B1aMHqj_oFtMmjihxyM= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/GsfMsbE8B1aMHqj_oFtMmjihxyM=
new file mode 100644
index 0000000..ee0fc38
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/GsfMsbE8B1aMHqj_oFtMmjihxyM= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/GvVb_iA3FTOp6wwtFOL8iFiFq18= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/GvVb_iA3FTOp6wwtFOL8iFiFq18=
new file mode 100644
index 0000000..3aad90c
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/GvVb_iA3FTOp6wwtFOL8iFiFq18= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/Hc+2nunvOIcBmziRArO6olDYGkE= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/Hc+2nunvOIcBmziRArO6olDYGkE=
new file mode 100644
index 0000000..d03b977
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/Hc+2nunvOIcBmziRArO6olDYGkE= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/JFZRpasTAbv7cgav7h_RHGiNlHQ= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/JFZRpasTAbv7cgav7h_RHGiNlHQ=
new file mode 100644
index 0000000..f821693
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/JFZRpasTAbv7cgav7h_RHGiNlHQ= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/LEtcs1fUMMNp5AlrgKyUApVvXdA= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/LEtcs1fUMMNp5AlrgKyUApVvXdA=
new file mode 100644
index 0000000..a20288b
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/LEtcs1fUMMNp5AlrgKyUApVvXdA= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/MzBFfU_0KHSP0UJoima8REIuZ_I= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/MzBFfU_0KHSP0UJoima8REIuZ_I=
new file mode 100644
index 0000000..f3ed40b
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/MzBFfU_0KHSP0UJoima8REIuZ_I= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/NiSyuJZ0DlfKkgCIE7v8ZD4s6V8= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/NiSyuJZ0DlfKkgCIE7v8ZD4s6V8=
new file mode 100644
index 0000000..f570eb5
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/NiSyuJZ0DlfKkgCIE7v8ZD4s6V8= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/OIJimEVvb3u+ge8zyZi6p+686jI= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/OIJimEVvb3u+ge8zyZi6p+686jI=
new file mode 100644
index 0000000..3402ba5
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/OIJimEVvb3u+ge8zyZi6p+686jI= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/PfJZCnX20fySYzHilr0wDXy3zIE= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/PfJZCnX20fySYzHilr0wDXy3zIE=
new file mode 100644
index 0000000..8190f88
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/PfJZCnX20fySYzHilr0wDXy3zIE= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/SZZNrJPuQWS+BLfPQ7v7kp8atT8= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/SZZNrJPuQWS+BLfPQ7v7kp8atT8=
new file mode 100644
index 0000000..b2d8fa0
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/SZZNrJPuQWS+BLfPQ7v7kp8atT8= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/SaOD5PginW20zmjKpMbj53fvO9I= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/SaOD5PginW20zmjKpMbj53fvO9I=
new file mode 100644
index 0000000..46d3cb3
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/SaOD5PginW20zmjKpMbj53fvO9I= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/SunMUpJCtdLTdZG+g_LFAChNc7E= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/SunMUpJCtdLTdZG+g_LFAChNc7E=
new file mode 100644
index 0000000..3b85954
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/SunMUpJCtdLTdZG+g_LFAChNc7E= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/Vbfj4_B8t5t7ID91IfCjt+i6cyw= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/Vbfj4_B8t5t7ID91IfCjt+i6cyw=
new file mode 100644
index 0000000..e40b65d
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/Vbfj4_B8t5t7ID91IfCjt+i6cyw= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/aKCWWQGiWdBD2+OqW5vJ337V3bw= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/aKCWWQGiWdBD2+OqW5vJ337V3bw=
new file mode 100644
index 0000000..5afb9b4
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/aKCWWQGiWdBD2+OqW5vJ337V3bw= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/aTmHJuaXU+Jh+J6dMqfK28VFAYU= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/aTmHJuaXU+Jh+J6dMqfK28VFAYU=
new file mode 100644
index 0000000..9b2e38b
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/aTmHJuaXU+Jh+J6dMqfK28VFAYU= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/anLHtgUu_6CLf75TjWSwb5sZ6Fg= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/anLHtgUu_6CLf75TjWSwb5sZ6Fg=
new file mode 100644
index 0000000..eb369f4
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/anLHtgUu_6CLf75TjWSwb5sZ6Fg= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/bCLVpxBLQI8yTcZ7TE4udQ47_PQ= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/bCLVpxBLQI8yTcZ7TE4udQ47_PQ=
new file mode 100644
index 0000000..2e46a7c
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/bCLVpxBLQI8yTcZ7TE4udQ47_PQ= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/bm_5KnVqBmhh+67U0ZlNy7nK9Lc= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/bm_5KnVqBmhh+67U0ZlNy7nK9Lc=
new file mode 100644
index 0000000..42c4de2
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/bm_5KnVqBmhh+67U0ZlNy7nK9Lc= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/bv89kRZj5AgSGCjM2lci5ti8L9w= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/bv89kRZj5AgSGCjM2lci5ti8L9w=
new file mode 100644
index 0000000..042f968
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/bv89kRZj5AgSGCjM2lci5ti8L9w= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/c59q3+vUioDeDAOwF7oPOBXSlVE= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/c59q3+vUioDeDAOwF7oPOBXSlVE=
new file mode 100644
index 0000000..a784a12
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/c59q3+vUioDeDAOwF7oPOBXSlVE= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/ckrubCa9ZEkdSCXAuYMuH5jMhbc= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/ckrubCa9ZEkdSCXAuYMuH5jMhbc=
new file mode 100644
index 0000000..0d4a161
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/ckrubCa9ZEkdSCXAuYMuH5jMhbc= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/dxmjKVKlMm3XCFkQ31srMU5XC9A= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/dxmjKVKlMm3XCFkQ31srMU5XC9A=
new file mode 100644
index 0000000..ca492e8
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/dxmjKVKlMm3XCFkQ31srMU5XC9A= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/eYcwk0OGYegKd+3pa8bz_HNqDjw= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/eYcwk0OGYegKd+3pa8bz_HNqDjw=
new file mode 100644
index 0000000..9c5f03a
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/eYcwk0OGYegKd+3pa8bz_HNqDjw= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/f8YzlVnpw6+uqPwOxshMv44uNdU= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/f8YzlVnpw6+uqPwOxshMv44uNdU=
new file mode 100644
index 0000000..93b769e
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/f8YzlVnpw6+uqPwOxshMv44uNdU= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/gPT5YXC8A50nw7L5M3SarNK0Mxs= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/gPT5YXC8A50nw7L5M3SarNK0Mxs=
new file mode 100644
index 0000000..b5e5cbc
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/gPT5YXC8A50nw7L5M3SarNK0Mxs= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/gbARQMMj_k7iWYPrN3vL5g2BETE= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/gbARQMMj_k7iWYPrN3vL5g2BETE=
new file mode 100644
index 0000000..2400090
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/gbARQMMj_k7iWYPrN3vL5g2BETE= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/ggxVwI4Lg_GITKKEOnIZXsbiavg= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/ggxVwI4Lg_GITKKEOnIZXsbiavg=
new file mode 100644
index 0000000..1f8cc12
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/ggxVwI4Lg_GITKKEOnIZXsbiavg= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/i4Cbya+bZ290knR0OwCVayIqCSQ= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/i4Cbya+bZ290knR0OwCVayIqCSQ=
new file mode 100644
index 0000000..091b6b6
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/i4Cbya+bZ290knR0OwCVayIqCSQ= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/j6WtN1qc1YiEOsJRRZAs9UUMdtI= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/j6WtN1qc1YiEOsJRRZAs9UUMdtI=
new file mode 100644
index 0000000..127ead7
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/j6WtN1qc1YiEOsJRRZAs9UUMdtI= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/jvG3GquJ2cnjsQ5trzoeoJWz3nk= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/jvG3GquJ2cnjsQ5trzoeoJWz3nk=
new file mode 100644
index 0000000..2b28058
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/jvG3GquJ2cnjsQ5trzoeoJWz3nk= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/lfseyot+KBd2vdhur0Halveh6Yw= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/lfseyot+KBd2vdhur0Halveh6Yw=
new file mode 100644
index 0000000..7a59601
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/lfseyot+KBd2vdhur0Halveh6Yw= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/oP71HiGFHqSa6n1Gjdy1iJzuE28= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/oP71HiGFHqSa6n1Gjdy1iJzuE28=
new file mode 100644
index 0000000..85e5545
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/oP71HiGFHqSa6n1Gjdy1iJzuE28= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/oVkzNSdsZzUqdZnOF4QnfX0hSpE= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/oVkzNSdsZzUqdZnOF4QnfX0hSpE=
new file mode 100644
index 0000000..b2cd286
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/oVkzNSdsZzUqdZnOF4QnfX0hSpE= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/oeVviuptD14R1idQpD2Qyl3Fywc= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/oeVviuptD14R1idQpD2Qyl3Fywc=
new file mode 100644
index 0000000..9f562b5
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/oeVviuptD14R1idQpD2Qyl3Fywc= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/owzD39jDisMVTGs0I0dUs1mGDgI= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/owzD39jDisMVTGs0I0dUs1mGDgI=
new file mode 100644
index 0000000..b322a60
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/owzD39jDisMVTGs0I0dUs1mGDgI= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/scdJTy8yQFLmphoGv75tMlmsKyw= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/scdJTy8yQFLmphoGv75tMlmsKyw=
new file mode 100644
index 0000000..172691b
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/scdJTy8yQFLmphoGv75tMlmsKyw= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/sgFQOBc7T9gqrqTkxjyIXtj5kdw= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/sgFQOBc7T9gqrqTkxjyIXtj5kdw=
new file mode 100644
index 0000000..1d6c424
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/sgFQOBc7T9gqrqTkxjyIXtj5kdw= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/tdIbYkNGSWhzsK9iILrJfdMJAt8= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/tdIbYkNGSWhzsK9iILrJfdMJAt8=
new file mode 100644
index 0000000..3e3acf4
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/tdIbYkNGSWhzsK9iILrJfdMJAt8= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/uDDAH5UXv20fzrOvTKm_cY_TboQ= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/uDDAH5UXv20fzrOvTKm_cY_TboQ=
new file mode 100644
index 0000000..775415c
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/uDDAH5UXv20fzrOvTKm_cY_TboQ= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/vhh_1vdh0hIisd0SBYNFOi_ySOA= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/vhh_1vdh0hIisd0SBYNFOi_ySOA=
new file mode 100644
index 0000000..ea6f509
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/vhh_1vdh0hIisd0SBYNFOi_ySOA= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/vyvmLj9jMtG_YbfVKnEos+AhCAg= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/vyvmLj9jMtG_YbfVKnEos+AhCAg=
new file mode 100644
index 0000000..cb3b8e8
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/vyvmLj9jMtG_YbfVKnEos+AhCAg= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/wj9XEkGNji2UWbKASKq1vvCt2qo= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/wj9XEkGNji2UWbKASKq1vvCt2qo=
new file mode 100644
index 0000000..6a09445
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/wj9XEkGNji2UWbKASKq1vvCt2qo= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/x9OlHa3RHddtQkbthfnj9UzuNmo= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/x9OlHa3RHddtQkbthfnj9UzuNmo=
new file mode 100644
index 0000000..0562ebf
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/x9OlHa3RHddtQkbthfnj9UzuNmo= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/zRW+bforctSvNKgykoscMk66cVc= b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/zRW+bforctSvNKgykoscMk66cVc=
new file mode 100644
index 0000000..a8a7530
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/zRW+bforctSvNKgykoscMk66cVc= differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties b/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
new file mode 100644
index 0000000..b4f945b
--- /dev/null
+++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
@@ -0,0 +1 @@
+#Wed Oct 28 10:55:11 CST 2020
diff --git a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml
new file mode 100644
index 0000000..f7032f8
--- /dev/null
+++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master\app\src\androidTest\res"/><source path="D:\Notes-master\app\build\generated\res\rs\androidTest\debug"/><source path="D:\Notes-master\app\build\generated\res\resValues\androidTest\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest" generated-set="androidTest$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master\app\src\androidTest\res"/><source path="D:\Notes-master\app\build\generated\res\rs\androidTest\debug"/><source path="D:\Notes-master\app\build\generated\res\resValues\androidTest\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master\app\src\androidTestDebug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug" generated-set="androidTestDebug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master\app\src\androidTestDebug\res"/></dataSet><mergedItems/></merger>
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
index 691e379..abcefe4 100644
--- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
+++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master\app\src\main\assets"/><source path="D:\Notes-master\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master\app\src\debug\assets"/></dataSet></merger>
\ No newline at end of file
+<merger version="3"><dataSet config="jp.wasabeef:richeditor-android:1.2.2" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\59866\.gradle\caches\transforms-2\files-2.1\effe5a587e2d2e96d8d7c6f547b1a0bf\richeditor-android-1.2.2\assets"><file name="editor.html" path="C:\Users\59866\.gradle\caches\transforms-2\files-2.1\effe5a587e2d2e96d8d7c6f547b1a0bf\richeditor-android-1.2.2\assets\editor.html"/><file name="normalize.css" path="C:\Users\59866\.gradle\caches\transforms-2\files-2.1\effe5a587e2d2e96d8d7c6f547b1a0bf\richeditor-android-1.2.2\assets\normalize.css"/><file name="rich_editor.js" path="C:\Users\59866\.gradle\caches\transforms-2\files-2.1\effe5a587e2d2e96d8d7c6f547b1a0bf\richeditor-android-1.2.2\assets\rich_editor.js"/><file name="style.css" path="C:\Users\59866\.gradle\caches\transforms-2\files-2.1\effe5a587e2d2e96d8d7c6f547b1a0bf\richeditor-android-1.2.2\assets\style.css"/></source></dataSet><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master\app\src\main\assets"/><source path="D:\Notes-master\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master\app\src\debug\assets"/></dataSet></merger>
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
index 39a8c52..0905816 100644
--- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
+++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
@@ -1,13 +1,18 @@
-#Wed Sep 23 11:14:40 CST 2020
+#Fri Nov 27 10:25:19 CST 2020
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_up.9.png.flat
+D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\insert_numbers.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_insert_numbers.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_background.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_background.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\layout\\note_item.xml=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_item.xml.flat
 D\:\\Notes-master\\app\\src\\main\\res\\menu\\note_list_options.xml=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_options.xml.flat
+D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\action_bold.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_action_bold.png.flat
+D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\new_set_bg.jpg=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_set_bg.jpg.flat
 D\:\\Notes-master\\app\\src\\main\\res\\color\\secondary_text_dark.xml=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\color_secondary_text_dark.xml.flat
-D\:\\Notes-master\\app\\src\\main\\res\\layout\\widget_4x.xml=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_4x.xml.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_up.9.png.flat
+D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\action_align_left.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_action_align_left.png.flat
+D\:\\Notes-master\\app\\src\\main\\res\\layout\\widget_4x.xml=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_4x.xml.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_red.9.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_green.9.png.flat
+D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\check_box.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_check_box.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\layout\\folder_list_item.xml=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_folder_list_item.xml.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_green.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_single.9.png.flat
@@ -17,25 +22,32 @@ D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png=D
 D\:\\Notes-master\\app\\src\\main\\res\\raw\\introduction=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\raw_introduction.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\selected.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_selected.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
+D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\strike_through.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_strike_through.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_normal.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\layout\\note_list.xml=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list.xml.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_down.9.png.flat
+D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\action_align_center.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_action_align_center.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\xml\\preferences.xml=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_preferences.xml.flat
+D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\superscript.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_superscript.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_single.9.png.flat
-D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_white.png.flat
+D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\text_color.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_text_color.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\layout\\note_edit.xml=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit.xml.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
+D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_white.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_pressed.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\menu\\note_list.xml=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list.xml.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\notification.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_notification.png.flat
+D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\action_align_right.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_action_align_right.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_down.9.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\layout\\add_account_text.xml=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_add_account_text.xml.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_normal.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\clock.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_clock.png.flat
+D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\action_underline.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_action_underline.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\menu\\note_edit.xml=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_edit.xml.flat
-D\:\\Notes-master\\app\\src\\main\\res\\menu\\note_list_dropdown.xml=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_dropdown.xml.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_large.png.flat
+D\:\\Notes-master\\app\\src\\main\\res\\menu\\note_list_dropdown.xml=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_dropdown.xml.flat
+D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\indent.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_indent.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\xml\\searchable.xml=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_searchable.xml.flat
 D\:\\Notes-master\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_dropdown_menu.xml.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_red.9.png.flat
@@ -47,50 +59,62 @@ D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png=D\:\
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\xml\\widget_4x_info.xml=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_4x_info.xml.flat
 D\:\\Notes-master\\app\\src\\main\\res\\menu\\call_note_edit.xml=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_note_edit.xml.flat
+D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\action_italic.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_action_italic.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_red.png.flat
-D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_middle.9.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_super.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_super.png.flat
+D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_middle.9.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\layout\\note_edit_list_item.xml=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit_list_item.xml.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_red.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_white.9.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
+D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\html.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_html.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\raw-zh-rCN\\introduction=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\raw-zh-rCN_introduction.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_white.9.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_green.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_single.9.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_yellow.9.png.flat
-D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_single.9.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_down.9.png.flat
-D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_move.png.flat
-D\:\\Notes-master\\app\\src\\main\\res\\layout\\settings_header.xml=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_settings_header.xml.flat
-D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_down.9.png.flat
+D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_single.9.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\xml\\widget_2x_info.xml=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_2x_info.xml.flat
-D\:\\Notes-master\\app\\src\\main\\res\\layout\\widget_2x.xml=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_2x.xml.flat
-D\:\\Notes-master\\app\\src\\main\\res\\layout\\account_dialog_title.xml=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_account_dialog_title.xml.flat
-D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
+D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_down.9.png.flat
+D\:\\Notes-master\\app\\src\\main\\res\\layout\\settings_header.xml=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_settings_header.xml.flat
+D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_move.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\menu\\sub_folder.xml=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_sub_folder.xml.flat
-D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
+D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
+D\:\\Notes-master\\app\\src\\main\\res\\layout\\account_dialog_title.xml=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_account_dialog_title.xml.flat
+D\:\\Notes-master\\app\\src\\main\\res\\layout\\widget_2x.xml=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_2x.xml.flat
+D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\insert_img.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_insert_img.png.flat
+D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\action_undo.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_action_undo.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_blue.png.flat
+D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
+D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\insert_bullets.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_insert_bullets.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
-D\:\\Notes-master\\app\\src\\main\\res\\drawable\\new_note.xml=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable_new_note.xml.flat
+D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\unlock.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_unlock.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_folder.9.png.flat
+D\:\\Notes-master\\app\\src\\main\\res\\drawable\\new_note.xml=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable_new_note.xml.flat
+D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\link.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_link.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_small.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
+D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\subscript.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_subscript.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_app.png.flat
-D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\call_record.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_call_record.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_white.png.flat
+D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\call_record.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_call_record.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\menu\\call_record_folder.xml=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_record_folder.xml.flat
 D\:\\Notes-master\\app\\src\\main\\res\\layout\\dialog_edit_text.xml=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_dialog_edit_text.xml.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_alert.png.flat
+D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\outdent.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_outdent.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\layout\\note_list_footer.xml=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_footer.xml.flat
-D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_up.9.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_delete.png.flat
+D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_up.9.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_middle.9.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\layout\\datetime_picker.xml=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_datetime_picker.xml.flat
+D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\lock.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_lock.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_blue.png.flat
+D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\action_redo.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_action_redo.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_up.9.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
+D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\bg_text_color.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_text_color.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
-D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
 D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
+D\:\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=D\:\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
diff --git a/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merger.xml
index 0a0f81e..f13a701 100644
--- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merger.xml
+++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merger.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3" xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master\app\src\main\res"/><source path="D:\Notes-master\app\build\generated\res\rs\debug"/><source path="D:\Notes-master\app\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master\app\src\main\res"><file name="primary_text_dark" path="D:\Notes-master\app\src\main\res\color\primary_text_dark.xml" qualifiers="" type="color"/><file name="secondary_text_dark" path="D:\Notes-master\app\src\main\res\color\secondary_text_dark.xml" qualifiers="" type="color"/><file name="new_note" path="D:\Notes-master\app\src\main\res\drawable\new_note.xml" qualifiers="" type="drawable"/><file name="bg_btn_set_color" path="D:\Notes-master\app\src\main\res\drawable-hdpi\bg_btn_set_color.png" qualifiers="hdpi-v4" type="drawable"/><file name="bg_color_btn_mask" path="D:\Notes-master\app\src\main\res\drawable-hdpi\bg_color_btn_mask.png" qualifiers="hdpi-v4" type="drawable"/><file name="call_record" path="D:\Notes-master\app\src\main\res\drawable-hdpi\call_record.png" qualifiers="hdpi-v4" type="drawable"/><file name="clock" path="D:\Notes-master\app\src\main\res\drawable-hdpi\clock.png" qualifiers="hdpi-v4" type="drawable"/><file name="delete" path="D:\Notes-master\app\src\main\res\drawable-hdpi\delete.png" qualifiers="hdpi-v4" type="drawable"/><file name="dropdown_icon" path="D:\Notes-master\app\src\main\res\drawable-hdpi\dropdown_icon.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_blue" path="D:\Notes-master\app\src\main\res\drawable-hdpi\edit_blue.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_green" path="D:\Notes-master\app\src\main\res\drawable-hdpi\edit_green.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_red" path="D:\Notes-master\app\src\main\res\drawable-hdpi\edit_red.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_blue" path="D:\Notes-master\app\src\main\res\drawable-hdpi\edit_title_blue.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_green" path="D:\Notes-master\app\src\main\res\drawable-hdpi\edit_title_green.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_red" path="D:\Notes-master\app\src\main\res\drawable-hdpi\edit_title_red.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_white" path="D:\Notes-master\app\src\main\res\drawable-hdpi\edit_title_white.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_yellow" path="D:\Notes-master\app\src\main\res\drawable-hdpi\edit_title_yellow.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_white" path="D:\Notes-master\app\src\main\res\drawable-hdpi\edit_white.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_yellow" path="D:\Notes-master\app\src\main\res\drawable-hdpi\edit_yellow.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_large" path="D:\Notes-master\app\src\main\res\drawable-hdpi\font_large.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_normal" path="D:\Notes-master\app\src\main\res\drawable-hdpi\font_normal.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_size_selector_bg" path="D:\Notes-master\app\src\main\res\drawable-hdpi\font_size_selector_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_small" path="D:\Notes-master\app\src\main\res\drawable-hdpi\font_small.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_super" path="D:\Notes-master\app\src\main\res\drawable-hdpi\font_super.png" qualifiers="hdpi-v4" type="drawable"/><file name="icon_app" path="D:\Notes-master\app\src\main\res\drawable-hdpi\icon_app.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_background" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_background.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_down" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_blue_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_middle" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_blue_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_single" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_blue_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_up" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_blue_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_folder" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_folder.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_footer_bg" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_footer_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_down" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_green_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_middle" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_green_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_single" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_green_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_up" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_green_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_down" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_red_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_middle" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_red_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_single" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_red_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_up" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_red_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_down" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_white_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_middle" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_white_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_single" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_white_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_up" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_white_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_down" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_yellow_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_middle" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_yellow_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_single" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_yellow_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_up" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_yellow_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="menu_delete" path="D:\Notes-master\app\src\main\res\drawable-hdpi\menu_delete.png" qualifiers="hdpi-v4" type="drawable"/><file name="menu_move" path="D:\Notes-master\app\src\main\res\drawable-hdpi\menu_move.png" qualifiers="hdpi-v4" type="drawable"/><file name="new_note_normal" path="D:\Notes-master\app\src\main\res\drawable-hdpi\new_note_normal.png" qualifiers="hdpi-v4" type="drawable"/><file name="new_note_pressed" path="D:\Notes-master\app\src\main\res\drawable-hdpi\new_note_pressed.png" qualifiers="hdpi-v4" type="drawable"/><file name="note_edit_color_selector_panel" path="D:\Notes-master\app\src\main\res\drawable-hdpi\note_edit_color_selector_panel.png" qualifiers="hdpi-v4" type="drawable"/><file name="notification" path="D:\Notes-master\app\src\main\res\drawable-hdpi\notification.png" qualifiers="hdpi-v4" type="drawable"/><file name="search_result" path="D:\Notes-master\app\src\main\res\drawable-hdpi\search_result.png" qualifiers="hdpi-v4" type="drawable"/><file name="selected" path="D:\Notes-master\app\src\main\res\drawable-hdpi\selected.png" qualifiers="hdpi-v4" type="drawable"/><file name="title_alert" path="D:\Notes-master\app\src\main\res\drawable-hdpi\title_alert.png" qualifiers="hdpi-v4" type="drawable"/><file name="title_bar_bg" path="D:\Notes-master\app\src\main\res\drawable-hdpi\title_bar_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_blue" path="D:\Notes-master\app\src\main\res\drawable-hdpi\widget_2x_blue.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_green" path="D:\Notes-master\app\src\main\res\drawable-hdpi\widget_2x_green.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_red" path="D:\Notes-master\app\src\main\res\drawable-hdpi\widget_2x_red.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_white" path="D:\Notes-master\app\src\main\res\drawable-hdpi\widget_2x_white.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_yellow" path="D:\Notes-master\app\src\main\res\drawable-hdpi\widget_2x_yellow.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_blue" path="D:\Notes-master\app\src\main\res\drawable-hdpi\widget_4x_blue.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_green" path="D:\Notes-master\app\src\main\res\drawable-hdpi\widget_4x_green.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_red" path="D:\Notes-master\app\src\main\res\drawable-hdpi\widget_4x_red.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_white" path="D:\Notes-master\app\src\main\res\drawable-hdpi\widget_4x_white.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_yellow" path="D:\Notes-master\app\src\main\res\drawable-hdpi\widget_4x_yellow.png" qualifiers="hdpi-v4" type="drawable"/><file name="account_dialog_title" path="D:\Notes-master\app\src\main\res\layout\account_dialog_title.xml" qualifiers="" type="layout"/><file name="add_account_text" path="D:\Notes-master\app\src\main\res\layout\add_account_text.xml" qualifiers="" type="layout"/><file name="datetime_picker" path="D:\Notes-master\app\src\main\res\layout\datetime_picker.xml" qualifiers="" type="layout"/><file name="dialog_edit_text" path="D:\Notes-master\app\src\main\res\layout\dialog_edit_text.xml" qualifiers="" type="layout"/><file name="folder_list_item" path="D:\Notes-master\app\src\main\res\layout\folder_list_item.xml" qualifiers="" type="layout"/><file name="note_edit" path="D:\Notes-master\app\src\main\res\layout\note_edit.xml" qualifiers="" type="layout"/><file name="note_edit_list_item" path="D:\Notes-master\app\src\main\res\layout\note_edit_list_item.xml" qualifiers="" type="layout"/><file name="note_item" path="D:\Notes-master\app\src\main\res\layout\note_item.xml" qualifiers="" type="layout"/><file name="note_list" path="D:\Notes-master\app\src\main\res\layout\note_list.xml" qualifiers="" type="layout"/><file name="note_list_dropdown_menu" path="D:\Notes-master\app\src\main\res\layout\note_list_dropdown_menu.xml" qualifiers="" type="layout"/><file name="note_list_footer" path="D:\Notes-master\app\src\main\res\layout\note_list_footer.xml" qualifiers="" type="layout"/><file name="settings_header" path="D:\Notes-master\app\src\main\res\layout\settings_header.xml" qualifiers="" type="layout"/><file name="widget_2x" path="D:\Notes-master\app\src\main\res\layout\widget_2x.xml" qualifiers="" type="layout"/><file name="widget_4x" path="D:\Notes-master\app\src\main\res\layout\widget_4x.xml" qualifiers="" type="layout"/><file name="call_note_edit" path="D:\Notes-master\app\src\main\res\menu\call_note_edit.xml" qualifiers="" type="menu"/><file name="call_record_folder" path="D:\Notes-master\app\src\main\res\menu\call_record_folder.xml" qualifiers="" type="menu"/><file name="note_edit" path="D:\Notes-master\app\src\main\res\menu\note_edit.xml" qualifiers="" type="menu"/><file name="note_list" path="D:\Notes-master\app\src\main\res\menu\note_list.xml" qualifiers="" type="menu"/><file name="note_list_dropdown" path="D:\Notes-master\app\src\main\res\menu\note_list_dropdown.xml" qualifiers="" type="menu"/><file name="note_list_options" path="D:\Notes-master\app\src\main\res\menu\note_list_options.xml" qualifiers="" type="menu"/><file name="sub_folder" path="D:\Notes-master\app\src\main\res\menu\sub_folder.xml" qualifiers="" type="menu"/><file name="introduction" path="D:\Notes-master\app\src\main\res\raw\introduction" qualifiers="" type="raw"/><file name="introduction" path="D:\Notes-master\app\src\main\res\raw-zh-rCN\introduction" qualifiers="zh-rCN" type="raw"/><file path="D:\Notes-master\app\src\main\res\values\arrays.xml" qualifiers=""><string-array name="format_for_exported_note">
+<merger version="3" xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master\app\src\main\res"/><source path="D:\Notes-master\app\build\generated\res\rs\debug"/><source path="D:\Notes-master\app\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master\app\src\main\res"><file name="primary_text_dark" path="D:\Notes-master\app\src\main\res\color\primary_text_dark.xml" qualifiers="" type="color"/><file name="secondary_text_dark" path="D:\Notes-master\app\src\main\res\color\secondary_text_dark.xml" qualifiers="" type="color"/><file name="new_note" path="D:\Notes-master\app\src\main\res\drawable\new_note.xml" qualifiers="" type="drawable"/><file name="action_align_center" path="D:\Notes-master\app\src\main\res\drawable-hdpi\action_align_center.png" qualifiers="hdpi-v4" type="drawable"/><file name="action_align_left" path="D:\Notes-master\app\src\main\res\drawable-hdpi\action_align_left.png" qualifiers="hdpi-v4" type="drawable"/><file name="action_align_right" path="D:\Notes-master\app\src\main\res\drawable-hdpi\action_align_right.png" qualifiers="hdpi-v4" type="drawable"/><file name="action_bold" path="D:\Notes-master\app\src\main\res\drawable-hdpi\action_bold.png" qualifiers="hdpi-v4" type="drawable"/><file name="action_italic" path="D:\Notes-master\app\src\main\res\drawable-hdpi\action_italic.png" qualifiers="hdpi-v4" type="drawable"/><file name="action_redo" path="D:\Notes-master\app\src\main\res\drawable-hdpi\action_redo.png" qualifiers="hdpi-v4" type="drawable"/><file name="action_underline" path="D:\Notes-master\app\src\main\res\drawable-hdpi\action_underline.png" qualifiers="hdpi-v4" type="drawable"/><file name="action_undo" path="D:\Notes-master\app\src\main\res\drawable-hdpi\action_undo.png" qualifiers="hdpi-v4" type="drawable"/><file name="bg_btn_set_color" path="D:\Notes-master\app\src\main\res\drawable-hdpi\bg_btn_set_color.png" qualifiers="hdpi-v4" type="drawable"/><file name="bg_color_btn_mask" path="D:\Notes-master\app\src\main\res\drawable-hdpi\bg_color_btn_mask.png" qualifiers="hdpi-v4" type="drawable"/><file name="bg_text_color" path="D:\Notes-master\app\src\main\res\drawable-hdpi\bg_text_color.png" qualifiers="hdpi-v4" type="drawable"/><file name="call_record" path="D:\Notes-master\app\src\main\res\drawable-hdpi\call_record.png" qualifiers="hdpi-v4" type="drawable"/><file name="check_box" path="D:\Notes-master\app\src\main\res\drawable-hdpi\check_box.png" qualifiers="hdpi-v4" type="drawable"/><file name="clock" path="D:\Notes-master\app\src\main\res\drawable-hdpi\clock.png" qualifiers="hdpi-v4" type="drawable"/><file name="delete" path="D:\Notes-master\app\src\main\res\drawable-hdpi\delete.png" qualifiers="hdpi-v4" type="drawable"/><file name="dropdown_icon" path="D:\Notes-master\app\src\main\res\drawable-hdpi\dropdown_icon.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_blue" path="D:\Notes-master\app\src\main\res\drawable-hdpi\edit_blue.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_green" path="D:\Notes-master\app\src\main\res\drawable-hdpi\edit_green.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_red" path="D:\Notes-master\app\src\main\res\drawable-hdpi\edit_red.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_blue" path="D:\Notes-master\app\src\main\res\drawable-hdpi\edit_title_blue.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_green" path="D:\Notes-master\app\src\main\res\drawable-hdpi\edit_title_green.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_red" path="D:\Notes-master\app\src\main\res\drawable-hdpi\edit_title_red.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_white" path="D:\Notes-master\app\src\main\res\drawable-hdpi\edit_title_white.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_yellow" path="D:\Notes-master\app\src\main\res\drawable-hdpi\edit_title_yellow.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_white" path="D:\Notes-master\app\src\main\res\drawable-hdpi\edit_white.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_yellow" path="D:\Notes-master\app\src\main\res\drawable-hdpi\edit_yellow.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_large" path="D:\Notes-master\app\src\main\res\drawable-hdpi\font_large.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_normal" path="D:\Notes-master\app\src\main\res\drawable-hdpi\font_normal.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_size_selector_bg" path="D:\Notes-master\app\src\main\res\drawable-hdpi\font_size_selector_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_small" path="D:\Notes-master\app\src\main\res\drawable-hdpi\font_small.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_super" path="D:\Notes-master\app\src\main\res\drawable-hdpi\font_super.png" qualifiers="hdpi-v4" type="drawable"/><file name="html" path="D:\Notes-master\app\src\main\res\drawable-hdpi\html.png" qualifiers="hdpi-v4" type="drawable"/><file name="icon_app" path="D:\Notes-master\app\src\main\res\drawable-hdpi\icon_app.png" qualifiers="hdpi-v4" type="drawable"/><file name="indent" path="D:\Notes-master\app\src\main\res\drawable-hdpi\indent.png" qualifiers="hdpi-v4" type="drawable"/><file name="insert_bullets" path="D:\Notes-master\app\src\main\res\drawable-hdpi\insert_bullets.png" qualifiers="hdpi-v4" type="drawable"/><file name="insert_img" path="D:\Notes-master\app\src\main\res\drawable-hdpi\insert_img.png" qualifiers="hdpi-v4" type="drawable"/><file name="insert_numbers" path="D:\Notes-master\app\src\main\res\drawable-hdpi\insert_numbers.png" qualifiers="hdpi-v4" type="drawable"/><file name="link" path="D:\Notes-master\app\src\main\res\drawable-hdpi\link.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_background" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_background.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_down" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_blue_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_middle" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_blue_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_single" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_blue_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_up" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_blue_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_folder" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_folder.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_footer_bg" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_footer_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_down" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_green_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_middle" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_green_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_single" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_green_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_up" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_green_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_down" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_red_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_middle" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_red_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_single" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_red_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_up" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_red_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_down" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_white_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_middle" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_white_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_single" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_white_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_up" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_white_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_down" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_yellow_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_middle" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_yellow_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_single" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_yellow_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_up" path="D:\Notes-master\app\src\main\res\drawable-hdpi\list_yellow_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="lock" path="D:\Notes-master\app\src\main\res\drawable-hdpi\lock.png" qualifiers="hdpi-v4" type="drawable"/><file name="menu_delete" path="D:\Notes-master\app\src\main\res\drawable-hdpi\menu_delete.png" qualifiers="hdpi-v4" type="drawable"/><file name="menu_move" path="D:\Notes-master\app\src\main\res\drawable-hdpi\menu_move.png" qualifiers="hdpi-v4" type="drawable"/><file name="new_note_normal" path="D:\Notes-master\app\src\main\res\drawable-hdpi\new_note_normal.png" qualifiers="hdpi-v4" type="drawable"/><file name="new_note_pressed" path="D:\Notes-master\app\src\main\res\drawable-hdpi\new_note_pressed.png" qualifiers="hdpi-v4" type="drawable"/><file name="new_set_bg" path="D:\Notes-master\app\src\main\res\drawable-hdpi\new_set_bg.jpg" qualifiers="hdpi-v4" type="drawable"/><file name="note_edit_color_selector_panel" path="D:\Notes-master\app\src\main\res\drawable-hdpi\note_edit_color_selector_panel.png" qualifiers="hdpi-v4" type="drawable"/><file name="notification" path="D:\Notes-master\app\src\main\res\drawable-hdpi\notification.png" qualifiers="hdpi-v4" type="drawable"/><file name="outdent" path="D:\Notes-master\app\src\main\res\drawable-hdpi\outdent.png" qualifiers="hdpi-v4" type="drawable"/><file name="search_result" path="D:\Notes-master\app\src\main\res\drawable-hdpi\search_result.png" qualifiers="hdpi-v4" type="drawable"/><file name="selected" path="D:\Notes-master\app\src\main\res\drawable-hdpi\selected.png" qualifiers="hdpi-v4" type="drawable"/><file name="strike_through" path="D:\Notes-master\app\src\main\res\drawable-hdpi\strike_through.png" qualifiers="hdpi-v4" type="drawable"/><file name="subscript" path="D:\Notes-master\app\src\main\res\drawable-hdpi\subscript.png" qualifiers="hdpi-v4" type="drawable"/><file name="superscript" path="D:\Notes-master\app\src\main\res\drawable-hdpi\superscript.png" qualifiers="hdpi-v4" type="drawable"/><file name="text_color" path="D:\Notes-master\app\src\main\res\drawable-hdpi\text_color.png" qualifiers="hdpi-v4" type="drawable"/><file name="title_alert" path="D:\Notes-master\app\src\main\res\drawable-hdpi\title_alert.png" qualifiers="hdpi-v4" type="drawable"/><file name="title_bar_bg" path="D:\Notes-master\app\src\main\res\drawable-hdpi\title_bar_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="unlock" path="D:\Notes-master\app\src\main\res\drawable-hdpi\unlock.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_blue" path="D:\Notes-master\app\src\main\res\drawable-hdpi\widget_2x_blue.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_green" path="D:\Notes-master\app\src\main\res\drawable-hdpi\widget_2x_green.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_red" path="D:\Notes-master\app\src\main\res\drawable-hdpi\widget_2x_red.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_white" path="D:\Notes-master\app\src\main\res\drawable-hdpi\widget_2x_white.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_yellow" path="D:\Notes-master\app\src\main\res\drawable-hdpi\widget_2x_yellow.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_blue" path="D:\Notes-master\app\src\main\res\drawable-hdpi\widget_4x_blue.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_green" path="D:\Notes-master\app\src\main\res\drawable-hdpi\widget_4x_green.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_red" path="D:\Notes-master\app\src\main\res\drawable-hdpi\widget_4x_red.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_white" path="D:\Notes-master\app\src\main\res\drawable-hdpi\widget_4x_white.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_yellow" path="D:\Notes-master\app\src\main\res\drawable-hdpi\widget_4x_yellow.png" qualifiers="hdpi-v4" type="drawable"/><file name="account_dialog_title" path="D:\Notes-master\app\src\main\res\layout\account_dialog_title.xml" qualifiers="" type="layout"/><file name="add_account_text" path="D:\Notes-master\app\src\main\res\layout\add_account_text.xml" qualifiers="" type="layout"/><file name="datetime_picker" path="D:\Notes-master\app\src\main\res\layout\datetime_picker.xml" qualifiers="" type="layout"/><file name="dialog_edit_text" path="D:\Notes-master\app\src\main\res\layout\dialog_edit_text.xml" qualifiers="" type="layout"/><file name="folder_list_item" path="D:\Notes-master\app\src\main\res\layout\folder_list_item.xml" qualifiers="" type="layout"/><file name="note_edit" path="D:\Notes-master\app\src\main\res\layout\note_edit.xml" qualifiers="" type="layout"/><file name="note_edit_list_item" path="D:\Notes-master\app\src\main\res\layout\note_edit_list_item.xml" qualifiers="" type="layout"/><file name="note_item" path="D:\Notes-master\app\src\main\res\layout\note_item.xml" qualifiers="" type="layout"/><file name="note_list" path="D:\Notes-master\app\src\main\res\layout\note_list.xml" qualifiers="" type="layout"/><file name="note_list_dropdown_menu" path="D:\Notes-master\app\src\main\res\layout\note_list_dropdown_menu.xml" qualifiers="" type="layout"/><file name="note_list_footer" path="D:\Notes-master\app\src\main\res\layout\note_list_footer.xml" qualifiers="" type="layout"/><file name="settings_header" path="D:\Notes-master\app\src\main\res\layout\settings_header.xml" qualifiers="" type="layout"/><file name="widget_2x" path="D:\Notes-master\app\src\main\res\layout\widget_2x.xml" qualifiers="" type="layout"/><file name="widget_4x" path="D:\Notes-master\app\src\main\res\layout\widget_4x.xml" qualifiers="" type="layout"/><file name="call_note_edit" path="D:\Notes-master\app\src\main\res\menu\call_note_edit.xml" qualifiers="" type="menu"/><file name="call_record_folder" path="D:\Notes-master\app\src\main\res\menu\call_record_folder.xml" qualifiers="" type="menu"/><file name="note_edit" path="D:\Notes-master\app\src\main\res\menu\note_edit.xml" qualifiers="" type="menu"/><file name="note_list" path="D:\Notes-master\app\src\main\res\menu\note_list.xml" qualifiers="" type="menu"/><file name="note_list_dropdown" path="D:\Notes-master\app\src\main\res\menu\note_list_dropdown.xml" qualifiers="" type="menu"/><file name="note_list_options" path="D:\Notes-master\app\src\main\res\menu\note_list_options.xml" qualifiers="" type="menu"/><file name="sub_folder" path="D:\Notes-master\app\src\main\res\menu\sub_folder.xml" qualifiers="" type="menu"/><file name="introduction" path="D:\Notes-master\app\src\main\res\raw\introduction" qualifiers="" type="raw"/><file name="introduction" path="D:\Notes-master\app\src\main\res\raw-zh-rCN\introduction" qualifiers="zh-rCN" type="raw"/><file path="D:\Notes-master\app\src\main\res\values\arrays.xml" qualifiers=""><string-array name="format_for_exported_note">
         <item>-%s</item>      
         <item>--%s</item>     
         <item>--%s</item>     
@@ -7,7 +7,20 @@
     </string-array><string-array name="menu_share_ways">
         <item>Messaging</item>
         <item>Email</item>
-    </string-array></file><file path="D:\Notes-master\app\src\main\res\values\colors.xml" qualifiers=""><color name="user_query_highlight">#335b5b5b</color></file><file path="D:\Notes-master\app\src\main\res\values\dimens.xml" qualifiers=""><dimen name="text_font_size_super">33sp</dimen><dimen name="text_font_size_large">26sp</dimen><dimen name="text_font_size_medium">20sp</dimen><dimen name="text_font_size_normal">17sp</dimen><dimen name="text_font_size_small">14sp</dimen></file><file path="D:\Notes-master\app\src\main\res\values\strings.xml" qualifiers=""><string name="app_name">Notes</string><string name="app_widget2x2">Notes 2x2</string><string name="app_widget4x4">Notes 4x4</string><string name="widget_havenot_content">No associated note found, click to create associated note.</string><string name="widget_under_visit_mode">Privacy mode，can not see note content</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">Add note</string><string name="delete_remind_time_message">Delete reminder successfully</string><string name="set_remind_time_message">Set reminder</string><string name="note_alert_expired">Expired</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MMMd kk:mm</string><string name="notealert_ok">Got it</string><string name="notealert_enter">Take a look</string><string name="note_link_tel">Call</string><string name="note_link_email">Send email</string><string name="note_link_web">Browse web</string><string name="note_link_other">Open map</string><string name="file_path">/MIUI/notes/</string><string name="file_name_txt_format">notes_%s.txt</string><string name="format_folder_files_count">(%d)</string><string name="menu_create_folder">New Folder</string><string name="menu_export_text">Export text</string><string name="menu_sync">Sync</string><string name="menu_sync_cancel">Cancel syncing</string><string name="menu_setting">Settings</string><string name="menu_search">Search</string><string name="menu_delete">Delete</string><string name="menu_move">Move to folder</string><string name="menu_select_title">%d selected</string><string name="menu_select_none">Nothing selected, the operation is invalid</string><string name="menu_select_all">Select all</string><string name="menu_deselect_all">Deselect all</string><string name="menu_font_size">Font size</string><string name="menu_font_small">Small</string><string name="menu_font_normal">Medium</string><string name="menu_font_large">Large</string><string name="menu_font_super">Super</string><string name="menu_list_mode">Enter check list</string><string name="menu_normal_mode">Leave check list</string><string name="menu_folder_view">View folder</string><string name="menu_folder_delete">Delete folder</string><string name="menu_folder_change_name">Change folder name</string><string name="folder_exist">The folder %1$s exist, please rename</string><string name="menu_share">Share</string><string name="menu_send_to_desktop">Send to home</string><string name="menu_alert">Remind me</string><string name="menu_remove_remind">Delete reminder</string><string name="menu_title_select_folder">Select folder</string><string name="menu_move_parent_folder">Parent folder</string><string name="info_note_enter_desktop">Note added to home</string><string name="alert_message_delete_folder">Confirm to delete folder and its notes?</string><string name="alert_title_delete">Delete selected notes</string><string name="alert_message_delete_notes">Confirm to delete the selected %d notes?</string><string name="alert_message_delete_note">Confirm to delete this note?</string><string name="format_move_notes_to_folder">Have moved selected %1$d notes to %2$s folder</string><string name="error_sdcard_unmounted">SD card busy, not available now</string><string name="error_sdcard_export">Export failed, please check SD card</string><string name="error_note_not_exist">The note is not exist</string><string name="error_note_empty_for_clock">Sorry, can not set clock on empty note</string><string name="error_note_empty_for_send_to_desktop">Sorry, can not send and empty note to home</string><string name="success_sdcard_export">Export successful</string><string name="failed_sdcard_export">Export fail</string><string name="format_exported_file_location">Export text file (%1$s) to SD (%2$s) directory</string><string name="ticker_syncing">Syncing notes...</string><string name="ticker_success">Sync is successful</string><string name="ticker_fail">Sync is failed</string><string name="ticker_cancel">Sync is canceled</string><string name="success_sync_account">Sync is successful with account %1$s</string><string name="error_sync_network">Sync failed, please check network and account settings</string><string name="error_sync_internal">Sync failed, internal error occurs</string><string name="error_sync_cancelled">Sync is canceled</string><string name="sync_progress_login">Logging into %1$s...</string><string name="sync_progress_init_list">Getting remote note list...</string><string name="sync_progress_syncing">Synchronize local notes with Google Task...</string><string name="preferences_title">Settings</string><string name="preferences_account_title">Sync account</string><string name="preferences_account_summary">Sync notes with google task</string><string name="preferences_last_sync_time">Last sync time %1$s</string><string name="preferences_last_sync_time_format">yyyy-MM-dd hh:mm:ss</string><string name="preferences_add_account">Add account</string><string name="preferences_menu_change_account">Change sync account</string><string name="preferences_menu_remove_account">Remove sync account</string><string name="preferences_menu_cancel">Cancel</string><string name="preferences_button_sync_immediately">Sync immediately</string><string name="preferences_button_sync_cancel">Cancel syncing</string><string name="preferences_dialog_change_account_title">Current account %1$s</string><string name="preferences_dialog_change_account_warn_msg">All sync related information will be deleted, which may result in duplicated items sometime</string><string name="preferences_dialog_select_account_title">Sync notes</string><string name="preferences_dialog_select_account_tips">Please select a google account. Local notes will be synced with google task.</string><string name="preferences_toast_cannot_change_account">Cannot change the account because sync is in progress</string><string name="preferences_toast_success_set_accout">%1$s has been set as the sync account</string><string name="preferences_bg_random_appear_title">New note background color random</string><string name="button_delete">Delete</string><string name="call_record_folder_name">Call notes</string><string name="hint_foler_name">Input name</string><string name="search_label">Searching Notes</string><string name="search_hint">Search notes</string><string name="search_setting_description">Text in your notes</string><string name="search">Notes</string><string name="datetime_dialog_ok">set</string><string name="datetime_dialog_cancel">cancel</string><plurals name="search_results_title">
+    </string-array><string-array name="text_bg_color">
+        <item>Red</item>
+        <item>Yellow</item>
+        <item>Blue</item>
+        <item>Green</item>
+        <item>Black</item>
+        <item>Transparent</item>
+    </string-array><string-array name="text_color">
+        <item>Red</item>
+        <item>Yellow</item>
+        <item>Blue</item>
+        <item>Green</item>
+        <item>Black</item>
+    </string-array></file><file path="D:\Notes-master\app\src\main\res\values\colors.xml" qualifiers=""><color name="user_query_highlight">#335b5b5b</color></file><file path="D:\Notes-master\app\src\main\res\values\dimens.xml" qualifiers=""><dimen name="text_font_size_super">33sp</dimen><dimen name="text_font_size_large">26sp</dimen><dimen name="text_font_size_medium">20sp</dimen><dimen name="text_font_size_normal">17sp</dimen><dimen name="text_font_size_small">14sp</dimen></file><file path="D:\Notes-master\app\src\main\res\values\strings.xml" qualifiers=""><string name="app_name">Notes</string><string name="app_widget2x2">Notes 2x2</string><string name="app_widget4x4">Notes 4x4</string><string name="widget_havenot_content">No associated note found, click to create associated note.</string><string name="widget_under_visit_mode">Privacy mode，can not see note content</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">Add note</string><string name="delete_remind_time_message">Delete reminder successfully</string><string name="set_remind_time_message">Set reminder</string><string name="note_alert_expired">Expired</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MMMd kk:mm</string><string name="notealert_ok">Got it</string><string name="notealert_enter">Take a look</string><string name="note_link_tel">Call</string><string name="note_link_email">Send email</string><string name="note_link_web">Browse web</string><string name="note_link_other">Open map</string><string name="file_path">/MIUI/notes/</string><string name="file_name_txt_format">notes_%s.txt</string><string name="tips_of_revoke">Tips</string><string name="can_not_revoke">You can not revoke any more</string><string name="have_not_input_anything">You haven not input anything</string><string name="menu_revoke">Revoke</string><string name="format_folder_files_count" translatable="false">(%d)</string><string name="menu_create_folder">New Folder</string><string name="menu_export_text">Export text</string><string name="menu_sync">Sync</string><string name="menu_sync_cancel">Cancel syncing</string><string name="menu_setting">Settings</string><string name="menu_search">Search</string><string name="menu_delete">Delete</string><string name="menu_move">Move to folder</string><string name="menu_select_title">%d selected</string><string name="menu_select_none">Nothing selected, the operation is invalid</string><string name="menu_select_all">Select all</string><string name="menu_deselect_all">Deselect all</string><string name="menu_font_size">Font size</string><string name="menu_font_small">Small</string><string name="menu_font_normal">Medium</string><string name="menu_font_large">Large</string><string name="menu_font_super">Super</string><string name="menu_list_mode">Enter check list</string><string name="menu_normal_mode">Leave check list</string><string name="menu_folder_view">View folder</string><string name="menu_folder_delete">Delete folder</string><string name="menu_folder_change_name">Change folder name</string><string name="folder_exist">The folder %1$s exist, please rename</string><string name="menu_share">Share</string><string name="menu_send_to_desktop">Send to home</string><string name="menu_alert">Remind me</string><string name="menu_remove_remind">Delete reminder</string><string name="menu_title_select_folder">Select folder</string><string name="menu_move_parent_folder">Parent folder</string><string name="info_note_enter_desktop">Note added to home</string><string name="alert_message_delete_folder">Confirm to delete folder and its notes?</string><string name="alert_title_delete">Delete selected notes</string><string name="alert_message_delete_notes">Confirm to delete the selected %d notes?</string><string name="alert_message_delete_note">Confirm to delete this note?</string><string name="format_move_notes_to_folder">Have moved selected %1$d notes to %2$s folder</string><string name="error_sdcard_unmounted">SD card busy, not available now</string><string name="error_sdcard_export">Export failed, please check SD card</string><string name="error_note_not_exist">The note is not exist</string><string name="error_note_empty_for_clock">Sorry, can not set clock on empty note</string><string name="error_note_empty_for_send_to_desktop">Sorry, can not send and empty note to home</string><string name="success_sdcard_export">Export successful</string><string name="failed_sdcard_export">Export fail</string><string name="format_exported_file_location">Export text file (%1$s) to SD (%2$s) directory</string><string name="ticker_syncing">Syncing notes...</string><string name="ticker_success">Sync is successful</string><string name="ticker_fail">Sync is failed</string><string name="ticker_cancel">Sync is canceled</string><string name="success_sync_account">Sync is successful with account %1$s</string><string name="error_sync_network">Sync failed, please check network and account settings</string><string name="error_sync_internal">Sync failed, internal error occurs</string><string name="error_sync_cancelled">Sync is canceled</string><string name="sync_progress_login">Logging into %1$s...</string><string name="sync_progress_init_list">Getting remote note list...</string><string name="sync_progress_syncing">Synchronize local notes with Google Task...</string><string name="preferences_title">Settings</string><string name="preferences_account_title">Sync account</string><string name="preferences_account_summary">Sync notes with google task</string><string name="preferences_last_sync_time">Last sync time %1$s</string><string name="preferences_last_sync_time_format">yyyy-MM-dd hh:mm:ss</string><string name="preferences_add_account">Add account</string><string name="preferences_menu_change_account">Change sync account</string><string name="preferences_menu_remove_account">Remove sync account</string><string name="preferences_menu_cancel">Cancel</string><string name="preferences_button_sync_immediately">Sync immediately</string><string name="preferences_button_sync_cancel">Cancel syncing</string><string name="preferences_dialog_change_account_title">Current account %1$s</string><string name="preferences_dialog_change_account_warn_msg">All sync related information will be deleted, which may result in duplicated items sometime</string><string name="preferences_dialog_select_account_title">Sync notes</string><string name="preferences_dialog_select_account_tips">Please select a google account. Local notes will be synced with google task.</string><string name="preferences_toast_cannot_change_account">Cannot change the account because sync is in progress</string><string name="preferences_toast_success_set_accout">%1$s has been set as the sync account</string><string name="preferences_bg_random_appear_title">New note background color random</string><string name="button_delete">Delete</string><string name="call_record_folder_name">Call notes</string><string name="hint_foler_name">Input name</string><string name="search_label">Searching Notes</string><string name="search_hint">Search notes</string><string name="search_setting_description">Text in your notes</string><string name="search">Notes</string><string name="datetime_dialog_ok">set</string><string name="datetime_dialog_cancel">cancel</string><plurals name="search_results_title">
          <item quantity="one"><ns1:g example="1" id="number">%1$s</ns1:g> result for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
         
         <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>
@@ -41,16 +54,29 @@
     </style><style name="NoteTheme" parent="@android:style/Theme.Holo.Light">
         <item name="android:actionBarStyle">@style/NoteActionBarStyle</item>
     </style><style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
-        <item name="android:displayOptions"/>
-        <item name="android:visibility">gone</item>
+
+        <item name="android:visibility">visible</item>
     </style></file><file path="D:\Notes-master\app\src\main\res\values-zh-rCN\arrays.xml" qualifiers="zh-rCN"><string-array name="menu_share_ways">
         <item>短信</item>
         <item>邮件</item>
-    </string-array></file><file path="D:\Notes-master\app\src\main\res\values-zh-rCN\strings.xml" qualifiers="zh-rCN"><string name="app_name">便签</string><string name="app_widget2x2">便签2x2</string><string name="app_widget4x4">便签4x4</string><string name="widget_havenot_content">没有关联内容，点击新建便签。</string><string name="widget_under_visit_mode">访客模式下，便签内容不可见</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">新建便签</string><string name="delete_remind_time_message">成功删除提醒</string><string name="set_remind_time_message">创建提醒</string><string name="note_alert_expired">已过期</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MM月dd日 kk:mm</string><string name="notealert_ok">知道了</string><string name="notealert_enter">查看</string><string name="note_link_tel">呼叫电话</string><string name="note_link_email">发送邮件</string><string name="note_link_web">浏览网页</string><string name="note_link_other">打开地图</string><string name="menu_create_folder">新建文件夹</string><string name="menu_export_text">导出文本</string><string name="menu_sync">同步</string><string name="menu_sync_cancel">取消同步</string><string name="menu_setting">设置</string><string name="menu_search">搜索</string><string name="menu_delete">删除</string><string name="menu_move">移动到文件夹</string><string name="menu_select_title">选中了 %d 项</string><string name="menu_select_none">没有选中项，操作无效</string><string name="menu_select_all">全选</string><string name="menu_deselect_all">取消全选</string><string name="menu_font_size">文字大小</string><string name="menu_font_small">小</string><string name="menu_font_normal">正常</string><string name="menu_font_large">大</string><string name="menu_font_super">超大</string><string name="menu_list_mode">进入清单模式</string><string name="menu_normal_mode">退出清单模式</string><string name="menu_folder_view">查看文件夹</string><string name="menu_folder_delete">刪除文件夹</string><string name="menu_folder_change_name">修改文件夹名称</string><string name="folder_exist">文件夹 %1$s 已存在，请重新命名</string><string name="menu_share">分享</string><string name="menu_send_to_desktop">发送到桌面</string><string name="menu_alert">提醒我</string><string name="menu_remove_remind">删除提醒</string><string name="menu_title_select_folder">选择文件夹</string><string name="menu_move_parent_folder">上一级文件夹</string><string name="info_note_enter_desktop">已添加到桌面</string><string name="alert_title_delete">删除</string><string name="alert_message_delete_notes">确认要删除所选的 %d 条便签吗?</string><string name="alert_message_delete_note">确认要删除该条便签吗?</string><string name="alert_message_delete_folder">确认删除文件夹及所包含的便签吗？</string><string name="format_move_notes_to_folder">已将所选 %1$d 条便签移到 %2$s 文件夹</string><string name="error_sdcard_unmounted">SD卡被占用，不能操作</string><string name="error_sdcard_export">导出文本时发生错误，请检查SD卡</string><string name="error_note_not_exist">要查看的便签不存在</string><string name="error_note_empty_for_clock">不能为空便签设置闹钟提醒</string><string name="error_note_empty_for_send_to_desktop">不能将空便签发送到桌面</string><string name="success_sdcard_export">导出成功</string><string name="failed_sdcard_export">导出失败</string><string name="format_exported_file_location">已将文本文件(%1$s)输出至SD卡(%2$s)目录</string><string name="ticker_syncing">同步便签...</string><string name="ticker_success">同步成功</string><string name="ticker_fail">同步失败</string><string name="ticker_cancel">同步已取消</string><string name="success_sync_account">与%1$s同步成功</string><string name="error_sync_network">同步失败，请检查网络和帐号设置</string><string name="error_sync_internal">同步失败，发生内部错误</string><string name="error_sync_cancelled">同步已取消</string><string name="sync_progress_login">登录%1$s...</string><string name="sync_progress_init_list">正在获取服务器便签列表...</string><string name="sync_progress_syncing">正在同步本地便签...</string><string name="preferences_title">设置</string><string name="preferences_account_title">同步账号</string><string name="preferences_account_summary">与google task同步便签记录</string><string name="preferences_last_sync_time">上次同步于 %1$s</string><string name="preferences_add_account">添加账号</string><string name="preferences_menu_change_account">更换账号</string><string name="preferences_menu_remove_account">删除账号</string><string name="preferences_menu_cancel">取消</string><string name="preferences_button_sync_immediately">立即同步</string><string name="preferences_button_sync_cancel">取消同步</string><string name="preferences_dialog_change_account_title">当前帐号 %1$s</string><string name="preferences_dialog_change_account_warn_msg">如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复</string><string name="preferences_dialog_select_account_title">同步便签</string><string name="preferences_dialog_select_account_tips">请选择google帐号，便签将与该帐号的google task内容同步。</string><string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帐号</string><string name="preferences_toast_success_set_accout">同步帐号已设置为%1$s</string><string name="preferences_bg_random_appear_title">新建便签背景颜色随机</string><string name="button_delete">删除</string><string name="call_record_folder_name">通话便签</string><string name="hint_foler_name">请输入名称</string><string name="search_label">正在搜索便签</string><string name="search_hint">搜索便签</string><string name="search_setting_description">便签中的文字</string><string name="search">便签</string><string name="datetime_dialog_ok">设置</string><string name="datetime_dialog_cancel">取消</string><plurals name="search_results_title">
+    </string-array><string-array name="text_bg_color">
+        <item>红</item>
+        <item>黄</item>
+        <item>蓝</item>
+        <item>绿</item>
+        <item>黑</item>
+        <item>透明</item>
+    </string-array><string-array name="text_color">
+        <item>红</item>
+        <item>黄</item>
+        <item>蓝</item>
+        <item>绿</item>
+        <item>黑</item>
+    </string-array></file><file path="D:\Notes-master\app\src\main\res\values-zh-rCN\strings.xml" qualifiers="zh-rCN"><string name="app_name">便签</string><string name="app_widget2x2">便签2x2</string><string name="app_widget4x4">便签4x4</string><string name="widget_havenot_content">没有关联内容，点击新建便签。</string><string name="widget_under_visit_mode">访客模式下，便签内容不可见</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">新建便签</string><string name="delete_remind_time_message">成功删除提醒</string><string name="set_remind_time_message">创建提醒</string><string name="note_alert_expired">已过期</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MM月dd日 kk:mm</string><string name="notealert_ok">知道了</string><string name="notealert_enter">查看</string><string name="note_link_tel">呼叫电话</string><string name="note_link_email">发送邮件</string><string name="note_link_web">浏览网页</string><string name="note_link_other">打开地图</string><string name="tips_of_revoke">提示</string><string name="can_not_revoke">您不能再执行撤销了</string><string name="have_not_input_anything">您还没有输入任何内容</string><string name="menu_revoke">撤销</string><string name="menu_create_folder">新建文件夹</string><string name="menu_export_text">导出文本</string><string name="menu_sync">同步</string><string name="menu_sync_cancel">取消同步</string><string name="menu_setting">设置</string><string name="menu_search">搜索</string><string name="menu_delete">删除</string><string name="menu_move">移动到文件夹</string><string name="menu_select_title">选中了 %d 项</string><string name="menu_select_none">没有选中项，操作无效</string><string name="menu_select_all">全选</string><string name="menu_deselect_all">取消全选</string><string name="menu_font_size">文字大小</string><string name="menu_font_small">小</string><string name="menu_font_normal">正常</string><string name="menu_font_large">大</string><string name="menu_font_super">超大</string><string name="menu_list_mode">进入清单模式</string><string name="menu_normal_mode">退出清单模式</string><string name="menu_folder_view">查看文件夹</string><string name="menu_folder_delete">刪除文件夹</string><string name="menu_folder_change_name">修改文件夹名称</string><string name="folder_exist">文件夹 %1$s 已存在，请重新命名</string><string name="menu_share">分享</string><string name="menu_send_to_desktop">发送到桌面</string><string name="menu_alert">提醒我</string><string name="menu_remove_remind">删除提醒</string><string name="menu_title_select_folder">选择文件夹</string><string name="menu_move_parent_folder">上一级文件夹</string><string name="info_note_enter_desktop">已添加到桌面</string><string name="alert_title_delete">删除</string><string name="alert_message_delete_notes">确认要删除所选的 %d 条便签吗?</string><string name="alert_message_delete_note">确认要删除该条便签吗?</string><string name="alert_message_delete_folder">确认删除文件夹及所包含的便签吗？</string><string name="format_move_notes_to_folder">已将所选 %1$d 条便签移到 %2$s 文件夹</string><string name="error_sdcard_unmounted">SD卡被占用，不能操作</string><string name="error_sdcard_export">导出文本时发生错误，请检查SD卡</string><string name="error_note_not_exist">要查看的便签不存在</string><string name="error_note_empty_for_clock">不能为空便签设置闹钟提醒</string><string name="error_note_empty_for_send_to_desktop">不能将空便签发送到桌面</string><string name="success_sdcard_export">导出成功</string><string name="failed_sdcard_export">导出失败</string><string name="format_exported_file_location">已将文本文件(%1$s)输出至SD卡(%2$s)目录</string><string name="ticker_syncing">同步便签...</string><string name="ticker_success">同步成功</string><string name="ticker_fail">同步失败</string><string name="ticker_cancel">同步已取消</string><string name="success_sync_account">与%1$s同步成功</string><string name="error_sync_network">同步失败，请检查网络和帐号设置</string><string name="error_sync_internal">同步失败，发生内部错误</string><string name="error_sync_cancelled">同步已取消</string><string name="sync_progress_login">登录%1$s...</string><string name="sync_progress_init_list">正在获取服务器便签列表...</string><string name="sync_progress_syncing">正在同步本地便签...</string><string name="preferences_title">设置</string><string name="preferences_account_title">同步账号</string><string name="preferences_account_summary">与google task同步便签记录</string><string name="preferences_last_sync_time">上次同步于 %1$s</string><string name="preferences_add_account">添加账号</string><string name="preferences_menu_change_account">更换账号</string><string name="preferences_menu_remove_account">删除账号</string><string name="preferences_menu_cancel">取消</string><string name="preferences_button_sync_immediately">立即同步</string><string name="preferences_button_sync_cancel">取消同步</string><string name="preferences_dialog_change_account_title">当前帐号 %1$s</string><string name="preferences_dialog_change_account_warn_msg">如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复</string><string name="preferences_dialog_select_account_title">同步便签</string><string name="preferences_dialog_select_account_tips">请选择google帐号，便签将与该帐号的google task内容同步。</string><string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帐号</string><string name="preferences_toast_success_set_accout">同步帐号已设置为%1$s</string><string name="preferences_bg_random_appear_title">新建便签背景颜色随机</string><string name="button_delete">删除</string><string name="call_record_folder_name">通话便签</string><string name="hint_foler_name">请输入名称</string><string name="search_label">正在搜索便签</string><string name="search_hint">搜索便签</string><string name="search_setting_description">便签中的文字</string><string name="search">便签</string><string name="datetime_dialog_ok">设置</string><string name="datetime_dialog_cancel">取消</string><plurals name="search_results_title">
         <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 条符合“<ns1:g id="SEARCH">%2$s</ns1:g>”的搜索结果</item>
     </plurals></file><file path="D:\Notes-master\app\src\main\res\values-zh-rTW\arrays.xml" qualifiers="zh-rTW"><string-array name="menu_share_ways">
         <item>短信</item>
         <item>郵件</item>
-    </string-array></file><file path="D:\Notes-master\app\src\main\res\values-zh-rTW\strings.xml" qualifiers="zh-rTW"><string name="app_name">便簽</string><string name="app_widget2x2">便簽2x2</string><string name="app_widget4x4">便簽4x4</string><string name="widget_havenot_content">沒有關聯內容，點擊新建便簽。</string><string name="widget_under_visit_mode">訪客模式下，便籤內容不可見</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">新建便簽</string><string name="delete_remind_time_message">成功刪除提醒</string><string name="set_remind_time_message">創建提醒</string><string name="note_alert_expired">已過期</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MM月dd日 kk:mm</string><string name="notealert_ok">知道了</string><string name="notealert_enter">查看</string><string name="note_link_tel">呼叫電話</string><string name="note_link_email">發送郵件</string><string name="note_link_web">浏覽網頁</string><string name="note_link_other">打開地圖</string><string name="format_move_notes_to_folder">已將所選 %1$d 便籤移到 %2$s 文件夾</string><string name="menu_create_folder">新建文件夾</string><string name="menu_export_text">導出文本</string><string name="menu_sync">同步</string><string name="menu_sync_cancel">取消同步</string><string name="menu_setting">設置</string><string name="menu_search">搜尋</string><string name="menu_delete">刪除</string><string name="menu_move">移動到文件夾</string><string name="menu_select_title">選中了 %d 項</string><string name="menu_select_none">沒有選中項，操作無效</string><string name="menu_select_all">全選</string><string name="menu_deselect_all">取消全選</string><string name="menu_font_size">文字大小</string><string name="menu_font_small">小</string><string name="menu_font_normal">正常</string><string name="menu_font_large">大</string><string name="menu_font_super">超大</string><string name="menu_list_mode">進入清單模式</string><string name="menu_normal_mode">退出清單模式</string><string name="menu_folder_view">查看文件夾</string><string name="menu_folder_delete">刪除文件夾</string><string name="menu_folder_change_name">修改文件夾名稱</string><string name="folder_exist">文件夾 %1$s 已存在，請重新命名</string><string name="menu_share">分享</string><string name="menu_send_to_desktop">發送到桌面</string><string name="menu_alert">提醒我</string><string name="menu_remove_remind">刪除提醒</string><string name="menu_title_select_folder">選擇文件夾</string><string name="menu_move_parent_folder">上一級文件夾</string><string name="info_note_enter_desktop">已添加到桌面</string><string name="alert_title_delete">刪除</string><string name="alert_message_delete_notes">确认要刪除所選的 %d 條便籤嗎?</string><string name="alert_message_delete_note">确认要删除該條便籤嗎?</string><string name="alert_message_delete_folder">確認刪除檔夾及所包含的便簽嗎？</string><string name="error_sdcard_unmounted">SD卡被佔用，不能操作</string><string name="error_sdcard_export">導出TXT時發生錯誤，請檢查SD卡</string><string name="error_note_not_exist">要查看的便籤不存在</string><string name="error_note_empty_for_clock">不能爲空便籤設置鬧鐘提醒</string><string name="error_note_empty_for_send_to_desktop">不能將空便籤發送到桌面</string><string name="success_sdcard_export">導出成功</string><string name="failed_sdcard_export">導出失敗</string><string name="format_exported_file_location">已將文本文件(%1$s)導出至SD(%2$s)目錄</string><string name="ticker_syncing">同步便簽...</string><string name="ticker_success">同步成功</string><string name="ticker_fail">同步失敗</string><string name="ticker_cancel">同步已取消</string><string name="success_sync_account">與%1$s同步成功</string><string name="error_sync_network">同步失敗，請檢查網絡和帳號設置</string><string name="error_sync_internal">同步失敗，發生內部錯誤</string><string name="error_sync_cancelled">同步已取消</string><string name="sync_progress_login">登陸%1$s...</string><string name="sync_progress_init_list">正在獲取服務器便籤列表...</string><string name="sync_progress_syncing">正在同步本地便籤...</string><string name="preferences_title">設置</string><string name="preferences_account_title">同步賬號</string><string name="preferences_account_summary">与google task同步便簽記錄</string><string name="preferences_last_sync_time">上次同步于 %1$s</string><string name="preferences_add_account">添加賬號</string><string name="preferences_menu_change_account">更換賬號</string><string name="preferences_menu_remove_account">刪除賬號</string><string name="preferences_menu_cancel">取消</string><string name="preferences_button_sync_immediately">立即同步</string><string name="preferences_button_sync_cancel">取消同步</string><string name="preferences_dialog_change_account_title">當前帳號 %1$s</string><string name="preferences_dialog_change_account_warn_msg">如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復</string><string name="preferences_dialog_select_account_title">同步便簽</string><string name="preferences_dialog_select_account_tips">請選擇google帳號，便簽將與該帳號的google task內容同步。</string><string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帳號</string><string name="preferences_toast_success_set_accout">同步帳號已設置為%1$s</string><string name="preferences_bg_random_appear_title">新建便籤背景顏色隨機</string><string name="button_delete">刪除</string><string name="call_record_folder_name">通話便籤</string><string name="hint_foler_name">請輸入名稱</string><string name="search_label">正在搜索便籤</string><string name="search_hint">搜索便籤</string><string name="search_setting_description">便籤中的文字</string><string name="search">便籤</string><string name="datetime_dialog_ok">設置</string><string name="datetime_dialog_cancel">取消</string><plurals name="search_results_title">
+    </string-array></file><file path="D:\Notes-master\app\src\main\res\values-zh-rTW\strings.xml" qualifiers="zh-rTW"><string name="app_name">便簽</string><string name="app_widget2x2">便簽2x2</string><string name="app_widget4x4">便簽4x4</string><string name="widget_havenot_content">沒有關聯內容，點擊新建便簽。</string><string name="widget_under_visit_mode">訪客模式下，便籤內容不可見</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">新建便簽</string><string name="delete_remind_time_message">成功刪除提醒</string><string name="set_remind_time_message">創建提醒</string><string name="note_alert_expired">已過期</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MM月dd日 kk:mm</string><string name="notealert_ok">知道了</string><string name="notealert_enter">查看</string><string name="note_link_tel">呼叫電話</string><string name="note_link_email">發送郵件</string><string name="note_link_web">浏覽網頁</string><string name="note_link_other">打開地圖</string><string name="format_move_notes_to_folder">已將所選 %1$d 便籤移到 %2$s 文件夾</string><string name="tips_of_revoke">提示</string><string name="can_not_revoke">您不能再撤销了</string><string name="have_not_input_anything">您还没有输入任何内容</string><string name="menu_revoke">撤销</string><string name="menu_create_folder">新建文件夾</string><string name="menu_export_text">導出文本</string><string name="menu_sync">同步</string><string name="menu_sync_cancel">取消同步</string><string name="menu_setting">設置</string><string name="menu_search">搜尋</string><string name="menu_delete">刪除</string><string name="menu_move">移動到文件夾</string><string name="menu_select_title">選中了 %d 項</string><string name="menu_select_none">沒有選中項，操作無效</string><string name="menu_select_all">全選</string><string name="menu_deselect_all">取消全選</string><string name="menu_font_size">文字大小</string><string name="menu_font_small">小</string><string name="menu_font_normal">正常</string><string name="menu_font_large">大</string><string name="menu_font_super">超大</string><string name="menu_list_mode">進入清單模式</string><string name="menu_normal_mode">退出清單模式</string><string name="menu_folder_view">查看文件夾</string><string name="menu_folder_delete">刪除文件夾</string><string name="menu_folder_change_name">修改文件夾名稱</string><string name="folder_exist">文件夾 %1$s 已存在，請重新命名</string><string name="menu_share">分享</string><string name="menu_send_to_desktop">發送到桌面</string><string name="menu_alert">提醒我</string><string name="menu_remove_remind">刪除提醒</string><string name="menu_title_select_folder">選擇文件夾</string><string name="menu_move_parent_folder">上一級文件夾</string><string name="info_note_enter_desktop">已添加到桌面</string><string name="alert_title_delete">刪除</string><string name="alert_message_delete_notes">确认要刪除所選的 %d 條便籤嗎?</string><string name="alert_message_delete_note">确认要删除該條便籤嗎?</string><string name="alert_message_delete_folder">確認刪除檔夾及所包含的便簽嗎？</string><string name="error_sdcard_unmounted">SD卡被佔用，不能操作</string><string name="error_sdcard_export">導出TXT時發生錯誤，請檢查SD卡</string><string name="error_note_not_exist">要查看的便籤不存在</string><string name="error_note_empty_for_clock">不能爲空便籤設置鬧鐘提醒</string><string name="error_note_empty_for_send_to_desktop">不能將空便籤發送到桌面</string><string name="success_sdcard_export">導出成功</string><string name="failed_sdcard_export">導出失敗</string><string name="format_exported_file_location">已將文本文件(%1$s)導出至SD(%2$s)目錄</string><string name="ticker_syncing">同步便簽...</string><string name="ticker_success">同步成功</string><string name="ticker_fail">同步失敗</string><string name="ticker_cancel">同步已取消</string><string name="success_sync_account">與%1$s同步成功</string><string name="error_sync_network">同步失敗，請檢查網絡和帳號設置</string><string name="error_sync_internal">同步失敗，發生內部錯誤</string><string name="error_sync_cancelled">同步已取消</string><string name="sync_progress_login">登陸%1$s...</string><string name="sync_progress_init_list">正在獲取服務器便籤列表...</string><string name="sync_progress_syncing">正在同步本地便籤...</string><string name="preferences_title">設置</string><string name="preferences_account_title">同步賬號</string><string name="preferences_account_summary">与google task同步便簽記錄</string><string name="preferences_last_sync_time">上次同步于 %1$s</string><string name="preferences_add_account">添加賬號</string><string name="preferences_menu_change_account">更換賬號</string><string name="preferences_menu_remove_account">刪除賬號</string><string name="preferences_menu_cancel">取消</string><string name="preferences_button_sync_immediately">立即同步</string><string name="preferences_button_sync_cancel">取消同步</string><string name="preferences_dialog_change_account_title">當前帳號 %1$s</string><string name="preferences_dialog_change_account_warn_msg">如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復</string><string name="preferences_dialog_select_account_title">同步便簽</string><string name="preferences_dialog_select_account_tips">請選擇google帳號，便簽將與該帳號的google task內容同步。</string><string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帳號</string><string name="preferences_toast_success_set_accout">同步帳號已設置為%1$s</string><string name="preferences_bg_random_appear_title">新建便籤背景顏色隨機</string><string name="button_delete">刪除</string><string name="call_record_folder_name">通話便籤</string><string name="hint_foler_name">請輸入名稱</string><string name="search_label">正在搜索便籤</string><string name="search_hint">搜索便籤</string><string name="search_setting_description">便籤中的文字</string><string name="search">便籤</string><string name="datetime_dialog_ok">設置</string><string name="datetime_dialog_cancel">取消</string><plurals name="search_results_title">
         <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 條符合”<ns1:g id="SEARCH">%2$s</ns1:g>“的搜尋結果</item>
     </plurals></file><file name="preferences" path="D:\Notes-master\app\src\main\res\xml\preferences.xml" qualifiers="" type="xml"/><file name="searchable" path="D:\Notes-master\app\src\main\res\xml\searchable.xml" qualifiers="" type="xml"/><file name="widget_2x_info" path="D:\Notes-master\app\src\main\res\xml\widget_2x_info.xml" qualifiers="" type="xml"/><file name="widget_4x_info" path="D:\Notes-master\app\src\main\res\xml\widget_4x_info.xml" qualifiers="" type="xml"/></source><source path="D:\Notes-master\app\build\generated\res\rs\debug"/><source path="D:\Notes-master\app\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master\app\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master\app\src\debug\res"/></dataSet><mergedItems/></merger>
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
index cf3cc61..45c25f4 100644
--- a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Wed Sep 23 11:22:32 CST 2020
+#Fri Nov 27 10:25:22 CST 2020
 base.0=D\:\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
 path.0=classes.dex
 renamed.0=classes.dex
diff --git a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
index 60d968f..1a18410 100644
Binary files a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ
diff --git a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0
index 2aaad69..e065ae7 100644
Binary files a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 and b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 differ
diff --git a/src/Notes-master/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml b/src/Notes-master/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml
index 72a45c5..219c8ca 100644
--- a/src/Notes-master/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml
+++ b/src/Notes-master/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml
@@ -24,6 +24,7 @@
         android:minSdkVersion="14"
         android:targetSdkVersion="14" />
 
+    <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -37,7 +38,7 @@
     <application
         android:debuggable="true"
         android:icon="@drawable/icon_app"
-        android:label="@string/app_name"
+        android:label="Notes"
         android:testOnly="true" >
         <activity
             android:name="net.micode.notes.ui.NotesListActivity"
@@ -45,7 +46,6 @@
             android:label="@string/app_name"
             android:launchMode="singleTop"
             android:theme="@style/NoteTheme"
-            android:uiOptions="splitActionBarWhenNarrow"
             android:windowSoftInputMode="adjustPan" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class
index 620035c..441de87 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class
index 6d8c966..7fed472 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class
index c73d36e..19472e1 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class
index 5312fbd..ad93282 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class
index 8558246..727b49b 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class
index 2004066..364e4bf 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class
index 7fd93af..1b16cce 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class
index d13e818..d16f97d 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class
index 03b143b..9897dab 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class
index 52cdd89..21f3215 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class
index 47b930b..0b3e462 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class
index 750d9c6..7b1e903 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class
index ff81638..60f82f7 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class
index 36b4922..0647528 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class
index 4047d44..85ae6ce 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class
index 95fa8a5..dda2540 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class
index 8c369b7..f71a2c9 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class
index 3da8eb1..ec8caa9 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class
index 7db192e..a27e1c0 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class
index 5eed195..a991ac0 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class
index c166e99..324c99e 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class
index 51e6b34..e40fb62 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class
index d879e16..9a2c570 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$10.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$10.class
new file mode 100644
index 0000000..0708fad
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$10.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$11.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$11.class
new file mode 100644
index 0000000..17be82c
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$11.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$12.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$12.class
new file mode 100644
index 0000000..8328187
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$12.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$13.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$13.class
new file mode 100644
index 0000000..51a3ec6
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$13.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$14.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$14.class
new file mode 100644
index 0000000..2ce88c2
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$14.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$15$1.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$15$1.class
new file mode 100644
index 0000000..74bb540
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$15$1.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$15.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$15.class
new file mode 100644
index 0000000..f9d9bdf
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$15.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$16$1.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$16$1.class
new file mode 100644
index 0000000..7fb97a6
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$16$1.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$16.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$16.class
new file mode 100644
index 0000000..da8550f
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$16.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$17.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$17.class
new file mode 100644
index 0000000..1e78809
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$17.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$18.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$18.class
new file mode 100644
index 0000000..5588808
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$18.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$19.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$19.class
new file mode 100644
index 0000000..4e2d484
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$19.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class
index b789f1d..106b179 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$20.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$20.class
new file mode 100644
index 0000000..2833592
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$20.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$21.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$21.class
new file mode 100644
index 0000000..52875fd
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$21.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$22.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$22.class
new file mode 100644
index 0000000..9d93aaf
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$22.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$23.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$23.class
new file mode 100644
index 0000000..68a8636
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$23.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$24.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$24.class
new file mode 100644
index 0000000..6acbe91
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$24.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$25.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$25.class
new file mode 100644
index 0000000..87b9ec8
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$25.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$26.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$26.class
new file mode 100644
index 0000000..93e839a
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$26.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$27.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$27.class
new file mode 100644
index 0000000..6fa0c28
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$27.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$28.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$28.class
new file mode 100644
index 0000000..d899f20
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$28.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$29.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$29.class
new file mode 100644
index 0000000..9d34ee6
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$29.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class
index 866ec31..da3a59b 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$30.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$30.class
new file mode 100644
index 0000000..5749236
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$30.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class
new file mode 100644
index 0000000..ccf662e
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class
new file mode 100644
index 0000000..8a81c7b
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$6.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$6.class
new file mode 100644
index 0000000..a2ef6a3
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$6.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$7.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$7.class
new file mode 100644
index 0000000..41357c3
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$7.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$8.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$8.class
new file mode 100644
index 0000000..80329f0
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$8.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$9.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$9.class
new file mode 100644
index 0000000..26fffb5
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$9.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class
index 5bd5d69..1f11aac 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
index d41f333..0006bfd 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class
index 6102411..3897054 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class
index e14b454..fc2b8b3 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class
index d7d0fc9..57327e6 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class
index 7e01406..401b241 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class
index f3d88ce..acf9e23 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class
index 6ffb6ee..62315a3 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class
index 045dd2a..585b818 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class
index 664dcbb..7b45d16 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class
index 5d985f6..2eb58bc 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
index 39ffb21..6cd81fe 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class
index 6e98dbb..1c467b8 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class
index 250f431..19d789e 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class
index a9bdef5..57ec2c9 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class
index 7a20028..f923701 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class
index 0930bf9..9b204b6 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class
index 8d35c85..bc8d918 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener$1.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener$1.class
new file mode 100644
index 0000000..72911cd
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener$1.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener$2.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener$2.class
new file mode 100644
index 0000000..2a461e1
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener$2.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
index de885be..5bbc7fc 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
index c677232..3abd678 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class
index c161d09..e36c80e 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class
index d361bc6..abd1e4d 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class
index f6c7814..a84f4f7 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class
index 88c3a02..762a486 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class
index 732b6aa..47154d7 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class
index 1e3e0f7..0739940 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class
index b8f887a..968e561 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class
index 282522d..992994d 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class
index 01a4267..c48ba7a 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class
index b4d341e..ba21fe9 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class
index 9a8fb0c..bf6c4d8 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class
index fc41031..3a586be 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class
index 5aea3c1..5921bd5 100644
Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class differ
diff --git a/src/Notes-master/app/build/intermediates/javac/debugAndroidTest/classes/net/micode/notes/test/BuildConfig.class b/src/Notes-master/app/build/intermediates/javac/debugAndroidTest/classes/net/micode/notes/test/BuildConfig.class
new file mode 100644
index 0000000..af3a424
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debugAndroidTest/classes/net/micode/notes/test/BuildConfig.class differ
diff --git a/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
index f70f155..3dd75ec 100644
--- a/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
+++ b/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
@@ -25,248 +25,249 @@
 24        android:targetSdkVersion="14" />
 24-->D:\Notes-master\app\src\main\AndroidManifest.xml
 25
-26    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-26-->D:\Notes-master\app\src\main\AndroidManifest.xml:23:5-81
-26-->D:\Notes-master\app\src\main\AndroidManifest.xml:23:22-78
-27    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
-27-->D:\Notes-master\app\src\main\AndroidManifest.xml:24:5-88
-27-->D:\Notes-master\app\src\main\AndroidManifest.xml:24:22-85
-28    <uses-permission android:name="android.permission.INTERNET" />
-28-->D:\Notes-master\app\src\main\AndroidManifest.xml:25:5-67
-28-->D:\Notes-master\app\src\main\AndroidManifest.xml:25:22-64
-29    <uses-permission android:name="android.permission.READ_CONTACTS" />
-29-->D:\Notes-master\app\src\main\AndroidManifest.xml:26:5-72
-29-->D:\Notes-master\app\src\main\AndroidManifest.xml:26:22-69
-30    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-30-->D:\Notes-master\app\src\main\AndroidManifest.xml:27:5-74
-30-->D:\Notes-master\app\src\main\AndroidManifest.xml:27:22-71
-31    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-31-->D:\Notes-master\app\src\main\AndroidManifest.xml:28:5-80
-31-->D:\Notes-master\app\src\main\AndroidManifest.xml:28:22-77
-32    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-32-->D:\Notes-master\app\src\main\AndroidManifest.xml:29:5-71
-32-->D:\Notes-master\app\src\main\AndroidManifest.xml:29:22-68
-33    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-33-->D:\Notes-master\app\src\main\AndroidManifest.xml:30:5-74
-33-->D:\Notes-master\app\src\main\AndroidManifest.xml:30:22-71
-34    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-34-->D:\Notes-master\app\src\main\AndroidManifest.xml:31:5-81
-34-->D:\Notes-master\app\src\main\AndroidManifest.xml:31:22-78
-35
-36    <application
-36-->D:\Notes-master\app\src\main\AndroidManifest.xml:33:5-147:19
-37        android:debuggable="true"
-38        android:icon="@drawable/icon_app"
-38-->D:\Notes-master\app\src\main\AndroidManifest.xml:34:9-42
-39        android:label="@string/app_name"
-39-->D:\Notes-master\app\src\main\AndroidManifest.xml:35:9-41
-40        android:testOnly="true" >
-41        <activity
-41-->D:\Notes-master\app\src\main\AndroidManifest.xml:36:9-49:20
-42            android:name="net.micode.notes.ui.NotesListActivity"
-42-->D:\Notes-master\app\src\main\AndroidManifest.xml:37:13-49
-43            android:configChanges="keyboardHidden|orientation|screenSize"
-43-->D:\Notes-master\app\src\main\AndroidManifest.xml:38:13-74
-44            android:label="@string/app_name"
-44-->D:\Notes-master\app\src\main\AndroidManifest.xml:39:13-45
-45            android:launchMode="singleTop"
-45-->D:\Notes-master\app\src\main\AndroidManifest.xml:40:13-43
-46            android:theme="@style/NoteTheme"
-46-->D:\Notes-master\app\src\main\AndroidManifest.xml:41:13-45
-47            android:uiOptions="splitActionBarWhenNarrow"
-47-->D:\Notes-master\app\src\main\AndroidManifest.xml:42:13-57
+26    <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
+26-->D:\Notes-master\app\src\main\AndroidManifest.xml:23:5-88
+26-->D:\Notes-master\app\src\main\AndroidManifest.xml:23:22-85
+27    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+27-->D:\Notes-master\app\src\main\AndroidManifest.xml:24:5-81
+27-->D:\Notes-master\app\src\main\AndroidManifest.xml:24:22-78
+28    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
+28-->D:\Notes-master\app\src\main\AndroidManifest.xml:25:5-88
+28-->D:\Notes-master\app\src\main\AndroidManifest.xml:25:22-85
+29    <uses-permission android:name="android.permission.INTERNET" />
+29-->D:\Notes-master\app\src\main\AndroidManifest.xml:26:5-67
+29-->D:\Notes-master\app\src\main\AndroidManifest.xml:26:22-64
+30    <uses-permission android:name="android.permission.READ_CONTACTS" />
+30-->D:\Notes-master\app\src\main\AndroidManifest.xml:27:5-72
+30-->D:\Notes-master\app\src\main\AndroidManifest.xml:27:22-69
+31    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
+31-->D:\Notes-master\app\src\main\AndroidManifest.xml:28:5-74
+31-->D:\Notes-master\app\src\main\AndroidManifest.xml:28:22-71
+32    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
+32-->D:\Notes-master\app\src\main\AndroidManifest.xml:29:5-80
+32-->D:\Notes-master\app\src\main\AndroidManifest.xml:29:22-77
+33    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+33-->D:\Notes-master\app\src\main\AndroidManifest.xml:30:5-71
+33-->D:\Notes-master\app\src\main\AndroidManifest.xml:30:22-68
+34    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
+34-->D:\Notes-master\app\src\main\AndroidManifest.xml:31:5-74
+34-->D:\Notes-master\app\src\main\AndroidManifest.xml:31:22-71
+35    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+35-->D:\Notes-master\app\src\main\AndroidManifest.xml:32:5-81
+35-->D:\Notes-master\app\src\main\AndroidManifest.xml:32:22-78
+36
+37    <application
+37-->D:\Notes-master\app\src\main\AndroidManifest.xml:35:5-149:19
+38        android:debuggable="true"
+39        android:icon="@drawable/icon_app"
+39-->D:\Notes-master\app\src\main\AndroidManifest.xml:36:9-42
+40        android:label="Notes"
+40-->D:\Notes-master\app\src\main\AndroidManifest.xml:37:9-30
+41        android:testOnly="true" >
+42        <activity
+42-->D:\Notes-master\app\src\main\AndroidManifest.xml:38:9-51:20
+43            android:name="net.micode.notes.ui.NotesListActivity"
+43-->D:\Notes-master\app\src\main\AndroidManifest.xml:39:13-49
+44            android:configChanges="keyboardHidden|orientation|screenSize"
+44-->D:\Notes-master\app\src\main\AndroidManifest.xml:40:13-74
+45            android:label="@string/app_name"
+45-->D:\Notes-master\app\src\main\AndroidManifest.xml:41:13-45
+46            android:launchMode="singleTop"
+46-->D:\Notes-master\app\src\main\AndroidManifest.xml:42:13-43
+47            android:theme="@style/NoteTheme"
+47-->D:\Notes-master\app\src\main\AndroidManifest.xml:43:13-45
 48            android:windowSoftInputMode="adjustPan" >
-48-->D:\Notes-master\app\src\main\AndroidManifest.xml:43:13-52
+48-->D:\Notes-master\app\src\main\AndroidManifest.xml:45:13-52
 49            <intent-filter>
-49-->D:\Notes-master\app\src\main\AndroidManifest.xml:45:13-48:29
+49-->D:\Notes-master\app\src\main\AndroidManifest.xml:47:13-50:29
 50                <action android:name="android.intent.action.MAIN" />
-50-->D:\Notes-master\app\src\main\AndroidManifest.xml:46:17-69
-50-->D:\Notes-master\app\src\main\AndroidManifest.xml:46:25-66
+50-->D:\Notes-master\app\src\main\AndroidManifest.xml:48:17-69
+50-->D:\Notes-master\app\src\main\AndroidManifest.xml:48:25-66
 51
 52                <category android:name="android.intent.category.LAUNCHER" />
-52-->D:\Notes-master\app\src\main\AndroidManifest.xml:47:17-77
-52-->D:\Notes-master\app\src\main\AndroidManifest.xml:47:27-74
+52-->D:\Notes-master\app\src\main\AndroidManifest.xml:49:17-77
+52-->D:\Notes-master\app\src\main\AndroidManifest.xml:49:27-74
 53            </intent-filter>
 54        </activity>
 55        <activity
-55-->D:\Notes-master\app\src\main\AndroidManifest.xml:51:9-79:20
+55-->D:\Notes-master\app\src\main\AndroidManifest.xml:53:9-81:20
 56            android:name="net.micode.notes.ui.NoteEditActivity"
-56-->D:\Notes-master\app\src\main\AndroidManifest.xml:52:13-48
+56-->D:\Notes-master\app\src\main\AndroidManifest.xml:54:13-48
 57            android:configChanges="keyboardHidden|orientation|screenSize"
-57-->D:\Notes-master\app\src\main\AndroidManifest.xml:53:13-74
+57-->D:\Notes-master\app\src\main\AndroidManifest.xml:55:13-74
 58            android:launchMode="singleTop"
-58-->D:\Notes-master\app\src\main\AndroidManifest.xml:54:13-43
+58-->D:\Notes-master\app\src\main\AndroidManifest.xml:56:13-43
 59            android:theme="@style/NoteTheme" >
-59-->D:\Notes-master\app\src\main\AndroidManifest.xml:55:13-45
+59-->D:\Notes-master\app\src\main\AndroidManifest.xml:57:13-45
 60            <intent-filter>
-60-->D:\Notes-master\app\src\main\AndroidManifest.xml:57:13-62:29
+60-->D:\Notes-master\app\src\main\AndroidManifest.xml:59:13-64:29
 61                <action android:name="android.intent.action.VIEW" />
-61-->D:\Notes-master\app\src\main\AndroidManifest.xml:58:17-69
-61-->D:\Notes-master\app\src\main\AndroidManifest.xml:58:25-66
+61-->D:\Notes-master\app\src\main\AndroidManifest.xml:60:17-69
+61-->D:\Notes-master\app\src\main\AndroidManifest.xml:60:25-66
 62
 63                <category android:name="android.intent.category.DEFAULT" />
-63-->D:\Notes-master\app\src\main\AndroidManifest.xml:59:17-76
-63-->D:\Notes-master\app\src\main\AndroidManifest.xml:59:27-73
+63-->D:\Notes-master\app\src\main\AndroidManifest.xml:61:17-76
+63-->D:\Notes-master\app\src\main\AndroidManifest.xml:61:27-73
 64
 65                <data android:mimeType="vnd.android.cursor.item/text_note" />
-65-->D:\Notes-master\app\src\main\AndroidManifest.xml:60:17-78
-65-->D:\Notes-master\app\src\main\AndroidManifest.xml:60:23-75
+65-->D:\Notes-master\app\src\main\AndroidManifest.xml:62:17-78
+65-->D:\Notes-master\app\src\main\AndroidManifest.xml:62:23-75
 66                <data android:mimeType="vnd.android.cursor.item/call_note" />
-66-->D:\Notes-master\app\src\main\AndroidManifest.xml:60:17-78
-66-->D:\Notes-master\app\src\main\AndroidManifest.xml:60:23-75
+66-->D:\Notes-master\app\src\main\AndroidManifest.xml:62:17-78
+66-->D:\Notes-master\app\src\main\AndroidManifest.xml:62:23-75
 67            </intent-filter>
 68            <intent-filter>
-68-->D:\Notes-master\app\src\main\AndroidManifest.xml:64:13-69:29
+68-->D:\Notes-master\app\src\main\AndroidManifest.xml:66:13-71:29
 69                <action android:name="android.intent.action.INSERT_OR_EDIT" />
-69-->D:\Notes-master\app\src\main\AndroidManifest.xml:65:17-79
-69-->D:\Notes-master\app\src\main\AndroidManifest.xml:65:25-76
+69-->D:\Notes-master\app\src\main\AndroidManifest.xml:67:17-79
+69-->D:\Notes-master\app\src\main\AndroidManifest.xml:67:25-76
 70
 71                <category android:name="android.intent.category.DEFAULT" />
-71-->D:\Notes-master\app\src\main\AndroidManifest.xml:59:17-76
-71-->D:\Notes-master\app\src\main\AndroidManifest.xml:59:27-73
+71-->D:\Notes-master\app\src\main\AndroidManifest.xml:61:17-76
+71-->D:\Notes-master\app\src\main\AndroidManifest.xml:61:27-73
 72
 73                <data android:mimeType="vnd.android.cursor.item/text_note" />
-73-->D:\Notes-master\app\src\main\AndroidManifest.xml:60:17-78
-73-->D:\Notes-master\app\src\main\AndroidManifest.xml:60:23-75
+73-->D:\Notes-master\app\src\main\AndroidManifest.xml:62:17-78
+73-->D:\Notes-master\app\src\main\AndroidManifest.xml:62:23-75
 74                <data android:mimeType="vnd.android.cursor.item/call_note" />
-74-->D:\Notes-master\app\src\main\AndroidManifest.xml:60:17-78
-74-->D:\Notes-master\app\src\main\AndroidManifest.xml:60:23-75
+74-->D:\Notes-master\app\src\main\AndroidManifest.xml:62:17-78
+74-->D:\Notes-master\app\src\main\AndroidManifest.xml:62:23-75
 75            </intent-filter>
 76            <intent-filter>
-76-->D:\Notes-master\app\src\main\AndroidManifest.xml:71:13-74:29
+76-->D:\Notes-master\app\src\main\AndroidManifest.xml:73:13-76:29
 77                <action android:name="android.intent.action.SEARCH" />
-77-->D:\Notes-master\app\src\main\AndroidManifest.xml:72:17-71
-77-->D:\Notes-master\app\src\main\AndroidManifest.xml:72:25-68
+77-->D:\Notes-master\app\src\main\AndroidManifest.xml:74:17-71
+77-->D:\Notes-master\app\src\main\AndroidManifest.xml:74:25-68
 78
 79                <category android:name="android.intent.category.DEFAULT" />
-79-->D:\Notes-master\app\src\main\AndroidManifest.xml:59:17-76
-79-->D:\Notes-master\app\src\main\AndroidManifest.xml:59:27-73
+79-->D:\Notes-master\app\src\main\AndroidManifest.xml:61:17-76
+79-->D:\Notes-master\app\src\main\AndroidManifest.xml:61:27-73
 80            </intent-filter>
 81
 82            <meta-data
-82-->D:\Notes-master\app\src\main\AndroidManifest.xml:76:13-78:54
+82-->D:\Notes-master\app\src\main\AndroidManifest.xml:78:13-80:54
 83                android:name="android.app.searchable"
-83-->D:\Notes-master\app\src\main\AndroidManifest.xml:77:17-54
+83-->D:\Notes-master\app\src\main\AndroidManifest.xml:79:17-54
 84                android:resource="@xml/searchable" />
-84-->D:\Notes-master\app\src\main\AndroidManifest.xml:78:17-51
+84-->D:\Notes-master\app\src\main\AndroidManifest.xml:80:17-51
 85        </activity>
 86
 87        <provider
-87-->D:\Notes-master\app\src\main\AndroidManifest.xml:81:9-84:43
+87-->D:\Notes-master\app\src\main\AndroidManifest.xml:83:9-86:43
 88            android:name="net.micode.notes.data.NotesProvider"
-88-->D:\Notes-master\app\src\main\AndroidManifest.xml:82:13-63
+88-->D:\Notes-master\app\src\main\AndroidManifest.xml:84:13-63
 89            android:authorities="micode_notes"
-89-->D:\Notes-master\app\src\main\AndroidManifest.xml:83:13-47
+89-->D:\Notes-master\app\src\main\AndroidManifest.xml:85:13-47
 90            android:multiprocess="true" />
-90-->D:\Notes-master\app\src\main\AndroidManifest.xml:84:13-40
+90-->D:\Notes-master\app\src\main\AndroidManifest.xml:86:13-40
 91
 92        <receiver
-92-->D:\Notes-master\app\src\main\AndroidManifest.xml:86:9-98:20
+92-->D:\Notes-master\app\src\main\AndroidManifest.xml:88:9-100:20
 93            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
-93-->D:\Notes-master\app\src\main\AndroidManifest.xml:87:13-57
+93-->D:\Notes-master\app\src\main\AndroidManifest.xml:89:13-57
 94            android:label="@string/app_widget2x2" >
-94-->D:\Notes-master\app\src\main\AndroidManifest.xml:88:13-50
+94-->D:\Notes-master\app\src\main\AndroidManifest.xml:90:13-50
 95            <intent-filter>
-95-->D:\Notes-master\app\src\main\AndroidManifest.xml:89:13-93:29
+95-->D:\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29
 96                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-96-->D:\Notes-master\app\src\main\AndroidManifest.xml:90:17-84
-96-->D:\Notes-master\app\src\main\AndroidManifest.xml:90:25-81
+96-->D:\Notes-master\app\src\main\AndroidManifest.xml:92:17-84
+96-->D:\Notes-master\app\src\main\AndroidManifest.xml:92:25-81
 97                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-97-->D:\Notes-master\app\src\main\AndroidManifest.xml:91:17-85
-97-->D:\Notes-master\app\src\main\AndroidManifest.xml:91:25-82
+97-->D:\Notes-master\app\src\main\AndroidManifest.xml:93:17-85
+97-->D:\Notes-master\app\src\main\AndroidManifest.xml:93:25-82
 98                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-98-->D:\Notes-master\app\src\main\AndroidManifest.xml:92:17-85
-98-->D:\Notes-master\app\src\main\AndroidManifest.xml:92:25-82
+98-->D:\Notes-master\app\src\main\AndroidManifest.xml:94:17-85
+98-->D:\Notes-master\app\src\main\AndroidManifest.xml:94:25-82
 99            </intent-filter>
 100
 101            <meta-data
-101-->D:\Notes-master\app\src\main\AndroidManifest.xml:95:13-97:58
+101-->D:\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58
 102                android:name="android.appwidget.provider"
-102-->D:\Notes-master\app\src\main\AndroidManifest.xml:96:17-58
+102-->D:\Notes-master\app\src\main\AndroidManifest.xml:98:17-58
 103                android:resource="@xml/widget_2x_info" />
-103-->D:\Notes-master\app\src\main\AndroidManifest.xml:97:17-55
+103-->D:\Notes-master\app\src\main\AndroidManifest.xml:99:17-55
 104        </receiver>
 105        <receiver
-105-->D:\Notes-master\app\src\main\AndroidManifest.xml:99:9-112:20
+105-->D:\Notes-master\app\src\main\AndroidManifest.xml:101:9-114:20
 106            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
-106-->D:\Notes-master\app\src\main\AndroidManifest.xml:100:13-57
+106-->D:\Notes-master\app\src\main\AndroidManifest.xml:102:13-57
 107            android:label="@string/app_widget4x4" >
-107-->D:\Notes-master\app\src\main\AndroidManifest.xml:101:13-50
+107-->D:\Notes-master\app\src\main\AndroidManifest.xml:103:13-50
 108            <intent-filter>
-108-->D:\Notes-master\app\src\main\AndroidManifest.xml:89:13-93:29
+108-->D:\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29
 109                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-109-->D:\Notes-master\app\src\main\AndroidManifest.xml:90:17-84
-109-->D:\Notes-master\app\src\main\AndroidManifest.xml:90:25-81
+109-->D:\Notes-master\app\src\main\AndroidManifest.xml:92:17-84
+109-->D:\Notes-master\app\src\main\AndroidManifest.xml:92:25-81
 110                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-110-->D:\Notes-master\app\src\main\AndroidManifest.xml:91:17-85
-110-->D:\Notes-master\app\src\main\AndroidManifest.xml:91:25-82
+110-->D:\Notes-master\app\src\main\AndroidManifest.xml:93:17-85
+110-->D:\Notes-master\app\src\main\AndroidManifest.xml:93:25-82
 111                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-111-->D:\Notes-master\app\src\main\AndroidManifest.xml:92:17-85
-111-->D:\Notes-master\app\src\main\AndroidManifest.xml:92:25-82
+111-->D:\Notes-master\app\src\main\AndroidManifest.xml:94:17-85
+111-->D:\Notes-master\app\src\main\AndroidManifest.xml:94:25-82
 112            </intent-filter>
 113
 114            <meta-data
-114-->D:\Notes-master\app\src\main\AndroidManifest.xml:95:13-97:58
+114-->D:\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58
 115                android:name="android.appwidget.provider"
-115-->D:\Notes-master\app\src\main\AndroidManifest.xml:96:17-58
+115-->D:\Notes-master\app\src\main\AndroidManifest.xml:98:17-58
 116                android:resource="@xml/widget_4x_info" />
-116-->D:\Notes-master\app\src\main\AndroidManifest.xml:97:17-55
+116-->D:\Notes-master\app\src\main\AndroidManifest.xml:99:17-55
 117        </receiver>
 118        <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
-118-->D:\Notes-master\app\src\main\AndroidManifest.xml:114:9-118:20
-118-->D:\Notes-master\app\src\main\AndroidManifest.xml:114:19-55
+118-->D:\Notes-master\app\src\main\AndroidManifest.xml:116:9-120:20
+118-->D:\Notes-master\app\src\main\AndroidManifest.xml:116:19-55
 119            <intent-filter>
-119-->D:\Notes-master\app\src\main\AndroidManifest.xml:115:13-117:29
+119-->D:\Notes-master\app\src\main\AndroidManifest.xml:117:13-119:29
 120                <action android:name="android.intent.action.BOOT_COMPLETED" />
-120-->D:\Notes-master\app\src\main\AndroidManifest.xml:116:17-79
-120-->D:\Notes-master\app\src\main\AndroidManifest.xml:116:25-76
+120-->D:\Notes-master\app\src\main\AndroidManifest.xml:118:17-79
+120-->D:\Notes-master\app\src\main\AndroidManifest.xml:118:25-76
 121            </intent-filter>
 122        </receiver>
 123        <receiver
-123-->D:\Notes-master\app\src\main\AndroidManifest.xml:120:9-123:20
+123-->D:\Notes-master\app\src\main\AndroidManifest.xml:122:9-125:20
 124            android:name="net.micode.notes.ui.AlarmReceiver"
-124-->D:\Notes-master\app\src\main\AndroidManifest.xml:121:13-61
+124-->D:\Notes-master\app\src\main\AndroidManifest.xml:123:13-61
 125            android:process=":remote" >
-125-->D:\Notes-master\app\src\main\AndroidManifest.xml:122:13-38
+125-->D:\Notes-master\app\src\main\AndroidManifest.xml:124:13-38
 126        </receiver>
 127
 128        <activity
-128-->D:\Notes-master\app\src\main\AndroidManifest.xml:125:9-130:20
+128-->D:\Notes-master\app\src\main\AndroidManifest.xml:127:9-132:20
 129            android:name="net.micode.notes.ui.AlarmAlertActivity"
-129-->D:\Notes-master\app\src\main\AndroidManifest.xml:126:13-50
+129-->D:\Notes-master\app\src\main\AndroidManifest.xml:128:13-50
 130            android:label="@string/app_name"
-130-->D:\Notes-master\app\src\main\AndroidManifest.xml:127:13-45
+130-->D:\Notes-master\app\src\main\AndroidManifest.xml:129:13-45
 131            android:launchMode="singleInstance"
-131-->D:\Notes-master\app\src\main\AndroidManifest.xml:128:13-48
+131-->D:\Notes-master\app\src\main\AndroidManifest.xml:130:13-48
 132            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
-132-->D:\Notes-master\app\src\main\AndroidManifest.xml:129:13-75
+132-->D:\Notes-master\app\src\main\AndroidManifest.xml:131:13-75
 133        </activity>
 134        <activity
-134-->D:\Notes-master\app\src\main\AndroidManifest.xml:132:9-137:20
+134-->D:\Notes-master\app\src\main\AndroidManifest.xml:134:9-139:20
 135            android:name="net.micode.notes.ui.NotesPreferenceActivity"
-135-->D:\Notes-master\app\src\main\AndroidManifest.xml:133:13-71
+135-->D:\Notes-master\app\src\main\AndroidManifest.xml:135:13-71
 136            android:label="@string/preferences_title"
-136-->D:\Notes-master\app\src\main\AndroidManifest.xml:134:13-54
+136-->D:\Notes-master\app\src\main\AndroidManifest.xml:136:13-54
 137            android:launchMode="singleTop"
-137-->D:\Notes-master\app\src\main\AndroidManifest.xml:135:13-43
+137-->D:\Notes-master\app\src\main\AndroidManifest.xml:137:13-43
 138            android:theme="@android:style/Theme.Holo.Light" >
-138-->D:\Notes-master\app\src\main\AndroidManifest.xml:136:13-60
+138-->D:\Notes-master\app\src\main\AndroidManifest.xml:138:13-60
 139        </activity>
 140
 141        <service
-141-->D:\Notes-master\app\src\main\AndroidManifest.xml:139:9-142:19
+141-->D:\Notes-master\app\src\main\AndroidManifest.xml:141:9-144:19
 142            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-142-->D:\Notes-master\app\src\main\AndroidManifest.xml:140:13-74
+142-->D:\Notes-master\app\src\main\AndroidManifest.xml:142:13-74
 143            android:exported="false" >
-143-->D:\Notes-master\app\src\main\AndroidManifest.xml:141:13-37
+143-->D:\Notes-master\app\src\main\AndroidManifest.xml:143:13-37
 144        </service>
 145
 146        <meta-data
-146-->D:\Notes-master\app\src\main\AndroidManifest.xml:144:9-146:52
+146-->D:\Notes-master\app\src\main\AndroidManifest.xml:146:9-148:52
 147            android:name="android.app.default_searchable"
-147-->D:\Notes-master\app\src\main\AndroidManifest.xml:145:13-58
+147-->D:\Notes-master\app\src\main\AndroidManifest.xml:147:13-58
 148            android:value=".ui.NoteEditActivity" />
-148-->D:\Notes-master\app\src\main\AndroidManifest.xml:146:13-49
+148-->D:\Notes-master\app\src\main\AndroidManifest.xml:148:13-49
 149    </application>
 150
 151</manifest>
diff --git a/src/Notes-master/app/build/intermediates/merged_assets/debug/out/editor.html b/src/Notes-master/app/build/intermediates/merged_assets/debug/out/editor.html
new file mode 100644
index 0000000..aa44a51
--- /dev/null
+++ b/src/Notes-master/app/build/intermediates/merged_assets/debug/out/editor.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta name="viewport" content="user-scalable=no">
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <link rel="stylesheet" type="text/css" href="normalize.css">
+    <link rel="stylesheet" type="text/css" href="style.css">
+</head>
+<body>
+<div id="editor" contenteditable="true"></div>
+<script type="text/javascript" src="rich_editor.js"></script>
+</body>
+</html>
diff --git a/src/Notes-master/app/build/intermediates/merged_assets/debug/out/normalize.css b/src/Notes-master/app/build/intermediates/merged_assets/debug/out/normalize.css
new file mode 100644
index 0000000..a5ae163
--- /dev/null
+++ b/src/Notes-master/app/build/intermediates/merged_assets/debug/out/normalize.css
@@ -0,0 +1,413 @@
+/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
+
+/**
+ * 1. Set default font family to sans-serif.
+ * 2. Prevent iOS text size adjust after orientation change, without disabling
+ *    user zoom.
+ */
+
+html {
+  font-family: sans-serif; /* 1 */
+  -webkit-text-size-adjust: 100%; /* 2 */
+}
+
+/**
+ * Remove default margin.
+ */
+
+body {
+  margin: 0;
+}
+
+/* HTML5 display definitions
+   ========================================================================== */
+
+/**
+ * Correct `block` display not defined for any HTML5 element in IE 8/9.
+ * Correct `block` display not defined for `details` or `summary` in IE 10/11
+ * and Firefox.
+ * Correct `block` display not defined for `main` in IE 11.
+ */
+
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+main,
+menu,
+nav,
+section,
+summary {
+  display: block;
+}
+
+/**
+ * 1. Correct `inline-block` display not defined in IE 8/9.
+ * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.
+ */
+
+audio,
+canvas,
+progress,
+video {
+  display: inline-block; /* 1 */
+  vertical-align: baseline; /* 2 */
+}
+
+/**
+ * Prevent modern browsers from displaying `audio` without controls.
+ * Remove excess height in iOS 5 devices.
+ */
+
+audio:not([controls]) {
+  display: none;
+  height: 0;
+}
+
+/**
+ * Address `[hidden]` styling not present in IE 8/9/10.
+ * Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22.
+ */
+
+[hidden],
+template {
+  display: none;
+}
+
+/* Links
+   ========================================================================== */
+
+/**
+ * Remove the gray background color from active links in IE 10.
+ */
+
+a {
+  background-color: transparent;
+}
+
+/**
+ * Improve readability when focused and also mouse hovered in all browsers.
+ */
+
+a:active,
+a:hover {
+  outline: 0;
+}
+
+/* Text-level semantics
+   ========================================================================== */
+
+/**
+ * Address styling not present in IE 8/9/10/11, Safari, and Chrome.
+ */
+
+abbr[title] {
+  border-bottom: 1px dotted;
+}
+
+/**
+ * Address style set to `bolder` in Firefox 4+, Safari, and Chrome.
+ */
+
+b,
+strong {
+  font-weight: bold;
+}
+
+/**
+ * Address styling not present in Safari and Chrome.
+ */
+
+dfn {
+  font-style: italic;
+}
+
+/**
+ * Address variable `h1` font-size and margin within `section` and `article`
+ * contexts in Firefox 4+, Safari, and Chrome.
+ */
+
+h1 {
+  font-size: 2em;
+  margin: 0.67em 0;
+}
+
+/**
+ * Address styling not present in IE 8/9.
+ */
+
+mark {
+  background: #ff0;
+  color: #000;
+}
+
+/**
+ * Address inconsistent and variable font size in all browsers.
+ */
+
+small {
+  font-size: 80%;
+}
+
+/**
+ * Prevent `sub` and `sup` affecting `line-height` in all browsers.
+ */
+
+sub,
+sup {
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
+}
+
+sup {
+  top: -0.5em;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+/* Embedded content
+   ========================================================================== */
+
+/**
+ * Remove border when inside `a` element in IE 8/9/10.
+ */
+
+img {
+  border: 0;
+}
+
+/**
+ * Correct overflow not hidden in IE 9/10/11.
+ */
+
+svg:not(:root) {
+  overflow: hidden;
+}
+
+/* Grouping content
+   ========================================================================== */
+
+/**
+ * Address margin not present in IE 8/9 and Safari.
+ */
+
+figure {
+  margin: 1em 40px;
+}
+
+/**
+ * Address differences between Firefox and other browsers.
+ */
+
+hr {
+  box-sizing: content-box;
+  height: 0;
+}
+
+/**
+ * Contain overflow in all browsers.
+ */
+
+pre {
+  overflow: auto;
+}
+
+/**
+ * Address odd `em`-unit font size rendering in all browsers.
+ */
+
+code,
+kbd,
+pre,
+samp {
+  font-family: monospace, monospace;
+  font-size: 1em;
+}
+
+/* Forms
+   ========================================================================== */
+
+/**
+ * Known limitation: by default, Chrome and Safari on OS X allow very limited
+ * styling of `select`, unless a `border` property is set.
+ */
+
+/**
+ * 1. Correct color not being inherited.
+ *    Known issue: affects color of disabled elements.
+ * 2. Correct font properties not being inherited.
+ * 3. Address margins set differently in Firefox 4+, Safari, and Chrome.
+ */
+
+button,
+input,
+optgroup,
+select,
+textarea {
+  color: inherit; /* 1 */
+  font: inherit; /* 2 */
+  margin: 0; /* 3 */
+}
+
+/**
+ * Address `overflow` set to `hidden` in IE 8/9/10/11.
+ */
+
+button {
+  overflow: visible;
+}
+
+/**
+ * Address inconsistent `text-transform` inheritance for `button` and `select`.
+ * All other form control elements do not inherit `text-transform` values.
+ * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera.
+ * Correct `select` style inheritance in Firefox.
+ */
+
+button,
+select {
+  text-transform: none;
+}
+
+/**
+ * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
+ *    and `video` controls.
+ * 2. Correct inability to style clickable `input` types in iOS.
+ * 3. Improve usability and consistency of cursor style between image-type
+ *    `input` and others.
+ */
+
+button,
+html input[type="button"], /* 1 */
+input[type="reset"],
+input[type="submit"] {
+  -webkit-appearance: button; /* 2 */
+  cursor: pointer; /* 3 */
+}
+
+/**
+ * Re-set default cursor for disabled elements.
+ */
+
+button[disabled],
+html input[disabled] {
+  cursor: default;
+}
+
+/**
+ * Address Firefox 4+ setting `line-height` on `input` using `!important` in
+ * the UA stylesheet.
+ */
+
+input {
+  line-height: normal;
+}
+
+/**
+ * It's recommended that you don't attempt to style these elements.
+ * Firefox's implementation doesn't respect box-sizing, padding, or width.
+ *
+ * 1. Address box sizing set to `content-box` in IE 8/9/10.
+ * 2. Remove excess padding in IE 8/9/10.
+ */
+
+input[type="checkbox"],
+input[type="radio"] {
+  box-sizing: border-box; /* 1 */
+  padding: 0; /* 2 */
+}
+
+/**
+ * Fix the cursor style for Chrome's increment/decrement buttons. For certain
+ * `font-size` values of the `input`, it causes the cursor style of the
+ * decrement button to change from `default` to `text`.
+ */
+
+input[type="number"]::-webkit-inner-spin-button,
+input[type="number"]::-webkit-outer-spin-button {
+  height: auto;
+}
+
+/**
+ * 1. Address `appearance` set to `searchfield` in Safari and Chrome.
+ * 2. Address `box-sizing` set to `border-box` in Safari and Chrome
+ */
+
+input[type="search"] {
+  -webkit-appearance: textfield; /* 1 */
+  -webkit-box-sizing: content-box; /* 2 */
+  box-sizing: content-box;
+}
+
+/**
+ * Remove inner padding and search cancel button in Safari and Chrome on OS X.
+ * Safari (but not Chrome) clips the cancel button when the search input has
+ * padding (and `textfield` appearance).
+ */
+
+input[type="search"]::-webkit-search-cancel-button,
+input[type="search"]::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+
+/**
+ * Define consistent border, margin, and padding.
+ */
+
+fieldset {
+  border: 1px solid #c0c0c0;
+  margin: 0 2px;
+  padding: 0.35em 0.625em 0.75em;
+}
+
+/**
+ * 1. Correct `color` not being inherited in IE 8/9/10/11.
+ * 2. Remove padding so people aren't caught out if they zero out fieldsets.
+ */
+
+legend {
+  border: 0; /* 1 */
+  padding: 0; /* 2 */
+}
+
+/**
+ * Remove default vertical scrollbar in IE 8/9/10/11.
+ */
+
+textarea {
+  overflow: auto;
+}
+
+/**
+ * Don't inherit the `font-weight` (applied by a rule above).
+ * NOTE: the default cannot safely be changed in Chrome and Safari on OS X.
+ */
+
+optgroup {
+  font-weight: bold;
+}
+
+/* Tables
+   ========================================================================== */
+
+/**
+ * Remove most spacing between table cells.
+ */
+
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+td,
+th {
+  padding: 0;
+}
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/merged_assets/debug/out/rich_editor.js b/src/Notes-master/app/build/intermediates/merged_assets/debug/out/rich_editor.js
new file mode 100644
index 0000000..9eca168
--- /dev/null
+++ b/src/Notes-master/app/build/intermediates/merged_assets/debug/out/rich_editor.js
@@ -0,0 +1,312 @@
+/**
+ * Copyright (C) 2017 Wasabeef
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+var RE = {};
+
+RE.currentSelection = {
+    "startContainer": 0,
+    "startOffset": 0,
+    "endContainer": 0,
+    "endOffset": 0};
+
+RE.editor = document.getElementById('editor');
+
+document.addEventListener("selectionchange", function() { RE.backuprange(); });
+
+// Initializations
+RE.callback = function() {
+    window.location.href = "re-callback://" + encodeURI(RE.getHtml());
+}
+
+RE.setHtml = function(contents) {
+    RE.editor.innerHTML = decodeURIComponent(contents.replace(/\+/g, '%20'));
+}
+
+RE.getHtml = function() {
+    return RE.editor.innerHTML;
+}
+
+RE.getText = function() {
+    return RE.editor.innerText;
+}
+
+RE.setBaseTextColor = function(color) {
+    RE.editor.style.color  = color;
+}
+
+RE.setBaseFontSize = function(size) {
+    RE.editor.style.fontSize = size;
+}
+
+RE.setPadding = function(left, top, right, bottom) {
+  RE.editor.style.paddingLeft = left;
+  RE.editor.style.paddingTop = top;
+  RE.editor.style.paddingRight = right;
+  RE.editor.style.paddingBottom = bottom;
+}
+
+RE.setBackgroundColor = function(color) {
+    document.body.style.backgroundColor = color;
+}
+
+RE.setBackgroundImage = function(image) {
+    RE.editor.style.backgroundImage = image;
+}
+
+RE.setWidth = function(size) {
+    RE.editor.style.minWidth = size;
+}
+
+RE.setHeight = function(size) {
+    RE.editor.style.height = size;
+}
+
+RE.setTextAlign = function(align) {
+    RE.editor.style.textAlign = align;
+}
+
+RE.setVerticalAlign = function(align) {
+    RE.editor.style.verticalAlign = align;
+}
+
+RE.setPlaceholder = function(placeholder) {
+    RE.editor.setAttribute("placeholder", placeholder);
+}
+
+RE.setInputEnabled = function(inputEnabled) {
+    RE.editor.contentEditable = String(inputEnabled);
+}
+
+RE.undo = function() {
+    document.execCommand('undo', false, null);
+}
+
+RE.redo = function() {
+    document.execCommand('redo', false, null);
+}
+
+RE.setBold = function() {
+    document.execCommand('bold', false, null);
+}
+
+RE.setItalic = function() {
+    document.execCommand('italic', false, null);
+}
+
+RE.setSubscript = function() {
+    document.execCommand('subscript', false, null);
+}
+
+RE.setSuperscript = function() {
+    document.execCommand('superscript', false, null);
+}
+
+RE.setStrikeThrough = function() {
+    document.execCommand('strikeThrough', false, null);
+}
+
+RE.setUnderline = function() {
+    document.execCommand('underline', false, null);
+}
+
+RE.setBullets = function() {
+    document.execCommand('insertUnorderedList', false, null);
+}
+
+RE.setNumbers = function() {
+    document.execCommand('insertOrderedList', false, null);
+}
+
+RE.setTextColor = function(color) {
+    RE.restorerange();
+    document.execCommand("styleWithCSS", null, true);
+    document.execCommand('foreColor', false, color);
+    document.execCommand("styleWithCSS", null, false);
+}
+
+RE.setTextBackgroundColor = function(color) {
+    RE.restorerange();
+    document.execCommand("styleWithCSS", null, true);
+    document.execCommand('hiliteColor', false, color);
+    document.execCommand("styleWithCSS", null, false);
+}
+
+RE.setFontSize = function(fontSize){
+    document.execCommand("fontSize", false, fontSize);
+}
+
+RE.setHeading = function(heading) {
+    document.execCommand('formatBlock', false, '<h'+heading+'>');
+}
+
+RE.setIndent = function() {
+    document.execCommand('indent', false, null);
+}
+
+RE.setOutdent = function() {
+    document.execCommand('outdent', false, null);
+}
+
+RE.setJustifyLeft = function() {
+    document.execCommand('justifyLeft', false, null);
+}
+
+RE.setJustifyCenter = function() {
+    document.execCommand('justifyCenter', false, null);
+}
+
+RE.setJustifyRight = function() {
+    document.execCommand('justifyRight', false, null);
+}
+
+RE.setBlockquote = function() {
+    document.execCommand('formatBlock', false, '<blockquote>');
+}
+
+RE.insertImage = function(url, alt) {
+    var html = '<img src="' + url + '" alt="' + alt + '" />';
+    RE.insertHTML(html);
+}
+
+RE.insertHTML = function(html) {
+    RE.restorerange();
+    document.execCommand('insertHTML', false, html);
+}
+
+RE.insertLink = function(url, title) {
+    RE.restorerange();
+    var sel = document.getSelection();
+    if (sel.toString().length == 0) {
+        document.execCommand("insertHTML",false,"<a href='"+url+"'>"+title+"</a>");
+    } else if (sel.rangeCount) {
+       var el = document.createElement("a");
+       el.setAttribute("href", url);
+       el.setAttribute("title", title);
+
+       var range = sel.getRangeAt(0).cloneRange();
+       range.surroundContents(el);
+       sel.removeAllRanges();
+       sel.addRange(range);
+   }
+    RE.callback();
+}
+
+RE.setTodo = function(text) {
+    var html = '<input type="checkbox" name="'+ text +'" value="'+ text +'"/> &nbsp;';
+    document.execCommand('insertHTML', false, html);
+}
+
+RE.prepareInsert = function() {
+    RE.backuprange();
+}
+
+RE.backuprange = function(){
+    var selection = window.getSelection();
+    if (selection.rangeCount > 0) {
+      var range = selection.getRangeAt(0);
+      RE.currentSelection = {
+          "startContainer": range.startContainer,
+          "startOffset": range.startOffset,
+          "endContainer": range.endContainer,
+          "endOffset": range.endOffset};
+    }
+}
+
+RE.restorerange = function(){
+    var selection = window.getSelection();
+    selection.removeAllRanges();
+    var range = document.createRange();
+    range.setStart(RE.currentSelection.startContainer, RE.currentSelection.startOffset);
+    range.setEnd(RE.currentSelection.endContainer, RE.currentSelection.endOffset);
+    selection.addRange(range);
+}
+
+RE.enabledEditingItems = function(e) {
+    var items = [];
+    if (document.queryCommandState('bold')) {
+        items.push('bold');
+    }
+    if (document.queryCommandState('italic')) {
+        items.push('italic');
+    }
+    if (document.queryCommandState('subscript')) {
+        items.push('subscript');
+    }
+    if (document.queryCommandState('superscript')) {
+        items.push('superscript');
+    }
+    if (document.queryCommandState('strikeThrough')) {
+        items.push('strikeThrough');
+    }
+    if (document.queryCommandState('underline')) {
+        items.push('underline');
+    }
+    if (document.queryCommandState('insertOrderedList')) {
+        items.push('orderedList');
+    }
+    if (document.queryCommandState('insertUnorderedList')) {
+        items.push('unorderedList');
+    }
+    if (document.queryCommandState('justifyCenter')) {
+        items.push('justifyCenter');
+    }
+    if (document.queryCommandState('justifyFull')) {
+        items.push('justifyFull');
+    }
+    if (document.queryCommandState('justifyLeft')) {
+        items.push('justifyLeft');
+    }
+    if (document.queryCommandState('justifyRight')) {
+        items.push('justifyRight');
+    }
+    if (document.queryCommandState('insertHorizontalRule')) {
+        items.push('horizontalRule');
+    }
+    var formatBlock = document.queryCommandValue('formatBlock');
+    if (formatBlock.length > 0) {
+        items.push(formatBlock);
+    }
+
+    window.location.href = "re-state://" + encodeURI(items.join(','));
+}
+
+RE.focus = function() {
+    var range = document.createRange();
+    range.selectNodeContents(RE.editor);
+    range.collapse(false);
+    var selection = window.getSelection();
+    selection.removeAllRanges();
+    selection.addRange(range);
+    RE.editor.focus();
+}
+
+RE.blurFocus = function() {
+    RE.editor.blur();
+}
+
+RE.removeFormat = function() {
+    document.execCommand('removeFormat', false, null);
+}
+
+// Event Listeners
+RE.editor.addEventListener("input", RE.callback);
+RE.editor.addEventListener("keyup", function(e) {
+    var KEY_LEFT = 37, KEY_RIGHT = 39;
+    if (e.which == KEY_LEFT || e.which == KEY_RIGHT) {
+        RE.enabledEditingItems(e);
+    }
+});
+RE.editor.addEventListener("click", RE.enabledEditingItems);
diff --git a/src/Notes-master/app/build/intermediates/merged_assets/debug/out/style.css b/src/Notes-master/app/build/intermediates/merged_assets/debug/out/style.css
new file mode 100644
index 0000000..c6618c3
--- /dev/null
+++ b/src/Notes-master/app/build/intermediates/merged_assets/debug/out/style.css
@@ -0,0 +1,43 @@
+/**
+ * Copyright (C) 2017 Wasabeef
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@charset "UTF-8";
+
+
+html {
+  height: 100%;
+}
+
+body {
+  overflow: scroll;
+  display: table;
+  table-layout: fixed;
+  width: 100%;
+  min-height:100%;
+}
+
+#editor {
+  display: table-cell;
+  outline: 0px solid transparent;
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: cover;
+}
+
+#editor[placeholder]:empty:not(:focus):before {
+  content: attr(placeholder);
+  opacity: .5;
+}}
diff --git a/src/Notes-master/app/build/intermediates/merged_java_res/debug/out.jar b/src/Notes-master/app/build/intermediates/merged_java_res/debug/out.jar
index 7014d98..b880dab 100644
Binary files a/src/Notes-master/app/build/intermediates/merged_java_res/debug/out.jar and b/src/Notes-master/app/build/intermediates/merged_java_res/debug/out.jar differ
diff --git a/src/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/src/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
index f237bf5..d45daaa 100644
--- a/src/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
+++ b/src/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
@@ -23,6 +23,7 @@
         android:minSdkVersion="14"
         android:targetSdkVersion="14" />
 
+    <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -36,7 +37,7 @@
     <application
         android:debuggable="true"
         android:icon="@drawable/icon_app"
-        android:label="@string/app_name"
+        android:label="Notes"
         android:testOnly="true" >
         <activity
             android:name="net.micode.notes.ui.NotesListActivity"
@@ -44,7 +45,6 @@
             android:label="@string/app_name"
             android:launchMode="singleTop"
             android:theme="@style/NoteTheme"
-            android:uiOptions="splitActionBarWhenNarrow"
             android:windowSoftInputMode="adjustPan" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/src/Notes-master/app/build/intermediates/merged_manifests/debugAndroidTest/AndroidManifest.xml b/src/Notes-master/app/build/intermediates/merged_manifests/debugAndroidTest/AndroidManifest.xml
new file mode 100644
index 0000000..485ad0f
--- /dev/null
+++ b/src/Notes-master/app/build/intermediates/merged_manifests/debugAndroidTest/AndroidManifest.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="net.micode.notes.test">
+
+    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="14" />
+
+    <application android:debuggable="true" >
+        <uses-library android:name="android.test.runner" />
+    </application>
+
+    <instrumentation android:name="android.test.InstrumentationTestRunner"
+                     android:targetPackage="net.micode.notes"
+                     android:handleProfiling="false"
+                     android:functionalTest="false"
+                     android:label="Tests for net.micode.notes"/>
+</manifest>
diff --git a/src/Notes-master/app/build/intermediates/merged_manifests/debugAndroidTest/output.json b/src/Notes-master/app/build/intermediates/merged_manifests/debugAndroidTest/output.json
new file mode 100644
index 0000000..e5420bc
--- /dev/null
+++ b/src/Notes-master/app/build/intermediates/merged_manifests/debugAndroidTest/output.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "applicationId": "net.micode.notes.test",
+  "variantType": "ANDROID_TEST",
+  "elements": [
+    {
+      "outputType": {
+        "type": "MERGED_MANIFESTS"
+      },
+      "apkData": {
+        "type": "MAIN",
+        "splits": [],
+        "versionCode": -1,
+        "outputFile": "app-debug-androidTest.apk",
+        "fullName": "debugAndroidTest",
+        "baseName": "debug-androidTest",
+        "dirName": ""
+      },
+      "path": "AndroidManifest.xml",
+      "properties": {}
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/Notes-master/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
index 05fe414..e77d7a2 100644
Binary files a/src/Notes-master/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/src/Notes-master/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ
diff --git a/src/Notes-master/app/build/intermediates/processed_res/debugAndroidTest/out/output.json b/src/Notes-master/app/build/intermediates/processed_res/debugAndroidTest/out/output.json
new file mode 100644
index 0000000..bf73840
--- /dev/null
+++ b/src/Notes-master/app/build/intermediates/processed_res/debugAndroidTest/out/output.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "applicationId": "net.micode.notes.test",
+  "variantType": "ANDROID_TEST",
+  "elements": [
+    {
+      "outputType": {
+        "type": "PROCESSED_RES"
+      },
+      "apkData": {
+        "type": "MAIN",
+        "splits": [],
+        "versionCode": -1,
+        "outputFile": "app-debug-androidTest.apk",
+        "fullName": "debugAndroidTest",
+        "baseName": "debug-androidTest",
+        "dirName": ""
+      },
+      "path": "resources-debugAndroidTest.ap_",
+      "properties": {}
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/Notes-master/app/build/intermediates/processed_res/debugAndroidTest/out/resources-debugAndroidTest.ap_ b/src/Notes-master/app/build/intermediates/processed_res/debugAndroidTest/out/resources-debugAndroidTest.ap_
new file mode 100644
index 0000000..06547df
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/processed_res/debugAndroidTest/out/resources-debugAndroidTest.ap_ differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/fb7f637a40a6e3fd1a924a3fa5ed62ebc23a9b747719ad06ddc2c769fa886ae5_0.jar b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/fb7f637a40a6e3fd1a924a3fa5ed62ebc23a9b747719ad06ddc2c769fa886ae5_0.jar
new file mode 100644
index 0000000..92dfe32
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/fb7f637a40a6e3fd1a924a3fa5ed62ebc23a9b747719ad06ddc2c769fa886ae5_0.jar differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/fb7f637a40a6e3fd1a924a3fa5ed62ebc23a9b747719ad06ddc2c769fa886ae5_1.jar b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/fb7f637a40a6e3fd1a924a3fa5ed62ebc23a9b747719ad06ddc2c769fa886ae5_1.jar
new file mode 100644
index 0000000..3f42232
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/fb7f637a40a6e3fd1a924a3fa5ed62ebc23a9b747719ad06ddc2c769fa886ae5_1.jar differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/fb7f637a40a6e3fd1a924a3fa5ed62ebc23a9b747719ad06ddc2c769fa886ae5_2.jar b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/fb7f637a40a6e3fd1a924a3fa5ed62ebc23a9b747719ad06ddc2c769fa886ae5_2.jar
new file mode 100644
index 0000000..199a008
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/fb7f637a40a6e3fd1a924a3fa5ed62ebc23a9b747719ad06ddc2c769fa886ae5_2.jar differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/fb7f637a40a6e3fd1a924a3fa5ed62ebc23a9b747719ad06ddc2c769fa886ae5_3.jar b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/fb7f637a40a6e3fd1a924a3fa5ed62ebc23a9b747719ad06ddc2c769fa886ae5_3.jar
new file mode 100644
index 0000000..7b50abe
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/fb7f637a40a6e3fd1a924a3fa5ed62ebc23a9b747719ad06ddc2c769fa886ae5_3.jar differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/fb7f637a40a6e3fd1a924a3fa5ed62ebc23a9b747719ad06ddc2c769fa886ae5_4.jar b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/fb7f637a40a6e3fd1a924a3fa5ed62ebc23a9b747719ad06ddc2c769fa886ae5_4.jar
new file mode 100644
index 0000000..4986845
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/fb7f637a40a6e3fd1a924a3fa5ed62ebc23a9b747719ad06ddc2c769fa886ae5_4.jar differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/fb7f637a40a6e3fd1a924a3fa5ed62ebc23a9b747719ad06ddc2c769fa886ae5_5.jar b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/fb7f637a40a6e3fd1a924a3fa5ed62ebc23a9b747719ad06ddc2c769fa886ae5_5.jar
new file mode 100644
index 0000000..21718e9
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/fb7f637a40a6e3fd1a924a3fa5ed62ebc23a9b747719ad06ddc2c769fa886ae5_5.jar differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex
index 945ace2..92cba78 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex
index 116b081..6ccae93 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex
index bfddfee..1e364fc 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex
index d99883f..2ad878f 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex
index 82de025..d7d5831 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex
index 70eda56..548879f 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex
index 8be20b6..ddefdf0 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex
index 8912558..f21c685 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex
index 71e70e2..5854ce3 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex
index 41183c4..5a6b009 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex
index 62df3b2..8e82ea4 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex
index 2929c7d..72e6a83 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex
index ef773d9..7090740 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex
index 1a407ec..08bca9c 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex
index a20bde5..702c256 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex
index 9cc7bf3..01719e6 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex
index c6ccf82..47e4664 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex
index b6eef18..3f4e157 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex
index 915ba18..c914eb6 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex
index 988b222..1f6d9a3 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex
index 6cadfc6..c8718e9 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex
index 0bee083..42e48fe 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex
index 2b0ef77..77b51b1 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$10.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$10.dex
new file mode 100644
index 0000000..9794c2f
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$10.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$11.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$11.dex
new file mode 100644
index 0000000..4c2d8a1
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$11.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$12.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$12.dex
new file mode 100644
index 0000000..3fd1b53
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$12.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$13.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$13.dex
new file mode 100644
index 0000000..f97c338
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$13.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$14.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$14.dex
new file mode 100644
index 0000000..80fe409
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$14.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$15$1.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$15$1.dex
new file mode 100644
index 0000000..5a9eef0
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$15$1.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$15.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$15.dex
new file mode 100644
index 0000000..35ccec6
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$15.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$16$1.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$16$1.dex
new file mode 100644
index 0000000..0c0f3f6
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$16$1.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$16.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$16.dex
new file mode 100644
index 0000000..874c54a
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$16.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$17.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$17.dex
new file mode 100644
index 0000000..75b5391
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$17.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$18.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$18.dex
new file mode 100644
index 0000000..da9f46d
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$18.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$19.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$19.dex
new file mode 100644
index 0000000..93da8b2
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$19.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex
index 07ea9d7..4a809f0 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$20.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$20.dex
new file mode 100644
index 0000000..8e42fab
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$20.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$21.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$21.dex
new file mode 100644
index 0000000..854f35d
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$21.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$22.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$22.dex
new file mode 100644
index 0000000..c78951e
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$22.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$23.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$23.dex
new file mode 100644
index 0000000..8cbe9ab
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$23.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$24.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$24.dex
new file mode 100644
index 0000000..a830eeb
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$24.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$25.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$25.dex
new file mode 100644
index 0000000..e28a6bd
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$25.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$26.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$26.dex
new file mode 100644
index 0000000..d755779
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$26.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$27.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$27.dex
new file mode 100644
index 0000000..3560722
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$27.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$28.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$28.dex
new file mode 100644
index 0000000..7d171a2
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$28.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$29.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$29.dex
new file mode 100644
index 0000000..768bd47
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$29.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex
index bfd8504..9ba6066 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$30.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$30.dex
new file mode 100644
index 0000000..b3147db
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$30.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex
new file mode 100644
index 0000000..26bac6c
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$5.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$5.dex
new file mode 100644
index 0000000..3000eaa
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$5.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$6.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$6.dex
new file mode 100644
index 0000000..3ba4ce6
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$6.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$7.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$7.dex
new file mode 100644
index 0000000..59a73c9
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$7.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$8.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$8.dex
new file mode 100644
index 0000000..95e36a9
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$8.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$9.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$9.dex
new file mode 100644
index 0000000..6ebefae
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$9.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex
index d21e5b2..ee4b875 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex
index 7058dc0..b9124ac 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex
index 06e8c97..fe2c87f 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex
index 2223e8a..9b065e1 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex
index 0fb154d..50b6028 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex
index 852fe6d..d4021c4 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex
index b29dec2..b2f27c5 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex
index 620f991..31e07aa 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex
index 310238a..cfe3696 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex
index 4c7b295..81d013c 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex
index 1418edb..bddf830 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex
index e074074..5c7db0e 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex
index b4e2052..5f88476 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex
index aea776d..82c5377 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex
index a1c8325..d1c7ed1 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex
index f9ef937..ffa78eb 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex
index 75652b4..722a6d7 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex
index 179b08c..44f187b 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener$1.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener$1.dex
new file mode 100644
index 0000000..fb1b764
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener$1.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener$2.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener$2.dex
new file mode 100644
index 0000000..f65877d
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener$2.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex
index dbbce38..f9bcb4d 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex
index b64c7e8..6491e9d 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex
index e134e00..78359b9 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex
index 4f7249c..c0561c5 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex
index 650c055..7bf911a 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex
index 91bb107..7f12aaf 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex
index 5b13567..e0f7a55 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex
index 7d795a4..36d5f9b 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex
index 18dd3c6..26b8532 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex
index 0534fe4..eeecc67 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex
index d8e73e0..624fb23 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex
index 193356e..a9e5337 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex
index 48423c9..9c791b4 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex
index e5e6a69..8c99c82 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex differ
diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex
index 96b992c..1896359 100644
Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex differ
diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_action_align_center.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_action_align_center.png.flat
new file mode 100644
index 0000000..7cc8593
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_action_align_center.png.flat differ
diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_action_align_left.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_action_align_left.png.flat
new file mode 100644
index 0000000..0e32846
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_action_align_left.png.flat differ
diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_action_align_right.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_action_align_right.png.flat
new file mode 100644
index 0000000..9092c8f
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_action_align_right.png.flat differ
diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_action_bold.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_action_bold.png.flat
new file mode 100644
index 0000000..0cc878d
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_action_bold.png.flat differ
diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_action_italic.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_action_italic.png.flat
new file mode 100644
index 0000000..418726c
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_action_italic.png.flat differ
diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_action_redo.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_action_redo.png.flat
new file mode 100644
index 0000000..31c371c
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_action_redo.png.flat differ
diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_action_underline.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_action_underline.png.flat
new file mode 100644
index 0000000..0af0e76
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_action_underline.png.flat differ
diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_action_undo.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_action_undo.png.flat
new file mode 100644
index 0000000..1014fcf
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_action_undo.png.flat differ
diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_text_color.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_text_color.png.flat
new file mode 100644
index 0000000..8496b5b
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_text_color.png.flat differ
diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_check_box.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_check_box.png.flat
new file mode 100644
index 0000000..ca3e6e0
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_check_box.png.flat differ
diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_dropdown_icon.9.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_dropdown_icon.9.png.flat
index 597f7bc..fbd3ee7 100644
Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_dropdown_icon.9.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_dropdown_icon.9.png.flat differ
diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_yellow.9.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_yellow.9.png.flat
index 74f1c49..fc8684a 100644
Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_yellow.9.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_yellow.9.png.flat differ
diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_html.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_html.png.flat
new file mode 100644
index 0000000..6f663d9
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_html.png.flat differ
diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_indent.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_indent.png.flat
new file mode 100644
index 0000000..0f5cd71
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_indent.png.flat differ
diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_insert_bullets.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_insert_bullets.png.flat
new file mode 100644
index 0000000..bd376e5
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_insert_bullets.png.flat differ
diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_insert_img.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_insert_img.png.flat
new file mode 100644
index 0000000..8b882e8
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_insert_img.png.flat differ
diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_insert_numbers.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_insert_numbers.png.flat
new file mode 100644
index 0000000..d5d4e4d
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_insert_numbers.png.flat differ
diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_link.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_link.png.flat
new file mode 100644
index 0000000..945a349
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_link.png.flat differ
diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_lock.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_lock.png.flat
new file mode 100644
index 0000000..e4c0b2d
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_lock.png.flat differ
diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_new_set_bg.jpg.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_new_set_bg.jpg.flat
new file mode 100644
index 0000000..cc7cf3b
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_new_set_bg.jpg.flat differ
diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_outdent.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_outdent.png.flat
new file mode 100644
index 0000000..9e65447
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_outdent.png.flat differ
diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_strike_through.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_strike_through.png.flat
new file mode 100644
index 0000000..0bffb40
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_strike_through.png.flat differ
diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_subscript.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_subscript.png.flat
new file mode 100644
index 0000000..c9909e2
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_subscript.png.flat differ
diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_superscript.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_superscript.png.flat
new file mode 100644
index 0000000..3cc4ca2
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_superscript.png.flat differ
diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_text_color.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_text_color.png.flat
new file mode 100644
index 0000000..e58f3f6
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_text_color.png.flat differ
diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_unlock.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_unlock.png.flat
new file mode 100644
index 0000000..7cb9397
Binary files /dev/null and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_unlock.png.flat differ
diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_edit.xml.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_edit.xml.flat
index 087f621..42db0c8 100644
Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_edit.xml.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_edit.xml.flat differ
diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_edit_list_item.xml.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_edit_list_item.xml.flat
index de4a600..dc45ea0 100644
Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_edit_list_item.xml.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_edit_list_item.xml.flat differ
diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_item.xml.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_item.xml.flat
index e8a1248..2f86d29 100644
Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_item.xml.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_item.xml.flat differ
diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_list.xml.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_list.xml.flat
index 0d2de39..7e042d4 100644
Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_list.xml.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_list.xml.flat differ
diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_list_dropdown_menu.xml.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_list_dropdown_menu.xml.flat
index c580841..f78432d 100644
Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_list_dropdown_menu.xml.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_list_dropdown_menu.xml.flat differ
diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/menu_note_edit.xml.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/menu_note_edit.xml.flat
index 2a5f95c..86e878e 100644
Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/menu_note_edit.xml.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/menu_note_edit.xml.flat differ
diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/values-zh-rCN_values-zh-rCN.arsc.flat
index 233fcdf..cc49cf6 100644
Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/values-zh-rCN_values-zh-rCN.arsc.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/values-zh-rCN_values-zh-rCN.arsc.flat differ
diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/values-zh-rTW_values-zh-rTW.arsc.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/values-zh-rTW_values-zh-rTW.arsc.flat
index a5dd589..76f67a7 100644
Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/values-zh-rTW_values-zh-rTW.arsc.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/values-zh-rTW_values-zh-rTW.arsc.flat differ
diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/values_values.arsc.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/values_values.arsc.flat
index 44c9cc5..23a2a8b 100644
Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/values_values.arsc.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/values_values.arsc.flat differ
diff --git a/src/Notes-master/app/build/intermediates/runtime_symbol_list/debug/R.txt b/src/Notes-master/app/build/intermediates/runtime_symbol_list/debug/R.txt
index 00d6e91..1655866 100644
--- a/src/Notes-master/app/build/intermediates/runtime_symbol_list/debug/R.txt
+++ b/src/Notes-master/app/build/intermediates/runtime_symbol_list/debug/R.txt
@@ -1,5 +1,7 @@
 int array format_for_exported_note 0x7f010000
 int array menu_share_ways 0x7f010001
+int array text_bg_color 0x7f010002
+int array text_color 0x7f010003
 int color primary_text_dark 0x7f020000
 int color secondary_text_dark 0x7f020001
 int color user_query_highlight 0x7f020002
@@ -8,139 +10,192 @@ int dimen text_font_size_medium 0x7f030001
 int dimen text_font_size_normal 0x7f030002
 int dimen text_font_size_small 0x7f030003
 int dimen text_font_size_super 0x7f030004
-int drawable bg_btn_set_color 0x7f040000
-int drawable bg_color_btn_mask 0x7f040001
-int drawable call_record 0x7f040002
-int drawable clock 0x7f040003
-int drawable delete 0x7f040004
-int drawable dropdown_icon 0x7f040005
-int drawable edit_blue 0x7f040006
-int drawable edit_green 0x7f040007
-int drawable edit_red 0x7f040008
-int drawable edit_title_blue 0x7f040009
-int drawable edit_title_green 0x7f04000a
-int drawable edit_title_red 0x7f04000b
-int drawable edit_title_white 0x7f04000c
-int drawable edit_title_yellow 0x7f04000d
-int drawable edit_white 0x7f04000e
-int drawable edit_yellow 0x7f04000f
-int drawable font_large 0x7f040010
-int drawable font_normal 0x7f040011
-int drawable font_size_selector_bg 0x7f040012
-int drawable font_small 0x7f040013
-int drawable font_super 0x7f040014
-int drawable icon_app 0x7f040015
-int drawable list_background 0x7f040016
-int drawable list_blue_down 0x7f040017
-int drawable list_blue_middle 0x7f040018
-int drawable list_blue_single 0x7f040019
-int drawable list_blue_up 0x7f04001a
-int drawable list_folder 0x7f04001b
-int drawable list_footer_bg 0x7f04001c
-int drawable list_green_down 0x7f04001d
-int drawable list_green_middle 0x7f04001e
-int drawable list_green_single 0x7f04001f
-int drawable list_green_up 0x7f040020
-int drawable list_red_down 0x7f040021
-int drawable list_red_middle 0x7f040022
-int drawable list_red_single 0x7f040023
-int drawable list_red_up 0x7f040024
-int drawable list_white_down 0x7f040025
-int drawable list_white_middle 0x7f040026
-int drawable list_white_single 0x7f040027
-int drawable list_white_up 0x7f040028
-int drawable list_yellow_down 0x7f040029
-int drawable list_yellow_middle 0x7f04002a
-int drawable list_yellow_single 0x7f04002b
-int drawable list_yellow_up 0x7f04002c
-int drawable menu_delete 0x7f04002d
-int drawable menu_move 0x7f04002e
-int drawable new_note 0x7f04002f
-int drawable new_note_normal 0x7f040030
-int drawable new_note_pressed 0x7f040031
-int drawable note_edit_color_selector_panel 0x7f040032
-int drawable notification 0x7f040033
-int drawable search_result 0x7f040034
-int drawable selected 0x7f040035
-int drawable title_alert 0x7f040036
-int drawable title_bar_bg 0x7f040037
-int drawable widget_2x_blue 0x7f040038
-int drawable widget_2x_green 0x7f040039
-int drawable widget_2x_red 0x7f04003a
-int drawable widget_2x_white 0x7f04003b
-int drawable widget_2x_yellow 0x7f04003c
-int drawable widget_4x_blue 0x7f04003d
-int drawable widget_4x_green 0x7f04003e
-int drawable widget_4x_red 0x7f04003f
-int drawable widget_4x_white 0x7f040040
-int drawable widget_4x_yellow 0x7f040041
+int drawable action_align_center 0x7f040000
+int drawable action_align_left 0x7f040001
+int drawable action_align_right 0x7f040002
+int drawable action_bold 0x7f040003
+int drawable action_italic 0x7f040004
+int drawable action_redo 0x7f040005
+int drawable action_underline 0x7f040006
+int drawable action_undo 0x7f040007
+int drawable bg_btn_set_color 0x7f040008
+int drawable bg_color_btn_mask 0x7f040009
+int drawable bg_text_color 0x7f04000a
+int drawable call_record 0x7f04000b
+int drawable check_box 0x7f04000c
+int drawable clock 0x7f04000d
+int drawable delete 0x7f04000e
+int drawable dropdown_icon 0x7f04000f
+int drawable edit_blue 0x7f040010
+int drawable edit_green 0x7f040011
+int drawable edit_red 0x7f040012
+int drawable edit_title_blue 0x7f040013
+int drawable edit_title_green 0x7f040014
+int drawable edit_title_red 0x7f040015
+int drawable edit_title_white 0x7f040016
+int drawable edit_title_yellow 0x7f040017
+int drawable edit_white 0x7f040018
+int drawable edit_yellow 0x7f040019
+int drawable font_large 0x7f04001a
+int drawable font_normal 0x7f04001b
+int drawable font_size_selector_bg 0x7f04001c
+int drawable font_small 0x7f04001d
+int drawable font_super 0x7f04001e
+int drawable html 0x7f04001f
+int drawable icon_app 0x7f040020
+int drawable indent 0x7f040021
+int drawable insert_bullets 0x7f040022
+int drawable insert_img 0x7f040023
+int drawable insert_numbers 0x7f040024
+int drawable link 0x7f040025
+int drawable list_background 0x7f040026
+int drawable list_blue_down 0x7f040027
+int drawable list_blue_middle 0x7f040028
+int drawable list_blue_single 0x7f040029
+int drawable list_blue_up 0x7f04002a
+int drawable list_folder 0x7f04002b
+int drawable list_footer_bg 0x7f04002c
+int drawable list_green_down 0x7f04002d
+int drawable list_green_middle 0x7f04002e
+int drawable list_green_single 0x7f04002f
+int drawable list_green_up 0x7f040030
+int drawable list_red_down 0x7f040031
+int drawable list_red_middle 0x7f040032
+int drawable list_red_single 0x7f040033
+int drawable list_red_up 0x7f040034
+int drawable list_white_down 0x7f040035
+int drawable list_white_middle 0x7f040036
+int drawable list_white_single 0x7f040037
+int drawable list_white_up 0x7f040038
+int drawable list_yellow_down 0x7f040039
+int drawable list_yellow_middle 0x7f04003a
+int drawable list_yellow_single 0x7f04003b
+int drawable list_yellow_up 0x7f04003c
+int drawable lock 0x7f04003d
+int drawable menu_delete 0x7f04003e
+int drawable menu_move 0x7f04003f
+int drawable new_note 0x7f040040
+int drawable new_note_normal 0x7f040041
+int drawable new_note_pressed 0x7f040042
+int drawable new_set_bg 0x7f040043
+int drawable note_edit_color_selector_panel 0x7f040044
+int drawable notification 0x7f040045
+int drawable outdent 0x7f040046
+int drawable search_result 0x7f040047
+int drawable selected 0x7f040048
+int drawable strike_through 0x7f040049
+int drawable subscript 0x7f04004a
+int drawable superscript 0x7f04004b
+int drawable text_color 0x7f04004c
+int drawable title_alert 0x7f04004d
+int drawable title_bar_bg 0x7f04004e
+int drawable unlock 0x7f04004f
+int drawable widget_2x_blue 0x7f040050
+int drawable widget_2x_green 0x7f040051
+int drawable widget_2x_red 0x7f040052
+int drawable widget_2x_white 0x7f040053
+int drawable widget_2x_yellow 0x7f040054
+int drawable widget_4x_blue 0x7f040055
+int drawable widget_4x_green 0x7f040056
+int drawable widget_4x_red 0x7f040057
+int drawable widget_4x_white 0x7f040058
+int drawable widget_4x_yellow 0x7f040059
 int id account_dialog_subtitle 0x7f050000
 int id account_dialog_title 0x7f050001
-int id action_select_all 0x7f050002
-int id amPm 0x7f050003
-int id btn_new_note 0x7f050004
-int id btn_set_bg_color 0x7f050005
-int id cb_edit_item 0x7f050006
-int id date 0x7f050007
-int id delete 0x7f050008
-int id et_edit_text 0x7f050009
-int id et_foler_name 0x7f05000a
-int id font_size_selector 0x7f05000b
-int id hour 0x7f05000c
-int id iv_alert_icon 0x7f05000d
-int id iv_bg_blue 0x7f05000e
-int id iv_bg_blue_select 0x7f05000f
-int id iv_bg_green 0x7f050010
-int id iv_bg_green_select 0x7f050011
-int id iv_bg_red 0x7f050012
-int id iv_bg_red_select 0x7f050013
-int id iv_bg_white 0x7f050014
-int id iv_bg_white_select 0x7f050015
-int id iv_bg_yellow 0x7f050016
-int id iv_bg_yellow_select 0x7f050017
-int id iv_large_select 0x7f050018
-int id iv_medium_select 0x7f050019
-int id iv_small_select 0x7f05001a
-int id iv_super_select 0x7f05001b
-int id ll_font_large 0x7f05001c
-int id ll_font_normal 0x7f05001d
-int id ll_font_small 0x7f05001e
-int id ll_font_super 0x7f05001f
-int id menu_alert 0x7f050020
-int id menu_delete 0x7f050021
-int id menu_delete_remind 0x7f050022
-int id menu_export_text 0x7f050023
-int id menu_font_size 0x7f050024
-int id menu_list_mode 0x7f050025
-int id menu_new_folder 0x7f050026
-int id menu_new_note 0x7f050027
-int id menu_search 0x7f050028
-int id menu_send_to_desktop 0x7f050029
-int id menu_setting 0x7f05002a
-int id menu_share 0x7f05002b
-int id menu_sync 0x7f05002c
-int id minute 0x7f05002d
-int id move 0x7f05002e
-int id navigation_bar 0x7f05002f
-int id note_bg_color_selector 0x7f050030
-int id note_edit_list 0x7f050031
-int id note_edit_view 0x7f050032
-int id note_item 0x7f050033
-int id note_title 0x7f050034
-int id notes_list 0x7f050035
-int id prefenerece_sync_status_textview 0x7f050036
-int id preference_sync_button 0x7f050037
-int id selection_menu 0x7f050038
-int id sv_note_edit 0x7f050039
-int id tv_alert_date 0x7f05003a
-int id tv_folder_name 0x7f05003b
-int id tv_modified_date 0x7f05003c
-int id tv_name 0x7f05003d
-int id tv_time 0x7f05003e
-int id tv_title 0x7f05003f
-int id tv_title_bar 0x7f050040
-int id widget_bg_image 0x7f050041
-int id widget_text 0x7f050042
+int id action_align_center 0x7f050002
+int id action_align_left 0x7f050003
+int id action_align_right 0x7f050004
+int id action_bg_color 0x7f050005
+int id action_bold 0x7f050006
+int id action_heading1 0x7f050007
+int id action_heading2 0x7f050008
+int id action_heading3 0x7f050009
+int id action_heading4 0x7f05000a
+int id action_heading5 0x7f05000b
+int id action_heading6 0x7f05000c
+int id action_indent 0x7f05000d
+int id action_insert_bullets 0x7f05000e
+int id action_insert_checkbox 0x7f05000f
+int id action_insert_numbers 0x7f050010
+int id action_italic 0x7f050011
+int id action_outdent 0x7f050012
+int id action_redo 0x7f050013
+int id action_select_all 0x7f050014
+int id action_strikethrough 0x7f050015
+int id action_subscript 0x7f050016
+int id action_superscript 0x7f050017
+int id action_txt_color 0x7f050018
+int id action_underline 0x7f050019
+int id action_undo 0x7f05001a
+int id amPm 0x7f05001b
+int id btn_new_note 0x7f05001c
+int id btn_set_bg_color 0x7f05001d
+int id cb_edit_item 0x7f05001e
+int id date 0x7f05001f
+int id delete 0x7f050020
+int id et_edit_text 0x7f050021
+int id et_foler_name 0x7f050022
+int id font_size_selector 0x7f050023
+int id hour 0x7f050024
+int id image_of_lock 0x7f050025
+int id image_of_unlock 0x7f050026
+int id iv_alert_icon 0x7f050027
+int id iv_bg_blue 0x7f050028
+int id iv_bg_blue_select 0x7f050029
+int id iv_bg_green 0x7f05002a
+int id iv_bg_green_select 0x7f05002b
+int id iv_bg_red 0x7f05002c
+int id iv_bg_red_select 0x7f05002d
+int id iv_bg_white 0x7f05002e
+int id iv_bg_white_select 0x7f05002f
+int id iv_bg_yellow 0x7f050030
+int id iv_bg_yellow_select 0x7f050031
+int id iv_large_select 0x7f050032
+int id iv_lock 0x7f050033
+int id iv_medium_select 0x7f050034
+int id iv_small_select 0x7f050035
+int id iv_super_select 0x7f050036
+int id ll_font_large 0x7f050037
+int id ll_font_normal 0x7f050038
+int id ll_font_small 0x7f050039
+int id ll_font_super 0x7f05003a
+int id lock 0x7f05003b
+int id menu_alert 0x7f05003c
+int id menu_delete 0x7f05003d
+int id menu_delete_remind 0x7f05003e
+int id menu_export_text 0x7f05003f
+int id menu_font_size 0x7f050040
+int id menu_list_mode 0x7f050041
+int id menu_new_folder 0x7f050042
+int id menu_new_note 0x7f050043
+int id menu_revoke 0x7f050044
+int id menu_search 0x7f050045
+int id menu_send_to_desktop 0x7f050046
+int id menu_setting 0x7f050047
+int id menu_share 0x7f050048
+int id menu_sync 0x7f050049
+int id minute 0x7f05004a
+int id move 0x7f05004b
+int id navigation_bar 0x7f05004c
+int id note_bg_color_selector 0x7f05004d
+int id note_edit_list 0x7f05004e
+int id note_edit_view 0x7f05004f
+int id note_item 0x7f050050
+int id note_title 0x7f050051
+int id notes_list 0x7f050052
+int id prefenerece_sync_status_textview 0x7f050053
+int id preference_sync_button 0x7f050054
+int id selection_menu 0x7f050055
+int id sv_note_edit 0x7f050056
+int id tv_alert_date 0x7f050057
+int id tv_folder_name 0x7f050058
+int id tv_modified_date 0x7f050059
+int id tv_name 0x7f05005a
+int id tv_time 0x7f05005b
+int id tv_title 0x7f05005c
+int id tv_title_bar 0x7f05005d
+int id widget_bg_image 0x7f05005e
+int id widget_text 0x7f05005f
 int layout account_dialog_title 0x7f060000
 int layout add_account_text 0x7f060001
 int layout datetime_picker 0x7f060002
@@ -173,99 +228,103 @@ int string app_widget2x2 0x7f0a0005
 int string app_widget4x4 0x7f0a0006
 int string button_delete 0x7f0a0007
 int string call_record_folder_name 0x7f0a0008
-int string datetime_dialog_cancel 0x7f0a0009
-int string datetime_dialog_ok 0x7f0a000a
-int string delete_remind_time_message 0x7f0a000b
-int string error_note_empty_for_clock 0x7f0a000c
-int string error_note_empty_for_send_to_desktop 0x7f0a000d
-int string error_note_not_exist 0x7f0a000e
-int string error_sdcard_export 0x7f0a000f
-int string error_sdcard_unmounted 0x7f0a0010
-int string error_sync_cancelled 0x7f0a0011
-int string error_sync_internal 0x7f0a0012
-int string error_sync_network 0x7f0a0013
-int string failed_sdcard_export 0x7f0a0014
-int string file_name_txt_format 0x7f0a0015
-int string file_path 0x7f0a0016
-int string folder_exist 0x7f0a0017
-int string format_date_ymd 0x7f0a0018
-int string format_datetime_mdhm 0x7f0a0019
-int string format_exported_file_location 0x7f0a001a
-int string format_folder_files_count 0x7f0a001b
-int string format_move_notes_to_folder 0x7f0a001c
-int string hint_foler_name 0x7f0a001d
-int string info_note_enter_desktop 0x7f0a001e
-int string menu_alert 0x7f0a001f
-int string menu_create_folder 0x7f0a0020
-int string menu_delete 0x7f0a0021
-int string menu_deselect_all 0x7f0a0022
-int string menu_export_text 0x7f0a0023
-int string menu_folder_change_name 0x7f0a0024
-int string menu_folder_delete 0x7f0a0025
-int string menu_folder_view 0x7f0a0026
-int string menu_font_large 0x7f0a0027
-int string menu_font_normal 0x7f0a0028
-int string menu_font_size 0x7f0a0029
-int string menu_font_small 0x7f0a002a
-int string menu_font_super 0x7f0a002b
-int string menu_list_mode 0x7f0a002c
-int string menu_move 0x7f0a002d
-int string menu_move_parent_folder 0x7f0a002e
-int string menu_normal_mode 0x7f0a002f
-int string menu_remove_remind 0x7f0a0030
-int string menu_search 0x7f0a0031
-int string menu_select_all 0x7f0a0032
-int string menu_select_none 0x7f0a0033
-int string menu_select_title 0x7f0a0034
-int string menu_send_to_desktop 0x7f0a0035
-int string menu_setting 0x7f0a0036
-int string menu_share 0x7f0a0037
-int string menu_sync 0x7f0a0038
-int string menu_sync_cancel 0x7f0a0039
-int string menu_title_select_folder 0x7f0a003a
-int string note_alert_expired 0x7f0a003b
-int string note_link_email 0x7f0a003c
-int string note_link_other 0x7f0a003d
-int string note_link_tel 0x7f0a003e
-int string note_link_web 0x7f0a003f
-int string notealert_enter 0x7f0a0040
-int string notealert_ok 0x7f0a0041
-int string notelist_menu_new 0x7f0a0042
-int string notelist_string_info 0x7f0a0043
-int string preferences_account_summary 0x7f0a0044
-int string preferences_account_title 0x7f0a0045
-int string preferences_add_account 0x7f0a0046
-int string preferences_bg_random_appear_title 0x7f0a0047
-int string preferences_button_sync_cancel 0x7f0a0048
-int string preferences_button_sync_immediately 0x7f0a0049
-int string preferences_dialog_change_account_title 0x7f0a004a
-int string preferences_dialog_change_account_warn_msg 0x7f0a004b
-int string preferences_dialog_select_account_tips 0x7f0a004c
-int string preferences_dialog_select_account_title 0x7f0a004d
-int string preferences_last_sync_time 0x7f0a004e
-int string preferences_last_sync_time_format 0x7f0a004f
-int string preferences_menu_cancel 0x7f0a0050
-int string preferences_menu_change_account 0x7f0a0051
-int string preferences_menu_remove_account 0x7f0a0052
-int string preferences_title 0x7f0a0053
-int string preferences_toast_cannot_change_account 0x7f0a0054
-int string preferences_toast_success_set_accout 0x7f0a0055
-int string search 0x7f0a0056
-int string search_hint 0x7f0a0057
-int string search_label 0x7f0a0058
-int string search_setting_description 0x7f0a0059
-int string set_remind_time_message 0x7f0a005a
-int string success_sdcard_export 0x7f0a005b
-int string success_sync_account 0x7f0a005c
-int string sync_progress_init_list 0x7f0a005d
-int string sync_progress_login 0x7f0a005e
-int string sync_progress_syncing 0x7f0a005f
-int string ticker_cancel 0x7f0a0060
-int string ticker_fail 0x7f0a0061
-int string ticker_success 0x7f0a0062
-int string ticker_syncing 0x7f0a0063
-int string widget_havenot_content 0x7f0a0064
-int string widget_under_visit_mode 0x7f0a0065
+int string can_not_revoke 0x7f0a0009
+int string datetime_dialog_cancel 0x7f0a000a
+int string datetime_dialog_ok 0x7f0a000b
+int string delete_remind_time_message 0x7f0a000c
+int string error_note_empty_for_clock 0x7f0a000d
+int string error_note_empty_for_send_to_desktop 0x7f0a000e
+int string error_note_not_exist 0x7f0a000f
+int string error_sdcard_export 0x7f0a0010
+int string error_sdcard_unmounted 0x7f0a0011
+int string error_sync_cancelled 0x7f0a0012
+int string error_sync_internal 0x7f0a0013
+int string error_sync_network 0x7f0a0014
+int string failed_sdcard_export 0x7f0a0015
+int string file_name_txt_format 0x7f0a0016
+int string file_path 0x7f0a0017
+int string folder_exist 0x7f0a0018
+int string format_date_ymd 0x7f0a0019
+int string format_datetime_mdhm 0x7f0a001a
+int string format_exported_file_location 0x7f0a001b
+int string format_folder_files_count 0x7f0a001c
+int string format_move_notes_to_folder 0x7f0a001d
+int string have_not_input_anything 0x7f0a001e
+int string hint_foler_name 0x7f0a001f
+int string info_note_enter_desktop 0x7f0a0020
+int string menu_alert 0x7f0a0021
+int string menu_create_folder 0x7f0a0022
+int string menu_delete 0x7f0a0023
+int string menu_deselect_all 0x7f0a0024
+int string menu_export_text 0x7f0a0025
+int string menu_folder_change_name 0x7f0a0026
+int string menu_folder_delete 0x7f0a0027
+int string menu_folder_view 0x7f0a0028
+int string menu_font_large 0x7f0a0029
+int string menu_font_normal 0x7f0a002a
+int string menu_font_size 0x7f0a002b
+int string menu_font_small 0x7f0a002c
+int string menu_font_super 0x7f0a002d
+int string menu_list_mode 0x7f0a002e
+int string menu_move 0x7f0a002f
+int string menu_move_parent_folder 0x7f0a0030
+int string menu_normal_mode 0x7f0a0031
+int string menu_remove_remind 0x7f0a0032
+int string menu_revoke 0x7f0a0033
+int string menu_search 0x7f0a0034
+int string menu_select_all 0x7f0a0035
+int string menu_select_none 0x7f0a0036
+int string menu_select_title 0x7f0a0037
+int string menu_send_to_desktop 0x7f0a0038
+int string menu_setting 0x7f0a0039
+int string menu_share 0x7f0a003a
+int string menu_sync 0x7f0a003b
+int string menu_sync_cancel 0x7f0a003c
+int string menu_title_select_folder 0x7f0a003d
+int string note_alert_expired 0x7f0a003e
+int string note_link_email 0x7f0a003f
+int string note_link_other 0x7f0a0040
+int string note_link_tel 0x7f0a0041
+int string note_link_web 0x7f0a0042
+int string notealert_enter 0x7f0a0043
+int string notealert_ok 0x7f0a0044
+int string notelist_menu_new 0x7f0a0045
+int string notelist_string_info 0x7f0a0046
+int string preferences_account_summary 0x7f0a0047
+int string preferences_account_title 0x7f0a0048
+int string preferences_add_account 0x7f0a0049
+int string preferences_bg_random_appear_title 0x7f0a004a
+int string preferences_button_sync_cancel 0x7f0a004b
+int string preferences_button_sync_immediately 0x7f0a004c
+int string preferences_dialog_change_account_title 0x7f0a004d
+int string preferences_dialog_change_account_warn_msg 0x7f0a004e
+int string preferences_dialog_select_account_tips 0x7f0a004f
+int string preferences_dialog_select_account_title 0x7f0a0050
+int string preferences_last_sync_time 0x7f0a0051
+int string preferences_last_sync_time_format 0x7f0a0052
+int string preferences_menu_cancel 0x7f0a0053
+int string preferences_menu_change_account 0x7f0a0054
+int string preferences_menu_remove_account 0x7f0a0055
+int string preferences_title 0x7f0a0056
+int string preferences_toast_cannot_change_account 0x7f0a0057
+int string preferences_toast_success_set_accout 0x7f0a0058
+int string search 0x7f0a0059
+int string search_hint 0x7f0a005a
+int string search_label 0x7f0a005b
+int string search_setting_description 0x7f0a005c
+int string set_remind_time_message 0x7f0a005d
+int string success_sdcard_export 0x7f0a005e
+int string success_sync_account 0x7f0a005f
+int string sync_progress_init_list 0x7f0a0060
+int string sync_progress_login 0x7f0a0061
+int string sync_progress_syncing 0x7f0a0062
+int string ticker_cancel 0x7f0a0063
+int string ticker_fail 0x7f0a0064
+int string ticker_success 0x7f0a0065
+int string ticker_syncing 0x7f0a0066
+int string tips_of_revoke 0x7f0a0067
+int string widget_havenot_content 0x7f0a0068
+int string widget_under_visit_mode 0x7f0a0069
 int style HighlightTextAppearancePrimary 0x7f0b0000
 int style HighlightTextAppearanceSecondary 0x7f0b0001
 int style NoteActionBarStyle 0x7f0b0002
diff --git a/src/Notes-master/app/build/intermediates/runtime_symbol_list/debugAndroidTest/R.txt b/src/Notes-master/app/build/intermediates/runtime_symbol_list/debugAndroidTest/R.txt
new file mode 100644
index 0000000..e69de29
diff --git a/src/Notes-master/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt b/src/Notes-master/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt
new file mode 100644
index 0000000..c6d24ce
--- /dev/null
+++ b/src/Notes-master/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt
@@ -0,0 +1,343 @@
+net.micode.notes
+array format_for_exported_note
+array menu_share_ways
+array text_bg_color
+array text_color
+color primary_text_dark
+color secondary_text_dark
+color user_query_highlight
+dimen text_font_size_large
+dimen text_font_size_medium
+dimen text_font_size_normal
+dimen text_font_size_small
+dimen text_font_size_super
+drawable action_align_center
+drawable action_align_left
+drawable action_align_right
+drawable action_bold
+drawable action_italic
+drawable action_redo
+drawable action_underline
+drawable action_undo
+drawable bg_btn_set_color
+drawable bg_color_btn_mask
+drawable bg_text_color
+drawable call_record
+drawable check_box
+drawable clock
+drawable delete
+drawable dropdown_icon
+drawable edit_blue
+drawable edit_green
+drawable edit_red
+drawable edit_title_blue
+drawable edit_title_green
+drawable edit_title_red
+drawable edit_title_white
+drawable edit_title_yellow
+drawable edit_white
+drawable edit_yellow
+drawable font_large
+drawable font_normal
+drawable font_size_selector_bg
+drawable font_small
+drawable font_super
+drawable html
+drawable icon_app
+drawable indent
+drawable insert_bullets
+drawable insert_img
+drawable insert_numbers
+drawable link
+drawable list_background
+drawable list_blue_down
+drawable list_blue_middle
+drawable list_blue_single
+drawable list_blue_up
+drawable list_folder
+drawable list_footer_bg
+drawable list_green_down
+drawable list_green_middle
+drawable list_green_single
+drawable list_green_up
+drawable list_red_down
+drawable list_red_middle
+drawable list_red_single
+drawable list_red_up
+drawable list_white_down
+drawable list_white_middle
+drawable list_white_single
+drawable list_white_up
+drawable list_yellow_down
+drawable list_yellow_middle
+drawable list_yellow_single
+drawable list_yellow_up
+drawable lock
+drawable menu_delete
+drawable menu_move
+drawable new_note
+drawable new_note_normal
+drawable new_note_pressed
+drawable new_set_bg
+drawable note_edit_color_selector_panel
+drawable notification
+drawable outdent
+drawable search_result
+drawable selected
+drawable strike_through
+drawable subscript
+drawable superscript
+drawable text_color
+drawable title_alert
+drawable title_bar_bg
+drawable unlock
+drawable widget_2x_blue
+drawable widget_2x_green
+drawable widget_2x_red
+drawable widget_2x_white
+drawable widget_2x_yellow
+drawable widget_4x_blue
+drawable widget_4x_green
+drawable widget_4x_red
+drawable widget_4x_white
+drawable widget_4x_yellow
+id account_dialog_subtitle
+id account_dialog_title
+id action_align_center
+id action_align_left
+id action_align_right
+id action_bg_color
+id action_bold
+id action_heading1
+id action_heading2
+id action_heading3
+id action_heading4
+id action_heading5
+id action_heading6
+id action_indent
+id action_insert_bullets
+id action_insert_checkbox
+id action_insert_numbers
+id action_italic
+id action_outdent
+id action_redo
+id action_select_all
+id action_strikethrough
+id action_subscript
+id action_superscript
+id action_txt_color
+id action_underline
+id action_undo
+id amPm
+id btn_new_note
+id btn_set_bg_color
+id cb_edit_item
+id date
+id delete
+id et_edit_text
+id et_foler_name
+id font_size_selector
+id hour
+id image_of_lock
+id image_of_unlock
+id iv_alert_icon
+id iv_bg_blue
+id iv_bg_blue_select
+id iv_bg_green
+id iv_bg_green_select
+id iv_bg_red
+id iv_bg_red_select
+id iv_bg_white
+id iv_bg_white_select
+id iv_bg_yellow
+id iv_bg_yellow_select
+id iv_large_select
+id iv_lock
+id iv_medium_select
+id iv_small_select
+id iv_super_select
+id ll_font_large
+id ll_font_normal
+id ll_font_small
+id ll_font_super
+id lock
+id menu_alert
+id menu_delete
+id menu_delete_remind
+id menu_export_text
+id menu_font_size
+id menu_list_mode
+id menu_new_folder
+id menu_new_note
+id menu_revoke
+id menu_search
+id menu_send_to_desktop
+id menu_setting
+id menu_share
+id menu_sync
+id minute
+id move
+id navigation_bar
+id note_bg_color_selector
+id note_edit_list
+id note_edit_view
+id note_item
+id note_title
+id notes_list
+id prefenerece_sync_status_textview
+id preference_sync_button
+id selection_menu
+id sv_note_edit
+id tv_alert_date
+id tv_folder_name
+id tv_modified_date
+id tv_name
+id tv_time
+id tv_title
+id tv_title_bar
+id widget_bg_image
+id widget_text
+layout account_dialog_title
+layout add_account_text
+layout datetime_picker
+layout dialog_edit_text
+layout folder_list_item
+layout note_edit
+layout note_edit_list_item
+layout note_item
+layout note_list
+layout note_list_dropdown_menu
+layout note_list_footer
+layout settings_header
+layout widget_2x
+layout widget_4x
+menu call_note_edit
+menu call_record_folder
+menu note_edit
+menu note_list
+menu note_list_dropdown
+menu note_list_options
+menu sub_folder
+plurals search_results_title
+raw introduction
+string alert_message_delete_folder
+string alert_message_delete_note
+string alert_message_delete_notes
+string alert_title_delete
+string app_name
+string app_widget2x2
+string app_widget4x4
+string button_delete
+string call_record_folder_name
+string can_not_revoke
+string datetime_dialog_cancel
+string datetime_dialog_ok
+string delete_remind_time_message
+string error_note_empty_for_clock
+string error_note_empty_for_send_to_desktop
+string error_note_not_exist
+string error_sdcard_export
+string error_sdcard_unmounted
+string error_sync_cancelled
+string error_sync_internal
+string error_sync_network
+string failed_sdcard_export
+string file_name_txt_format
+string file_path
+string folder_exist
+string format_date_ymd
+string format_datetime_mdhm
+string format_exported_file_location
+string format_folder_files_count
+string format_move_notes_to_folder
+string have_not_input_anything
+string hint_foler_name
+string info_note_enter_desktop
+string menu_alert
+string menu_create_folder
+string menu_delete
+string menu_deselect_all
+string menu_export_text
+string menu_folder_change_name
+string menu_folder_delete
+string menu_folder_view
+string menu_font_large
+string menu_font_normal
+string menu_font_size
+string menu_font_small
+string menu_font_super
+string menu_list_mode
+string menu_move
+string menu_move_parent_folder
+string menu_normal_mode
+string menu_remove_remind
+string menu_revoke
+string menu_search
+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_sync
+string menu_sync_cancel
+string menu_title_select_folder
+string note_alert_expired
+string note_link_email
+string note_link_other
+string note_link_tel
+string note_link_web
+string notealert_enter
+string notealert_ok
+string notelist_menu_new
+string notelist_string_info
+string preferences_account_summary
+string preferences_account_title
+string preferences_add_account
+string preferences_bg_random_appear_title
+string preferences_button_sync_cancel
+string preferences_button_sync_immediately
+string preferences_dialog_change_account_title
+string preferences_dialog_change_account_warn_msg
+string preferences_dialog_select_account_tips
+string preferences_dialog_select_account_title
+string preferences_last_sync_time
+string preferences_last_sync_time_format
+string preferences_menu_cancel
+string preferences_menu_change_account
+string preferences_menu_remove_account
+string preferences_title
+string preferences_toast_cannot_change_account
+string preferences_toast_success_set_accout
+string search
+string search_hint
+string search_label
+string search_setting_description
+string set_remind_time_message
+string success_sdcard_export
+string success_sync_account
+string sync_progress_init_list
+string sync_progress_login
+string sync_progress_syncing
+string ticker_cancel
+string ticker_fail
+string ticker_success
+string ticker_syncing
+string tips_of_revoke
+string widget_havenot_content
+string widget_under_visit_mode
+style HighlightTextAppearancePrimary
+style HighlightTextAppearanceSecondary
+style NoteActionBarStyle
+style NoteTheme
+style TextAppearanceLarge
+style TextAppearanceMedium
+style TextAppearanceNormal
+style TextAppearancePrimaryItem
+style TextAppearanceSecondaryItem
+style TextAppearanceSuper
+style TextAppearanceUnderMenuIcon
+xml preferences
+xml searchable
+xml widget_2x_info
+xml widget_4x_info
diff --git a/src/Notes-master/app/build/outputs/apk/debug/app-debug.apk b/src/Notes-master/app/build/outputs/apk/debug/app-debug.apk
index 3166e77..1fa28ea 100644
Binary files a/src/Notes-master/app/build/outputs/apk/debug/app-debug.apk and b/src/Notes-master/app/build/outputs/apk/debug/app-debug.apk differ
diff --git a/src/Notes-master/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/Notes-master/app/build/outputs/logs/manifest-merger-debug-report.txt
index 23acdde..a0eac77 100644
--- a/src/Notes-master/app/build/outputs/logs/manifest-merger-debug-report.txt
+++ b/src/Notes-master/app/build/outputs/logs/manifest-merger-debug-report.txt
@@ -1,12 +1,13 @@
 -- Merging decision tree log ---
 manifest
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:18:1-148:12
-INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml:18:1-148:12
-INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml:18:1-148:12
-INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml:18:1-148:12
-INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml:18:1-148:12
-INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml:18:1-148:12
-INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml:18:1-148:12
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
+MERGED from [jp.wasabeef:richeditor-android:1.2.2] C:\Users\59866\.gradle\caches\transforms-2\files-2.1\effe5a587e2d2e96d8d7c6f547b1a0bf\richeditor-android-1.2.2\AndroidManifest.xml:2:1-12:12
+INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
 	package
 		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:19:5-31
 		INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml
@@ -21,208 +22,212 @@ INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml:18:1-148:12
 		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:20:5-28
 		INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml
 		INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml
+uses-permission#android.permission.DOWNLOAD_WITHOUT_NOTIFICATION
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:23:5-88
+	android:name
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:23:22-85
 uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:23:5-81
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:24:5-81
 	android:name
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:23:22-78
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:24:22-78
 uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:24:5-88
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:25:5-88
 	android:name
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:24:22-85
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:25:22-85
 uses-permission#android.permission.INTERNET
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:25:5-67
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:26:5-67
 	android:name
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:25:22-64
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:26:22-64
 uses-permission#android.permission.READ_CONTACTS
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:26:5-72
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:27:5-72
 	android:name
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:26:22-69
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:27:22-69
 uses-permission#android.permission.MANAGE_ACCOUNTS
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:27:5-74
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:28:5-74
 	android:name
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:27:22-71
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:28:22-71
 uses-permission#android.permission.AUTHENTICATE_ACCOUNTS
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:28:5-80
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:29:5-80
 	android:name
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:28:22-77
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:29:22-77
 uses-permission#android.permission.GET_ACCOUNTS
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:29:5-71
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:30:5-71
 	android:name
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:29:22-68
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:30:22-68
 uses-permission#android.permission.USE_CREDENTIALS
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:30:5-74
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:31:5-74
 	android:name
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:30:22-71
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:31:22-71
 uses-permission#android.permission.RECEIVE_BOOT_COMPLETED
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:31:5-81
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:32:5-81
 	android:name
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:31:22-78
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:32:22-78
 application
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:33:5-147:19
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:35:5-149:19
 	android:label
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:35:9-41
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:37:9-30
 	android:icon
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:34:9-42
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:36:9-42
 activity#net.micode.notes.ui.NotesListActivity
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:36:9-49:20
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:38:9-51:20
 	android:label
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:39:13-45
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:41:13-45
 	android:launchMode
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:40:13-43
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:42:13-43
 	android:windowSoftInputMode
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:43:13-52
-	android:uiOptions
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:42:13-57
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:45:13-52
 	android:configChanges
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:38:13-74
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:40:13-74
 	android:theme
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:41:13-45
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:43:13-45
 	android:name
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:37:13-49
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:39:13-49
 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:45:13-48:29
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:47:13-50:29
 action#android.intent.action.MAIN
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:46:17-69
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:48:17-69
 	android:name
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:46:25-66
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:48:25-66
 category#android.intent.category.LAUNCHER
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:47:17-77
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:49:17-77
 	android:name
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:47:27-74
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:49:27-74
 activity#net.micode.notes.ui.NoteEditActivity
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:51:9-79:20
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:53:9-81:20
 	android:launchMode
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:54:13-43
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:56:13-43
 	android:configChanges
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:53:13-74
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:55:13-74
 	android:theme
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:55:13-45
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:57:13-45
 	android:name
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:52:13-48
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:54:13-48
 intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:57:13-62:29
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:59:13-64:29
 action#android.intent.action.VIEW
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:58:17-69
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:60:17-69
 	android:name
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:58:25-66
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:60:25-66
 category#android.intent.category.DEFAULT
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:59:17-76
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:61:17-76
 	android:name
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:59:27-73
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:61:27-73
 data
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:60:17-78
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:62:17-78
 	android:mimeType
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:60:23-75
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:62:23-75
 intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:64:13-69:29
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:66:13-71:29
 action#android.intent.action.INSERT_OR_EDIT
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:65:17-79
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:67:17-79
 	android:name
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:65:25-76
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:67:25-76
 intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:71:13-74:29
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:73:13-76:29
 action#android.intent.action.SEARCH
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:72:17-71
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:74:17-71
 	android:name
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:72:25-68
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:74:25-68
 meta-data#android.app.searchable
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:76:13-78:54
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:78:13-80:54
 	android:resource
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:78:17-51
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:80:17-51
 	android:name
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:77:17-54
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:79:17-54
 provider#net.micode.notes.data.NotesProvider
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:81:9-84:43
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:83:9-86:43
 	android:authorities
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:83:13-47
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:85:13-47
 	android:multiprocess
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:84:13-40
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:86:13-40
 	android:name
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:82:13-63
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:84:13-63
 receiver#net.micode.notes.widget.NoteWidgetProvider_2x
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:86:9-98:20
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:88:9-100:20
 	android:label
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:88:13-50
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:90:13-50
 	android:name
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:87:13-57
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:89:13-57
 intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:89:13-93:29
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29
 action#android.appwidget.action.APPWIDGET_UPDATE
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:90:17-84
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:92:17-84
 	android:name
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:90:25-81
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:92:25-81
 action#android.appwidget.action.APPWIDGET_DELETED
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:91:17-85
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:93:17-85
 	android:name
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:91:25-82
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:93:25-82
 action#android.intent.action.PRIVACY_MODE_CHANGED
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:92:17-85
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:94:17-85
 	android:name
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:92:25-82
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:94:25-82
 meta-data#android.appwidget.provider
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:95:13-97:58
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58
 	android:resource
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:97:17-55
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:99:17-55
 	android:name
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:96:17-58
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:98:17-58
 receiver#net.micode.notes.widget.NoteWidgetProvider_4x
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:99:9-112:20
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:101:9-114:20
 	android:label
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:101:13-50
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:103:13-50
 	android:name
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:100:13-57
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:102:13-57
 receiver#net.micode.notes.ui.AlarmInitReceiver
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:114:9-118:20
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:116:9-120:20
 	android:name
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:114:19-55
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:116:19-55
 intent-filter#action:name:android.intent.action.BOOT_COMPLETED
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:115:13-117:29
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:117:13-119:29
 action#android.intent.action.BOOT_COMPLETED
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:116:17-79
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:118:17-79
 	android:name
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:116:25-76
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:118:25-76
 receiver#net.micode.notes.ui.AlarmReceiver
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:120:9-123:20
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:122:9-125:20
 	android:process
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:122:13-38
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:124:13-38
 	android:name
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:121:13-61
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:123:13-61
 activity#net.micode.notes.ui.AlarmAlertActivity
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:125:9-130:20
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:127:9-132:20
 	android:label
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:127:13-45
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:129:13-45
 	android:launchMode
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:128:13-48
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:130:13-48
 	android:theme
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:129:13-75
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:131:13-75
 	android:name
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:126:13-50
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:128:13-50
 activity#net.micode.notes.ui.NotesPreferenceActivity
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:132:9-137:20
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:134:9-139:20
 	android:label
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:134:13-54
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:136:13-54
 	android:launchMode
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:135:13-43
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:137:13-43
 	android:theme
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:136:13-60
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:138:13-60
 	android:name
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:133:13-71
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:135:13-71
 service#net.micode.notes.gtask.remote.GTaskSyncService
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:139:9-142:19
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:141:9-144:19
 	android:exported
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:141:13-37
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:143:13-37
 	android:name
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:140:13-74
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:142:13-74
 meta-data#android.app.default_searchable
-ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:144:9-146:52
+ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:146:9-148:52
 	android:value
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:146:13-49
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:148:13-49
 	android:name
-		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:145:13-58
+		ADDED from D:\Notes-master\app\src\main\AndroidManifest.xml:147:13-58
 uses-sdk
 INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml reason: use-sdk injection requested
 INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml
 INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml
+MERGED from [jp.wasabeef:richeditor-android:1.2.2] C:\Users\59866\.gradle\caches\transforms-2\files-2.1\effe5a587e2d2e96d8d7c6f547b1a0bf\richeditor-android-1.2.2\AndroidManifest.xml:8:5-10:41
+MERGED from [jp.wasabeef:richeditor-android:1.2.2] C:\Users\59866\.gradle\caches\transforms-2\files-2.1\effe5a587e2d2e96d8d7c6f547b1a0bf\richeditor-android-1.2.2\AndroidManifest.xml:8:5-10:41
 INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml
 INJECTED from D:\Notes-master\app\src\main\AndroidManifest.xml
 	android:targetSdkVersion
diff --git a/src/Notes-master/app/src/main/AndroidManifest.xml b/src/Notes-master/app/src/main/AndroidManifest.xml
index 2b77297..37b4e87 100644
--- a/src/Notes-master/app/src/main/AndroidManifest.xml
+++ b/src/Notes-master/app/src/main/AndroidManifest.xml
@@ -20,6 +20,7 @@
     android:versionCode="1"
     android:versionName="0.1" >
 
+    <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -30,16 +31,17 @@
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
+
     <application
         android:icon="@drawable/icon_app"
-        android:label="@string/app_name" >
+        android:label="Notes" >
         <activity
             android:name=".ui.NotesListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/app_name"
             android:launchMode="singleTop"
             android:theme="@style/NoteTheme"
-            android:uiOptions="splitActionBarWhenNarrow"
+
             android:windowSoftInputMode="adjustPan" >
 
             <intent-filter>
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/data/Notes.java b/src/Notes-master/app/src/main/java/net/micode/notes/data/Notes.java
index f240604..83c02f9 100644
--- a/src/Notes-master/app/src/main/java/net/micode/notes/data/Notes.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/data/Notes.java
@@ -62,6 +62,11 @@ public class Notes {
     public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data");
 
     public interface NoteColumns {
+        /**
+         * The code for note
+         * <P> Type:Text</P>
+         */
+        public static final String PASSWORD = "password";
         /**
          * The unique ID for a row
          * <P> Type: INTEGER (long) </P>
@@ -121,6 +126,7 @@ public class Notes {
          * For text note, it doesn't has attachment, for multi-media
          * note, it has at least one attachment
          * <P> Type: INTEGER </P>
+         * 是否有附件
          */
         public static final String HAS_ATTACHMENT = "has_attachment";
 
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
index ffe5d57..a3cc9d9 100644
--- a/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
@@ -15,17 +15,20 @@
  */
 
 package net.micode.notes.data;
-
+import android.content.Intent;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.util.Log;
+import android.database.Cursor;
+import android.widget.EditText;
 
 import net.micode.notes.data.Notes.DataColumns;
 import net.micode.notes.data.Notes.DataConstants;
 import net.micode.notes.data.Notes.NoteColumns;
-
+import net.micode.notes.ui.NoteEditActivity;
+import net.micode.notes.ui.NotesListActivity;
 
 public class NotesDatabaseHelper extends SQLiteOpenHelper {
     private static final String DB_NAME = "note.db";
@@ -39,7 +42,6 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
     }
 
     private static final String TAG = "NotesDatabaseHelper";
-
     private static NotesDatabaseHelper mInstance;
 
     private static final String CREATE_NOTE_TABLE_SQL =
@@ -60,7 +62,8 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
             NoteColumns.LOCAL_MODIFIED + " INTEGER NOT NULL DEFAULT 0," +
             NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +
             NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," +
-            NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" +
+            NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0," +
+            NoteColumns.PASSWORD+" TEXT NOT NULL DEFAULT 1" +
         ")";
 
     private static final String CREATE_DATA_TABLE_SQL =
@@ -322,6 +325,11 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
             oldVersion++;
         }
 
+        if(oldVersion == 4){
+            upgradeToV5(db);
+            oldVersion++;
+        }
+
         if (reCreateTriggers) {
             reCreateNoteTableTriggers(db);
             reCreateDataTableTriggers(db);
@@ -359,4 +367,25 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
         db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION
                 + " INTEGER NOT NULL DEFAULT 0");
     }
+    private void upgradeToV5(SQLiteDatabase db) {
+        db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.PASSWORD
+                + " INTEGER NOT NULL DEFAULT ''");
+    }
+    public void doResearch(String queryString)
+    {
+        Cursor cursor = null;
+        SQLiteDatabase db = mInstance.getReadableDatabase();
+        String query_sql_string = "select * from " + TABLE.DATA + " where content like " + "'%"+ queryString + "%'";
+        Log.i(TAG,query_sql_string);
+        cursor = db.rawQuery(query_sql_string,null);
+        if(cursor!=null)
+        {
+            while(cursor.moveToNext())
+            {
+                String content = cursor.getString(cursor.getColumnIndex("content"));
+                Log.i(TAG, content);
+            }
+        }
+        cursor.close();
+    }
 }
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java b/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java
index edb0a60..8d15228 100644
--- a/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java
@@ -80,14 +80,16 @@ public class NotesProvider extends ContentProvider {
         + " AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE;
 
     @Override
-    public boolean onCreate() {
+    public boolean onCreate()
+    {
         mHelper = NotesDatabaseHelper.getInstance(getContext());
         return true;
     }
 
     @Override
     public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
-            String sortOrder) {
+            String sortOrder)
+    {
         Cursor c = null;
         SQLiteDatabase db = mHelper.getReadableDatabase();
         String id = null;
@@ -148,7 +150,8 @@ public class NotesProvider extends ContentProvider {
     }
 
     @Override
-    public Uri insert(Uri uri, ContentValues values) {
+    public Uri insert(Uri uri, ContentValues values)
+    {
         SQLiteDatabase db = mHelper.getWritableDatabase();
         long dataId = 0, noteId = 0, insertedId = 0;
         switch (mMatcher.match(uri)) {
@@ -182,7 +185,8 @@ public class NotesProvider extends ContentProvider {
     }
 
     @Override
-    public int delete(Uri uri, String selection, String[] selectionArgs) {
+    public int delete(Uri uri, String selection, String[] selectionArgs)
+    {
         int count = 0;
         String id = null;
         SQLiteDatabase db = mHelper.getWritableDatabase();
@@ -228,7 +232,8 @@ public class NotesProvider extends ContentProvider {
     }
 
     @Override
-    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs)
+    {
         int count = 0;
         String id = null;
         SQLiteDatabase db = mHelper.getWritableDatabase();
@@ -267,11 +272,13 @@ public class NotesProvider extends ContentProvider {
         return count;
     }
 
-    private String parseSelection(String selection) {
+    private String parseSelection(String selection)
+    {
         return (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : "");
     }
 
-    private void increaseNoteVersion(long id, String selection, String[] selectionArgs) {
+    private void increaseNoteVersion(long id, String selection, String[] selectionArgs)
+    {
         StringBuilder sql = new StringBuilder(120);
         sql.append("UPDATE ");
         sql.append(TABLE.NOTE);
@@ -297,7 +304,8 @@ public class NotesProvider extends ContentProvider {
     }
 
     @Override
-    public String getType(Uri uri) {
+    public String getType(Uri uri)
+    {
         // TODO Auto-generated method stub
         return null;
     }
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Task.java b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Task.java
index 6a19454..4ef6702 100644
--- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Task.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Task.java
@@ -180,8 +180,30 @@ public class Task extends Node {
                 || !js.has(GTaskStringUtils.META_HEAD_DATA)) {
             Log.w(TAG, "setContentByLocalJSON: nothing is avaiable");
         }
+        else {
+            try {
+                JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
+                JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA);
 
-        try {
+                if (note.getInt(NoteColumns.TYPE) != Notes.TYPE_NOTE) {
+                    Log.e(TAG, "invalid type");
+                    return;
+                }
+
+                for (int i = 0; i < dataArray.length(); i++) {
+                    JSONObject data = dataArray.getJSONObject(i);
+                    if (TextUtils.equals(data.getString(DataColumns.MIME_TYPE), DataConstants.NOTE)) {
+                        setName(data.getString(DataColumns.CONTENT));
+                        break;
+                    }
+                }
+
+            } catch (JSONException e) {
+                Log.e(TAG, e.toString());
+                e.printStackTrace();
+            }
+        }
+        /**try {
             JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
             JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA);
 
@@ -201,7 +223,7 @@ public class Task extends Node {
         } catch (JSONException e) {
             Log.e(TAG, e.toString());
             e.printStackTrace();
-        }
+        }*/
     }
 
     public JSONObject getLocalJSONFromContent() {
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/TaskList.java b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
index 4ea21c5..cc36878 100644
--- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
@@ -133,7 +133,31 @@ public class TaskList extends Node {
         if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE)) {
             Log.w(TAG, "setContentByLocalJSON: nothing is avaiable");
         }
-
+        //lcp
+        else {
+            try {
+                JSONObject folder = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
+
+                if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) {
+                    String name = folder.getString(NoteColumns.SNIPPET);
+                    setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + name);
+                } else if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) {
+                    if (folder.getLong(NoteColumns.ID) == Notes.ID_ROOT_FOLDER)
+                        setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT);
+                    else if (folder.getLong(NoteColumns.ID) == Notes.ID_CALL_RECORD_FOLDER)
+                        setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX
+                                + GTaskStringUtils.FOLDER_CALL_NOTE);
+                    else
+                        Log.e(TAG, "invalid system folder");
+                } else {
+                    Log.e(TAG, "error type");
+                }
+            } catch (JSONException e) {
+                Log.e(TAG, e.toString());
+                e.printStackTrace();
+            }
+        }
+        /**
         try {
             JSONObject folder = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
 
@@ -154,7 +178,7 @@ public class TaskList extends Node {
         } catch (JSONException e) {
             Log.e(TAG, e.toString());
             e.printStackTrace();
-        }
+        }*/
     }
 
     public JSONObject getLocalJSONFromContent() {
@@ -203,10 +227,12 @@ public class TaskList extends Node {
                 if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) {
                     // local modification only
                     return SYNC_ACTION_UPDATE_REMOTE;
-                } else {
+                }
+                //lcp
+                /**else {
                     // for folder conflicts, just apply local modification
                     return SYNC_ACTION_UPDATE_REMOTE;
-                }
+                }*/
             }
         } catch (Exception e) {
             Log.e(TAG, e.toString());
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
index c67dfdf..87170e3 100644
--- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
@@ -112,7 +112,7 @@ public class GTaskClient {
     public boolean login(Activity activity) {
         // we suppose that the cookie would expire after 5 minutes
         // then we need to re-login
-        final long interval = 1000 * 60 * 5;
+        final long interval = 1000L * 60L * 5L;
         if (mLastLoginTime + interval < System.currentTimeMillis()) {
             mLoggedin = false;
         }
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
index d2b4082..3dae666 100644
--- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
@@ -38,10 +38,12 @@ import net.micode.notes.gtask.exception.NetworkFailureException;
 import net.micode.notes.tool.DataUtils;
 import net.micode.notes.tool.GTaskStringUtils;
 
+import org.apache.http.ContentTooLongException;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.io.SyncFailedException;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -331,6 +333,7 @@ public class GTaskManager {
         while (iter.hasNext()) {
             Map.Entry<String, Node> entry = iter.next();
             node = entry.getValue();
+            //Bug:node might be null
             doContentSync(Node.SYNC_ACTION_ADD_LOCAL, node, null);
         }
 
@@ -466,10 +469,15 @@ public class GTaskManager {
             Map.Entry<String, TaskList> entry = iter.next();
             gid = entry.getKey();
             node = entry.getValue();
-            if (mGTaskHashMap.containsKey(gid)) {
-                mGTaskHashMap.remove(gid);
-                doContentSync(Node.SYNC_ACTION_ADD_LOCAL, node, null);
+            if(node!=null)
+            {
+                if (mGTaskHashMap.containsKey(gid)) {
+                    mGTaskHashMap.remove(gid);
+                    //Bug:"NullPointerException" will be thrown when invoking method "doContentSync()".
+                    doContentSync(Node.SYNC_ACTION_ADD_LOCAL, node, null);
+                }
             }
+
         }
 
         if (!mCancelled)
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java b/src/Notes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java
index be081e4..65c7433 100644
--- a/src/Notes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java
@@ -60,6 +60,7 @@ public class WorkingNote {
 
     private boolean mIsDeleted;
 
+
     private NoteSettingChangedListener mNoteSettingStatusListener;
 
     public static final String[] DATA_PROJECTION = new String[] {
@@ -288,6 +289,19 @@ public class WorkingNote {
         }
     }
 
+    /**
+     * 新增方法：设置密码
+     * @param password
+     */
+    public void setPassword(String password){
+        mNote.setNoteValue(NoteColumns.PASSWORD,String.valueOf(password));
+    }
+    /**
+     * 新增方法：移除密码
+     */
+    public void removePassword(){
+        mNote.setNoteValue(NoteColumns.PASSWORD,"");
+    }
     public void convertToCallNote(String phoneNumber, long callDate) {
         mNote.setCallData(CallNote.CALL_DATE, String.valueOf(callDate));
         mNote.setCallData(CallNote.PHONE_NUMBER, phoneNumber);
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/tool/BackupUtils.java b/src/Notes-master/app/src/main/java/net/micode/notes/tool/BackupUtils.java
index 39f6ec4..9df0b5d 100644
--- a/src/Notes-master/app/src/main/java/net/micode/notes/tool/BackupUtils.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/tool/BackupUtils.java
@@ -16,8 +16,10 @@
 
 package net.micode.notes.tool;
 
+import android.annotation.TargetApi;
 import android.content.Context;
 import android.database.Cursor;
+import android.os.Build;
 import android.os.Environment;
 import android.text.TextUtils;
 import android.text.format.DateFormat;
@@ -285,6 +287,7 @@ public class BackupUtils {
         /**
          * Get a print stream pointed to the file {@generateExportedTextFile}
          */
+        @TargetApi(Build.VERSION_CODES.KITKAT)
         private PrintStream getExportToTextPrintStream() {
             File file = generateFileMountedOnSDcard(mContext, R.string.file_path,
                     R.string.file_name_txt_format);
@@ -295,6 +298,7 @@ public class BackupUtils {
             mFileName = file.getName();
             mFileDirectory = mContext.getString(R.string.file_path);
             PrintStream ps = null;
+            /**
             try {
                 FileOutputStream fos = new FileOutputStream(file);
                 ps = new PrintStream(fos);
@@ -304,6 +308,16 @@ public class BackupUtils {
             } catch (NullPointerException e) {
                 e.printStackTrace();
                 return null;
+            }*/
+            try(FileOutputStream fos = new FileOutputStream(file);)
+            {
+                ps = new PrintStream(fos);
+            } catch (FileNotFoundException e) {
+                e.printStackTrace();
+                return null;
+            } catch (IOException e) {
+                e.printStackTrace();
+                return null;
             }
             return ps;
         }
@@ -328,7 +342,11 @@ public class BackupUtils {
                 filedir.mkdir();
             }
             if (!file.exists()) {
-                file.createNewFile();
+                //lcp
+                //file.createNewFile();
+                if(!file.createNewFile()) {
+                    Log.e(TAG,"create new file error");
+                }
             }
             return file;
         } catch (SecurityException e) {
@@ -339,6 +357,7 @@ public class BackupUtils {
 
         return null;
     }
+
 }
 
 
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java b/src/Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
index 2c47ba4..38f0a4b 100644
--- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
@@ -77,7 +77,9 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener
             DateUtils.FORMAT_SHOW_YEAR |
             DateUtils.FORMAT_SHOW_DATE |
             DateUtils.FORMAT_SHOW_TIME;
-        flag |= mIs24HourView ? DateUtils.FORMAT_24HOUR : DateUtils.FORMAT_24HOUR;
+        //flag |= mIs24HourView ? DateUtils.FORMAT_24HOUR : DateUtils.FORMAT_24HOUR;
+        //lcp
+        flag |=DateUtils.FORMAT_24HOUR;
         setTitle(DateUtils.formatDateTime(this.getContext(), date, flag));
     }
 
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/DropdownMenu.java b/src/Notes-master/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
index 613dc74..988f591 100644
--- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
@@ -28,34 +28,54 @@ import android.widget.PopupMenu.OnMenuItemClickListener;
 import net.micode.notes.R;
 
 public class DropdownMenu {
-    private Button mButton;
-    private PopupMenu mPopupMenu;
-    private Menu mMenu;
-
+    private Button mButton;//按钮
+    private PopupMenu mPopupMenu;//跳出菜单控件
+    private Menu mMenu;//菜单
+    /**功能描述：将菜单私有变量实例化（初始化）
+     * 函数参数：上下文context，按钮button，实例化的menu的id
+     * 实现：实例化button，设置背景资源
+     */
     public DropdownMenu(Context context, Button button, int menuId) {
         mButton = button;
-        mButton.setBackgroundResource(R.drawable.dropdown_icon);
-        mPopupMenu = new PopupMenu(context, mButton);
+        mButton.setBackgroundResource(R.drawable.dropdown_icon);//设置背景
+        mPopupMenu = new PopupMenu(context, mButton);//跳出菜单控件
         mMenu = mPopupMenu.getMenu();
-        mPopupMenu.getMenuInflater().inflate(menuId, mMenu);
-        mButton.setOnClickListener(new OnClickListener() {
-            public void onClick(View v) {
+        //menuID是要加载的布局文件的ID，mMenu是要填充的菜单
+        mPopupMenu.getMenuInflater().inflate(menuId, mMenu);//实例化Menu目录下Menu布局文件，指定一个xml资源去填充
+        mButton.setOnClickListener(new OnClickListener()//设置点击监听器
+        {
+            public void onClick(View v)
+            {
+                //显示 menu
                 mPopupMenu.show();
             }
         });
     }
 
-    public void setOnDropdownMenuItemClickListener(OnMenuItemClickListener listener) {
-        if (mPopupMenu != null) {
+    /**功能描述：设置菜单点击监听器
+     * 函数参数：菜单项点击事件监听器
+     * 实现：如果弹出菜单有效，利用setOnMenuItemClickListener设置菜单点击事件监听器
+     */
+    public void setOnDropdownMenuItemClickListener(OnMenuItemClickListener listener)
+    {
+        if (mPopupMenu != null)
+        {
             mPopupMenu.setOnMenuItemClickListener(listener);
         }
     }
-
+    /**功能描述：根据菜单中的项目的id查找项目
+     * 函数参数：菜单item的id
+     * 实现：调用父类的findItem函数，返回找到的项目
+     */
     public MenuItem findItem(int id) {
         return mMenu.findItem(id);
     }
-
-    public void setTitle(CharSequence title) {
+    /**功能描述：设置按钮的文本信息
+     * 函数参数：接口CharSequence的实例对象title，其实就是描述了一个string对象
+     * 实现：调用setText函数，传入title作为参数
+     */
+    public void setTitle(CharSequence title)
+    {
         mButton.setText(title);
     }
 }
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
index 96a9ff8..778a459 100644
--- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
@@ -19,6 +19,8 @@ package net.micode.notes.ui;
 import android.app.Activity;
 import android.app.AlarmManager;
 import android.app.AlertDialog;
+import android.app.AlertDialog.Builder;
+import android.app.Dialog;
 import android.app.PendingIntent;
 import android.app.SearchManager;
 import android.appwidget.AppWidgetManager;
@@ -27,6 +29,7 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.graphics.Color;
 import android.graphics.Paint;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
@@ -43,10 +46,13 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.WindowManager;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.EditText;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -64,6 +70,7 @@ import net.micode.notes.ui.DateTimePickerDialog.OnDateTimeSetListener;
 import net.micode.notes.ui.NoteEditText.OnTextViewChangeListener;
 import net.micode.notes.widget.NoteWidgetProvider_2x;
 import net.micode.notes.widget.NoteWidgetProvider_4x;
+import net.micode.notes.data.NotesDatabaseHelper;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -71,6 +78,8 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import jp.wasabeef.richeditor.RichEditor;
+
 
 public class NoteEditActivity extends Activity implements OnClickListener,
         NoteSettingChangedListener, OnTextViewChangeListener {
@@ -82,6 +91,10 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         public TextView tvAlertDate;
 
         public ImageView ibSetBgColor;
+
+        public ImageView ibSetLock;
+
+        public ImageView ibSetUnLock;
     }
 
     private static final Map<Integer, Integer> sBgSelectorBtnsMap = new HashMap<Integer, Integer>();
@@ -128,27 +141,39 @@ public class NoteEditActivity extends Activity implements OnClickListener,
 
     private View mFontSizeSelector;
 
-    private EditText mNoteEditor;
+    /**
+     * 修改代码：富文本编辑器
+     */
+    private RichEditor mNoteEditor;
+    //private EditText mNoteEditor;
 
     private View mNoteEditorPanel;
 
     private WorkingNote mWorkingNote;
 
     private SharedPreferences mSharedPrefs;
+
     private int mFontSizeId;
 
+    /**便签文本字符数量*/
+    private int mNoteLength;
+
     private static final String PREFERENCE_FONT_SIZE = "pref_font_size";
 
     private static final int SHORTCUT_ICON_TITLE_MAX_LEN = 10;
 
     public static final String TAG_CHECKED = String.valueOf('\u221A');
+
     public static final String TAG_UNCHECKED = String.valueOf('\u25A1');
 
     private LinearLayout mEditTextList;
 
     private String mUserQuery;
+
     private Pattern mPattern;
 
+    /**新增属性：便签内容*/
+    private String mText;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -159,6 +184,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
             return;
         }
         initResources();
+        initButtons();
     }
 
     /**
@@ -253,7 +279,14 @@ public class NoteEditActivity extends Activity implements OnClickListener,
             getWindow().setSoftInputMode(
                     WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
                             | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
-        } else {
+        }else if(TextUtils.equals(Intent.ACTION_SEARCH,intent.getAction())){
+            String queryString = intent.getStringExtra(SearchManager.QUERY); //获取搜索框内的字符串
+            NotesDatabaseHelper dataBaseHelper = new  NotesDatabaseHelper(this);
+            dataBaseHelper.doResearch(queryString);
+            finish();
+            return false;
+        }
+        else {
             Log.e(TAG, "Intent not specified action, should not support");
             finish();
             return false;
@@ -268,15 +301,350 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         initNoteScreen();
     }
 
+    /**
+     * 新增方法
+     * 初始化富文本编辑按钮
+     */
+    private void initButtons(){
+        /*
+         * 撤销当前标签状态下所有内容
+         * */
+        findViewById(R.id.action_undo).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mNoteEditor.undo();
+            }
+        });
+        /*
+         * 恢复撤销的内容
+         * */
+        findViewById(R.id.action_redo).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mNoteEditor.redo();
+            }
+        });
+        /*
+         * 加粗
+         * */
+        findViewById(R.id.action_bold).setOnClickListener(new View.OnClickListener() {
+
+            @Override
+            public void onClick(View v) {
+                mNoteEditor.focusEditor();
+                mNoteEditor.setBold();
+            }
+        });
+        /*
+         * 斜体
+         * */
+        findViewById(R.id.action_italic).setOnClickListener(new View.OnClickListener() {
+
+            @Override
+            public void onClick(View v) {
+                mNoteEditor.focusEditor();
+                mNoteEditor.setItalic();
+            }
+        });
+        /*
+         * 下角标
+         * */
+        findViewById(R.id.action_subscript).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mNoteEditor.focusEditor();
+                if (mNoteEditor.getHtml() == null) {
+                    return;
+                }
+                mNoteEditor.setSubscript();
+            }
+        });
+        /*
+         * 上角标
+         * */
+        findViewById(R.id.action_superscript).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mNoteEditor.focusEditor();
+                if (mNoteEditor.getHtml() == null) {
+                    return;
+                }
+                mNoteEditor.setSuperscript();
+            }
+        });
+        /*
+         * 删除线
+         * */
+        findViewById(R.id.action_strikethrough).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mNoteEditor.focusEditor();
+                mNoteEditor.setStrikeThrough();
+            }
+        });
+        /*
+         *下划线
+         * */
+        findViewById(R.id.action_underline).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mNoteEditor.focusEditor();
+                mNoteEditor.setUnderline();
+            }
+        });
+        /*
+         * 设置标题（1到6）
+         * */
+        findViewById(R.id.action_heading1).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mNoteEditor.setHeading(1);
+            }
+        });
+
+        findViewById(R.id.action_heading2).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mNoteEditor.setHeading(2);
+            }
+        });
+
+        findViewById(R.id.action_heading3).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mNoteEditor.setHeading(3);
+            }
+        });
+
+        findViewById(R.id.action_heading4).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mNoteEditor.setHeading(4);
+            }
+        });
+
+        findViewById(R.id.action_heading5).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mNoteEditor.setHeading(5);
+            }
+        });
+
+        findViewById(R.id.action_heading6).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mNoteEditor.setHeading(6);
+            }
+        });
+        /*
+         * 设置字体颜色
+         * */
+        findViewById(R.id.action_txt_color).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mNoteEditor.focusEditor();
+                new AlertDialog.Builder(NoteEditActivity.this)
+                        .setTitle("选择字体颜色")
+                        .setSingleChoiceItems(R.array.text_color, 0,
+                                new DialogInterface.OnClickListener() {
+                                    @Override
+                                    public void onClick(DialogInterface dialog, int which) {
+                                        switch (which) {
+                                            //红
+                                            case 0:
+                                                mNoteEditor.setTextColor(Color.RED);
+                                                break;
+                                            //黄
+                                            case 1:
+                                                mNoteEditor.setTextColor(Color.YELLOW);
+                                                break;
+                                            //蓝
+                                            case 2:
+                                                mNoteEditor.setTextColor(Color.BLUE);
+                                                break;
+                                            //绿
+                                            case 3:
+                                                mNoteEditor.setTextColor(Color.GREEN);
+                                                break;
+                                            //黑
+                                            case 4:
+                                                mNoteEditor.setTextColor(Color.BLACK);
+                                                break;
+                                        }
+                                    }
+                                }).show();
+            }
+        });
+        findViewById(R.id.action_bg_color).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mNoteEditor.focusEditor();
+                new AlertDialog.Builder(NoteEditActivity.this).setTitle("选择字体背景颜色")
+                    .setSingleChoiceItems(R.array.text_bg_color, 0,
+                        new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                                switch (which) {
+                                    //红
+                                    case 0:
+                                        mNoteEditor.setTextBackgroundColor(Color.RED);
+                                        break;
+                                    //黄
+                                    case 1:
+                                        mNoteEditor.setTextBackgroundColor(Color.YELLOW);
+                                        break;
+                                    //蓝
+                                    case 2:
+                                        mNoteEditor.setTextBackgroundColor(Color.BLUE);
+                                        break;
+                                    //绿
+                                    case 3:
+                                        mNoteEditor.setTextBackgroundColor(Color.GREEN);
+                                        break;
+                                    //黑
+                                    case 4:
+                                        mNoteEditor.setTextBackgroundColor(Color.BLACK);
+                                        break;
+
+                                    case 5:
+                                        mNoteEditor.setTextBackgroundColor(Color.WHITE);
+                                        break;
+                                }
+                            }
+                        }).show();
+            }
+        });
+        /*
+         * 向右缩进
+         * */
+        findViewById(R.id.action_indent).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mNoteEditor.focusEditor();
+                mNoteEditor.setIndent();
+            }
+        });
+        /*
+         * 向左缩进
+         * */
+        findViewById(R.id.action_outdent).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mNoteEditor.focusEditor();
+                mNoteEditor.setOutdent();
+            }
+        });
+        /*
+         *左对齐
+         * */
+        findViewById(R.id.action_align_left).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mNoteEditor.focusEditor();
+                mNoteEditor.setAlignLeft();
+            }
+        });
+        /*
+         * 居中
+         * */
+        findViewById(R.id.action_align_center).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mNoteEditor.setAlignCenter();
+            }
+        });
+        /*
+         * 右对齐
+         * */
+        findViewById(R.id.action_align_right).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mNoteEditor.setAlignRight();
+            }
+        });
+        /*
+         * 设置序号
+         * */
+        findViewById(R.id.action_insert_bullets).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mNoteEditor.setBullets();
+            }
+        });
+        /*
+         * 设置数字序号
+         * */
+        findViewById(R.id.action_insert_numbers).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mNoteEditor.setNumbers();
+            }
+        });
+        /*
+         * 选择框
+         * */
+        findViewById(R.id.action_insert_checkbox).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mNoteEditor.focusEditor();
+                mNoteEditor.insertTodo();
+            }
+        });
+
+    }
+
+    /**
+     * 新增方法：
+     * 初始化富文本编辑框
+     */
+    public void initRichEditor(){
+        mNoteEditor.setEditorHeight(200);//设置编辑器界面高度
+        mNoteEditor.setEditorFontSize(22);//字体大小
+        mNoteEditor.setEditorFontColor(Color.BLACK);//字体颜色
+        mNoteEditor.setPadding(6, 5, 6, 5);//内边距
+        mNoteEditor.setPlaceholder("点击输入内容");//设置默认显示语句
+        mNoteEditor.setInputEnabled(true);//设置编辑器是否可用
+        mNoteEditor.setBackgroundResource(R.drawable.edit_white);//编辑背景
+    }
+
+    /**
+     * @param oriText
+     * @return 不含空格、换行符、制表符、图片的文本内容
+     */
+    private String textChange(String oriText){
+        StringBuffer stringBuffer = new StringBuffer(oriText);
+        int Flag1 = -1;//记录oriText中异常字符的索引
+        int Flag2 = -1;//记录oriText中异常字符的索引
+        do {//不计入表示图片的字符
+            Flag1 = stringBuffer.indexOf("<img");
+            Flag2 = stringBuffer.indexOf(">");
+            if (Flag1 != -1 && Flag2 != -1) {
+                stringBuffer = stringBuffer.replace(Flag1, Flag2+1, "");//将该位置为空
+            }
+        } while (Flag1 != -1 && Flag2 != -1);
+        do {//不计入换行字符
+            Flag1 = stringBuffer.indexOf("\n");
+            if (Flag1 != -1){
+                stringBuffer = stringBuffer.replace(Flag1, Flag1+1, "");//将该位置为空
+            }
+        } while (Flag1 != -1);
+        do {//不计入空格字符
+            Flag1 = stringBuffer.indexOf(" ");
+            if (Flag1 != -1) {
+                stringBuffer = stringBuffer.replace(Flag1, Flag1+1, "");//将该位置为空
+            }
+        } while (Flag1 != -1);
+        return stringBuffer.toString();
+    }
     private void initNoteScreen() {
-        mNoteEditor.setTextAppearance(this, TextAppearanceResources
-                .getTexAppearanceResource(mFontSizeId));
-        if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
-            switchToListMode(mWorkingNote.getContent());
-        } else {
-            mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery));
-            mNoteEditor.setSelection(mNoteEditor.getText().length());
+        initRichEditor();//初始化富文本编辑框
+        mText = mWorkingNote.getContent();//获取编辑的内容初始化mText
+        if(mText == null){
+            mNoteLength = 0;
+        }else {
+            mNoteLength = textChange(mText).length();//计算当前便签的字符数
         }
+        mNoteEditor.setHtml(mText);//修改代码：设置便签编辑内容
         for (Integer id : sBgSelectorSelectionMap.keySet()) {
             findViewById(sBgSelectorSelectionMap.get(id)).setVisibility(View.GONE);
         }
@@ -286,7 +654,8 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         mNoteHeaderHolder.tvModified.setText(DateUtils.formatDateTime(this,
                 mWorkingNote.getModifiedDate(), DateUtils.FORMAT_SHOW_DATE
                         | DateUtils.FORMAT_NUMERIC_DATE | DateUtils.FORMAT_SHOW_TIME
-                        | DateUtils.FORMAT_SHOW_YEAR));
+                        | DateUtils.FORMAT_SHOW_YEAR)+"\n字符数："
+                        +mNoteLength);//修改代码：设置时间信息以及字符数量信息
 
         /**
          * TODO: Add the menu for setting alert. Currently disable it because the DateTimePicker
@@ -369,9 +738,47 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         mNoteHeaderHolder.tvModified = (TextView) findViewById(R.id.tv_modified_date);
         mNoteHeaderHolder.ivAlertIcon = (ImageView) findViewById(R.id.iv_alert_icon);
         mNoteHeaderHolder.tvAlertDate = (TextView) findViewById(R.id.tv_alert_date);
+        mNoteHeaderHolder.ibSetLock = (ImageButton)findViewById(R.id.image_of_lock);//配置加锁按钮
+        mNoteHeaderHolder.ibSetLock.setOnClickListener(this);//设置监听器
+        mNoteHeaderHolder.ibSetUnLock = (ImageButton)findViewById(R.id.image_of_unlock);//配置解锁按钮
+        mNoteHeaderHolder.ibSetUnLock.setOnClickListener(this);//设置监听器
         mNoteHeaderHolder.ibSetBgColor = (ImageView) findViewById(R.id.btn_set_bg_color);
         mNoteHeaderHolder.ibSetBgColor.setOnClickListener(this);
-        mNoteEditor = (EditText) findViewById(R.id.note_edit_view);
+        /**
+        修改代码块：设置富文本编辑器及监听器
+         */
+        mNoteEditor = (RichEditor) findViewById(R.id.note_edit_view);
+        mNoteEditor.setOnTextChangeListener(new RichEditor.OnTextChangeListener() {
+            @Override
+            public void onTextChange(String text) {
+                mText = text;
+                mNoteLength = textChange(mText).length();
+                mNoteHeaderHolder.tvModified.setText(DateUtils.formatDateTime(NoteEditActivity.this,
+                        mWorkingNote.getModifiedDate(), DateUtils.FORMAT_SHOW_DATE
+                                | DateUtils.FORMAT_NUMERIC_DATE | DateUtils.FORMAT_SHOW_TIME
+                                | DateUtils.FORMAT_SHOW_YEAR)+"\n字符数："+mNoteLength);
+            }
+        });
+        /**
+         * 撤销功能
+        mNoteEditor.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+            }
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+            }
+            @Override
+            public void afterTextChanged(Editable s) {
+                if(!mIsRvoke) {
+                    saveMyChanged();
+                }
+                else {
+                    mIsRvoke = false;
+                }
+            }
+        });
+         */
         mNoteEditorPanel = findViewById(R.id.sv_note_edit);
         mNoteBgColorSelector = findViewById(R.id.note_bg_color_selector);
         for (int id : sBgSelectorBtnsMap.keySet()) {
@@ -396,7 +803,42 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         }
         mEditTextList = (LinearLayout) findViewById(R.id.note_edit_list);
     }
+    /**
+     * 撤销功能
+    private void saveMyChanged(){
+        SpannableString text = new SpannableString(mNoteEditor.getText());//用getText方法获取每次编辑的内容
+        if(mChanged.size()>=MAX_TIME_OF_RVOKE_TIME){//如果栈中的数据大于最大撤销次数，就把第一次修改的内容删除
+            mChanged.removeElementAt(0);
+        }
+        mChanged.add(text);//然后把本次修改的内容加入栈中
+    }
 
+    private void doRevoke(){
+        int size = mChanged.size();//获取当前栈大小
+        Builder dialog = new Builder(this);//创建一个alertdialog窗口
+        dialog.setTitle(R.string.tips_of_revoke);//设置title信息
+        dialog.setCancelable(true);//设置为可取消
+        dialog.setPositiveButton("OK", new DialogInterface.OnClickListener() {//只需要设置一个OK键即可
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+            }
+        });
+        mIsRvoke = true;//把是否已执行撤销的标记设置为true
+        if(size<=1){//如果栈中元素过少，打印提示信息
+            dialog.setMessage(R.string.have_not_input_anything);//提示用户您还没有输入任何信息
+            dialog.show();//显示当前alertdialog
+            return;
+        }
+        else {
+            mNoteEditor.setText((CharSequence) mChanged.elementAt(size-2));//在textview中设置撤销的内容
+            mChanged.removeElementAt(size-1);//删除元素
+            if(size==2){
+                dialog.setMessage(R.string.can_not_revoke);//如果只有一次操作，那么提示用户不能再撤销了
+                dialog.show();//显示当前alertdialog
+            }
+        }
+    }
+     */
     @Override
     protected void onPause() {
         super.onPause();
@@ -413,7 +855,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         } else if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_4X) {
             intent.setClass(this, NoteWidgetProvider_4x.class);
         } else {
-            Log.e(TAG, "Unspported widget type");
+            Log.e(TAG, "Unsupported widget type");
             return;
         }
 
@@ -430,7 +872,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         if (id == R.id.btn_set_bg_color) {
             mNoteBgColorSelector.setVisibility(View.VISIBLE);
             findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
-                    -                    View.VISIBLE);
+                    View.VISIBLE);
         } else if (sBgSelectorBtnsMap.containsKey(id)) {
             findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
                     View.GONE);
@@ -444,12 +886,43 @@ public class NoteEditActivity extends Activity implements OnClickListener,
             if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
                 getWorkingText();
                 switchToListMode(mWorkingNote.getContent());
-            } else {
-                mNoteEditor.setTextAppearance(this,
-                        TextAppearanceResources.getTexAppearanceResource(mFontSizeId));
             }
             mFontSizeSelector.setVisibility(View.GONE);
         }
+        /**
+        新增代码块：点击“🔒”对应响应
+         */
+        else if(id == R.id.image_of_lock){
+            final Builder builder = new Builder(this);
+            View view = LayoutInflater.from(this).inflate(R.layout.dialog_edit_text,null);
+            final EditText etName = (EditText)view.findViewById(R.id.et_foler_name);
+            etName.setText("");
+            etName.setHint("请输入密码");
+            builder.setTitle("为便签设置新密码");
+            builder.setPositiveButton("OK",null);
+            builder.setNegativeButton("cancel", new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+                    inputMethodManager.hideSoftInputFromWindow(etName.getWindowToken(),0);
+                }
+            });
+            final Dialog dialog = builder.setView(view).show();
+            final Button positive = (Button)dialog.findViewById(android.R.id.button1);
+            positive.setEnabled(true);
+            positive.setOnClickListener(new View.OnClickListener(){
+            public void onClick(View v){
+                String password = etName.getText().toString();
+                mWorkingNote.setPassword(password);
+                Toast.makeText(NoteEditActivity.this,"设置密码成功",Toast.LENGTH_SHORT).show();
+                dialog.dismiss();
+            }
+            });
+        }
+        else if(id == R.id.image_of_unlock){
+            mWorkingNote.removePassword();
+            Toast.makeText(NoteEditActivity.this,"撤销密码成功",Toast.LENGTH_SHORT).show();
+        }
     }
 
     @Override
@@ -512,7 +985,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
                 createNewNote();
                 break;
             case R.id.menu_delete:
-                AlertDialog.Builder builder = new AlertDialog.Builder(this);
+                Builder builder = new Builder(this);
                 builder.setTitle(getString(R.string.alert_title_delete));
                 builder.setIcon(android.R.drawable.ic_dialog_alert);
                 builder.setMessage(getString(R.string.alert_message_delete_note));
@@ -547,6 +1020,9 @@ public class NoteEditActivity extends Activity implements OnClickListener,
             case R.id.menu_delete_remind:
                 mWorkingNote.setAlertDate(0, false);
                 break;
+            case R.id.menu_revoke:
+                //doRevoke();
+                break;
             default:
                 break;
         }
@@ -577,7 +1053,6 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     private void createNewNote() {
         // Firstly, save current editing notes
         saveNote();
-
         // For safety, start a new NoteEditActivity
         finish();
         Intent intent = new Intent(this, NoteEditActivity.class);
@@ -708,7 +1183,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         mEditTextList.setVisibility(View.VISIBLE);
     }
 
-    private Spannable getHighlightQueryResult(String fullText, String userQuery) {
+    public Spannable getHighlightQueryResult(String fullText, String userQuery) {
         SpannableString spannable = new SpannableString(fullText == null ? "" : fullText);
         if (!TextUtils.isEmpty(userQuery)) {
             mPattern = Pattern.compile(userQuery);
@@ -770,13 +1245,12 @@ public class NoteEditActivity extends Activity implements OnClickListener,
 
     public void onCheckListModeChanged(int oldMode, int newMode) {
         if (newMode == TextNote.MODE_CHECK_LIST) {
-            switchToListMode(mNoteEditor.getText().toString());
+            switchToListMode(mText);
         } else {
             if (!getWorkingText()) {
                 mWorkingNote.setWorkingText(mWorkingNote.getContent().replace(TAG_UNCHECKED + " ",
                         ""));
             }
-            mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery));
             mEditTextList.setVisibility(View.GONE);
             mNoteEditor.setVisibility(View.VISIBLE);
         }
@@ -800,7 +1274,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
             }
             mWorkingNote.setWorkingText(sb.toString());
         } else {
-            mWorkingNote.setWorkingText(mNoteEditor.getText().toString());
+            mWorkingNote.setWorkingText(mText);
         }
         return hasChecked;
     }
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteItemData.java b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteItemData.java
index 0f5a878..78f8b2a 100644
--- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteItemData.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteItemData.java
@@ -25,6 +25,10 @@ import net.micode.notes.data.Notes;
 import net.micode.notes.data.Notes.NoteColumns;
 import net.micode.notes.tool.DataUtils;
 
+/**
+ * 1.后面带_COLUMN的变量是为了方便cursor确定以后寻找对应列的数据
+ * 2.前面有"m_"的前缀，表示类成员变量；有"g_"的前缀，表示全局变量
+ */
 
 public class NoteItemData {
     static final String [] PROJECTION = new String [] {
@@ -40,6 +44,7 @@ public class NoteItemData {
         NoteColumns.TYPE,
         NoteColumns.WIDGET_ID,
         NoteColumns.WIDGET_TYPE,
+        NoteColumns.PASSWORD//新增密码
     };
 
     private static final int ID_COLUMN                    = 0;
@@ -54,6 +59,7 @@ public class NoteItemData {
     private static final int TYPE_COLUMN                  = 9;
     private static final int WIDGET_ID_COLUMN             = 10;
     private static final int WIDGET_TYPE_COLUMN           = 11;
+    private static final int PASSWORD_COLUMN           = 12;
 
     private long mId;
     private long mAlertDate;
@@ -69,7 +75,7 @@ public class NoteItemData {
     private int mWidgetType;
     private String mName;
     private String mPhoneNumber;
-
+    private String mPassWord;
     private boolean mIsLastItem;
     private boolean mIsFirstItem;
     private boolean mIsOnlyOneItem;
@@ -92,6 +98,8 @@ public class NoteItemData {
         mWidgetId = cursor.getInt(WIDGET_ID_COLUMN);
         mWidgetType = cursor.getInt(WIDGET_TYPE_COLUMN);
 
+        mPassWord = "";
+        mPassWord = cursor.getString(PASSWORD_COLUMN);
         mPhoneNumber = "";
         if (mParentId == Notes.ID_CALL_RECORD_FOLDER) {
             mPhoneNumber = DataUtils.getCallNumberByNoteId(context.getContentResolver(), mId);
@@ -106,10 +114,10 @@ public class NoteItemData {
         if (mName == null) {
             mName = "";
         }
-        checkPostion(cursor);
+        checkPosition(cursor);
     }
 
-    private void checkPostion(Cursor cursor) {
+    private void checkPosition(Cursor cursor) {
         mIsLastItem = cursor.isLast() ? true : false;
         mIsFirstItem = cursor.isFirst() ? true : false;
         mIsOnlyOneItem = (cursor.getCount() == 1);
@@ -218,7 +226,24 @@ public class NoteItemData {
         return (mParentId == Notes.ID_CALL_RECORD_FOLDER && !TextUtils.isEmpty(mPhoneNumber));
     }
 
+    /**
+     * 新增方法：获取密码
+     * @return mPassWord 当前便签密码
+     */
+    public String getPassword(){
+        return String.valueOf(mPassWord);
+    }
+
+    /**
+     * 新增方法：是否有密码
+     * @return if the note item has password
+     */
+    public boolean hasPassword(){
+        return !mPassWord.equals("");
+    }
     public static int getNoteType(Cursor cursor) {
         return cursor.getInt(TYPE_COLUMN);
     }
+
+
 }
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
index e843aec..b96169a 100644
--- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
@@ -135,8 +135,9 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     private final static int REQUEST_CODE_OPEN_NODE = 102;
     private final static int REQUEST_CODE_NEW_NODE  = 103;
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    @Override//重写父类的函数
+    protected void onCreate(Bundle savedInstanceState) //设置窗口的风格、位置
+    {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.note_list);
         initResources();
@@ -148,53 +149,74 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     }
 
     @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) //主activity向调用的activity发送数据，通过回调函数获取传回来的值
+    {
         if (resultCode == RESULT_OK
                 && (requestCode == REQUEST_CODE_OPEN_NODE || requestCode == REQUEST_CODE_NEW_NODE)) {
-            mNotesListAdapter.changeCursor(null);
+            mNotesListAdapter.changeCursor(null);//如果处理结果成功（resultCode = RESULT_OK）并且打开或者新建一个note，就改变光标
         } else {
-            super.onActivityResult(requestCode, resultCode, data);
+            super.onActivityResult(requestCode, resultCode, data);//将数据返回给父类
         }
     }
 
-    private void setAppInfoFromRawRes() {
-        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
+    private void setAppInfoFromRawRes() //从res.raw中设置首次进入app时的信息
+    {
+        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);//SharedPreferences轻量级 键值对式存储方法
+        //getDefaultSharedPreferences获取了配置文件Preferences.xml
         if (!sp.getBoolean(PREFERENCE_ADD_INTRODUCTION, false)) {
             StringBuilder sb = new StringBuilder();
             InputStream in = null;
+            InputStreamReader isr = null;
+            BufferedReader br = null;
             try {
-                 in = getResources().openRawResource(R.raw.introduction);
-                if (in != null) {
-                    InputStreamReader isr = new InputStreamReader(in);
-                    BufferedReader br = new BufferedReader(isr);
-                    char [] buf = new char[1024];
-                    int len = 0;
-                    while ((len = br.read(buf)) > 0) {
-                        sb.append(buf, 0, len);
-                    }
-                } else {
-                    Log.e(TAG, "Read introduction file error");
-                    return;
+                //try(创建流对象，用';'分隔开) {} catch(IOException e){e.printStackTrace();} ---->用于捕捉异常
+                in = getResources().openRawResource(R.raw.introduction);//打开resource 读数据
+                //lcp
+                isr = new InputStreamReader(in);//InputStreamReader:使用指定的charset读取字节并将其解码为字符
+                br = new BufferedReader(isr);//BufferedReader:从字符输入流中读取文本
+                char [] buf = new char[1024];
+                int len = 0;
+                while ((len = br.read(buf)) > 0) {
+                    sb.append(buf, 0, len);
                 }
-            } catch (IOException e) {
-                e.printStackTrace();
+            }
+            catch (IOException e) {
+                e.printStackTrace();//在命令行打印异常信息在程序中出错的位置及原因
                 return;
             } finally {
                 if(in != null) {
                     try {
-                        in.close();
-                    } catch (IOException e) {
+                        in.close();//关闭文件
+                    } catch (IOException e) {//关闭错误
                         // TODO Auto-generated catch block
-                        e.printStackTrace();
+                        e.printStackTrace();//在命令行打印异常信息在程序中出错的位置及原因
+                    }
+                }
+                if(isr!=null)
+                {
+                    try {
+                        isr.close();//关闭文件
+                    } catch (IOException e) {//关闭错误
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();//在命令行打印异常信息在程序中出错的位置及原因
+                    }
+                }
+                if(br!=null)
+                {
+                    try {
+                        br.close();//关闭文件
+                    } catch (IOException e) {//关闭错误
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();//在命令行打印异常信息在程序中出错的位置及原因
                     }
                 }
             }
 
             WorkingNote note = WorkingNote.createEmptyNote(this, Notes.ID_ROOT_FOLDER,
                     AppWidgetManager.INVALID_APPWIDGET_ID, Notes.TYPE_WIDGET_INVALIDE,
-                    ResourceParser.RED);
+                    ResourceParser.RED);//创建一个空的Note
             note.setWorkingText(sb.toString());
-            if (note.saveNote()) {
+            if (note.saveNote()) {//保存introduction文件：成功或者失败
                 sp.edit().putBoolean(PREFERENCE_ADD_INTRODUCTION, true).commit();
             } else {
                 Log.e(TAG, "Save introduction note error");
@@ -204,46 +226,54 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     }
 
     @Override
-    protected void onStart() {
+    protected void onStart() //app生命周期开始
+    {
         super.onStart();
-        startAsyncNotesListQuery();
+        startAsyncNotesListQuery();//同步列表的便签信息
     }
 
-    private void initResources() {
-        mContentResolver = this.getContentResolver();
-        mBackgroundQueryHandler = new BackgroundQueryHandler(this.getContentResolver());
-        mCurrentFolderId = Notes.ID_ROOT_FOLDER;
-        mNotesListView = (ListView) findViewById(R.id.notes_list);
+    private void initResources() //初始化资源
+    {
+        mContentResolver = this.getContentResolver();//访问内容提供器提供的数据 获得应用程序的数据
+        mBackgroundQueryHandler = new BackgroundQueryHandler(this.getContentResolver());//异步操作数据库
+        mCurrentFolderId = Notes.ID_ROOT_FOLDER;//当前文件夹的ID等于根文件夹ID  ID是什么
+        //findViewById返回的是一个view对象，所以加上了强制转换
+        mNotesListView = (ListView) findViewById(R.id.notes_list);//调用顶层的View的findViewTraversal函数，找界面元素，把xml文件中的notes_list读出来
         mNotesListView.addFooterView(LayoutInflater.from(this).inflate(R.layout.note_list_footer, null),
-                null, false);
-        mNotesListView.setOnItemClickListener(new OnListItemClickListener());
-        mNotesListView.setOnItemLongClickListener(this);
-        mNotesListAdapter = new NotesListAdapter(this);
-        mNotesListView.setAdapter(mNotesListAdapter);
-        mAddNewNote = (Button) findViewById(R.id.btn_new_note);
-        mAddNewNote.setOnClickListener(this);
-        mAddNewNote.setOnTouchListener(new NewNoteOnTouchListener());
+                null, false);//在页脚添加布局
+        mNotesListView.setOnItemClickListener(new OnListItemClickListener());//设置一个listview item被点击的监听器
+        mNotesListView.setOnItemLongClickListener(this);//设置长按点击监听器
+        mNotesListAdapter = new NotesListAdapter(this);//定义一个新的列表的适配器
+        mNotesListView.setAdapter(mNotesListAdapter);//设置noteslist的适配器
+        mAddNewNote = (Button) findViewById(R.id.btn_new_note);//设置“新建note”的按钮
+        mAddNewNote.setOnClickListener(this);//点击监听器
+        mAddNewNote.setOnTouchListener(new NewNoteOnTouchListener());//触屏监听器
+        //设置长宽高
         mDispatch = false;
         mDispatchY = 0;
         mOriginY = 0;
-        mTitleBar = (TextView) findViewById(R.id.tv_title_bar);
-        mState = ListEditState.NOTE_LIST;
-        mModeCallBack = new ModeCallback();
+        mTitleBar = (TextView) findViewById(R.id.tv_title_bar);//设置title bar
+        mState = ListEditState.NOTE_LIST;//***状态
+        mModeCallBack = new ModeCallback();//***模式转换
     }
-
-    private class ModeCallback implements ListView.MultiChoiceModeListener, OnMenuItemClickListener {
+    //ModeCallback 模式回调  OnMenuItemClickListener菜单上的点击监听器  MultiChoiceModeListener多选模式侦听器
+    //长按选择文件、可单选可多选，选择以后有action，action执行完毕有action mode的finish，destroy等
+    private class ModeCallback implements ListView.MultiChoiceModeListener, OnMenuItemClickListener
+    {
         private DropdownMenu mDropDownMenu;
-        private ActionMode mActionMode;
+        private ActionMode mActionMode;//菜单的一种实现方式，一种操作模式，长按后多选，暂时占据actionBar展示菜单
         private MenuItem mMoveMenu;
-
-        public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+        //创建actionMode
+        public boolean onCreateActionMode(ActionMode mode, Menu menu)
+        {
             getMenuInflater().inflate(R.menu.note_list_options, menu);
             menu.findItem(R.id.delete).setOnMenuItemClickListener(this);
             mMoveMenu = menu.findItem(R.id.move);
             if (mFocusNoteDataItem.getParentId() == Notes.ID_CALL_RECORD_FOLDER
                     || DataUtils.getUserFolderCount(mContentResolver) == 0) {
                 mMoveMenu.setVisible(false);
-            } else {
+            }
+            else {
                 mMoveMenu.setVisible(true);
                 mMoveMenu.setOnMenuItemClickListener(this);
             }
@@ -259,17 +289,19 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                     (Button) customView.findViewById(R.id.selection_menu),
                     R.menu.note_list_dropdown);
             mDropDownMenu.setOnDropdownMenuItemClickListener(new PopupMenu.OnMenuItemClickListener(){
-                public boolean onMenuItemClick(MenuItem item) {
-                    mNotesListAdapter.selectAll(!mNotesListAdapter.isAllSelected());
-                    updateMenu();
-                    return true;
-                }
+            public boolean onMenuItemClick(MenuItem item)
+            {
+                mNotesListAdapter.selectAll(!mNotesListAdapter.isAllSelected());
+                updateMenu();
+                return true;
+            }
 
             });
             return true;
         }
-
-        private void updateMenu() {
+        //更新菜单
+        private void updateMenu()
+        {
             int selectedCount = mNotesListAdapter.getSelectedCount();
             // Update dropdown menu
             String format = getResources().getString(R.string.menu_select_title, selectedCount);
@@ -285,34 +317,44 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                 }
             }
         }
-
-        public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
+        public boolean onPrepareActionMode(ActionMode mode, Menu menu)
+        {
             // TODO Auto-generated method stub
             return false;
+            //lcp
+            //return true;
         }
 
-        public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
+        public boolean onActionItemClicked(ActionMode mode, MenuItem item)
+
+        {
             // TODO Auto-generated method stub
             return false;
+            //lcp
+            //return true;
         }
 
-        public void onDestroyActionMode(ActionMode mode) {
+        public void onDestroyActionMode(ActionMode mode)
+        {
             mNotesListAdapter.setChoiceMode(false);
             mNotesListView.setLongClickable(true);
             mAddNewNote.setVisibility(View.VISIBLE);
         }
 
-        public void finishActionMode() {
+        public void finishActionMode()
+        {
             mActionMode.finish();
         }
 
-        public void onItemCheckedStateChanged(ActionMode mode, int position, long id,
-                boolean checked) {
+        public void onItemCheckedStateChanged(ActionMode mode, int position, long id,//项目检查状态已更改
+                boolean checked)
+        {
             mNotesListAdapter.setCheckedItem(position, checked);
             updateMenu();
         }
 
-        public boolean onMenuItemClick(MenuItem item) {
+        public boolean onMenuItemClick(MenuItem item)
+        {
             if (mNotesListAdapter.getSelectedCount() == 0) {
                 Toast.makeText(NotesListActivity.this, getString(R.string.menu_select_none),
                         Toast.LENGTH_SHORT).show();
@@ -346,11 +388,14 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         }
     }
 
-    private class NewNoteOnTouchListener implements OnTouchListener {
+    private class NewNoteOnTouchListener implements OnTouchListener
+    //监听新建一个note，点击“写便签”即会调用
+    {
 
-        public boolean onTouch(View v, MotionEvent event) {
+        public boolean onTouch(View v, MotionEvent event)
+        {
             switch (event.getAction()) {
-                case MotionEvent.ACTION_DOWN: {
+                case MotionEvent.ACTION_DOWN: {//初次触碰到屏幕的触发
                     Display display = getWindowManager().getDefaultDisplay();
                     int screenHeight = display.getHeight();
                     int newNoteViewHeight = mAddNewNote.getHeight();
@@ -372,7 +417,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                      * Notice that, if the background of the button changes, the formula should
                      * also change. This is very bad, just for the UI designer's strong requirement.
                      */
-                    if (event.getY() < (event.getX() * (-0.12) + 94)) {
+                    if (event.getY() < (event.getX() * (-0.12) + 94))
+                    {
                         View view = mNotesListView.getChildAt(mNotesListView.getChildCount() - 1
                                 - mNotesListView.getFooterViewsCount());
                         if (view != null && view.getBottom() > start
@@ -386,7 +432,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                     }
                     break;
                 }
-                case MotionEvent.ACTION_MOVE: {
+                case MotionEvent.ACTION_MOVE: {//手指在屏幕上滑动的触发
                     if (mDispatch) {
                         mDispatchY += (int) event.getY() - mOriginY;
                         event.setLocation(event.getX(), mDispatchY);
@@ -408,31 +454,40 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
 
     };
 
-    private void startAsyncNotesListQuery() {
+    private void startAsyncNotesListQuery() //NoteList异步操作数据库
+    {
         String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION
-                : NORMAL_SELECTION;
+                : NORMAL_SELECTION;//如果当前文件id与保存在文件夹的id相同，selection为文件夹模式，否则为常规模式
         mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null,
                 Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[] {
-                    String.valueOf(mCurrentFolderId)
-                }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC");
+                    String.valueOf(mCurrentFolderId)//将 mCurrentFolderId 转化为字符串
+                }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC");//开始异步查询数据库操作
     }
 
-    private final class BackgroundQueryHandler extends AsyncQueryHandler {
+    private final class BackgroundQueryHandler extends AsyncQueryHandler //异步操作数据库
+    {
         public BackgroundQueryHandler(ContentResolver contentResolver) {
             super(contentResolver);
         }
 
         @Override
-        protected void onQueryComplete(int token, Object cookie, Cursor cursor) {
-            switch (token) {
-                case FOLDER_NOTE_LIST_QUERY_TOKEN:
+        protected void onQueryComplete(int token, Object cookie, Cursor cursor)//异步查询框架AsyncQueryHandler，当单查询完毕后
+        //会调用onQueryComplete(token, cookie, cursor)通知查询完毕，并且传回cursor
+
+        {
+            switch (token)
+            {
+                case FOLDER_NOTE_LIST_QUERY_TOKEN://便签列表请求
                     mNotesListAdapter.changeCursor(cursor);
                     break;
                 case FOLDER_LIST_QUERY_TOKEN:
-                    if (cursor != null && cursor.getCount() > 0) {
-                        showFolderListMenu(cursor);
-                    } else {
-                        Log.e(TAG, "Query folder failed");
+                    if (cursor != null && cursor.getCount() > 0)//如果光标！=null且游标行数大于零
+                    {
+                        showFolderListMenu(cursor);//展示文件夹列表
+                    }
+                    else
+                        {
+                        Log.e(TAG, "Query folder failed");//请球文件夹失败
                     }
                     break;
                 default:
@@ -441,7 +496,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         }
     }
 
-    private void showFolderListMenu(Cursor cursor) {
+    private void showFolderListMenu(Cursor cursor) //移动文件时，显示文件夹列表菜单
+    {
         AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this);
         builder.setTitle(R.string.menu_title_select_folder);
         final FoldersListAdapter adapter = new FoldersListAdapter(this, cursor);
@@ -462,14 +518,16 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         builder.show();
     }
 
-    private void createNewNote() {
+    private void createNewNote() //创建新note，在文件夹中menu新建或在根目录“写便签”都会调用
+    {
         Intent intent = new Intent(this, NoteEditActivity.class);
         intent.setAction(Intent.ACTION_INSERT_OR_EDIT);
         intent.putExtra(Notes.INTENT_EXTRA_FOLDER_ID, mCurrentFolderId);
         this.startActivityForResult(intent, REQUEST_CODE_NEW_NODE);
     }
 
-    private void batchDelete() {
+    private void batchDelete() //批量删除
+    {
         new AsyncTask<Void, Void, HashSet<AppWidgetAttribute>>() {
             protected HashSet<AppWidgetAttribute> doInBackground(Void... unused) {
                 HashSet<AppWidgetAttribute> widgets = mNotesListAdapter.getSelectedWidget();
@@ -492,7 +550,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
             }
 
             @Override
-            protected void onPostExecute(HashSet<AppWidgetAttribute> widgets) {
+            protected void onPostExecute(HashSet<AppWidgetAttribute> widgets) {//执行后
                 if (widgets != null) {
                     for (AppWidgetAttribute widget : widgets) {
                         if (widget.widgetId != AppWidgetManager.INVALID_APPWIDGET_ID
@@ -506,7 +564,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         }.execute();
     }
 
-    private void deleteFolder(long folderId) {
+    private void deleteFolder(long folderId) //删除文件夹
+    {
         if (folderId == Notes.ID_ROOT_FOLDER) {
             Log.e(TAG, "Wrong folder id, should not happen " + folderId);
             return;
@@ -533,14 +592,17 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         }
     }
 
-    private void openNode(NoteItemData data) {
+    private void openNode(NoteItemData data) //打开node
+    {
         Intent intent = new Intent(this, NoteEditActivity.class);
         intent.setAction(Intent.ACTION_VIEW);
         intent.putExtra(Intent.EXTRA_UID, data.getId());
+        Log.d(TAG, "openNode: "+data.getId());
         this.startActivityForResult(intent, REQUEST_CODE_OPEN_NODE);
     }
 
-    private void openFolder(NoteItemData data) {
+    private void openFolder(NoteItemData data) //打开文件夹
+    {
         mCurrentFolderId = data.getId();
         startAsyncNotesListQuery();
         if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) {
@@ -557,7 +619,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         mTitleBar.setVisibility(View.VISIBLE);
     }
 
-    public void onClick(View v) {
+    public void onClick(View v) //点击
+    {
         switch (v.getId()) {
             case R.id.btn_new_note:
                 createNewNote();
@@ -567,20 +630,22 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         }
     }
 
-    private void showSoftInput() {
+    private void showSoftInput() //显示软键盘
+    {
         InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
         if (inputMethodManager != null) {
             inputMethodManager.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
         }
     }
 
-    private void hideSoftInput(View view) {
+    private void hideSoftInput(View view) //隐藏软键盘
+    {
         InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
         inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0);
     }
 
-    private void showCreateOrModifyFolderDialog(final boolean create) {
-        final AlertDialog.Builder builder = new AlertDialog.Builder(this);
+    private void showCreateOrModifyFolderDialog(final boolean create) //显示“创建或修改文件夹”对话框
+        {final AlertDialog.Builder builder = new AlertDialog.Builder(this);
         View view = LayoutInflater.from(this).inflate(R.layout.dialog_edit_text, null);
         final EditText etName = (EditText) view.findViewById(R.id.et_foler_name);
         showSoftInput();
@@ -644,12 +709,12 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
          * When the name edit text is null, disable the positive button
          */
         etName.addTextChangedListener(new TextWatcher() {
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {//text改变之前
                 // TODO Auto-generated method stub
 
             }
 
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
+            public void onTextChanged(CharSequence s, int start, int before, int count) {//改变text
                 if (TextUtils.isEmpty(etName.getText())) {
                     positive.setEnabled(false);
                 } else {
@@ -657,7 +722,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                 }
             }
 
-            public void afterTextChanged(Editable s) {
+            public void afterTextChanged(Editable s) {//在text被改变之后
                 // TODO Auto-generated method stub
 
             }
@@ -665,8 +730,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     }
 
     @Override
-    public void onBackPressed() {
-        switch (mState) {
+    public void onBackPressed() //按返回键
+        {    switch (mState) {
             case SUB_FOLDER:
                 mCurrentFolderId = Notes.ID_ROOT_FOLDER;
                 mState = ListEditState.NOTE_LIST;
@@ -688,7 +753,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         }
     }
 
-    private void updateWidget(int appWidgetId, int appWidgetType) {
+    private void updateWidget(int appWidgetId, int appWidgetType) //更新小部件
+    {
         Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
         if (appWidgetType == Notes.TYPE_WIDGET_2X) {
             intent.setClass(this, NoteWidgetProvider_2x.class);
@@ -719,7 +785,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     };
 
     @Override
-    public void onContextMenuClosed(Menu menu) {
+    public void onContextMenuClosed(Menu menu) //上下文菜单关闭
+    {
         if (mNotesListView != null) {
             mNotesListView.setOnCreateContextMenuListener(null);
         }
@@ -727,7 +794,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     }
 
     @Override
-    public boolean onContextItemSelected(MenuItem item) {
+    public boolean onContextItemSelected(MenuItem item)
+    {
         if (mFocusNoteDataItem == null) {
             Log.e(TAG, "The long click data item is null");
             return false;
@@ -761,7 +829,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     }
 
     @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
+    public boolean onPrepareOptionsMenu(Menu menu) //准备选项菜单
+    {
         menu.clear();
         if (mState == ListEditState.NOTE_LIST) {
             getMenuInflater().inflate(R.menu.note_list, menu);
@@ -779,7 +848,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     }
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
+    public boolean onOptionsItemSelected(MenuItem item) //已选择的选项
+    {
         switch (item.getItemId()) {
             case R.id.menu_new_folder: {
                 showCreateOrModifyFolderDialog(true);
@@ -819,12 +889,14 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     }
 
     @Override
-    public boolean onSearchRequested() {
+    public boolean onSearchRequested() //搜索需求
+    {
         startSearch(null, false, null /* appData */, false);
         return true;
     }
 
-    private void exportNoteToText() {
+    private void exportNoteToText() //导出注释到文本
+    {
         final BackupUtils backup = BackupUtils.getInstance(NotesListActivity.this);
         new AsyncTask<Void, Void, Integer>() {
 
@@ -866,21 +938,27 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         }.execute();
     }
 
-    private boolean isSyncMode() {
+    private boolean isSyncMode()
+    //同步
+    {
         return NotesPreferenceActivity.getSyncAccountName(this).trim().length() > 0;
     }
 
-    private void startPreferenceActivity() {
+    private void startPreferenceActivity()
+    //打开设置界面
+    {
         Activity from = getParent() != null ? getParent() : this;
         Intent intent = new Intent(from, NotesPreferenceActivity.class);
         from.startActivityIfNeeded(intent, -1);
     }
 
-    private class OnListItemClickListener implements OnItemClickListener {
-
-        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+    private class OnListItemClickListener implements OnItemClickListener
+    //在主界面中点击任意一个项目（文件夹或者文件）都会调用
+    {
+        public void onItemClick(AdapterView<?> parent, View view, int position, long id)
+        {
             if (view instanceof NotesListItem) {
-                NoteItemData item = ((NotesListItem) view).getItemData();
+                final NoteItemData item = ((NotesListItem) view).getItemData();
                 if (mNotesListAdapter.isInChoiceMode()) {
                     if (item.getType() == Notes.TYPE_NOTE) {
                         position = position - mNotesListView.getHeaderViewsCount();
@@ -896,7 +974,41 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                                 || item.getType() == Notes.TYPE_SYSTEM) {
                             openFolder(item);
                         } else if (item.getType() == Notes.TYPE_NOTE) {
-                            openNode(item);
+                            if(item.hasPassword()) {//如果便签有密码
+                                final AlertDialog.Builder builder = new AlertDialog.Builder(view.getContext());
+                                View newView = LayoutInflater.from(view.getContext()).inflate(R.layout.dialog_edit_text,null);
+                                final EditText etName = (EditText)newView.findViewById(R.id.et_foler_name);
+                                etName.setHint("请输入密码");
+                                builder.setTitle("密码验证");
+                                builder.setPositiveButton("ok",null);
+                                builder.setNegativeButton("cancel", new DialogInterface.OnClickListener() {
+                                    @Override
+                                    public void onClick(DialogInterface dialog, int which) {
+                                        InputMethodManager inputMethodManager =
+                                                (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+                                        inputMethodManager.hideSoftInputFromWindow(etName.getWindowToken(),
+                                                0);//隐藏软键盘
+                                    }
+                                });
+                                final Dialog dialog = builder.setView(newView).show();//显示该dialog
+                                final Button positive = (Button)dialog.findViewById(android.R.id.button1);
+                                positive.setOnClickListener(new View.OnClickListener(){
+                                    public void onClick(View v){
+                                        String password = etName.getText().toString();//获取输入的密码
+                                        if(password.equals(item.getPassword())) {//将获取的字符串与真实密码对比
+                                            Toast.makeText(NotesListActivity.this,"密码输入正确，进入便签",
+                                                    Toast.LENGTH_SHORT).show();//提示用户密码输入正确
+                                            dialog.dismiss();//关闭该dialog
+                                            openNode(item);//密码正确打开该便签项
+                                        } else {
+                                            Toast.makeText(NotesListActivity.this,"密码输入错误，请重新输入",
+                                                    Toast.LENGTH_SHORT).show();//提示用户密码输入错误
+                                        }
+                                    }
+                                });
+                            } else {//如果没有密码，直接打开便签项
+                                openNode(item);
+                            }
                         } else {
                             Log.e(TAG, "Wrong note type in NOTE_LIST");
                         }
@@ -917,7 +1029,9 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
 
     }
 
-    private void startQueryDestinationFolders() {
+    private void startQueryDestinationFolders()
+    //查询目标文件夹
+    {
         String selection = NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>? AND " + NoteColumns.ID + "<>?";
         selection = (mState == ListEditState.NOTE_LIST) ? selection:
             "(" + selection + ") OR (" + NoteColumns.ID + "=" + Notes.ID_ROOT_FOLDER + ")";
@@ -935,7 +1049,9 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                 NoteColumns.MODIFIED_DATE + " DESC");
     }
 
-    public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
+    public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id)
+    //长按项目
+    {
         if (view instanceof NotesListItem) {
             mFocusNoteDataItem = ((NotesListItem) view).getItemData();
             if (mFocusNoteDataItem.getType() == Notes.TYPE_NOTE && !mNotesListAdapter.isInChoiceMode()) {
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
index 51c9cb9..3caa5f7 100644
--- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
@@ -38,12 +38,14 @@ public class NotesListAdapter extends CursorAdapter {
     private int mNotesCount;
     private boolean mChoiceMode;
 
-    public static class AppWidgetAttribute {
+    public static class AppWidgetAttribute //app小部件属性
+    {
         public int widgetId;
         public int widgetType;
     };
 
-    public NotesListAdapter(Context context) {
+    public NotesListAdapter(Context context)
+    {
         super(context, null);
         mSelectedIndex = new HashMap<Integer, Boolean>();
         mContext = context;
@@ -51,12 +53,14 @@ public class NotesListAdapter extends CursorAdapter {
     }
 
     @Override
-    public View newView(Context context, Cursor cursor, ViewGroup parent) {
+    public View newView(Context context, Cursor cursor, ViewGroup parent)
+    {
         return new NotesListItem(context);
     }
 
     @Override
-    public void bindView(View view, Context context, Cursor cursor) {
+    public void bindView(View view, Context context, Cursor cursor)
+    {
         if (view instanceof NotesListItem) {
             NoteItemData itemData = new NoteItemData(context, cursor);
             ((NotesListItem) view).bind(context, itemData, mChoiceMode,
@@ -64,21 +68,25 @@ public class NotesListAdapter extends CursorAdapter {
         }
     }
 
-    public void setCheckedItem(final int position, final boolean checked) {
+    public void setCheckedItem(final int position, final boolean checked)//设置检查项目
+    {
         mSelectedIndex.put(position, checked);
         notifyDataSetChanged();
     }
 
-    public boolean isInChoiceMode() {
+    public boolean isInChoiceMode() //处于选择模式
+    {
         return mChoiceMode;
     }
 
-    public void setChoiceMode(boolean mode) {
+    public void setChoiceMode(boolean mode) //设置选择模式
+    {
         mSelectedIndex.clear();
         mChoiceMode = mode;
     }
 
-    public void selectAll(boolean checked) {
+    public void selectAll(boolean checked) //全选
+    {
         Cursor cursor = getCursor();
         for (int i = 0; i < getCount(); i++) {
             if (cursor.moveToPosition(i)) {
@@ -89,7 +97,8 @@ public class NotesListAdapter extends CursorAdapter {
         }
     }
 
-    public HashSet<Long> getSelectedItemIds() {
+    public HashSet<Long> getSelectedItemIds() //获得被选择的项目的id
+    {
         HashSet<Long> itemSet = new HashSet<Long>();
         for (Integer position : mSelectedIndex.keySet()) {
             if (mSelectedIndex.get(position) == true) {
@@ -105,7 +114,8 @@ public class NotesListAdapter extends CursorAdapter {
         return itemSet;
     }
 
-    public HashSet<AppWidgetAttribute> getSelectedWidget() {
+    public HashSet<AppWidgetAttribute> getSelectedWidget() //获得被选择的小部件
+    {
         HashSet<AppWidgetAttribute> itemSet = new HashSet<AppWidgetAttribute>();
         for (Integer position : mSelectedIndex.keySet()) {
             if (mSelectedIndex.get(position) == true) {
@@ -128,7 +138,8 @@ public class NotesListAdapter extends CursorAdapter {
         return itemSet;
     }
 
-    public int getSelectedCount() {
+    public int getSelectedCount() //获得被选择的数量
+    {
         Collection<Boolean> values = mSelectedIndex.values();
         if (null == values) {
             return 0;
@@ -143,12 +154,14 @@ public class NotesListAdapter extends CursorAdapter {
         return count;
     }
 
-    public boolean isAllSelected() {
+    public boolean isAllSelected() //是否全选
+    {
         int checkedCount = getSelectedCount();
         return (checkedCount != 0 && checkedCount == mNotesCount);
     }
 
-    public boolean isSelectedItem(final int position) {
+    public boolean isSelectedItem(final int position)//是否选择项目
+    {
         if (null == mSelectedIndex.get(position)) {
             return false;
         }
@@ -156,18 +169,21 @@ public class NotesListAdapter extends CursorAdapter {
     }
 
     @Override
-    protected void onContentChanged() {
+    protected void onContentChanged() //内容改变
+    {
         super.onContentChanged();
         calcNotesCount();
     }
 
     @Override
-    public void changeCursor(Cursor cursor) {
+    public void changeCursor(Cursor cursor) //改变光标
+    {
         super.changeCursor(cursor);
         calcNotesCount();
     }
 
-    private void calcNotesCount() {
+    private void calcNotesCount() //计算新界面内note的数量
+    {
         mNotesCount = 0;
         for (int i = 0; i < getCount(); i++) {
             Cursor c = (Cursor) getItem(i);
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListItem.java b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListItem.java
index 1221e80..9bae471 100644
--- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListItem.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListItem.java
@@ -17,6 +17,7 @@
 package net.micode.notes.ui;
 
 import android.content.Context;
+import android.text.Html;
 import android.text.format.DateUtils;
 import android.view.View;
 import android.widget.CheckBox;
@@ -30,18 +31,20 @@ import net.micode.notes.tool.DataUtils;
 import net.micode.notes.tool.ResourceParser.NoteItemBgResources;
 
 
-public class NotesListItem extends LinearLayout {
+public class NotesListItem extends LinearLayout
+{
     private ImageView mAlert;
+    private ImageView mLock;
     private TextView mTitle;
     private TextView mTime;
     private TextView mCallName;
     private NoteItemData mItemData;
     private CheckBox mCheckBox;
-
     public NotesListItem(Context context) {
         super(context);
         inflate(context, R.layout.note_item, this);
         mAlert = (ImageView) findViewById(R.id.iv_alert_icon);
+        mLock = (ImageView) findViewById(R.id.iv_lock);//设置加密便签的title信息
         mTitle = (TextView) findViewById(R.id.tv_title);
         mTime = (TextView) findViewById(R.id.tv_time);
         mCallName = (TextView) findViewById(R.id.tv_name);
@@ -80,22 +83,31 @@ public class NotesListItem extends LinearLayout {
             mTitle.setTextAppearance(context, R.style.TextAppearancePrimaryItem);
 
             if (data.getType() == Notes.TYPE_FOLDER) {
-                mTitle.setText(data.getSnippet()
+                String text = data.getSnippet()
                         + context.getString(R.string.format_folder_files_count,
-                                data.getNotesCount()));
+                        data.getNotesCount());
+                mTitle.setText(text);
                 mAlert.setVisibility(View.GONE);
             } else {
-                mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet()));
+                mLock.setImageResource(R.drawable.lock);
+                if(data.hasPassword()){//为已加密便签设置title信息
+                    mLock.setVisibility(VISIBLE);
+                    //以便签的前两个字符设置title
+                    mTitle.setText(Html.fromHtml(DataUtils.getFormattedSnippet(data.getSnippet()).substring(0,1)));
+                } else {//解锁后恢复正常状态
+                    mLock.setVisibility(GONE);
+                    mTitle.setText(Html.fromHtml(DataUtils.getFormattedSnippet(data.getSnippet())));
+                }
                 if (data.hasAlert()) {
                     mAlert.setImageResource(R.drawable.clock);
                     mAlert.setVisibility(View.VISIBLE);
                 } else {
                     mAlert.setVisibility(View.GONE);
                 }
+
             }
         }
         mTime.setText(DateUtils.getRelativeTimeSpanString(data.getModifiedDate()));
-
         setBackground(data);
     }
 
diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
index 07c5f7e..d2685c1 100644
--- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
@@ -47,7 +47,10 @@ import net.micode.notes.data.Notes;
 import net.micode.notes.data.Notes.NoteColumns;
 import net.micode.notes.gtask.remote.GTaskSyncService;
 
-
+/**
+ * NotesPreferenceActivity：在小米便签中主要实现的是对背景颜色和字体大小的数据储存；
+ * 登录账号；将便签的内容与Google Task上的数据进行同步
+ */
 public class NotesPreferenceActivity extends PreferenceActivity {
     public static final String PREFERENCE_NAME = "notes_preferences";
 
@@ -70,6 +73,7 @@ public class NotesPreferenceActivity extends PreferenceActivity {
     private boolean mHasAddedAccount;
 
     @Override
+
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
@@ -89,6 +93,12 @@ public class NotesPreferenceActivity extends PreferenceActivity {
     }
 
     @Override
+    /**
+     * 功能描述：重启活动，活动由不可见变为可见，自动如果用户添加了一个新账户，则同步账户
+     * 函数实现：除了调用父类的onCreate，还有一些自己的个性化配置
+     * 参数描述：
+     * @return 无
+     */
     protected void onResume() {
         super.onResume();
 
@@ -117,6 +127,11 @@ public class NotesPreferenceActivity extends PreferenceActivity {
     }
 
     @Override
+    /**
+     * 功能描述：按下同步后，选择账户的设置
+     * 函数实现：先清除之前的所有偏好元素，包括布局等，再选择账户，加载
+     * 参数描述：无
+     */
     protected void onDestroy() {
         if (mReceiver != null) {
             unregisterReceiver(mReceiver);
@@ -124,7 +139,13 @@ public class NotesPreferenceActivity extends PreferenceActivity {
         super.onDestroy();
     }
 
-    private void loadAccountPreference() {
+    /**
+     * 功能描述：加载同步按键
+     * 函数实现：引入相关资源布局，和色湖之监听器
+     * 参数描述：无
+     */
+    private void loadAccountPreference()
+    {
         mAccountCategory.removeAll();
 
         Preference accountPref = new Preference(this);
@@ -153,8 +174,15 @@ public class NotesPreferenceActivity extends PreferenceActivity {
 
         mAccountCategory.addPreference(accountPref);
     }
-
-    private void loadSyncButton() {
+    /**
+     *  作用：加载同步按钮
+     *  实现：首先，加载“立即同步”按钮和底下的最后同步时间文本视图；
+     *  再根据当前的同步状态，设置按钮的功能为开始或者取消同步；再设置最后
+     *  同步时间视图，判断是否正在同步，再判断是否是第一次同步，显示最后同步时间的视图和文本
+     *  参数：无
+     */
+    private void loadSyncButton()
+    {
         Button syncButton = (Button) findViewById(R.id.preference_sync_button);
         TextView lastSyncTimeView = (TextView) findViewById(R.id.prefenerece_sync_status_textview);
 
@@ -193,12 +221,17 @@ public class NotesPreferenceActivity extends PreferenceActivity {
         }
     }
 
-    private void refreshUI() {
+    /**
+     *
+     */
+    private void refreshUI()
+    {
         loadAccountPreference();
         loadSyncButton();
     }
 
-    private void showSelectAccountAlertDialog() {
+    private void showSelectAccountAlertDialog()
+    {
         AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);
 
         View titleView = LayoutInflater.from(this).inflate(R.layout.account_dialog_title, null);
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/action_align_center.png b/src/Notes-master/app/src/main/res/drawable-hdpi/action_align_center.png
new file mode 100644
index 0000000..7edc219
Binary files /dev/null and b/src/Notes-master/app/src/main/res/drawable-hdpi/action_align_center.png differ
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/action_align_left.png b/src/Notes-master/app/src/main/res/drawable-hdpi/action_align_left.png
new file mode 100644
index 0000000..0ab1339
Binary files /dev/null and b/src/Notes-master/app/src/main/res/drawable-hdpi/action_align_left.png differ
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/action_align_right.png b/src/Notes-master/app/src/main/res/drawable-hdpi/action_align_right.png
new file mode 100644
index 0000000..0fae162
Binary files /dev/null and b/src/Notes-master/app/src/main/res/drawable-hdpi/action_align_right.png differ
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/action_bold.png b/src/Notes-master/app/src/main/res/drawable-hdpi/action_bold.png
new file mode 100644
index 0000000..e69154e
Binary files /dev/null and b/src/Notes-master/app/src/main/res/drawable-hdpi/action_bold.png differ
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/action_italic.png b/src/Notes-master/app/src/main/res/drawable-hdpi/action_italic.png
new file mode 100644
index 0000000..02a585c
Binary files /dev/null and b/src/Notes-master/app/src/main/res/drawable-hdpi/action_italic.png differ
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/action_redo.png b/src/Notes-master/app/src/main/res/drawable-hdpi/action_redo.png
new file mode 100644
index 0000000..3e9b38b
Binary files /dev/null and b/src/Notes-master/app/src/main/res/drawable-hdpi/action_redo.png differ
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/action_underline.png b/src/Notes-master/app/src/main/res/drawable-hdpi/action_underline.png
new file mode 100644
index 0000000..5c9fd19
Binary files /dev/null and b/src/Notes-master/app/src/main/res/drawable-hdpi/action_underline.png differ
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/action_undo.png b/src/Notes-master/app/src/main/res/drawable-hdpi/action_undo.png
new file mode 100644
index 0000000..9b9ec71
Binary files /dev/null and b/src/Notes-master/app/src/main/res/drawable-hdpi/action_undo.png differ
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/bg_text_color.png b/src/Notes-master/app/src/main/res/drawable-hdpi/bg_text_color.png
new file mode 100644
index 0000000..c6bd0ef
Binary files /dev/null and b/src/Notes-master/app/src/main/res/drawable-hdpi/bg_text_color.png differ
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/check_box.png b/src/Notes-master/app/src/main/res/drawable-hdpi/check_box.png
new file mode 100644
index 0000000..41e9003
Binary files /dev/null and b/src/Notes-master/app/src/main/res/drawable-hdpi/check_box.png differ
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/dropdown_icon.9.png b/src/Notes-master/app/src/main/res/drawable-hdpi/dropdown_icon.9.png
index 5525025..bfc2f64 100644
Binary files a/src/Notes-master/app/src/main/res/drawable-hdpi/dropdown_icon.9.png and b/src/Notes-master/app/src/main/res/drawable-hdpi/dropdown_icon.9.png differ
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/edit_yellow.9.png b/src/Notes-master/app/src/main/res/drawable-hdpi/edit_yellow.9.png
index 10cb642..e004bda 100644
Binary files a/src/Notes-master/app/src/main/res/drawable-hdpi/edit_yellow.9.png and b/src/Notes-master/app/src/main/res/drawable-hdpi/edit_yellow.9.png differ
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/html.png b/src/Notes-master/app/src/main/res/drawable-hdpi/html.png
new file mode 100644
index 0000000..ea48d1f
Binary files /dev/null and b/src/Notes-master/app/src/main/res/drawable-hdpi/html.png differ
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/indent.png b/src/Notes-master/app/src/main/res/drawable-hdpi/indent.png
new file mode 100644
index 0000000..db93767
Binary files /dev/null and b/src/Notes-master/app/src/main/res/drawable-hdpi/indent.png differ
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/insert_bullets.png b/src/Notes-master/app/src/main/res/drawable-hdpi/insert_bullets.png
new file mode 100644
index 0000000..9627cdb
Binary files /dev/null and b/src/Notes-master/app/src/main/res/drawable-hdpi/insert_bullets.png differ
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/insert_img.png b/src/Notes-master/app/src/main/res/drawable-hdpi/insert_img.png
new file mode 100644
index 0000000..e70da1a
Binary files /dev/null and b/src/Notes-master/app/src/main/res/drawable-hdpi/insert_img.png differ
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/insert_numbers.png b/src/Notes-master/app/src/main/res/drawable-hdpi/insert_numbers.png
new file mode 100644
index 0000000..3968a6f
Binary files /dev/null and b/src/Notes-master/app/src/main/res/drawable-hdpi/insert_numbers.png differ
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/link.png b/src/Notes-master/app/src/main/res/drawable-hdpi/link.png
new file mode 100644
index 0000000..4bd01d8
Binary files /dev/null and b/src/Notes-master/app/src/main/res/drawable-hdpi/link.png differ
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/lock.png b/src/Notes-master/app/src/main/res/drawable-hdpi/lock.png
new file mode 100644
index 0000000..7f73913
Binary files /dev/null and b/src/Notes-master/app/src/main/res/drawable-hdpi/lock.png differ
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/new_set_bg.jpg b/src/Notes-master/app/src/main/res/drawable-hdpi/new_set_bg.jpg
new file mode 100644
index 0000000..8e092ee
Binary files /dev/null and b/src/Notes-master/app/src/main/res/drawable-hdpi/new_set_bg.jpg differ
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/outdent.png b/src/Notes-master/app/src/main/res/drawable-hdpi/outdent.png
new file mode 100644
index 0000000..86999bf
Binary files /dev/null and b/src/Notes-master/app/src/main/res/drawable-hdpi/outdent.png differ
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/strike_through.png b/src/Notes-master/app/src/main/res/drawable-hdpi/strike_through.png
new file mode 100644
index 0000000..43cf2b1
Binary files /dev/null and b/src/Notes-master/app/src/main/res/drawable-hdpi/strike_through.png differ
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/subscript.png b/src/Notes-master/app/src/main/res/drawable-hdpi/subscript.png
new file mode 100644
index 0000000..1ecdff6
Binary files /dev/null and b/src/Notes-master/app/src/main/res/drawable-hdpi/subscript.png differ
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/superscript.png b/src/Notes-master/app/src/main/res/drawable-hdpi/superscript.png
new file mode 100644
index 0000000..bb9b390
Binary files /dev/null and b/src/Notes-master/app/src/main/res/drawable-hdpi/superscript.png differ
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/text_color.png b/src/Notes-master/app/src/main/res/drawable-hdpi/text_color.png
new file mode 100644
index 0000000..7d0e2eb
Binary files /dev/null and b/src/Notes-master/app/src/main/res/drawable-hdpi/text_color.png differ
diff --git a/src/Notes-master/app/src/main/res/drawable-hdpi/unlock.png b/src/Notes-master/app/src/main/res/drawable-hdpi/unlock.png
new file mode 100644
index 0000000..7292c85
Binary files /dev/null and b/src/Notes-master/app/src/main/res/drawable-hdpi/unlock.png differ
diff --git a/src/Notes-master/app/src/main/res/layout/note_edit.xml b/src/Notes-master/app/src/main/res/layout/note_edit.xml
index 10b2aa7..8701827 100644
--- a/src/Notes-master/app/src/main/res/layout/note_edit.xml
+++ b/src/Notes-master/app/src/main/res/layout/note_edit.xml
@@ -33,11 +33,11 @@
 
             <TextView
                 android:id="@+id/tv_modified_date"
-                android:layout_width="0dip"
+                android:layout_width="100dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
                 android:layout_gravity="left|center_vertical"
                 android:layout_marginRight="8dip"
+                android:layout_weight="1"
                 android:textAppearance="@style/TextAppearanceSecondaryItem" />
 
             <ImageView
@@ -46,7 +46,6 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:background="@drawable/title_alert" />
-
             <TextView
                 android:id="@+id/tv_alert_date"
                 android:layout_width="wrap_content"
@@ -55,12 +54,37 @@
                 android:layout_marginLeft="2dip"
                 android:layout_marginRight="8dip"
                 android:textAppearance="@style/TextAppearanceSecondaryItem" />
-
+            <Button
+                android:id="@+id/action_undo"
+                android:layout_width="20dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.1"
+                android:background="@drawable/action_undo" />
+
+            <Button
+                android:id="@+id/action_redo"
+                android:layout_width="20dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.1"
+                android:background="@drawable/action_redo" />
+            <ImageButton
+                android:id="@+id/image_of_lock"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center"
+                android:background="@drawable/lock"/>
+            <ImageButton
+                android:id="@+id/image_of_unlock"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center"
+                android:background="@drawable/unlock"/>
             <ImageButton
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:background="@drawable/bg_btn_set_color" />
+
         </LinearLayout>
 
         <LinearLayout
@@ -77,34 +101,34 @@
             <ScrollView
                 android:layout_width="fill_parent"
                 android:layout_height="0dip"
+                android:layout_gravity="left|top"
                 android:layout_weight="1"
-                android:scrollbars="none"
+                android:fadingEdgeLength="0dip"
                 android:overScrollMode="never"
-                android:layout_gravity="left|top"
-                android:fadingEdgeLength="0dip">
+                android:scrollbars="none">
 
                 <LinearLayout
                     android:layout_width="fill_parent"
                     android:layout_height="fill_parent">
 
-                    <net.micode.notes.ui.NoteEditText
+                    <jp.wasabeef.richeditor.RichEditor
                         android:id="@+id/note_edit_view"
                         android:layout_width="fill_parent"
                         android:layout_height="wrap_content"
-                        android:gravity="left|top"
-                        android:background="@null"
                         android:autoLink="all"
+                        android:background="@null"
+                        android:gravity="left|top"
+                        android:lineSpacingMultiplier="1.2"
                         android:linksClickable="false"
                         android:minLines="12"
-                        android:textAppearance="@style/TextAppearancePrimaryItem"
-                        android:lineSpacingMultiplier="1.2" />
+                        android:textAppearance="@style/TextAppearancePrimaryItem" />
 
                     <LinearLayout
                         android:id="@+id/note_edit_list"
                         android:layout_width="fill_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical"
                         android:layout_marginLeft="-10dip"
+                        android:orientation="vertical"
                         android:visibility="gone" />
                 </LinearLayout>
             </ScrollView>
@@ -397,4 +421,171 @@
                 android:src="@drawable/selected" />
         </FrameLayout>
     </LinearLayout>
+
+    <HorizontalScrollView
+        android:layout_width="wrap_content"
+        android:layout_height="37dp"
+        android:layout_gravity="bottom">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:orientation="horizontal">
+
+            <Button
+                android:id="@+id/action_bold"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_weight="1"
+                android:background="@drawable/action_bold" />
+
+            <Button
+                android:id="@+id/action_italic"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_weight="1"
+                android:background="@drawable/action_italic" />
+
+            <Button
+                android:id="@+id/action_subscript"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_weight="1"
+                android:background="@drawable/subscript" />
+
+            <Button
+                android:id="@+id/action_superscript"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_weight="1"
+                android:background="@drawable/superscript" />
+
+            <Button
+                android:id="@+id/action_strikethrough"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_weight="1"
+                android:background="@drawable/strike_through" />
+
+            <Button
+                android:id="@+id/action_underline"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_weight="1"
+                android:background="@drawable/action_underline" />
+
+            <Button
+                android:id="@+id/action_heading1"
+                android:layout_width="50dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:text="H1" />
+
+            <Button
+                android:id="@+id/action_heading2"
+                android:layout_width="50dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:text="H2" />
+
+            <Button
+                android:id="@+id/action_heading3"
+                android:layout_width="50dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:text="H3" />
+
+            <Button
+                android:id="@+id/action_heading4"
+                android:layout_width="50dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:text="H4" />
+
+            <Button
+                android:id="@+id/action_heading5"
+                android:layout_width="50dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:text="H5" />
+
+            <Button
+                android:id="@+id/action_heading6"
+                android:layout_width="50dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:text="H6" />
+
+            <Button
+                android:id="@+id/action_txt_color"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_weight="1"
+                android:background="@drawable/text_color" />
+
+            <Button
+                android:id="@+id/action_bg_color"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_weight="1"
+                android:background="@drawable/bg_text_color" />
+
+            <Button
+                android:id="@+id/action_indent"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_weight="1"
+                android:background="@drawable/indent" />
+
+            <Button
+                android:id="@+id/action_outdent"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_weight="1"
+                android:background="@drawable/outdent" />
+
+            <Button
+                android:id="@+id/action_align_left"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_weight="1"
+                android:background="@drawable/action_align_left" />
+
+            <Button
+                android:id="@+id/action_align_center"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_weight="1"
+                android:background="@drawable/action_align_center" />
+
+            <Button
+                android:id="@+id/action_align_right"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_weight="1"
+                android:background="@drawable/action_align_right" />
+
+            <Button
+                android:id="@+id/action_insert_bullets"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_weight="1"
+                android:background="@drawable/insert_bullets" />
+
+            <Button
+                android:id="@+id/action_insert_numbers"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_weight="1"
+                android:background="@drawable/insert_numbers" />
+
+            <Button
+                android:id="@+id/action_insert_checkbox"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_weight="1"
+                android:background="@drawable/check_box" />
+
+        </LinearLayout>
+    </HorizontalScrollView>
 </FrameLayout>
diff --git a/src/Notes-master/app/src/main/res/layout/note_edit_list_item.xml b/src/Notes-master/app/src/main/res/layout/note_edit_list_item.xml
index a885f9c..612bba8 100644
--- a/src/Notes-master/app/src/main/res/layout/note_edit_list_item.xml
+++ b/src/Notes-master/app/src/main/res/layout/note_edit_list_item.xml
@@ -36,4 +36,11 @@
         android:layout_gravity="center_vertical"
         android:textAppearance="@style/TextAppearancePrimaryItem"
         android:background="@null" />
+
+    <Button
+        android:id="@+id/lock"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:background="@drawable/lock"
+        android:visibility="gone" />
 </LinearLayout>
diff --git a/src/Notes-master/app/src/main/res/layout/note_item.xml b/src/Notes-master/app/src/main/res/layout/note_item.xml
index d541f6a..0c03f63 100644
--- a/src/Notes-master/app/src/main/res/layout/note_item.xml
+++ b/src/Notes-master/app/src/main/res/layout/note_item.xml
@@ -75,4 +75,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="top|right"/>
+    <ImageView
+        android:id="@+id/iv_lock"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:layout_gravity="top|left"/>
 </FrameLayout>
diff --git a/src/Notes-master/app/src/main/res/layout/note_list.xml b/src/Notes-master/app/src/main/res/layout/note_list.xml
index 6b25d38..6a7a05e 100644
--- a/src/Notes-master/app/src/main/res/layout/note_list.xml
+++ b/src/Notes-master/app/src/main/res/layout/note_list.xml
@@ -28,14 +28,14 @@
 
         <TextView
             android:id="@+id/tv_title_bar"
-            android:layout_width="fill_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="@drawable/title_bar_bg"
-            android:visibility="gone"
             android:gravity="center_vertical"
             android:singleLine="true"
             android:textColor="#FFEAD1AE"
-            android:textSize="@dimen/text_font_size_medium" />
+            android:textSize="@dimen/text_font_size_medium"
+            android:visibility="gone" />
 
         <ListView
             android:id="@+id/notes_list"
@@ -43,9 +43,9 @@
             android:layout_height="0dip"
             android:layout_weight="1"
             android:cacheColorHint="@null"
-            android:listSelector="@android:color/transparent"
             android:divider="@null"
-            android:fadingEdge="@null" />
+            android:fadingEdge="@null"
+            android:listSelector="@android:color/transparent" />
     </LinearLayout>
 
     <Button
diff --git a/src/Notes-master/app/src/main/res/layout/note_list_dropdown_menu.xml b/src/Notes-master/app/src/main/res/layout/note_list_dropdown_menu.xml
index 3fa271d..d1f8ea5 100644
--- a/src/Notes-master/app/src/main/res/layout/note_list_dropdown_menu.xml
+++ b/src/Notes-master/app/src/main/res/layout/note_list_dropdown_menu.xml
@@ -22,11 +22,12 @@
         android:layout_height="match_parent"
         android:orientation="horizontal">
 
-    <Button android:id="@+id/selection_menu"
-            android:divider="?android:attr/listDividerAlertDialog"
-            android:singleLine="true"
-            android:gravity="left|center_vertical"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            style="?android:attr/borderlessButtonStyle" />
+    <Button
+        android:id="@+id/selection_menu"
+        style="?android:attr/borderlessButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:divider="?android:attr/listDividerAlertDialog"
+        android:gravity="left|center_vertical"
+        android:singleLine="true" />
 </LinearLayout>
\ No newline at end of file
diff --git a/src/Notes-master/app/src/main/res/menu/note_edit.xml b/src/Notes-master/app/src/main/res/menu/note_edit.xml
index 35cacd1..6b7dcce 100644
--- a/src/Notes-master/app/src/main/res/menu/note_edit.xml
+++ b/src/Notes-master/app/src/main/res/menu/note_edit.xml
@@ -17,7 +17,6 @@
 
 <menu
     xmlns:android="http://schemas.android.com/apk/res/android">
-
     <item
         android:id="@+id/menu_new_note"
         android:title="@string/notelist_menu_new"/>
@@ -49,4 +48,7 @@
     <item
         android:id="@+id/menu_delete_remind"
         android:title="@string/menu_remove_remind" />
+    <item
+        android:id="@+id/menu_revoke"
+        android:title="@string/menu_revoke"/>
 </menu>
\ No newline at end of file
diff --git a/src/Notes-master/app/src/main/res/values-zh-rCN/arrays.xml b/src/Notes-master/app/src/main/res/values-zh-rCN/arrays.xml
index a092386..ae21898 100644
--- a/src/Notes-master/app/src/main/res/values-zh-rCN/arrays.xml
+++ b/src/Notes-master/app/src/main/res/values-zh-rCN/arrays.xml
@@ -20,4 +20,20 @@
         <item>短信</item>
         <item>邮件</item>
     </string-array>
+    <string-array name="text_bg_color">
+        <item>红</item>
+        <item>黄</item>
+        <item>蓝</item>
+        <item>绿</item>
+        <item>黑</item>
+        <item>透明</item>
+    </string-array>
+
+    <string-array name="text_color">
+        <item>红</item>
+        <item>黄</item>
+        <item>蓝</item>
+        <item>绿</item>
+        <item>黑</item>
+    </string-array>
 </resources>
\ No newline at end of file
diff --git a/src/Notes-master/app/src/main/res/values-zh-rCN/strings.xml b/src/Notes-master/app/src/main/res/values-zh-rCN/strings.xml
index 09f75ed..c5a8d1f 100644
--- a/src/Notes-master/app/src/main/res/values-zh-rCN/strings.xml
+++ b/src/Notes-master/app/src/main/res/values-zh-rCN/strings.xml
@@ -36,6 +36,10 @@
     <string name="note_link_web">浏览网页</string>
     <string name="note_link_other">打开地图</string>
     <!-- note list string -->
+    <string name="tips_of_revoke">提示</string>
+    <string name="can_not_revoke">您不能再执行撤销了</string>
+    <string name="have_not_input_anything">您还没有输入任何内容</string>
+    <string name="menu_revoke">撤销</string>
     <string name="menu_create_folder">新建文件夹</string>
     <string name="menu_export_text">导出文本</string>
     <string name="menu_sync">同步</string>
diff --git a/src/Notes-master/app/src/main/res/values-zh-rTW/strings.xml b/src/Notes-master/app/src/main/res/values-zh-rTW/strings.xml
index e29b79b..541a5e0 100644
--- a/src/Notes-master/app/src/main/res/values-zh-rTW/strings.xml
+++ b/src/Notes-master/app/src/main/res/values-zh-rTW/strings.xml
@@ -37,6 +37,10 @@
     <string name="note_link_other">打開地圖</string>
     <string name="format_move_notes_to_folder">已將所選 %1$d 便籤移到 %2$s 文件夾</string>
     <!-- note list string -->
+    <string name="tips_of_revoke">提示</string>
+    <string name="can_not_revoke">您不能再撤销了</string>
+    <string name="have_not_input_anything">您还没有输入任何内容</string>
+    <string name="menu_revoke">撤销</string>
     <string name="menu_create_folder">新建文件夾</string>
     <string name="menu_export_text">導出文本</string>
     <string name="menu_sync">同步</string>
diff --git a/src/Notes-master/app/src/main/res/values/arrays.xml b/src/Notes-master/app/src/main/res/values/arrays.xml
index e00210b..d470a7b 100644
--- a/src/Notes-master/app/src/main/res/values/arrays.xml
+++ b/src/Notes-master/app/src/main/res/values/arrays.xml
@@ -28,4 +28,20 @@
         <item>Messaging</item>
         <item>Email</item>
     </string-array>
+    <string-array name="text_bg_color">
+        <item>Red</item>
+        <item>Yellow</item>
+        <item>Blue</item>
+        <item>Green</item>
+        <item>Black</item>
+        <item>Transparent</item>
+    </string-array>
+
+    <string-array name="text_color">
+        <item>Red</item>
+        <item>Yellow</item>
+        <item>Blue</item>
+        <item>Green</item>
+        <item>Black</item>
+    </string-array>
 </resources>
\ No newline at end of file
diff --git a/src/Notes-master/app/src/main/res/values/strings.xml b/src/Notes-master/app/src/main/res/values/strings.xml
index 55df868..9efd6bd 100644
--- a/src/Notes-master/app/src/main/res/values/strings.xml
+++ b/src/Notes-master/app/src/main/res/values/strings.xml
@@ -39,7 +39,11 @@
     <string name="file_path">/MIUI/notes/</string>
     <string name="file_name_txt_format">notes_%s.txt</string>
     <!-- notes list string -->
-    <string name="format_folder_files_count">(%d)</string>
+    <string name="tips_of_revoke">Tips</string>
+    <string name="can_not_revoke">You can not revoke any more</string>
+    <string name="have_not_input_anything">You haven not input anything</string>
+    <string name="menu_revoke">Revoke</string>
+    <string name="format_folder_files_count" translatable="false">(%d)</string>
     <string name="menu_create_folder">New Folder</string>
     <string name="menu_export_text">Export text</string>
     <string name="menu_sync">Sync</string>
diff --git a/src/Notes-master/app/src/main/res/values/styles.xml b/src/Notes-master/app/src/main/res/values/styles.xml
index d750e65..cc2c84d 100644
--- a/src/Notes-master/app/src/main/res/values/styles.xml
+++ b/src/Notes-master/app/src/main/res/values/styles.xml
@@ -63,7 +63,7 @@
     </style>
 
     <style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
-        <item name="android:displayOptions" />
-        <item name="android:visibility">gone</item>
+
+        <item name="android:visibility">visible</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/src/Notes-master/build.gradle b/src/Notes-master/build.gradle
index dad9ef0..0303470 100644
--- a/src/Notes-master/build.gradle
+++ b/src/Notes-master/build.gradle
@@ -1,17 +1,23 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     repositories {
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
         google()
         jcenter()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7"
     }
 }
-
+apply plugin: "org.sonarqube"
 allprojects {
     repositories {
         google()
         jcenter()
     }
 }
+
+
diff --git a/src/Notes-master/build/sonar/.sonar_lock b/src/Notes-master/build/sonar/.sonar_lock
new file mode 100644
index 0000000..e69de29
diff --git a/src/Notes-master/build/sonar/report-task.txt b/src/Notes-master/build/sonar/report-task.txt
new file mode 100644
index 0000000..757a96f
--- /dev/null
+++ b/src/Notes-master/build/sonar/report-task.txt
@@ -0,0 +1,6 @@
+projectKey=micode-12
+serverUrl=http://localhost:9000
+serverVersion=8.5.0.37579
+dashboardUrl=http://localhost:9000/dashboard?id=micode-12
+ceTaskId=AXV0b7zlsqa4uwzm6xBp
+ceTaskUrl=http://localhost:9000/api/ce/task?id=AXV0b7zlsqa4uwzm6xBp