Only save when the user hits the back button

Author: K0bin

app/src/main/java/k0bin/notes/ui/fragment/EditFragment.java

@@ -26,9 +26,10 @@
 import java9.util.stream.StreamSupport;
 import k0bin.notes.R;
 import k0bin.notes.model.Tag;
+import k0bin.notes.ui.activity.MainActivity;
 import k0bin.notes.viewModel.EditViewModel;
 
-public class EditFragment extends Fragment {
+public class EditFragment extends Fragment implements MainActivity.BackFragment {
     private EditViewModel viewModel;
 
     private EditText titleEdit;
@@ -147,14 +148,17 @@ public void afterTextChanged(Editable editable) {
         });
 
         final BottomAppBar bottomBar = view.findViewById(R.id.bottomBar);
-        bottomBar.setNavigationOnClickListener (button -> Navigation.findNavController(view).navigateUp());
+        bottomBar.setNavigationOnClickListener (button -> {
+            goBack();
+            Navigation.findNavController(view).navigateUp();
+        });
     }
 
     @Override
-    public void onStop() {
-        super.onStop();
+    public boolean goBack() {
         viewModel.save();
         hideKeyboard();
+        return false;
     }
 
     private void hideKeyboard() {

app/src/main/java/k0bin/notes/ui/fragment/NotesFragment.java

@@ -35,7 +35,6 @@
 public class NotesFragment extends Fragment implements MainActivity.BackFragment {
     private NotesViewModel viewModel;
 
-    private int statusBarHeight;
     private int overlayColor = 0;
     private boolean isDrawerVisible = false;
     private FrameLayout overlay;
@@ -98,7 +97,7 @@ public void onSwiped(@NonNull RecyclerView.ViewHolder viewHolder, int i) {
 
         //Navigation drawer
         MaterialCardView drawer = view.findViewById(R.id.drawerSheet);
-        statusBarHeight = getStatusBarHeight();
+        int statusBarHeight = getStatusBarHeight();
 
         final RecyclerView drawerRecycler = view.findViewById(R.id.drawerRecycler);
         final int initialMargin = ((FrameLayout.LayoutParams)drawerRecycler.getLayoutParams()).topMargin;
@@ -110,7 +109,7 @@ public void onSwiped(@NonNull RecyclerView.ViewHolder viewHolder, int i) {
         final ObjectAnimator cornerAnimator = ObjectAnimator.ofFloat(drawer, "radius", roundRadius, 0f);
         cornerAnimator.setDuration(animationDuration);
 
-        final ValueAnimator marginAnimator = ValueAnimator.ofFloat((float)initialMargin, (float)statusBarHeight);
+        final ValueAnimator marginAnimator = ValueAnimator.ofFloat((float)initialMargin, (float) statusBarHeight);
         marginAnimator.setDuration(animationDuration);
         marginAnimator.addUpdateListener(animator -> {
             FrameLayout.LayoutParams params = (FrameLayout.LayoutParams)drawerRecycler.getLayoutParams();