Merge branch 'master' of https://bdgit.educoder.net/p82feo7wg/MiNoteRead into wangjiaqi_branch

src/Notes-master/res/drawable/action_bg_color.xml

@@ -1,5 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M2,20h20v4H2V20zM5.49,17h2.42l1.27,-3.58h5.65L16.09,17h2.42L13.25,3h-2.5L5.49,17zM9.91,11.39l2.03,-5.79h0.12l2.03,5.79H9.91z"/>
-    
-</vector>

src/Notes-master/res/layout/note_edit.xml

@@ -175,13 +175,12 @@
                         android:focusable="false"
                         android:clickable="true"/>
 
-                    <!-- 背景色按钮 -->
                     <Button
-                        android:id="@+id/action_bg_color"
+                        android:id="@+id/action_underline"
                         android:layout_width="40dp"
                         android:layout_height="40dp"
-                        android:layout_marginStart="4dp"
-                        android:background="@drawable/action_bg_color"
+                        android:layout_marginEnd="4dp"
+                        android:background="@drawable/action_underline"
                         android:backgroundTint="@null"
                         android:focusable="false"
                         android:clickable="true"/>

src/Notes-master/res/mipmap-anydpi/ic_launcher.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

src/Notes-master/res/mipmap-anydpi/ic_launcher_round.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

src/Notes-master/src/net/micode/notes/ui/NoteEditActivity.java

@@ -1722,42 +1722,13 @@ public class NoteEditActivity extends Activity implements OnClickListener,
             }
         });
 
-        // 背景色功能
-        findViewById(R.id.action_bg_color).setOnClickListener(new View.OnClickListener() {
+        // 下划线功能
+        findViewById(R.id.action_underline).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                mNoteEditor.focusEditor(); // 获取焦点
-                new AlertDialog.Builder(NoteEditActivity.this)
-                        .setTitle("选择字体背景颜色")
-                        .setItems(new String[]{"红色", "黄色", "蓝色", "绿色", "黑色", "白色"},
-                                new DialogInterface.OnClickListener() {
-                                    @Override
-                                    public void onClick(DialogInterface dialog, int which) {
-                                        switch (which) {
-                                            case 0: // 红
-                                                mNoteEditor.setTextBackgroundColor(Color.RED);
-                                                break;
-                                            case 1: // 黄
-                                                mNoteEditor.setTextBackgroundColor(Color.YELLOW);
-                                                break;
-                                            case 2: // 蓝
-                                                mNoteEditor.setTextBackgroundColor(Color.BLUE);
-                                                break;
-                                            case 3: // 绿
-                                                mNoteEditor.setTextBackgroundColor(Color.GREEN);
-                                                break;
-                                            case 4: // 黑
-                                                mNoteEditor.setTextBackgroundColor(Color.BLACK);
-                                                break;
-                                            case 5: // 白
-                                                mNoteEditor.setTextBackgroundColor(Color.WHITE);
-                                                break;
-                                        }
-                                        dialog.dismiss(); // 选择后关闭对话框
-                                    }
-                                })
-                        .show();
+                mNoteEditor.setUnderline();
             }
         });
+
     }
 }