fix

app/src/main/java/com/ads/cal/notes/MainActivity.java

@@ -125,17 +125,17 @@ public class MainActivity extends BaseActivity {
 
     private void updateLayoutStatus() {
         if (mainAdapter.getItemCount() > 0) {
-            if (notDataLayout.isShown()) {
+            if (notDataLayout.getVisibility() != View.GONE) {
                 notDataLayout.setVisibility(View.GONE);
             }
-            if (!recyclerView.isShown()) {
+            if (recyclerView.getVisibility() != View.VISIBLE) {
                 recyclerView.setVisibility(View.VISIBLE);
             }
         } else {
-            if (!notDataLayout.isShown()) {
+            if (notDataLayout.getVisibility() != View.VISIBLE) {
                 notDataLayout.setVisibility(View.VISIBLE);
             }
-            if (recyclerView.isShown()) {
+            if (recyclerView.getVisibility() != View.GONE) {
                 recyclerView.setVisibility(View.GONE);
             }
         }

app/src/main/java/com/ads/cal/notes/NoteEditActivity.java

@@ -71,7 +71,21 @@ public class NoteEditActivity extends BaseActivity {
 
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
-
+                if (count <= 0) {
+                    if (delete.getVisibility() != View.GONE) {
+                        delete.setVisibility(View.GONE);
+                    }
+                    if (save.getVisibility() != View.GONE) {
+                        save.setVisibility(View.GONE);
+                    }
+                } else {
+                    if (delete.getVisibility() != View.VISIBLE) {
+                        delete.setVisibility(View.VISIBLE);
+                    }
+                    if (save.getVisibility() != View.VISIBLE) {
+                        save.setVisibility(View.VISIBLE);
+                    }
+                }
             }
 
             @Override
@@ -94,6 +108,7 @@ public class NoteEditActivity extends BaseActivity {
         }
         oldContent = dataBean.content;
         editText.setText(oldContent);
+        editText.setSelection(oldContent.length());
     }
 
     private boolean startSave = false;
@@ -102,19 +117,19 @@ public class NoteEditActivity extends BaseActivity {
             return;
         }
         startSave = true;
-        if (isCreateNote) {
-            save();
-        } else {
-            update();
-        }
-    }
-
-    private void save() {
         String content = editText.getText().toString();
         if (oldContent != null && oldContent.equals(content)) {
             finish();
             return;
         }
+        if (isCreateNote) {
+            save(content);
+        } else {
+            update(content);
+        }
+    }
+
+    private void save(String content) {
         if (TextUtils.isEmpty(content)) {
             delete();
             return;
@@ -174,13 +189,12 @@ public class NoteEditActivity extends BaseActivity {
         });
     }
 
-    private void update() {
+    private void update(String content) {
         if (null == dataBean) {
             finish();
             return;
         }
-        String content = editText.getText().toString();
-        if (!TextUtils.isEmpty(content)) {
+        if (TextUtils.isEmpty(content)) {
             delete();
             return;
         }
@@ -223,10 +237,15 @@ public class NoteEditActivity extends BaseActivity {
 
     }
 
+    @Override
+    public void onBackPressed() {
+        functionNote();
+        super.onBackPressed();
+    }
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        functionNote();
     }
 
     public static void invoke(Context context, DataBean dataBean) {

app/src/main/res/layout/activity_edit.xml

@@ -11,30 +11,29 @@
 
         <ImageView
             android:id="@+id/back"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="55dp"
+            android:layout_height="match_parent"
             android:layout_centerVertical="true"
-            android:layout_marginStart="16dp"
             android:src="@mipmap/icon_back"
-            android:textSize="20sp"
+            android:scaleType="center"
             android:textStyle="bold" />
 
         <ImageView
             android:id="@+id/delete"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="55dp"
+            android:layout_height="match_parent"
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
-            android:layout_marginEnd="20dp"
+            android:scaleType="center"
             android:src="@mipmap/icon_delete02" />
 
         <ImageView
             android:id="@+id/save"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="55dp"
+            android:layout_height="match_parent"
             android:layout_centerVertical="true"
-            android:layout_marginEnd="20dp"
             android:layout_toStartOf="@+id/delete"
+            android:scaleType="center"
             android:src="@mipmap/icon_done" />
 
     </RelativeLayout>