Fix toolbar when switching between direct edit and normal edit

Signed-off-by: Álvaro Brey <[email protected]>

app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java

@@ -285,6 +285,10 @@ protected void onNoteLoaded(Note note) {
     protected void onScroll(int scrollY, int oldScrollY) {
     }
 
+    protected boolean shouldShowToolbar() {
+        return true;
+    }
+
     public void onCloseNote() {
         if (!titleModified && originalNote == null && getContent().isEmpty()) {
             repo.deleteNoteAndSync(localAccount, note.getId());
@@ -383,8 +387,6 @@ enum Mode {
 
         void onNoteUpdated(Note note);
 
-        void setToolbarVisibility(boolean visible);
-
         void changeMode(@NonNull Mode mode);
     }
 }

app/src/main/java/it/niedermann/owncloud/notes/edit/EditNoteActivity.java

@@ -170,6 +170,11 @@ private void launchExistingNote(long accountId, long noteId, @Nullable final Str
             fragment.setInitialSavedState(savedState);
         }
         getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container_view, fragment).commit();
+        if(!fragment.shouldShowToolbar()){
+            binding.toolbar.setVisibility(View.GONE);
+        }else {
+            binding.toolbar.setVisibility(View.VISIBLE);
+        }
     }
 
     private String getPreferenceMode() {
@@ -334,11 +339,6 @@ public void onNoteUpdated(Note note) {
         }
     }
 
-    @Override
-    public void setToolbarVisibility(boolean visible) {
-        binding.toolbar.setVisibility(visible ? View.VISIBLE : View.GONE);
-    }
-
     @Override
     public void changeMode(@NonNull Mode mode) {
         switch (mode) {

app/src/main/java/it/niedermann/owncloud/notes/edit/NoteDirectEditFragment.kt

@@ -1,12 +1,12 @@
 package it.niedermann.owncloud.notes.edit
 
 import android.annotation.SuppressLint
-import android.content.Context
 import android.content.pm.ApplicationInfo
 import android.net.http.SslError
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
+import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
 import android.webkit.JavascriptInterface
@@ -26,13 +26,15 @@ import it.niedermann.owncloud.notes.persistence.DirectEditingRepository
 import it.niedermann.owncloud.notes.persistence.entity.Note
 import it.niedermann.owncloud.notes.shared.model.ISyncCallback
 import it.niedermann.owncloud.notes.shared.util.ExtendedFabUtil
-import it.niedermann.owncloud.notes.shared.util.ExtendedFabUtil.toggleVisibilityOnScroll
 
 class NoteDirectEditFragment : BaseNoteFragment(), Branded {
     private var _binding: FragmentNoteDirectEditBinding? = null
     private val binding: FragmentNoteDirectEditBinding
         get() = _binding!!
 
+    // for hiding / showing the fab
+    private var scrollStart: Int = 0
+
     public override fun getScrollView(): ScrollView? {
         return null
     }
@@ -71,8 +73,21 @@ class NoteDirectEditFragment : BaseNoteFragment(), Branded {
     private fun setupFab() {
         binding.plainEditingFab.isExtended = false
         ExtendedFabUtil.toggleExtendedOnLongClick(binding.plainEditingFab)
-        binding.noteWebview.setOnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
-            toggleVisibilityOnScroll(binding.plainEditingFab, scrollY, oldScrollY)
+        binding.noteWebview.setOnTouchListener { _, event ->
+            when (event.action) {
+                MotionEvent.ACTION_DOWN -> {
+                    scrollStart = event.y.toInt()
+                }
+                MotionEvent.ACTION_UP -> {
+                    val scrollEnd = event.y.toInt()
+                    ExtendedFabUtil.toggleVisibilityOnScroll(
+                        binding.plainEditingFab,
+                        scrollStart,
+                        scrollEnd,
+                    )
+                }
+            }
+            return@setOnTouchListener false
         }
         binding.plainEditingFab.setOnClickListener {
             // TODO save note?
@@ -86,11 +101,6 @@ class NoteDirectEditFragment : BaseNoteFragment(), Branded {
         _binding = null
     }
 
-    override fun onAttach(context: Context) {
-        super.onAttach(context)
-        listener.setToolbarVisibility(false)
-    }
-
     override fun onNoteLoaded(note: Note) {
         super.onNoteLoaded(note)
         Log.d(TAG, "onNoteLoaded() called with: note = $note")
@@ -106,12 +116,15 @@ class NoteDirectEditFragment : BaseNoteFragment(), Branded {
                     Log.d(TAG, "onNoteLoaded: url = $url")
                 }
                 binding.noteWebview.loadUrl(url)
+                // TODO show warn/error if not loaded after 10 seconds
             }, { throwable ->
                 // TODO handle error
                 Log.e(TAG, "onNoteLoaded:", throwable)
             })
     }
 
+    override fun shouldShowToolbar(): Boolean = false
+
     @SuppressLint("SetJavaScriptEnabled")
     private fun setupWebSettings(webSettings: WebSettings) {
         WebView.setWebContentsDebuggingEnabled(true)