最终修改

src/Notes-master1/.idea/deploymentTargetDropDown.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <targetSelectedWithDropDown>
-      <Target>
-        <type value="QUICK_BOOT_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="C:\Users\15536\.android\avd\Pixel_3a_API_34_extension_level_7_x86_64.avd" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2024-01-18T16:49:17.567233900Z" />
-  </component>
-</project>

src/Notes-master1/.idea/sonarlint/issuestore/c/6/c65f5dc8218ef1da6f6bfb5d1b14aea855a54d7f

@@ -1,46 +0,0 @@
-
-“

-AYy_MCSLhZ96u27hlWV3
-java:S1118":Add a private constructor to hide the implicit public one.(§Ú¦“8¸Š¡—Å1J$618d7de4-485e-46f3-8b4c-6d02175a9671
-“

-AYy_MCSLhZ96u27hlWV4
-java:S1118*":Add a private constructor to hide the implicit public one.(¦¬ÿ”8¸Š¡—Å1J$aa8ae1bd-02f5-4cb4-9dda-4abc11312ad2
-ž

-AYy_MCSLhZ96u27hlWV5
-java:S1124+"EReorder the modifiers to comply with the Java Language Specification.(‰ßÆ“8¸Š¡—Å1J$531c2459-87a5-462f-9c68-ceb54338b165
-£

-AYy_MCSLhZ96u27hlWV6
-java:S11243"EReorder the modifiers to comply with the Java Language Specification.(¼Þý·þÿÿÿÿ
8¸Š¡—Å1J$2f6b41b4-17da-48bd-a42b-f90a77227e67
-‡

-AYy_MCSLhZ96u27hlWV8
-java:S2140G")Use "java.util.Random.nextInt()" instead.(Åðêôþÿÿÿÿ
8¸Š¡—Å1J$2490a9cd-5896-4180-a8c0-4d9828709a31
-˜

-AYy_MCSLhZ96u27hlWV-
-java:S1118M":Add a private constructor to hide the implicit public one.(øÕŪþÿÿÿÿ
8¸Š¡—Å1J$35b1b617-0f03-4604-86ca-b2edbe244702
-£

-AYy_MCSLhZ96u27hlWV_
-java:S1124N"EReorder the modifiers to comply with the Java Language Specification.(»ÔÌôüÿÿÿÿ
8¸Š¡—Å1J$0c1ed466-0f41-4801-9362-90a49b1b3f2b
-£

-AYy_MCSLhZ96u27hlWWA
-java:S1124V"EReorder the modifiers to comply with the Java Language Specification.(ÓþûÐúÿÿÿÿ
8¸Š¡—Å1J$a7ee775e-7547-40f5-9e30-194faabc7fac
-£

-AYy_MCSLhZ96u27hlWWB
-java:S1124^"EReorder the modifiers to comply with the Java Language Specification.(òÄó²ýÿÿÿÿ
8¸Š¡—Å1J$586a789f-a458-46ba-88a5-176d9d24b39b
-ž

-AYy_MCSLhZ96u27hlWWC
-java:S1124f"EReorder the modifiers to comply with the Java Language Specification.(¬Éœö8¸Š¡—Å1J$a7dae421-86a1-454b-99b1-d00fd8042ae2
-”

-AYy_MCSLhZ96u27hlWWD
-java:S1118ƒ
":Add a private constructor to hide the implicit public one.(ÜÖ¹Ø8¸Š¡—Å1J$47173ffa-c720-46c7-9dfe-4911a6649325
-¤

-AYy_MCSLhZ96u27hlWWE
-java:S1124„
"EReorder the modifiers to comply with the Java Language Specification.(®íç±þÿÿÿÿ
8¸Š¡—Å1J$7c5f9dd7-9b51-4c53-93ba-4554d6a8eb10
-¤

-AYy_MCSLhZ96u27hlWWF
-java:S1124<18>
"EReorder the modifiers to comply with the Java Language Specification.(ªª‡›úÿÿÿÿ
8¸Š¡—Å1J$9d2b208f-be46-4105-8c97-f6d9f843f8e7
-™

-AYy_MCSLhZ96u27hlWWG
-java:S1118<18>
":Add a private constructor to hide the implicit public one.(ŽÞëÿùÿÿÿÿ
8¸Š¡—Å1J$ebd6dde5-c282-4a4e-8edf-2836b820e9fd
-Ÿ

-AYy_MCSLhZ96u27hlWWH
-java:S1124ž
"EReorder the modifiers to comply with the Java Language Specification.(<28>Þúí
8¸Š¡—Å1J$239b2f5a-d16c-4269-b3a6-d330eed62b2e

src/Notes-master1/.idea/sonarlint/issuestore/index.pb

@@ -31,5 +31,3 @@ X
 (gradle/wrapper/gradle-wrapper.properties,f\b\fbe448ebfc3eb2d4e308f6b8b043666f5b57235e
 @
 local.properties,0\7\0712df971a99ac4d2fccb8e0fb19f377f3374cca
-k
-;app/src/main/java/net/micode/notes/tool/ResourceParser.java,c\6\c65f5dc8218ef1da6f6bfb5d1b14aea855a54d7f

src/Notes-master1/.idea/sonarlint/securityhotspotstore/c/6/c65f5dc8218ef1da6f6bfb5d1b14aea855a54d7f

@@ -1,7 +0,0 @@
-
-Ž

-AYy_MCSLhZ96u27hlWV7
-java:S6291E"5Make sure using an unencrypted database is safe here.(º—‡ê8¸Š¡—Å1J$f7115009-1b37-4729-9320-4f01ec8b2628
-£

-AYy_MCSLhZ96u27hlWV9
-java:S2245G"EMake sure that using this pseudorandom number generator is safe here.(Åðêôþÿÿÿÿ
8¸Š¡—Å1J$fdc32d67-659d-4ee2-b0fb-84bae306f49d

src/Notes-master1/.idea/sonarlint/securityhotspotstore/index.pb

@@ -31,5 +31,3 @@ X
 (gradle/wrapper/gradle-wrapper.properties,f\b\fbe448ebfc3eb2d4e308f6b8b043666f5b57235e
 @
 local.properties,0\7\0712df971a99ac4d2fccb8e0fb19f377f3374cca
-k
-;app/src/main/java/net/micode/notes/tool/ResourceParser.java,c\6\c65f5dc8218ef1da6f6bfb5d1b14aea855a54d7f

src/Notes-master1/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/NoteEditBinding.java

@@ -9,7 +9,6 @@ import android.view.ViewGroup;
 import android.viewbinding.ViewBinding;
 import android.viewbinding.ViewBindings;
 import android.widget.FrameLayout;
-import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -23,9 +22,6 @@ public final class NoteEditBinding implements ViewBinding {
   @NonNull
   private final FrameLayout rootView;
 
-  @NonNull
-  public final ImageButton addImgBtn;
-
   @NonNull
   public final ImageView btnSetBgColor;
 
@@ -113,10 +109,9 @@ public final class NoteEditBinding implements ViewBinding {
   @NonNull
   public final TextView tvModifiedDate;
 
-  private NoteEditBinding(@NonNull FrameLayout rootView, @NonNull ImageButton addImgBtn,
+  private NoteEditBinding(@NonNull FrameLayout rootView, @NonNull ImageView btnSetBgColor,
-      @NonNull ImageView btnSetBgColor, @NonNull LinearLayout fontSizeSelector,
+      @NonNull LinearLayout fontSizeSelector, @NonNull ImageView ivAlertIcon,
-      @NonNull ImageView ivAlertIcon, @NonNull ImageView ivBgBlue,
+      @NonNull ImageView ivBgBlue, @NonNull ImageView ivBgBlueSelect, @NonNull ImageView ivBgGreen,
-      @NonNull ImageView ivBgBlueSelect, @NonNull ImageView ivBgGreen,
       @NonNull ImageView ivBgGreenSelect, @NonNull ImageView ivBgRed,
       @NonNull ImageView ivBgRedSelect, @NonNull ImageView ivBgWhite,
       @NonNull ImageView ivBgWhiteSelect, @NonNull ImageView ivBgYellow,
@@ -129,7 +124,6 @@ public final class NoteEditBinding implements ViewBinding {
       @NonNull LinearLayout noteTitle, @NonNull LinearLayout svNoteEdit, @NonNull TextView textNum,
       @NonNull TextView tvAlertDate, @NonNull TextView tvModifiedDate) {
     this.rootView = rootView;
-    this.addImgBtn = addImgBtn;
     this.btnSetBgColor = btnSetBgColor;
     this.fontSizeSelector = fontSizeSelector;
     this.ivAlertIcon = ivAlertIcon;
@@ -188,12 +182,6 @@ public final class NoteEditBinding implements ViewBinding {
     // This is done to optimize the compiled bytecode for size and performance.
     int id;
     missingId: {
-      id = R.id.add_img_btn;
-      ImageButton addImgBtn = ViewBindings.findChildViewById(rootView, id);
-      if (addImgBtn == null) {
-        break missingId;
-      }
-
       id = R.id.btn_set_bg_color;
       ImageView btnSetBgColor = ViewBindings.findChildViewById(rootView, id);
       if (btnSetBgColor == null) {
@@ -368,7 +356,7 @@ public final class NoteEditBinding implements ViewBinding {
         break missingId;
       }
 
-      return new NoteEditBinding((FrameLayout) rootView, addImgBtn, btnSetBgColor, fontSizeSelector,
+      return new NoteEditBinding((FrameLayout) rootView, btnSetBgColor, fontSizeSelector,
           ivAlertIcon, ivBgBlue, ivBgBlueSelect, ivBgGreen, ivBgGreenSelect, ivBgRed, ivBgRedSelect,
           ivBgWhite, ivBgWhiteSelect, ivBgYellow, ivBgYellowSelect, ivLargeSelect, ivMediumSelect,
           ivSmallSelect, ivSuperSelect, llFontLarge, llFontNormal, llFontSmall, llFontSuper,

src/Notes-master1/app/build/intermediates/data_binding_layout_info_type_merge/debug/out/note_edit-layout.xml

@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?><Layout layout="note_edit" modulePackage="net.micode.notes" filePath="app\src\main\res\layout\note_edit.xml" directory="layout" isMerge="false" isBindingData="false" rootNodeType="android.widget.FrameLayout"><Targets><Target tag="layout/note_edit_0" view="FrameLayout"><Expressions/><location startLine="17" startOffset="0" endLine="416" endOffset="13"/></Target><Target id="@+id/note_title" view="LinearLayout"><Expressions/><location startLine="28" startOffset="8" endLine="71" endOffset="22"/></Target><Target id="@+id/tv_modified_date" view="TextView"><Expressions/><location startLine="33" startOffset="12" endLine="40" endOffset="77"/></Target><Target id="@+id/text_num" view="TextView"><Expressions/><location startLine="42" startOffset="12" endLine="48" endOffset="17"/></Target><Target id="@+id/iv_alert_icon" view="ImageView"><Expressions/><location startLine="50" startOffset="12" endLine="55" endOffset="60"/></Target><Target id="@+id/tv_alert_date" view="TextView"><Expressions/><location startLine="57" startOffset="12" endLine="64" endOffset="77"/></Target><Target id="@+id/sv_note_edit" view="LinearLayout"><Expressions/><location startLine="73" startOffset="8" endLine="123" endOffset="22"/></Target><Target id="@+id/note_edit_view" view="net.micode.notes.ui.NoteEditText"><Expressions/><location startLine="97" startOffset="20" endLine="107" endOffset="61"/></Target><Target id="@+id/note_edit_list" view="LinearLayout"><Expressions/><location startLine="109" startOffset="20" endLine="115" endOffset="51"/></Target><Target id="@+id/add_img_btn" view="ImageButton"><Expressions/><location startLine="126" startOffset="4" endLine="133" endOffset="57"/></Target><Target id="@+id/btn_set_bg_color" view="ImageView"><Expressions/><location startLine="135" startOffset="4" endLine="140" endOffset="44"/></Target><Target id="@+id/note_bg_color_selector" view="LinearLayout"><Expressions/><location startLine="142" startOffset="4" endLine="254" endOffset="18"/></Target><Target id="@+id/iv_bg_yellow" view="ImageView"><Expressions/><location startLine="157" startOffset="12" endLine="160" endOffset="54"/></Target><Target id="@+id/iv_bg_yellow_select" view="ImageView"><Expressions/><location startLine="162" startOffset="12" endLine="170" endOffset="50"/></Target><Target id="@+id/iv_bg_blue" view="ImageView"><Expressions/><location startLine="178" startOffset="12" endLine="181" endOffset="54"/></Target><Target id="@+id/iv_bg_blue_select" view="ImageView"><Expressions/><location startLine="183" startOffset="12" endLine="191" endOffset="50"/></Target><Target id="@+id/iv_bg_white" view="ImageView"><Expressions/><location startLine="199" startOffset="12" endLine="202" endOffset="54"/></Target><Target id="@+id/iv_bg_white_select" view="ImageView"><Expressions/><location startLine="204" startOffset="12" endLine="212" endOffset="50"/></Target><Target id="@+id/iv_bg_green" view="ImageView"><Expressions/><location startLine="220" startOffset="12" endLine="223" endOffset="54"/></Target><Target id="@+id/iv_bg_green_select" view="ImageView"><Expressions/><location startLine="225" startOffset="12" endLine="232" endOffset="50"/></Target><Target id="@+id/iv_bg_red" view="ImageView"><Expressions/><location startLine="240" startOffset="12" endLine="243" endOffset="54"/></Target><Target id="@+id/iv_bg_red_select" view="ImageView"><Expressions/><location startLine="245" startOffset="12" endLine="252" endOffset="50"/></Target><Target id="@+id/font_size_selector" view="LinearLayout"><Expressions/><location startLine="256" startOffset="4" endLine="415" endOffset="18"/></Target><Target id="@+id/ll_font_small" view="FrameLayout"><Expressions/><location startLine="264" startOffset="8" endLine="300" endOffset="21"/></Target><Target id="@+id/iv_small_select" view="ImageView"><Expressions/><location startLine="290" startOffset="12" endLine="299" endOffset="50"/></Target><Target id="@+id/ll_font_normal" view="FrameLayout"><Expressions/><location startLine="302" startOffset="8" endLine="338" endOffset="21"/></Target><Target id="@+id/iv_medium_select" view="ImageView"><Expressions/><location startLine="328" startOffset="12" endLine="337" endOffset="50"/></Target><Target id="@+id/ll_font_large" view="FrameLayout"><Expressions/><location startLine="340" startOffset="8" endLine="376" endOffset="21"/></Target><Target id="@+id/iv_large_select" view="ImageView"><Expressions/><location startLine="366" startOffset="12" endLine="375" endOffset="50"/></Target><Target id="@+id/ll_font_super" view="FrameLayout"><Expressions/><location startLine="378" startOffset="8" endLine="414" endOffset="21"/></Target><Target id="@+id/iv_super_select" view="ImageView"><Expressions/><location startLine="404" startOffset="12" endLine="413" endOffset="50"/></Target></Targets></Layout>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?><Layout layout="note_edit" modulePackage="net.micode.notes" filePath="app\src\main\res\layout\note_edit.xml" directory="layout" isMerge="false" isBindingData="false" rootNodeType="android.widget.FrameLayout"><Targets><Target tag="layout/note_edit_0" view="FrameLayout"><Expressions/><location startLine="17" startOffset="0" endLine="407" endOffset="13"/></Target><Target id="@+id/note_title" view="LinearLayout"><Expressions/><location startLine="28" startOffset="8" endLine="71" endOffset="22"/></Target><Target id="@+id/tv_modified_date" view="TextView"><Expressions/><location startLine="33" startOffset="12" endLine="40" endOffset="77"/></Target><Target id="@+id/text_num" view="TextView"><Expressions/><location startLine="42" startOffset="12" endLine="48" endOffset="17"/></Target><Target id="@+id/iv_alert_icon" view="ImageView"><Expressions/><location startLine="50" startOffset="12" endLine="55" endOffset="60"/></Target><Target id="@+id/tv_alert_date" view="TextView"><Expressions/><location startLine="57" startOffset="12" endLine="64" endOffset="77"/></Target><Target id="@+id/sv_note_edit" view="LinearLayout"><Expressions/><location startLine="73" startOffset="8" endLine="123" endOffset="22"/></Target><Target id="@+id/note_edit_view" view="net.micode.notes.ui.NoteEditText"><Expressions/><location startLine="97" startOffset="20" endLine="107" endOffset="61"/></Target><Target id="@+id/note_edit_list" view="LinearLayout"><Expressions/><location startLine="109" startOffset="20" endLine="115" endOffset="51"/></Target><Target id="@+id/btn_set_bg_color" view="ImageView"><Expressions/><location startLine="126" startOffset="4" endLine="131" endOffset="44"/></Target><Target id="@+id/note_bg_color_selector" view="LinearLayout"><Expressions/><location startLine="133" startOffset="4" endLine="245" endOffset="18"/></Target><Target id="@+id/iv_bg_yellow" view="ImageView"><Expressions/><location startLine="148" startOffset="12" endLine="151" endOffset="54"/></Target><Target id="@+id/iv_bg_yellow_select" view="ImageView"><Expressions/><location startLine="153" startOffset="12" endLine="161" endOffset="50"/></Target><Target id="@+id/iv_bg_blue" view="ImageView"><Expressions/><location startLine="169" startOffset="12" endLine="172" endOffset="54"/></Target><Target id="@+id/iv_bg_blue_select" view="ImageView"><Expressions/><location startLine="174" startOffset="12" endLine="182" endOffset="50"/></Target><Target id="@+id/iv_bg_white" view="ImageView"><Expressions/><location startLine="190" startOffset="12" endLine="193" endOffset="54"/></Target><Target id="@+id/iv_bg_white_select" view="ImageView"><Expressions/><location startLine="195" startOffset="12" endLine="203" endOffset="50"/></Target><Target id="@+id/iv_bg_green" view="ImageView"><Expressions/><location startLine="211" startOffset="12" endLine="214" endOffset="54"/></Target><Target id="@+id/iv_bg_green_select" view="ImageView"><Expressions/><location startLine="216" startOffset="12" endLine="223" endOffset="50"/></Target><Target id="@+id/iv_bg_red" view="ImageView"><Expressions/><location startLine="231" startOffset="12" endLine="234" endOffset="54"/></Target><Target id="@+id/iv_bg_red_select" view="ImageView"><Expressions/><location startLine="236" startOffset="12" endLine="243" endOffset="50"/></Target><Target id="@+id/font_size_selector" view="LinearLayout"><Expressions/><location startLine="247" startOffset="4" endLine="406" endOffset="18"/></Target><Target id="@+id/ll_font_small" view="FrameLayout"><Expressions/><location startLine="255" startOffset="8" endLine="291" endOffset="21"/></Target><Target id="@+id/iv_small_select" view="ImageView"><Expressions/><location startLine="281" startOffset="12" endLine="290" endOffset="50"/></Target><Target id="@+id/ll_font_normal" view="FrameLayout"><Expressions/><location startLine="293" startOffset="8" endLine="329" endOffset="21"/></Target><Target id="@+id/iv_medium_select" view="ImageView"><Expressions/><location startLine="319" startOffset="12" endLine="328" endOffset="50"/></Target><Target id="@+id/ll_font_large" view="FrameLayout"><Expressions/><location startLine="331" startOffset="8" endLine="367" endOffset="21"/></Target><Target id="@+id/iv_large_select" view="ImageView"><Expressions/><location startLine="357" startOffset="12" endLine="366" endOffset="50"/></Target><Target id="@+id/ll_font_super" view="FrameLayout"><Expressions/><location startLine="369" startOffset="8" endLine="405" endOffset="21"/></Target><Target id="@+id/iv_super_select" view="ImageView"><Expressions/><location startLine="395" startOffset="12" endLine="404" endOffset="50"/></Target></Targets></Layout>

src/Notes-master1/app/build/intermediates/data_binding_layout_info_type_package/debug/out/note_edit-layout.xml

@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?><Layout layout="note_edit" modulePackage="net.micode.notes" filePath="app\src\main\res\layout\note_edit.xml" directory="layout" isMerge="false" isBindingData="false" rootNodeType="android.widget.FrameLayout"><Targets><Target tag="layout/note_edit_0" view="FrameLayout"><Expressions/><location startLine="17" startOffset="0" endLine="416" endOffset="13"/></Target><Target id="@+id/note_title" view="LinearLayout"><Expressions/><location startLine="28" startOffset="8" endLine="71" endOffset="22"/></Target><Target id="@+id/tv_modified_date" view="TextView"><Expressions/><location startLine="33" startOffset="12" endLine="40" endOffset="77"/></Target><Target id="@+id/text_num" view="TextView"><Expressions/><location startLine="42" startOffset="12" endLine="48" endOffset="17"/></Target><Target id="@+id/iv_alert_icon" view="ImageView"><Expressions/><location startLine="50" startOffset="12" endLine="55" endOffset="60"/></Target><Target id="@+id/tv_alert_date" view="TextView"><Expressions/><location startLine="57" startOffset="12" endLine="64" endOffset="77"/></Target><Target id="@+id/sv_note_edit" view="LinearLayout"><Expressions/><location startLine="73" startOffset="8" endLine="123" endOffset="22"/></Target><Target id="@+id/note_edit_view" view="net.micode.notes.ui.NoteEditText"><Expressions/><location startLine="97" startOffset="20" endLine="107" endOffset="61"/></Target><Target id="@+id/note_edit_list" view="LinearLayout"><Expressions/><location startLine="109" startOffset="20" endLine="115" endOffset="51"/></Target><Target id="@+id/add_img_btn" view="ImageButton"><Expressions/><location startLine="126" startOffset="4" endLine="133" endOffset="57"/></Target><Target id="@+id/btn_set_bg_color" view="ImageView"><Expressions/><location startLine="135" startOffset="4" endLine="140" endOffset="44"/></Target><Target id="@+id/note_bg_color_selector" view="LinearLayout"><Expressions/><location startLine="142" startOffset="4" endLine="254" endOffset="18"/></Target><Target id="@+id/iv_bg_yellow" view="ImageView"><Expressions/><location startLine="157" startOffset="12" endLine="160" endOffset="54"/></Target><Target id="@+id/iv_bg_yellow_select" view="ImageView"><Expressions/><location startLine="162" startOffset="12" endLine="170" endOffset="50"/></Target><Target id="@+id/iv_bg_blue" view="ImageView"><Expressions/><location startLine="178" startOffset="12" endLine="181" endOffset="54"/></Target><Target id="@+id/iv_bg_blue_select" view="ImageView"><Expressions/><location startLine="183" startOffset="12" endLine="191" endOffset="50"/></Target><Target id="@+id/iv_bg_white" view="ImageView"><Expressions/><location startLine="199" startOffset="12" endLine="202" endOffset="54"/></Target><Target id="@+id/iv_bg_white_select" view="ImageView"><Expressions/><location startLine="204" startOffset="12" endLine="212" endOffset="50"/></Target><Target id="@+id/iv_bg_green" view="ImageView"><Expressions/><location startLine="220" startOffset="12" endLine="223" endOffset="54"/></Target><Target id="@+id/iv_bg_green_select" view="ImageView"><Expressions/><location startLine="225" startOffset="12" endLine="232" endOffset="50"/></Target><Target id="@+id/iv_bg_red" view="ImageView"><Expressions/><location startLine="240" startOffset="12" endLine="243" endOffset="54"/></Target><Target id="@+id/iv_bg_red_select" view="ImageView"><Expressions/><location startLine="245" startOffset="12" endLine="252" endOffset="50"/></Target><Target id="@+id/font_size_selector" view="LinearLayout"><Expressions/><location startLine="256" startOffset="4" endLine="415" endOffset="18"/></Target><Target id="@+id/ll_font_small" view="FrameLayout"><Expressions/><location startLine="264" startOffset="8" endLine="300" endOffset="21"/></Target><Target id="@+id/iv_small_select" view="ImageView"><Expressions/><location startLine="290" startOffset="12" endLine="299" endOffset="50"/></Target><Target id="@+id/ll_font_normal" view="FrameLayout"><Expressions/><location startLine="302" startOffset="8" endLine="338" endOffset="21"/></Target><Target id="@+id/iv_medium_select" view="ImageView"><Expressions/><location startLine="328" startOffset="12" endLine="337" endOffset="50"/></Target><Target id="@+id/ll_font_large" view="FrameLayout"><Expressions/><location startLine="340" startOffset="8" endLine="376" endOffset="21"/></Target><Target id="@+id/iv_large_select" view="ImageView"><Expressions/><location startLine="366" startOffset="12" endLine="375" endOffset="50"/></Target><Target id="@+id/ll_font_super" view="FrameLayout"><Expressions/><location startLine="378" startOffset="8" endLine="414" endOffset="21"/></Target><Target id="@+id/iv_super_select" view="ImageView"><Expressions/><location startLine="404" startOffset="12" endLine="413" endOffset="50"/></Target></Targets></Layout>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?><Layout layout="note_edit" modulePackage="net.micode.notes" filePath="app\src\main\res\layout\note_edit.xml" directory="layout" isMerge="false" isBindingData="false" rootNodeType="android.widget.FrameLayout"><Targets><Target tag="layout/note_edit_0" view="FrameLayout"><Expressions/><location startLine="17" startOffset="0" endLine="407" endOffset="13"/></Target><Target id="@+id/note_title" view="LinearLayout"><Expressions/><location startLine="28" startOffset="8" endLine="71" endOffset="22"/></Target><Target id="@+id/tv_modified_date" view="TextView"><Expressions/><location startLine="33" startOffset="12" endLine="40" endOffset="77"/></Target><Target id="@+id/text_num" view="TextView"><Expressions/><location startLine="42" startOffset="12" endLine="48" endOffset="17"/></Target><Target id="@+id/iv_alert_icon" view="ImageView"><Expressions/><location startLine="50" startOffset="12" endLine="55" endOffset="60"/></Target><Target id="@+id/tv_alert_date" view="TextView"><Expressions/><location startLine="57" startOffset="12" endLine="64" endOffset="77"/></Target><Target id="@+id/sv_note_edit" view="LinearLayout"><Expressions/><location startLine="73" startOffset="8" endLine="123" endOffset="22"/></Target><Target id="@+id/note_edit_view" view="net.micode.notes.ui.NoteEditText"><Expressions/><location startLine="97" startOffset="20" endLine="107" endOffset="61"/></Target><Target id="@+id/note_edit_list" view="LinearLayout"><Expressions/><location startLine="109" startOffset="20" endLine="115" endOffset="51"/></Target><Target id="@+id/btn_set_bg_color" view="ImageView"><Expressions/><location startLine="126" startOffset="4" endLine="131" endOffset="44"/></Target><Target id="@+id/note_bg_color_selector" view="LinearLayout"><Expressions/><location startLine="133" startOffset="4" endLine="245" endOffset="18"/></Target><Target id="@+id/iv_bg_yellow" view="ImageView"><Expressions/><location startLine="148" startOffset="12" endLine="151" endOffset="54"/></Target><Target id="@+id/iv_bg_yellow_select" view="ImageView"><Expressions/><location startLine="153" startOffset="12" endLine="161" endOffset="50"/></Target><Target id="@+id/iv_bg_blue" view="ImageView"><Expressions/><location startLine="169" startOffset="12" endLine="172" endOffset="54"/></Target><Target id="@+id/iv_bg_blue_select" view="ImageView"><Expressions/><location startLine="174" startOffset="12" endLine="182" endOffset="50"/></Target><Target id="@+id/iv_bg_white" view="ImageView"><Expressions/><location startLine="190" startOffset="12" endLine="193" endOffset="54"/></Target><Target id="@+id/iv_bg_white_select" view="ImageView"><Expressions/><location startLine="195" startOffset="12" endLine="203" endOffset="50"/></Target><Target id="@+id/iv_bg_green" view="ImageView"><Expressions/><location startLine="211" startOffset="12" endLine="214" endOffset="54"/></Target><Target id="@+id/iv_bg_green_select" view="ImageView"><Expressions/><location startLine="216" startOffset="12" endLine="223" endOffset="50"/></Target><Target id="@+id/iv_bg_red" view="ImageView"><Expressions/><location startLine="231" startOffset="12" endLine="234" endOffset="54"/></Target><Target id="@+id/iv_bg_red_select" view="ImageView"><Expressions/><location startLine="236" startOffset="12" endLine="243" endOffset="50"/></Target><Target id="@+id/font_size_selector" view="LinearLayout"><Expressions/><location startLine="247" startOffset="4" endLine="406" endOffset="18"/></Target><Target id="@+id/ll_font_small" view="FrameLayout"><Expressions/><location startLine="255" startOffset="8" endLine="291" endOffset="21"/></Target><Target id="@+id/iv_small_select" view="ImageView"><Expressions/><location startLine="281" startOffset="12" endLine="290" endOffset="50"/></Target><Target id="@+id/ll_font_normal" view="FrameLayout"><Expressions/><location startLine="293" startOffset="8" endLine="329" endOffset="21"/></Target><Target id="@+id/iv_medium_select" view="ImageView"><Expressions/><location startLine="319" startOffset="12" endLine="328" endOffset="50"/></Target><Target id="@+id/ll_font_large" view="FrameLayout"><Expressions/><location startLine="331" startOffset="8" endLine="367" endOffset="21"/></Target><Target id="@+id/iv_large_select" view="ImageView"><Expressions/><location startLine="357" startOffset="12" endLine="366" endOffset="50"/></Target><Target id="@+id/ll_font_super" view="FrameLayout"><Expressions/><location startLine="369" startOffset="8" endLine="405" endOffset="21"/></Target><Target id="@+id/iv_super_select" view="ImageView"><Expressions/><location startLine="395" startOffset="12" endLine="404" endOffset="50"/></Target></Targets></Layout>

src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Thu Jan 18 20:22:11 CST 2024
+#Thu Jan 18 15:22:07 CST 2024
 net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
 net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat

src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/stripped.dir/layout/note_edit.xml

@@ -1,417 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<FrameLayout
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="@drawable/list_background"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:id="@+id/note_title"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content">
-
-            <TextView
-                android:id="@+id/tv_modified_date"
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:layout_gravity="left|center_vertical"
-                android:layout_marginRight="8dip"
-                android:textAppearance="@style/TextAppearanceSecondaryItem" />
-
-            <TextView
-                android:id="@+id/text_num"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="right|center_vertical"
-                android:layout_marginRight="8dip"
-                />
-
-            <ImageView
-                android:id="@+id/iv_alert_icon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:background="@drawable/title_alert" />
-
-            <TextView
-                android:id="@+id/tv_alert_date"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="2dip"
-                android:layout_marginRight="8dip"
-                android:textAppearance="@style/TextAppearanceSecondaryItem" />
-
-            <ImageButton
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:background="@drawable/bg_btn_set_color" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/sv_note_edit"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:orientation="vertical">
-
-            <ImageView
-                android:layout_width="fill_parent"
-                android:layout_height="7dip"
-                android:background="@drawable/bg_color_btn_mask" />
-
-            <ScrollView
-                android:layout_width="fill_parent"
-                android:layout_height="0dip"
-                android:layout_weight="1"
-                android:scrollbars="none"
-                android:overScrollMode="never"
-                android:layout_gravity="left|top"
-                android:fadingEdgeLength="0dip">
-
-                <LinearLayout
-                    android:layout_width="fill_parent"
-                    android:layout_height="fill_parent">
-
-                    <net.micode.notes.ui.NoteEditText
-                        android:id="@+id/note_edit_view"
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="left|top"
-                        android:background="@null"
-                        android:autoLink="all"
-                        android:linksClickable="false"
-                        android:minLines="12"
-                        android:textAppearance="@style/TextAppearancePrimaryItem"
-                        android:lineSpacingMultiplier="1.2" />
-
-                    <LinearLayout
-                        android:id="@+id/note_edit_list"
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        android:layout_marginLeft="-10dip"
-                        android:visibility="gone" />
-                </LinearLayout>
-            </ScrollView>
-
-            <ImageView
-                android:layout_width="fill_parent"
-                android:layout_height="7dip"
-                android:background="@drawable/bg_color_btn_mask" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <ImageButton
-        android:id="@+id/add_img_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="7dp"
-        android:layout_marginTop="600dp"
-        android:layout_marginBottom="7dp"
-        android:src="@android:drawable/ic_menu_gallery" />
-
-    <ImageView
-        android:id="@+id/btn_set_bg_color"
-        android:layout_height="43dip"
-        android:layout_width="wrap_content"
-        android:background="@drawable/bg_color_btn_mask"
-        android:layout_gravity="top|right" />
-
-    <LinearLayout
-        android:id="@+id/note_bg_color_selector"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@drawable/note_edit_color_selector_panel"
-        android:layout_marginTop="30dip"
-        android:layout_marginRight="8dip"
-        android:layout_gravity="top|right"
-        android:visibility="gone">
-
-        <FrameLayout
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
-
-            <ImageView
-                android:id="@+id/iv_bg_yellow"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-
-            <ImageView
-                android:id="@+id/iv_bg_yellow_select"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom|right"
-                android:layout_marginRight="5dip"
-                android:focusable="false"
-                android:visibility="gone"
-                android:src="@drawable/selected" />
-        </FrameLayout>
-
-        <FrameLayout
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
-
-            <ImageView
-                android:id="@+id/iv_bg_blue"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-
-            <ImageView
-                android:id="@+id/iv_bg_blue_select"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom|right"
-                android:focusable="false"
-                android:visibility="gone"
-                android:layout_marginRight="3dip"
-                android:src="@drawable/selected" />
-        </FrameLayout>
-
-        <FrameLayout
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
-
-            <ImageView
-                android:id="@+id/iv_bg_white"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-
-            <ImageView
-                android:id="@+id/iv_bg_white_select"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom|right"
-                android:focusable="false"
-                android:visibility="gone"
-                android:layout_marginRight="2dip"
-                android:src="@drawable/selected" />
-        </FrameLayout>
-
-        <FrameLayout
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
-
-            <ImageView
-                android:id="@+id/iv_bg_green"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-
-            <ImageView
-                android:id="@+id/iv_bg_green_select"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom|right"
-                android:focusable="false"
-                android:visibility="gone"
-                android:src="@drawable/selected" />
-        </FrameLayout>
-
-        <FrameLayout
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
-
-            <ImageView
-                android:id="@+id/iv_bg_red"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-
-            <ImageView
-                android:id="@+id/iv_bg_red_select"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom|right"
-                android:focusable="false"
-                android:visibility="gone"
-                android:src="@drawable/selected" />
-        </FrameLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/font_size_selector"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/font_size_selector_bg"
-        android:layout_gravity="bottom"
-        android:visibility="gone">
-
-        <FrameLayout
-            android:id="@+id/ll_font_small"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1">
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:layout_gravity="center"
-                android:gravity="center">
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/font_small"
-                    android:layout_marginBottom="5dip" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/menu_font_small"
-                    android:textAppearance="@style/TextAppearanceUnderMenuIcon" />
-            </LinearLayout>
-
-            <ImageView
-                android:id="@+id/iv_small_select"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom|right"
-                android:layout_marginRight="6dip"
-                android:layout_marginBottom="-7dip"
-                android:focusable="false"
-                android:visibility="gone"
-                android:src="@drawable/selected" />
-        </FrameLayout>
-
-        <FrameLayout
-            android:id="@+id/ll_font_normal"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1">
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:layout_gravity="center"
-                android:gravity="center">
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/font_normal"
-                    android:layout_marginBottom="5dip" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/menu_font_normal"
-                    android:textAppearance="@style/TextAppearanceUnderMenuIcon" />
-            </LinearLayout>
-
-            <ImageView
-                android:id="@+id/iv_medium_select"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom|right"
-                android:focusable="false"
-                android:visibility="gone"
-                android:layout_marginRight="6dip"
-                android:layout_marginBottom="-7dip"
-                android:src="@drawable/selected" />
-        </FrameLayout>
-
-        <FrameLayout
-            android:id="@+id/ll_font_large"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1">
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:layout_gravity="center"
-                android:gravity="center">
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/font_large"
-                    android:layout_marginBottom="5dip" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/menu_font_large"
-                    android:textAppearance="@style/TextAppearanceUnderMenuIcon" />
-            </LinearLayout>
-
-            <ImageView
-                android:id="@+id/iv_large_select"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom|right"
-                android:focusable="false"
-                android:visibility="gone"
-                android:layout_marginRight="6dip"
-                android:layout_marginBottom="-7dip"
-                android:src="@drawable/selected" />
-        </FrameLayout>
-
-        <FrameLayout
-            android:id="@+id/ll_font_super"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1">
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:layout_gravity="center"
-                android:gravity="center">
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/font_super"
-                    android:layout_marginBottom="5dip" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/menu_font_super"
-                    android:textAppearance="@style/TextAppearanceUnderMenuIcon" />
-            </LinearLayout>
-
-            <ImageView
-                android:id="@+id/iv_super_select"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom|right"
-                android:focusable="false"
-                android:visibility="gone"
-                android:layout_marginRight="6dip"
-                android:layout_marginBottom="-7dip"
-                android:src="@drawable/selected" />
-        </FrameLayout>
-    </LinearLayout>
-</FrameLayout>

src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/stripped.dir/layout/note_list.xml

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+    <!-- android:background="@drawable/list_background"> -->
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/tv_title_bar"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/title_bar_bg"
+            android:visibility="gone"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:textColor="#FFEAD1AE"
+            android:textSize="@dimen/text_font_size_medium" />
+
+        <ListView
+            android:id="@+id/notes_list"
+            android:layout_width="fill_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1"
+            android:cacheColorHint="@null"
+            android:listSelector="@android:color/transparent"
+            android:divider="@null"
+            android:fadingEdge="@null" />
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/btn_new_note"
+        android:background="@drawable/new_note"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:focusable="false"
+        android:layout_gravity="bottom" />
+</FrameLayout>

src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Thu Jan 18 20:22:11 CST 2024
+#Thu Jan 18 15:22:07 CST 2024
 net.micode.notes.app-main-5\:/color/primary_text_dark.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml
 net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml
 net.micode.notes.app-main-5\:/drawable-hdpi/bg_btn_set_color.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_btn_set_color.png

src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/stripped.dir/layout/note_edit.xml

@@ -1,417 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<FrameLayout
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="@drawable/list_background"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:id="@+id/note_title"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content">
-
-            <TextView
-                android:id="@+id/tv_modified_date"
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:layout_gravity="left|center_vertical"
-                android:layout_marginRight="8dip"
-                android:textAppearance="@style/TextAppearanceSecondaryItem" />
-
-            <TextView
-                android:id="@+id/text_num"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="right|center_vertical"
-                android:layout_marginRight="8dip"
-                />
-
-            <ImageView
-                android:id="@+id/iv_alert_icon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:background="@drawable/title_alert" />
-
-            <TextView
-                android:id="@+id/tv_alert_date"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="2dip"
-                android:layout_marginRight="8dip"
-                android:textAppearance="@style/TextAppearanceSecondaryItem" />
-
-            <ImageButton
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:background="@drawable/bg_btn_set_color" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/sv_note_edit"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:orientation="vertical">
-
-            <ImageView
-                android:layout_width="fill_parent"
-                android:layout_height="7dip"
-                android:background="@drawable/bg_color_btn_mask" />
-
-            <ScrollView
-                android:layout_width="fill_parent"
-                android:layout_height="0dip"
-                android:layout_weight="1"
-                android:scrollbars="none"
-                android:overScrollMode="never"
-                android:layout_gravity="left|top"
-                android:fadingEdgeLength="0dip">
-
-                <LinearLayout
-                    android:layout_width="fill_parent"
-                    android:layout_height="fill_parent">
-
-                    <net.micode.notes.ui.NoteEditText
-                        android:id="@+id/note_edit_view"
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="left|top"
-                        android:background="@null"
-                        android:autoLink="all"
-                        android:linksClickable="false"
-                        android:minLines="12"
-                        android:textAppearance="@style/TextAppearancePrimaryItem"
-                        android:lineSpacingMultiplier="1.2" />
-
-                    <LinearLayout
-                        android:id="@+id/note_edit_list"
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        android:layout_marginLeft="-10dip"
-                        android:visibility="gone" />
-                </LinearLayout>
-            </ScrollView>
-
-            <ImageView
-                android:layout_width="fill_parent"
-                android:layout_height="7dip"
-                android:background="@drawable/bg_color_btn_mask" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <ImageButton
-        android:id="@+id/add_img_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="7dp"
-        android:layout_marginTop="600dp"
-        android:layout_marginBottom="7dp"
-        android:src="@android:drawable/ic_menu_gallery" />
-
-    <ImageView
-        android:id="@+id/btn_set_bg_color"
-        android:layout_height="43dip"
-        android:layout_width="wrap_content"
-        android:background="@drawable/bg_color_btn_mask"
-        android:layout_gravity="top|right" />
-
-    <LinearLayout
-        android:id="@+id/note_bg_color_selector"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@drawable/note_edit_color_selector_panel"
-        android:layout_marginTop="30dip"
-        android:layout_marginRight="8dip"
-        android:layout_gravity="top|right"
-        android:visibility="gone">
-
-        <FrameLayout
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
-
-            <ImageView
-                android:id="@+id/iv_bg_yellow"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-
-            <ImageView
-                android:id="@+id/iv_bg_yellow_select"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom|right"
-                android:layout_marginRight="5dip"
-                android:focusable="false"
-                android:visibility="gone"
-                android:src="@drawable/selected" />
-        </FrameLayout>
-
-        <FrameLayout
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
-
-            <ImageView
-                android:id="@+id/iv_bg_blue"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-
-            <ImageView
-                android:id="@+id/iv_bg_blue_select"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom|right"
-                android:focusable="false"
-                android:visibility="gone"
-                android:layout_marginRight="3dip"
-                android:src="@drawable/selected" />
-        </FrameLayout>
-
-        <FrameLayout
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
-
-            <ImageView
-                android:id="@+id/iv_bg_white"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-
-            <ImageView
-                android:id="@+id/iv_bg_white_select"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom|right"
-                android:focusable="false"
-                android:visibility="gone"
-                android:layout_marginRight="2dip"
-                android:src="@drawable/selected" />
-        </FrameLayout>
-
-        <FrameLayout
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
-
-            <ImageView
-                android:id="@+id/iv_bg_green"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-
-            <ImageView
-                android:id="@+id/iv_bg_green_select"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom|right"
-                android:focusable="false"
-                android:visibility="gone"
-                android:src="@drawable/selected" />
-        </FrameLayout>
-
-        <FrameLayout
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
-
-            <ImageView
-                android:id="@+id/iv_bg_red"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-
-            <ImageView
-                android:id="@+id/iv_bg_red_select"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom|right"
-                android:focusable="false"
-                android:visibility="gone"
-                android:src="@drawable/selected" />
-        </FrameLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/font_size_selector"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/font_size_selector_bg"
-        android:layout_gravity="bottom"
-        android:visibility="gone">
-
-        <FrameLayout
-            android:id="@+id/ll_font_small"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1">
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:layout_gravity="center"
-                android:gravity="center">
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/font_small"
-                    android:layout_marginBottom="5dip" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/menu_font_small"
-                    android:textAppearance="@style/TextAppearanceUnderMenuIcon" />
-            </LinearLayout>
-
-            <ImageView
-                android:id="@+id/iv_small_select"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom|right"
-                android:layout_marginRight="6dip"
-                android:layout_marginBottom="-7dip"
-                android:focusable="false"
-                android:visibility="gone"
-                android:src="@drawable/selected" />
-        </FrameLayout>
-
-        <FrameLayout
-            android:id="@+id/ll_font_normal"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1">
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:layout_gravity="center"
-                android:gravity="center">
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/font_normal"
-                    android:layout_marginBottom="5dip" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/menu_font_normal"
-                    android:textAppearance="@style/TextAppearanceUnderMenuIcon" />
-            </LinearLayout>
-
-            <ImageView
-                android:id="@+id/iv_medium_select"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom|right"
-                android:focusable="false"
-                android:visibility="gone"
-                android:layout_marginRight="6dip"
-                android:layout_marginBottom="-7dip"
-                android:src="@drawable/selected" />
-        </FrameLayout>
-
-        <FrameLayout
-            android:id="@+id/ll_font_large"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1">
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:layout_gravity="center"
-                android:gravity="center">
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/font_large"
-                    android:layout_marginBottom="5dip" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/menu_font_large"
-                    android:textAppearance="@style/TextAppearanceUnderMenuIcon" />
-            </LinearLayout>
-
-            <ImageView
-                android:id="@+id/iv_large_select"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom|right"
-                android:focusable="false"
-                android:visibility="gone"
-                android:layout_marginRight="6dip"
-                android:layout_marginBottom="-7dip"
-                android:src="@drawable/selected" />
-        </FrameLayout>
-
-        <FrameLayout
-            android:id="@+id/ll_font_super"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1">
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:layout_gravity="center"
-                android:gravity="center">
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/font_super"
-                    android:layout_marginBottom="5dip" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/menu_font_super"
-                    android:textAppearance="@style/TextAppearanceUnderMenuIcon" />
-            </LinearLayout>
-
-            <ImageView
-                android:id="@+id/iv_super_select"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom|right"
-                android:focusable="false"
-                android:visibility="gone"
-                android:layout_marginRight="6dip"
-                android:layout_marginBottom="-7dip"
-                android:src="@drawable/selected" />
-        </FrameLayout>
-    </LinearLayout>
-</FrameLayout>

src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/stripped.dir/layout/note_list.xml

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+    <!-- android:background="@drawable/list_background"> -->
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/tv_title_bar"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/title_bar_bg"
+            android:visibility="gone"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:textColor="#FFEAD1AE"
+            android:textSize="@dimen/text_font_size_medium" />
+
+        <ListView
+            android:id="@+id/notes_list"
+            android:layout_width="fill_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1"
+            android:cacheColorHint="@null"
+            android:listSelector="@android:color/transparent"
+            android:divider="@null"
+            android:fadingEdge="@null" />
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/btn_new_note"
+        android:background="@drawable/new_note"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:focusable="false"
+        android:layout_gravity="bottom" />
+</FrameLayout>

src/Notes-master1/app/build/intermediates/local_only_symbol_list/debug/R-def.txt

@@ -91,7 +91,6 @@ drawable widget_4x_yellow
 id account_dialog_subtitle
 id account_dialog_title
 id action_select_all
-id add_img_btn
 id amPm
 id btn_new_note
 id btn_set_bg_color

src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json

@@ -7,14 +7,14 @@
         "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_icon_app_yuan.png.flat",
         "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\drawable-hdpi\\icon_app_yuan.png"
     },
-    {
-        "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_btn_set_color.png.flat",
-        "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_btn_set_color.png"
-    },
     {
         "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_splash.png.flat",
         "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\drawable-hdpi\\splash.png"
     },
+    {
+        "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_btn_set_color.png.flat",
+        "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_btn_set_color.png"
+    },
     {
         "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_icon_app.png.flat",
         "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\drawable-hdpi\\icon_app.png"
@@ -63,14 +63,14 @@
         "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\layout_dialog_edit_text.xml.flat",
         "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\layout\\dialog_edit_text.xml"
     },
-    {
-        "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\layout_folder_list_item.xml.flat",
-        "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\layout\\folder_list_item.xml"
-    },
     {
         "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_yellow.png.flat",
         "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_yellow.png"
     },
+    {
+        "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\layout_folder_list_item.xml.flat",
+        "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\layout\\folder_list_item.xml"
+    },
     {
         "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_fly.png.flat",
         "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\drawable-hdpi\\fly.png"
@@ -112,8 +112,8 @@
         "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_red.png"
     },
     {
-        "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit.xml.flat",
+        "merged": "net.micode.notes.app-merged_res-5:/layout_note_list.xml.flat",
-        "source": "net.micode.notes.app-main-7:/layout/note_edit.xml"
+        "source": "net.micode.notes.app-main-7:/layout/note_list.xml"
     },
     {
         "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_green.png.flat",
@@ -123,14 +123,14 @@
         "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_super.png.flat",
         "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_super.png"
     },
-    {
-        "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_pressed.png.flat",
-        "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_pressed.png"
-    },
     {
         "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_middle.9.png.flat",
         "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_middle.9.png"
     },
+    {
+        "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_pressed.png.flat",
+        "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_pressed.png"
+    },
     {
         "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\layout_widget_2x.xml.flat",
         "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\layout\\widget_2x.xml"
@@ -139,6 +139,10 @@
         "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_normal.png.flat",
         "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_normal.png"
     },
+    {
+        "merged": "net.micode.notes.app-merged_res-5:/menu_note_list.xml.flat",
+        "source": "net.micode.notes.app-main-7:/menu/note_list.xml"
+    },
     {
         "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_notification.png.flat",
         "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\drawable-hdpi\\notification.png"

src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/layout.json

@@ -1,4 +1,8 @@
 [
+    {
+        "merged": "net.micode.notes.app-mergeDebugResources-4:/layout/note_list.xml",
+        "source": "net.micode.notes.app-main-7:/layout/note_list.xml"
+    },
     {
         "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-4:\\layout\\activity_splash.xml",
         "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\layout\\activity_splash.xml"
@@ -27,10 +31,6 @@
         "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-4:\\layout\\folder_list_item.xml",
         "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\layout\\folder_list_item.xml"
     },
-    {
-        "merged": "net.micode.notes.app-mergeDebugResources-4:/layout/note_edit.xml",
-        "source": "net.micode.notes.app-main-7:/layout/note_edit.xml"
-    },
     {
         "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-4:\\layout\\dialog_edit_text.xml",
         "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\layout\\dialog_edit_text.xml"
@@ -39,14 +39,14 @@
         "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-4:\\layout\\add_account_text.xml",
         "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\layout\\add_account_text.xml"
     },
-    {
-        "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-4:\\layout\\note_edit.xml",
-        "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\layout\\note_edit.xml"
-    },
     {
         "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-4:\\layout\\note_list_dropdown_menu.xml",
         "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\layout\\note_list_dropdown_menu.xml"
     },
+    {
+        "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-4:\\layout\\note_edit.xml",
+        "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\layout\\note_edit.xml"
+    },
     {
         "merged": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-4:\\layout\\datetime_picker.xml",
         "source": "C:\\Users\\15536\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-7:\\layout\\datetime_picker.xml"

src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_edit.xml

@@ -124,15 +124,6 @@
         </LinearLayout>
     </LinearLayout>
 
-    <ImageButton
-        android:id="@+id/add_img_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="7dp"
-        android:layout_marginTop="600dp"
-        android:layout_marginBottom="7dp"
-        android:src="@android:drawable/ic_menu_gallery" />
-
     <ImageView
         android:id="@+id/btn_set_bg_color"
         android:layout_height="43dip"

src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt

@@ -514,7 +514,6 @@ int id action_mode_bar_stub 0x7f08000f
 int id action_mode_close_button 0x7f080010
 int id action_select_all 0x7f080011
 int id activity_chooser_view_content 0x7f080012
-int id add_img_btn 0x7f0800a6
 int id alertTitle 0x7f080013
 int id always 0x7f080014
 int id amPm 0x7f080015

src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt

@@ -1,74 +1,74 @@
-net.micode.notes:style/Widget.AppCompat.ActivityChooserView = 0x7f0f00fa
-net.micode.notes:style/Widget.AppCompat.Light.ListView.DropDown = 0x7f0f011a
-net.micode.notes:styleable/ActionMode = 0x7f100004
-net.micode.notes:style/RtlOverlay.Widget.AppCompat.Search.DropDown.Icon2 = 0x7f0f009d
-net.micode.notes:style/Widget.AppCompat.Light.ActionButton.Overflow = 0x7f0f0114
-net.micode.notes:style/Base.Widget.AppCompat.ActionButton.CloseMode = 0x7f0f005b
-net.micode.notes:style/TextAppearanceLarge = 0x7f0f00d4
-net.micode.notes:style/Widget.AppCompat.Toolbar = 0x7f0f0130
-net.micode.notes:style/Base.AlertDialog.AppCompat = 0x7f0f0004
-net.micode.notes:style/RtlOverlay.Widget.AppCompat.ActionBar.TitleItem = 0x7f0f0095
-net.micode.notes:style/TextAppearance.AppCompat.SearchResult.Title = 0x7f0f00b7
 net.micode.notes:style/Widget.AppCompat.Toolbar.Button.Navigation = 0x7f0f0131
-net.micode.notes:style/Widget.AppCompat.Button.Small = 0x7f0f0100
+net.micode.notes:style/Widget.AppCompat.Light.ActionButton.Overflow = 0x7f0f0114
-net.micode.notes:drawable/list_green_single = 0x7f07005c
-net.micode.notes:menu/note_edit = 0x7f0b0002
-net.micode.notes:style/TextAppearance.AppCompat.Light.Widget.PopupMenu.Small = 0x7f0f00b2
 net.micode.notes:style/Base.TextAppearance.AppCompat.SearchResult.Subtitle = 0x7f0f001d
 net.micode.notes:styleable/TextAppearance = 0x7f100015
+net.micode.notes:style/Widget.AppCompat.Button.Small = 0x7f0f0100
+net.micode.notes:drawable/list_green_single = 0x7f07005c
 net.micode.notes:style/Widget.AppCompat.PopupWindow = 0x7f0f0125
 net.micode.notes:styleable/ActionBar = 0x7f100000
 net.micode.notes:style/Widget.AppCompat.ListView.DropDown = 0x7f0f0121
+net.micode.notes:style/TextAppearanceLarge = 0x7f0f00d4
+net.micode.notes:style/Widget.AppCompat.Toolbar = 0x7f0f0130
+net.micode.notes:style/Widget.AppCompat.Light.ListView.DropDown = 0x7f0f011a
+net.micode.notes:styleable/ActionMode = 0x7f100004
+net.micode.notes:style/TextAppearance.AppCompat.Widget.PopupMenu.Large = 0x7f0f00c8
+net.micode.notes:string/call_record_folder_name = 0x7f0e0019
+net.micode.notes:style/TextAppearance.AppCompat.SearchResult.Title = 0x7f0f00b7
+net.micode.notes:style/Base.AlertDialog.AppCompat = 0x7f0f0004
+net.micode.notes:menu/note_edit = 0x7f0b0002
+net.micode.notes:style/TextAppearance.AppCompat.Light.Widget.PopupMenu.Small = 0x7f0f00b2
+net.micode.notes:style/Theme.AppCompat.Light.DialogWhenLarge = 0x7f0f00e6
+net.micode.notes:style/Widget.AppCompat.EditText = 0x7f0f0108
+net.micode.notes:style/TextAppearance.AppCompat.Widget.DropDownItem = 0x7f0f00c7
+net.micode.notes:style/RtlOverlay.Widget.AppCompat.ActionBar.TitleItem = 0x7f0f0095
+net.micode.notes:style/Base.Widget.AppCompat.ActionButton.CloseMode = 0x7f0f005b
+net.micode.notes:string/preferences_menu_remove_account = 0x7f0e0068
+net.micode.notes:style/ThemeOverlay.Notesmaster1.FullscreenContainer = 0x7f0f00f0
 net.micode.notes:style/Widget.AppCompat.Spinner = 0x7f0f012b
 net.micode.notes:style/Widget.AppCompat.Light.SearchView = 0x7f0f011d
+net.micode.notes:style/RtlOverlay.Widget.AppCompat.Search.DropDown.Query = 0x7f0f009e
+net.micode.notes:drawable/abc_btn_borderless_material = 0x7f070001
 net.micode.notes:id/line1 = 0x7f08004a
 net.micode.notes:style/TextAppearance.AppCompat.Light.SearchResult.Title = 0x7f0f00b0
-net.micode.notes:style/Widget.AppCompat.Light.ActionMode.Inverse = 0x7f0f0115
+net.micode.notes:string/success_sync_account = 0x7f0e0073
-net.micode.notes:style/Theme.Notesmaster1.Fullscreen = 0x7f0f00ea
+net.micode.notes:id/ll_font_super = 0x7f080051
+net.micode.notes:style/Base.V7.Theme.AppCompat.Light = 0x7f0f0051
 net.micode.notes:style/Platform.V11.AppCompat.Light = 0x7f0f0091
+net.micode.notes:style/Base.Widget.AppCompat.Button.Borderless = 0x7f0f0061
 net.micode.notes:style/Widget.AppCompat.ActionButton = 0x7f0f00f6
-net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0e0063
 net.micode.notes:id/text_num = 0x7f080093
-net.micode.notes:style/Base.Widget.AppCompat.Button.Borderless = 0x7f0f0061
+net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0e0063
-net.micode.notes:style/TextAppearance.AppCompat.Widget.PopupMenu.Large = 0x7f0f00c8
+net.micode.notes:style/Theme.Notesmaster1.Fullscreen = 0x7f0f00ea
-net.micode.notes:style/TextAppearance.AppCompat.Widget.DropDownItem = 0x7f0f00c7
+net.micode.notes:style/Widget.AppCompat.ActivityChooserView = 0x7f0f00fa
-net.micode.notes:drawable/abc_ic_menu_share_mtrl_alpha = 0x7f07001c
+net.micode.notes:style/Widget.AppCompat.Light.ActionMode.Inverse = 0x7f0f0115
 net.micode.notes:string/status_bar_notification_info_overflow = 0x7f0e0071
-net.micode.notes:string/success_sync_account = 0x7f0e0073
+net.micode.notes:drawable/abc_ic_menu_share_mtrl_alpha = 0x7f07001c
-net.micode.notes:style/RtlOverlay.Widget.AppCompat.Search.DropDown.Query = 0x7f0f009e
-net.micode.notes:drawable/abc_btn_borderless_material = 0x7f070001
-net.micode.notes:style/Base.V7.Theme.AppCompat.Light = 0x7f0f0051
-net.micode.notes:id/ll_font_super = 0x7f080051
-net.micode.notes:style/Widget.AppCompat.EditText = 0x7f0f0108
 net.micode.notes:style/ThemeOverlay.AppCompat.Light = 0x7f0f00ef
 net.micode.notes:id/screen = 0x7f080076
+net.micode.notes:style/Platform.ThemeOverlay.AppCompat.Dark = 0x7f0f008e
 net.micode.notes:style/ThemeOverlay.AppCompat.ActionBar = 0x7f0f00ec
 net.micode.notes:style/Base.Widget.AppCompat.ProgressBar = 0x7f0f007d
-net.micode.notes:style/Widget.AppCompat.PopupMenu = 0x7f0f0123
-net.micode.notes:string/preferences_menu_remove_account = 0x7f0e0068
-net.micode.notes:style/ThemeOverlay.Notesmaster1.FullscreenContainer = 0x7f0f00f0
 net.micode.notes:id/wrap_content = 0x7f0800a4
 net.micode.notes:drawable/edit_title_blue = 0x7f070044
-net.micode.notes:string/dummy_content = 0x7f0e001e
 net.micode.notes:style/TextAppearance.AppCompat.Display1 = 0x7f0f00a7
+net.micode.notes:string/dummy_content = 0x7f0e001e
 net.micode.notes:drawable/edit_red = 0x7f070043
 net.micode.notes:style/TextAppearance.AppCompat.Medium.Inverse = 0x7f0f00b4
 net.micode.notes:dimen/abc_action_button_min_width_material = 0x7f06000d
 net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse = 0x7f0f0029
 net.micode.notes:style/AlertDialog.AppCompat = 0x7f0f0000
 net.micode.notes:style/Base.Widget.AppCompat.ActionBar.Solid = 0x7f0f0056
-net.micode.notes:layout/settings_header = 0x7f0a0030
-net.micode.notes:style/Base.Widget.AppCompat.ListView.DropDown = 0x7f0f0078
-net.micode.notes:id/custom = 0x7f080020
-net.micode.notes:styleable/LinearLayoutCompat = 0x7f10000a
 net.micode.notes:id/collapseActionView = 0x7f08001e
 net.micode.notes:drawable/bg_btn_set_color = 0x7f07003b
 net.micode.notes:id/menu_new_folder = 0x7f08005b
 net.micode.notes:style/TextAppearance.AppCompat.Small = 0x7f0f00b8
 net.micode.notes:string/preferences_add_account = 0x7f0e005c
+net.micode.notes:style/Base.Widget.AppCompat.ListView.DropDown = 0x7f0f0078
 net.micode.notes:styleable/ListPopupWindow = 0x7f10000c
+net.micode.notes:id/custom = 0x7f080020
+net.micode.notes:styleable/LinearLayoutCompat = 0x7f10000a
 net.micode.notes:string/success_sdcard_export = 0x7f0e0072
-net.micode.notes:style/Theme.AppCompat.Light.DialogWhenLarge = 0x7f0f00e6
+net.micode.notes:layout/settings_header = 0x7f0a0030
 net.micode.notes:style/TextAppearance.AppCompat.Menu = 0x7f0f00b5
 net.micode.notes:style/TextAppearance.AppCompat.Widget.ActionMode.Subtitle = 0x7f0f00c3
 net.micode.notes:style/RtlOverlay.Widget.AppCompat.SearchView.MagIcon = 0x7f0f00a0
@@ -82,23 +82,28 @@ net.micode.notes:style/TextAppearance.StatusBar.EventContent.Line2 = 0x7f0f00ce
 net.micode.notes:style/Widget.AppCompat.ListView = 0x7f0f0120
 net.micode.notes:string/menu_select_none = 0x7f0e0048
 net.micode.notes:style/Widget.AppCompat.Light.ActionBar = 0x7f0f0109
-net.micode.notes:string/menu_font_size = 0x7f0e003d
 net.micode.notes:layout/notification_template_big_media_narrow = 0x7f0a0028
 net.micode.notes:id/menu_send_to_desktop = 0x7f08005e
-net.micode.notes:style/Base.TextAppearance.AppCompat.Light.Widget.PopupMenu.Small = 0x7f0f0018
-net.micode.notes:layout/abc_alert_dialog_material = 0x7f0a0009
 net.micode.notes:style/Base.Theme.AppCompat.Light.DialogWhenLarge = 0x7f0f0041
 net.micode.notes:style/Widget.AppCompat.Light.ActionBar.Solid = 0x7f0f010a
+net.micode.notes:style/RtlOverlay.Widget.AppCompat.Search.DropDown.Icon2 = 0x7f0f009d
 net.micode.notes:string/preferences_account_title = 0x7f0e005b
 net.micode.notes:style/Base.Widget.AppCompat.CompoundButton.CheckBox = 0x7f0f0067
-net.micode.notes:menu/call_note_edit = 0x7f0b0000
+net.micode.notes:layout/abc_alert_dialog_material = 0x7f0a0009
+net.micode.notes:style/Base.TextAppearance.AppCompat.Light.Widget.PopupMenu.Small = 0x7f0f0018
+net.micode.notes:string/menu_font_size = 0x7f0e003d
 net.micode.notes:string/menu_share = 0x7f0e004c
-net.micode.notes:style/RtlOverlay.Widget.AppCompat.Search.DropDown.Icon1 = 0x7f0f009c
+net.micode.notes:menu/call_note_edit = 0x7f0b0000
+net.micode.notes:style/Widget.AppCompat.PopupMenu = 0x7f0f0123
+net.micode.notes:menu/note_list_dropdown = 0x7f0b0004
 net.micode.notes:style/Widget.AppCompat.Light.ActionBar.TabBar.Inverse = 0x7f0f010d
-net.micode.notes:id/action_mode_close_button = 0x7f080010
-net.micode.notes:attr/spinnerStyle = 0x7f03009c
 net.micode.notes:string/search_label = 0x7f0e006e
-net.micode.notes:menu/note_list_dropdown = 0x7f0b0004
+net.micode.notes:attr/spinnerStyle = 0x7f03009c
+net.micode.notes:id/action_mode_close_button = 0x7f080010
+net.micode.notes:style/RtlOverlay.Widget.AppCompat.Search.DropDown.Icon1 = 0x7f0f009c
+net.micode.notes:styleable/PopupWindowBackgroundState = 0x7f100011
+net.micode.notes:id/dialog = 0x7f080026
+net.micode.notes:id/time = 0x7f080094
 net.micode.notes:style/Base.Widget.AppCompat.ButtonBar.AlertDialog = 0x7f0f0066
 net.micode.notes:style/TextAppearance.AppCompat.Display4 = 0x7f0f00aa
 net.micode.notes:style/RtlOverlay.Widget.AppCompat.PopupMenuItem = 0x7f0f0098
@@ -112,41 +117,40 @@ net.micode.notes:style/Platform.V11.AppCompat = 0x7f0f0090
 net.micode.notes:style/TextAppearance.StatusBar.EventContent.Info = 0x7f0f00cd
 net.micode.notes:menu/note_list = 0x7f0b0003
 net.micode.notes:style/TextAppearance.AppCompat.Widget.ActionMode.Subtitle.Inverse = 0x7f0f00c4
-net.micode.notes:style/Base.Widget.AppCompat.SearchView.ActionBar = 0x7f0f0081
-net.micode.notes:style/Base.TextAppearance.Widget.AppCompat.Toolbar.Title = 0x7f0f0033
-net.micode.notes:string/call_record_folder_name = 0x7f0e0019
-net.micode.notes:xml/widget_4x_info = 0x7f110003
-net.micode.notes:style/Base.Widget.AppCompat.ProgressBar.Horizontal = 0x7f0f007e
-net.micode.notes:style/Base.ThemeOverlay.AppCompat.Light = 0x7f0f0046
-net.micode.notes:style/Base.TextAppearance.AppCompat.Display4 = 0x7f0f0012
-net.micode.notes:attr/listPopupWindowStyle = 0x7f030070
-net.micode.notes:id/search_voice_btn = 0x7f080081
-net.micode.notes:style/Base.Widget.AppCompat.PopupWindow = 0x7f0f007c
 net.micode.notes:style/Base.Widget.AppCompat.TextView.SpinnerItem = 0x7f0f0085
 net.micode.notes:id/iv_bg_red = 0x7f080040
 net.micode.notes:style/Widget.AppCompat.ActionMode = 0x7f0f00f9
 net.micode.notes:drawable/abc_btn_radio_to_on_mtrl_015 = 0x7f070008
-net.micode.notes:style/Widget.AppCompat.Spinner.Underlined = 0x7f0f012e
+net.micode.notes:style/Widget.AppCompat.ProgressBar = 0x7f0f0126
-net.micode.notes:style/Base.TextAppearance.AppCompat.Large = 0x7f0f0015
+net.micode.notes:style/Theme.AppCompat.Light.Dialog.MinWidth = 0x7f0f00e5
-net.micode.notes:string/format_exported_file_location = 0x7f0e002d
+net.micode.notes:style/Base.Widget.AppCompat.SearchView.ActionBar = 0x7f0f0081
-net.micode.notes:style/TextAppearance.AppCompat.Small.Inverse = 0x7f0f00b9
+net.micode.notes:style/Base.TextAppearance.Widget.AppCompat.Toolbar.Title = 0x7f0f0033
 net.micode.notes:id/beginning = 0x7f080016
 net.micode.notes:string/menu_create_folder = 0x7f0e0033
+net.micode.notes:string/format_exported_file_location = 0x7f0e002d
+net.micode.notes:style/TextAppearance.AppCompat.Small.Inverse = 0x7f0f00b9
 net.micode.notes:style/Widget.AppCompat.Light.ActionBar.TabView.Inverse = 0x7f0f0111
-net.micode.notes:styleable/PopupWindowBackgroundState = 0x7f100011
-net.micode.notes:id/dialog = 0x7f080026
-net.micode.notes:id/time = 0x7f080094
-net.micode.notes:style/Theme.AppCompat.Light.Dialog.MinWidth = 0x7f0f00e5
-net.micode.notes:style/Widget.AppCompat.ProgressBar = 0x7f0f0126
-net.micode.notes:attr/colorControlHighlight = 0x7f030040
 net.micode.notes:id/homeAsUp = 0x7f080035
+net.micode.notes:attr/colorControlHighlight = 0x7f030040
+net.micode.notes:xml/widget_4x_info = 0x7f110003
+net.micode.notes:style/Base.Widget.AppCompat.ProgressBar.Horizontal = 0x7f0f007e
+net.micode.notes:style/Base.Widget.AppCompat.PopupWindow = 0x7f0f007c
+net.micode.notes:style/Base.TextAppearance.AppCompat.Display4 = 0x7f0f0012
+net.micode.notes:attr/listPopupWindowStyle = 0x7f030070
+net.micode.notes:id/search_voice_btn = 0x7f080081
+net.micode.notes:style/Base.ThemeOverlay.AppCompat.Light = 0x7f0f0046
+net.micode.notes:style/Base.TextAppearance.AppCompat.Large = 0x7f0f0015
+net.micode.notes:style/Widget.AppCompat.Spinner.Underlined = 0x7f0f012e
 net.micode.notes:layout/notification_template_part_time = 0x7f0a002c
+net.micode.notes:style/Base.Widget.AppCompat.Button.Small = 0x7f0f0064
+net.micode.notes:style/Base.Widget.AppCompat.Toolbar = 0x7f0f0086
+net.micode.notes:string/error_sdcard_export = 0x7f0e0022
 net.micode.notes:style/Widget.AppCompat.ListPopupWindow = 0x7f0f011f
 net.micode.notes:string/abc_shareactionprovider_share_with_application = 0x7f0e000f
 net.micode.notes:style/Widget.Theme.Notesmaster1.ButtonBar.Fullscreen = 0x7f0f0133
-net.micode.notes:style/Base.Widget.AppCompat.Light.ActionBar.TabView = 0x7f0f0073
 net.micode.notes:style/Widget.AppCompat.ActionBar.TabBar = 0x7f0f00f3
 net.micode.notes:style/Base.TextAppearance.AppCompat.SearchResult = 0x7f0f001c
+net.micode.notes:style/Base.Widget.AppCompat.Light.ActionBar.TabView = 0x7f0f0073
 net.micode.notes:style/TextAppearance.AppCompat.Body2 = 0x7f0f00a4
 net.micode.notes:string/search_setting_description = 0x7f0e006f
 net.micode.notes:string/abc_searchview_description_clear = 0x7f0e0009
@@ -179,19 +183,16 @@ net.micode.notes:style/Widget.AppCompat.ActionButton.CloseMode = 0x7f0f00f7
 net.micode.notes:string/menu_sync_cancel = 0x7f0e004e
 net.micode.notes:layout/notification_media_action = 0x7f0a0025
 net.micode.notes:style/Base.Widget.AppCompat.ActionMode = 0x7f0f005d
-net.micode.notes:string/ticker_cancel = 0x7f0e0077
-net.micode.notes:style/Base.V7.Theme.AppCompat.Dialog = 0x7f0f0050
 net.micode.notes:style/Platform.AppCompat = 0x7f0f008c
 net.micode.notes:style/Base.Widget.AppCompat.CompoundButton.RadioButton = 0x7f0f0068
 net.micode.notes:style/RtlOverlay.Widget.AppCompat.DialogTitle.Icon = 0x7f0f0097
 net.micode.notes:id/search_go_btn = 0x7f08007d
 net.micode.notes:attr/textAppearanceLargePopupMenu = 0x7f0300a9
 net.micode.notes:style/Widget.AppCompat.Light.ActionBar.TabText = 0x7f0f010e
-net.micode.notes:styleable/LinearLayoutCompat_Layout = 0x7f10000b
+net.micode.notes:string/ticker_cancel = 0x7f0e0077
+net.micode.notes:style/Base.V7.Theme.AppCompat.Dialog = 0x7f0f0050
 net.micode.notes:style/Base.V7.Theme.AppCompat.Light.Dialog = 0x7f0f0052
-net.micode.notes:string/error_sdcard_export = 0x7f0e0022
+net.micode.notes:styleable/LinearLayoutCompat_Layout = 0x7f10000b
-net.micode.notes:style/Base.Widget.AppCompat.Button.Small = 0x7f0f0064
-net.micode.notes:style/Base.Widget.AppCompat.Toolbar = 0x7f0f0086
 net.micode.notes:style/Base.Animation.AppCompat.Dialog = 0x7f0f0006
 net.micode.notes:drawable/abc_tab_indicator_mtrl_alpha = 0x7f070034
 net.micode.notes:id/iv_bg_white_select = 0x7f080043
@@ -216,38 +217,33 @@ net.micode.notes:menu/note_list_options = 0x7f0b0005
 net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.PopupMenu.Large = 0x7f0f002d
 net.micode.notes:style/Theme.AppCompat = 0x7f0f00db
 net.micode.notes:style/Base.TextAppearance.AppCompat.Headline = 0x7f0f0013
-net.micode.notes:style/Platform.ThemeOverlay.AppCompat.Dark = 0x7f0f008e
-net.micode.notes:style/TextAppearance.AppCompat.Subhead.Inverse = 0x7f0f00bb
-net.micode.notes:style/Base.TextAppearance.AppCompat = 0x7f0f000a
-net.micode.notes:styleable/SearchView = 0x7f100012
 net.micode.notes:style/Base.AlertDialog.AppCompat.Light = 0x7f0f0005
-net.micode.notes:id/add_img_btn = 0x7f0800a6
+net.micode.notes:styleable/SearchView = 0x7f100012
 net.micode.notes:attr/colorAccent = 0x7f03003d
 net.micode.notes:color/user_query_highlight = 0x7f050045
 net.micode.notes:drawable/edit_title_white = 0x7f070047
-net.micode.notes:style/Base.V7.Widget.AppCompat.AutoCompleteTextView = 0x7f0f0053
+net.micode.notes:style/Base.TextAppearance.AppCompat = 0x7f0f000a
-net.micode.notes:dimen/abc_control_inset_material = 0x7f060016
 net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse = 0x7f0f0027
 net.micode.notes:style/Widget.AppCompat.Spinner.DropDown.ActionBar = 0x7f0f012d
 net.micode.notes:style/Base.TextAppearance.AppCompat.Title = 0x7f0f0023
 net.micode.notes:string/datetime_dialog_ok = 0x7f0e001b
 net.micode.notes:drawable/font_super = 0x7f070050
 net.micode.notes:string/menu_trash = 0x7f0e007e
-net.micode.notes:style/Widget.AppCompat.ActionButton.Overflow = 0x7f0f00f8
+net.micode.notes:style/TextAppearance.AppCompat.Widget.Switch = 0x7f0f00ca
-net.micode.notes:styleable/ViewStubCompat = 0x7f100019
+net.micode.notes:style/Theme.AppCompat.DialogWhenLarge = 0x7f0f00e0
-net.micode.notes:style/Widget.AppCompat.Light.ListPopupWindow = 0x7f0f0119
 net.micode.notes:attr/navigationMode = 0x7f03007d
 net.micode.notes:drawable/abc_item_background_holo_dark = 0x7f07001f
-net.micode.notes:style/Theme.AppCompat.DialogWhenLarge = 0x7f0f00e0
+net.micode.notes:styleable/ViewStubCompat = 0x7f100019
-net.micode.notes:style/TextAppearance.AppCompat.Widget.Switch = 0x7f0f00ca
+net.micode.notes:style/Widget.AppCompat.Light.ListPopupWindow = 0x7f0f0119
+net.micode.notes:style/Widget.AppCompat.ActionButton.Overflow = 0x7f0f00f8
 net.micode.notes:style/Base.TextAppearance.AppCompat.Subhead.Inverse = 0x7f0f0022
 net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.ActionMode.Title = 0x7f0f002b
 net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.ActionBar.Menu = 0x7f0f0025
 net.micode.notes:style/ThemeOverlay.AppCompat.Dark = 0x7f0f00ed
-net.micode.notes:drawable/abc_ic_menu_cut_mtrl_alpha = 0x7f070018
 net.micode.notes:drawable/abc_list_pressed_holo_light = 0x7f070025
 net.micode.notes:color/switch_thumb_material_dark = 0x7f050041
 net.micode.notes:color/material_blue_grey_800 = 0x7f05002a
+net.micode.notes:drawable/abc_ic_menu_cut_mtrl_alpha = 0x7f070018
 net.micode.notes:style/Widget.AppCompat.ActionBar.TabView = 0x7f0f00f5
 net.micode.notes:dimen/abc_dropdownitem_icon_width = 0x7f06001f
 net.micode.notes:id/menu_trash = 0x7f0800a5
@@ -270,8 +266,8 @@ net.micode.notes:style/Widget.AppCompat.Light.AutoCompleteTextView = 0x7f0f0117
 net.micode.notes:style/Base.V21.Theme.AppCompat.Light = 0x7f0f004d
 net.micode.notes:style/Widget.AppCompat.Light.PopupMenu.Overflow = 0x7f0f011c
 net.micode.notes:style/TextAppearance.AppCompat.Medium = 0x7f0f00b3
-net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.Switch = 0x7f0f002f
 net.micode.notes:id/tv_title_bar = 0x7f08009e
+net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.Switch = 0x7f0f002f
 net.micode.notes:color/light_blue_600 = 0x7f050024
 net.micode.notes:style/Widget.AppCompat.CompoundButton.CheckBox = 0x7f0f0103
 net.micode.notes:drawable/abc_ic_voice_search_api_mtrl_alpha = 0x7f07001e
@@ -282,8 +278,8 @@ net.micode.notes:style/Animation.AppCompat.DropDownUp = 0x7f0f0003
 net.micode.notes:style/TextAppearance.AppCompat.Headline = 0x7f0f00ab
 net.micode.notes:id/showCustom = 0x7f080085
 net.micode.notes:anim/abc_slide_out_bottom = 0x7f010008
-net.micode.notes:drawable/abc_dialog_material_background_light = 0x7f070011
 net.micode.notes:id/iv_bg_blue_select = 0x7f08003d
+net.micode.notes:drawable/abc_dialog_material_background_light = 0x7f070011
 net.micode.notes:style/Animation.AppCompat.Dialog = 0x7f0f0002
 net.micode.notes:style/Widget.AppCompat.SearchView = 0x7f0f0129
 net.micode.notes:layout/note_list_footer = 0x7f0a0024
@@ -346,10 +342,6 @@ net.micode.notes:string/menu_move = 0x7f0e0042
 net.micode.notes:attr/actionModeFindDrawable = 0x7f030015
 net.micode.notes:string/menu_font_large = 0x7f0e003b
 net.micode.notes:id/search_close_btn = 0x7f08007b
-net.micode.notes:anim/abc_slide_out_top = 0x7f010009
-net.micode.notes:attr/listPreferredItemHeightSmall = 0x7f030073
-net.micode.notes:string/abc_action_bar_home_subtitle_description_format = 0x7f0e0002
-net.micode.notes:id/tv_alert_date = 0x7f080098
 net.micode.notes:string/menu_deselect_all = 0x7f0e0035
 net.micode.notes:drawable/edit_white = 0x7f070049
 net.micode.notes:string/file_path = 0x7f0e0029
@@ -361,6 +353,11 @@ net.micode.notes:string/app_widget4x4 = 0x7f0e0017
 net.micode.notes:string/datetime_dialog_cancel = 0x7f0e001a
 net.micode.notes:string/abc_searchview_description_submit = 0x7f0e000c
 net.micode.notes:dimen/abc_button_inset_vertical_material = 0x7f060011
+net.micode.notes:string/abc_action_bar_home_subtitle_description_format = 0x7f0e0002
+net.micode.notes:anim/abc_slide_out_top = 0x7f010009
+net.micode.notes:attr/listPreferredItemHeightSmall = 0x7f030073
+net.micode.notes:id/tv_alert_date = 0x7f080098
+net.micode.notes:style/TextAppearance.AppCompat.Subhead.Inverse = 0x7f0f00bb
 net.micode.notes:style/Base.Widget.AppCompat.Button.Borderless.Colored = 0x7f0f0062
 net.micode.notes:string/abc_action_bar_home_description_format = 0x7f0e0001
 net.micode.notes:string/abc_searchview_description_search = 0x7f0e000b
@@ -391,9 +388,9 @@ net.micode.notes:id/action_divider = 0x7f08000b
 net.micode.notes:layout/folder_list_item = 0x7f0a001e
 net.micode.notes:style/Base.Widget.AppCompat.AutoCompleteTextView = 0x7f0f005f
 net.micode.notes:string/error_sdcard_unmounted = 0x7f0e0023
-net.micode.notes:string/note_link_web = 0x7f0e0055
-net.micode.notes:id/activity_chooser_view_content = 0x7f080012
 net.micode.notes:layout/dialog_edit_text = 0x7f0a001d
+net.micode.notes:id/activity_chooser_view_content = 0x7f080012
+net.micode.notes:string/note_link_web = 0x7f0e0055
 net.micode.notes:attr/colorPrimary = 0x7f030042
 net.micode.notes:layout/abc_simple_dropdown_hint = 0x7f0a0018
 net.micode.notes:layout/abc_screen_toolbar = 0x7f0a0014
@@ -459,6 +456,8 @@ net.micode.notes:string/abc_search_hint = 0x7f0e0008
 net.micode.notes:id/search_mag_icon = 0x7f08007e
 net.micode.notes:id/preference_sync_button = 0x7f080072
 net.micode.notes:attr/closeItemLayout = 0x7f030039
+net.micode.notes:style/Base.V7.Widget.AppCompat.AutoCompleteTextView = 0x7f0f0053
+net.micode.notes:dimen/abc_control_inset_material = 0x7f060016
 net.micode.notes:style/RtlOverlay.Widget.AppCompat.Search.DropDown = 0x7f0f009b
 net.micode.notes:id/notes_list = 0x7f08006f
 net.micode.notes:string/abc_action_menu_overflow_description = 0x7f0e0004

src/Notes-master1/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt

@@ -515,7 +515,6 @@ id action_mode_bar_stub
 id action_mode_close_button
 id action_select_all
 id activity_chooser_view_content
-id add_img_btn
 id alertTitle
 id always
 id amPm

src/Notes-master1/app/src/main/java/net/micode/notes/model/WorkingNote.java

@@ -38,7 +38,7 @@ public class WorkingNote {
     // Note Id
     private long mNoteId;
     // Note content
-    public String mContent;
+    private String mContent;
     // Note mode
     private int mMode;
 

src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java

@@ -58,17 +58,13 @@ public class AlarmInitReceiver extends BroadcastReceiver {
                 do {
                     long alertDate = c.getLong(COLUMN_ALERTED_DATE);
                     // 获取提醒时间和笔记ID
-                    
                     Intent sender = new Intent(context, AlarmReceiver.class);
                     sender.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, c.getLong(COLUMN_ID)));
                     // 创建用于触发闹钟的Intent
-
                     PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, sender, 0);
                     // 创建PendingIntent，用于启动AlarmReceiver
-
                     AlarmManager alermManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
                     // 获取AlarmManager
-
                     alermManager.set(AlarmManager.RTC_WAKEUP, alertDate, pendingIntent);
                     // 设置闹钟，在提醒时间触发
                 } while (c.moveToNext());

src/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePicker.java

@@ -28,9 +28,10 @@ import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.NumberPicker;
 
-public class DateTimePicker extends FrameLayout {
+//DateTimePicker是一个自定义的日期和时间选择器的类，它的外观和行为基于 FrameLayout 进行扩展。
 //FrameLayout是布局模板之一
 //所有的子元素全部在屏幕的右上方
+public class DateTimePicker extends FrameLayout {
     private static final boolean DEFAULT_ENABLE_STATE = true;
  
     private static final int HOURS_IN_HALF_DAY = 12;

src/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java

@@ -99,5 +99,4 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener
         }
     }//第一个参数arg0是接收到点击事件的对话框
     //第二个参数arg1是该对话框上的按钮
- 
 }

src/Notes-master1/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java

@@ -29,11 +29,11 @@ import net.micode.notes.data.Notes;
 import net.micode.notes.data.Notes.NoteColumns;
 
 
-public class FoldersListAdapter extends CursorAdapter {
 //CursorAdapter是Cursor和ListView的接口
 //FoldersListAdapter继承了CursorAdapter的类
 //主要作用是便签数据库和用户的交互
 //这里就是用folder（文件夹）的形式展现给用户
+public class FoldersListAdapter extends CursorAdapter {
     public static final String [] PROJECTION = {
         NoteColumns.ID,
         NoteColumns.SNIPPET

src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java

@@ -90,12 +90,10 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
- 
- 
-public class NoteEditActivity extends Activity implements OnClickListener,
-        NoteSettingChangedListener, OnTextViewChangeListener {
 //该类主要是针对标签的编辑
 //继承了系统内部许多和监听有关的类
+public class NoteEditActivity extends Activity implements OnClickListener,
+        NoteSettingChangedListener, OnTextViewChangeListener {
     private class HeadViewHolder {
         public TextView tvModified;
  

src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditText.java

@@ -46,6 +46,7 @@ public class NoteEditText extends EditText {
     private static final String SCHEME_HTTP = "http:" ;
     private static final String SCHEME_EMAIL = "mailto:" ;
 
+    ///建立一个字符和整数的hash表，用于链接电话，网站，还有邮箱
     private static final Map<String, Integer> sSchemaActionResMap = new HashMap<String, Integer>();
     static {
         sSchemaActionResMap.put(SCHEME_TEL, R.string.note_link_tel);
@@ -56,17 +57,20 @@ public class NoteEditText extends EditText {
     /**
      * Call by the {@link NoteEditActivity} to delete or add edit text
      */
+    //在NoteEditActivity中删除或添加文本的操作，可以看做是一个文本是否被变的标记，英文注释已说明的很清楚
     public interface OnTextViewChangeListener {
         /**
          * Delete current edit text when {@link KeyEvent#KEYCODE_DEL} happens
          * and the text is null
          */
+        //处理删除按键时的操作
         void onEditTextDelete(int index, String text);
 
         /**
          * Add edit text after current edit text when {@link KeyEvent#KEYCODE_ENTER}
          * happen
          */
+        //处理进入按键时的操作
         void onEditTextEnter(int index, String text);
 
         /**
@@ -77,43 +81,55 @@ public class NoteEditText extends EditText {
 
     private OnTextViewChangeListener mOnTextViewChangeListener;
 
+    //根据context设置文本
     public NoteEditText(Context context) {
         super(context, null);
         mIndex = 0;
     }
 
+    //设置当前光标
     public void setIndex(int index) {
         mIndex = index;
     }
 
+    //初始化文本修改标记
     public void setOnTextViewChangeListener(OnTextViewChangeListener listener) {
         mOnTextViewChangeListener = listener;
     }
 
+    //AttributeSet 百度了一下是自定义空控件属性，用于维护便签动态变化的属性
+    //初始化便签
     public NoteEditText(Context context, AttributeSet attrs) {
         super(context, attrs, android.R.attr.editTextStyle);
     }
 
+    // 根据defstyle自动初始化
     public NoteEditText(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
         // TODO Auto-generated constructor stub
     }
 
+//view里的函数，处理手机屏幕的所有事件
+    /*参数event为手机屏幕触摸事件封装类的对象，其中封装了该事件的所有信息，
+                例如触摸的位置、触摸的类型以及触摸的时间等。该对象会在用户触摸手机屏幕时被创建。*/
     @Override
     public boolean onTouchEvent(MotionEvent event) {
         switch (event.getAction()) {
+            //重写了需要处理屏幕被按下的事件
             case MotionEvent.ACTION_DOWN:
 
+                //跟新当前坐标值
                 int x = (int) event.getX();
                 int y = (int) event.getY();
                 x -= getTotalPaddingLeft();
                 y -= getTotalPaddingTop();
                 x += getScrollX();
                 y += getScrollY();
-
+                //用布局控件layout根据x,y的新值设置新的位置
                 Layout layout = getLayout();
                 int line = layout.getLineForVertical(y);
                 int off = layout.getOffsetForHorizontal(line, x);
+                //更新光标新的位置
                 Selection.setSelection(getText(), off);
                 break;
         }
@@ -122,96 +138,147 @@ public class NoteEditText extends EditText {
     }
 
     @Override
+    /*
+     * 函数功能：处理用户按下一个键盘按键时会触发 的事件
+     * 实现过程：如下注释
+     */
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         switch (keyCode) {
+            //根据按键的 Unicode 编码值来处理
             case KeyEvent.KEYCODE_ENTER:
+                //“进入”按键
                 if (mOnTextViewChangeListener != null) {
                     return false;
                 }
                 break;
             case KeyEvent.KEYCODE_DEL:
+                //“删除”按键
                 mSelectionStartBeforeDelete = getSelectionStart();
                 break;
             default:
                 break;
         }
+        //继续执行父类的其他点击事件
         return super.onKeyDown(keyCode, event);
     }
 
     @Override
+    /*
+     * 函数功能：处理用户松开一个键盘按键时会触发 的事件
+     * 实现方式：如下注释
+     */
     public boolean onKeyUp(int keyCode, KeyEvent event) {
         switch(keyCode) {
+            //根据按键的 Unicode 编码值来处理，有删除和进入2种操作
             case KeyEvent.KEYCODE_DEL:
                 if (mOnTextViewChangeListener != null) {
+                    //若是被修改过
                     if (0 == mSelectionStartBeforeDelete && mIndex != 0) {
+                        //若之前有被修改并且文档不为空
                         mOnTextViewChangeListener.onEditTextDelete(mIndex, getText().toString());
+                        //利用上文OnTextViewChangeListener对KEYCODE_DEL按键情况的删除函数进行删除
                         return true;
                     }
                 } else {
                     Log.d(TAG, "OnTextViewChangeListener was not seted");
+                    //其他情况报错，文档的改动监听器并没有建立
                 }
                 break;
             case KeyEvent.KEYCODE_ENTER:
+                //同上也是分为监听器是否建立2种情况
                 if (mOnTextViewChangeListener != null) {
                     int selectionStart = getSelectionStart();
+                    //获取当前位置
                     String text = getText().subSequence(selectionStart, length()).toString();
+                    //获取当前文本
                     setText(getText().subSequence(0, selectionStart));
+                    //根据获取的文本设置当前文本
                     mOnTextViewChangeListener.onEditTextEnter(mIndex + 1, text);
+                    //当{@link KeyEvent#KEYCODE_ENTER}添加新文本
                 } else {
                     Log.d(TAG, "OnTextViewChangeListener was not seted");
+                    //其他情况报错，文档的改动监听器并没有建立
                 }
                 break;
             default:
                 break;
         }
+        //继续执行父类的其他按键弹起的事件
         return super.onKeyUp(keyCode, event);
     }
 
     @Override
+    /*
+     * 函数功能：当焦点发生变化时，会自动调用该方法来处理焦点改变的事件
+     * 实现方式：如下注释
+     * 参数：focused表示触发该事件的View是否获得了焦点，当该控件获得焦点时，Focused等于true，否则等于false。
+           direction表示焦点移动的方向，用数值表示
+           Rect：表示在触发事件的View的坐标系中，前一个获得焦点的矩形区域，即表示焦点是从哪里来的。如果不可用则为null
+     */
     protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) {
         if (mOnTextViewChangeListener != null) {
+            //若监听器已经建立
             if (!focused && TextUtils.isEmpty(getText())) {
+                //获取到焦点并且文本不为空
                 mOnTextViewChangeListener.onTextChange(mIndex, false);
+                //mOnTextViewChangeListener子函数，置false隐藏事件选项
             } else {
                 mOnTextViewChangeListener.onTextChange(mIndex, true);
+                //mOnTextViewChangeListener子函数，置true显示事件选项
             }
         }
+        //继续执行父类的其他焦点变化的事件
         super.onFocusChanged(focused, direction, previouslyFocusedRect);
     }
 
     @Override
+    /*
+     * 函数功能：生成上下文菜单
+     * 函数实现：如下注释
+     */
     protected void onCreateContextMenu(ContextMenu menu) {
         if (getText() instanceof Spanned) {
+            //有文本存在
             int selStart = getSelectionStart();
             int selEnd = getSelectionEnd();
+            //获取文本开始和结尾位置
 
             int min = Math.min(selStart, selEnd);
             int max = Math.max(selStart, selEnd);
+            //获取开始到结尾的最大值和最小值
 
             final URLSpan[] urls = ((Spanned) getText()).getSpans(min, max, URLSpan.class);
+            //设置url的信息的范围值
             if (urls.length == 1) {
                 int defaultResId = 0;
                 for(String schema: sSchemaActionResMap.keySet()) {
+                    //获取计划表中所有的key值
                     if(urls[0].getURL().indexOf(schema) >= 0) {
+                        //若url可以添加则在添加后将defaultResId置为key所映射的值
                         defaultResId = sSchemaActionResMap.get(schema);
                         break;
                     }
                 }
 
                 if (defaultResId == 0) {
+                    //defaultResId == 0则说明url并没有添加任何东西，所以置为连接其他SchemaActionResMap的值
                     defaultResId = R.string.note_link_other;
                 }
 
+                //建立菜单
                 menu.add(0, 0, 0, defaultResId).setOnMenuItemClickListener(
                         new OnMenuItemClickListener() {
+                            //新建按键监听器
                             public boolean onMenuItemClick(MenuItem item) {
                                 // goto a new intent
                                 urls[0].onClick(NoteEditText.this);
+                                //根据相应的文本设置菜单的按键
                                 return true;
                             }
                         });
             }
         }
+        //继续执行父类的其他菜单创建的事件
         super.onCreateContextMenu(menu);
     }
 }

src/Notes-master1/app/src/main/res/layout/note_edit.xml

@@ -124,15 +124,6 @@
         </LinearLayout>
     </LinearLayout>
 
-    <ImageButton
-        android:id="@+id/add_img_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="7dp"
-        android:layout_marginTop="600dp"
-        android:layout_marginBottom="7dp"
-        android:src="@android:drawable/ic_menu_gallery" />
-
     <ImageView
         android:id="@+id/btn_set_bg_color"
         android:layout_height="43dip"