For #3813 - Create a save button for bookmark editing

app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt

@@ -10,34 +10,23 @@ import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
-import android.widget.EditText
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
-import androidx.core.widget.doOnTextChanged
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.Navigation
+import androidx.navigation.fragment.findNavController
 import kotlinx.android.synthetic.main.fragment_edit_bookmark.bookmarkNameEdit
 import kotlinx.android.synthetic.main.fragment_edit_bookmark.bookmarkParentFolderSelector
 import kotlinx.android.synthetic.main.fragment_edit_bookmark.bookmarkUrlEdit
 import kotlinx.android.synthetic.main.fragment_edit_bookmark.bookmarkUrlLabel
+import kotlinx.android.synthetic.main.fragment_edit_bookmark.progress_bar_bookmark
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.Dispatchers.Main
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.FlowPreview
-import kotlinx.coroutines.InternalCoroutinesApi
-import kotlinx.coroutines.channels.awaitClose
-import kotlinx.coroutines.flow.FlowCollector
-import kotlinx.coroutines.flow.channelFlow
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.debounce
-import kotlinx.coroutines.flow.drop
-import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import mozilla.appservices.places.UrlParseFailed
 import mozilla.components.concept.storage.BookmarkInfo
@@ -45,7 +34,6 @@ import mozilla.components.concept.storage.BookmarkNode
 import mozilla.components.concept.storage.BookmarkNodeType
 import mozilla.components.support.ktx.android.content.getColorFromAttr
 import mozilla.components.support.ktx.android.view.hideKeyboard
-import mozilla.components.support.ktx.android.view.toScope
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.FenixSnackbar
 import org.mozilla.fenix.components.metrics.Event
@@ -61,9 +49,6 @@ import org.mozilla.fenix.library.bookmarks.DesktopFolders
 /**
  * Menu to edit the name, URL, and location of a bookmark item.
  */
-@FlowPreview
-@ExperimentalCoroutinesApi
-@InternalCoroutinesApi // Cannot use collect as a lambda due to Kotlin SAM conversion issue
 class EditBookmarkFragment : Fragment(R.layout.fragment_edit_bookmark) {
 
     private lateinit var guidToEdit: String
@@ -78,9 +63,8 @@ class EditBookmarkFragment : Fragment(R.layout.fragment_edit_bookmark) {
         setHasOptionsMenu(true)
     }
 
-    override fun onResume() {
-        super.onResume()
-
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         initToolbar()
 
         guidToEdit = EditBookmarkFragmentArgs.fromBundle(arguments!!).guidToEdit
@@ -111,10 +95,6 @@ class EditBookmarkFragment : Fragment(R.layout.fragment_edit_bookmark) {
             bookmarkNode?.let { bookmarkNode ->
                 bookmarkNameEdit.setText(bookmarkNode.title)
                 bookmarkUrlEdit.setText(bookmarkNode.url)
-
-                if (sharedViewModel.selectedFolder != null && bookmarkNode.title != null) {
-                    updateBookmarkNode(bookmarkNode.title, bookmarkNode.url)
-                }
             }
 
             bookmarkParent?.let { node ->
@@ -129,8 +109,6 @@ class EditBookmarkFragment : Fragment(R.layout.fragment_edit_bookmark) {
                 }
             }
         }
-
-        updateBookmarkFromTextChanges()
     }
 
     private fun initToolbar() {
@@ -149,31 +127,7 @@ class EditBookmarkFragment : Fragment(R.layout.fragment_edit_bookmark) {
         super.onPause()
         bookmarkNameEdit.hideKeyboard()
         bookmarkUrlEdit.hideKeyboard()
-    }
-
-    private fun updateBookmarkFromTextChanges() {
-        fun EditText.observe() = channelFlow {
-            this@observe.doOnTextChanged { text, _, _, _ ->
-                runBlocking { send(text.toString()) }
-            }
-            awaitClose()
-        }
-
-        val nameText = bookmarkNameEdit.observe()
-        val urlText = bookmarkUrlEdit.observe()
-
-        bookmarkNameEdit.toScope().launch {
-            nameText.combine(urlText) { name, url -> name to url }
-                .drop(1)
-                .filter { (name) -> name.isNotBlank() }
-                .debounce(timeoutMillis = debouncePeriodInMs)
-                // TODO convert collect to lambda when Kotlin SAM conversions are supported
-                .collect(object : FlowCollector<Pair<String, String>> {
-                    override suspend fun emit(value: Pair<String, String>) {
-                        updateBookmarkNode(value.first, value.second)
-                    }
-                })
-        }
+        progress_bar_bookmark.visibility = View.GONE
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
@@ -186,6 +140,11 @@ class EditBookmarkFragment : Fragment(R.layout.fragment_edit_bookmark) {
                 displayDeleteBookmarkDialog()
                 true
             }
+            R.id.save_bookmark_button -> {
+                updateBookmarkFromTextChanges()
+                true
+            }
+
             else -> super.onOptionsItemSelected(item)
         }
     }
@@ -209,7 +168,8 @@ class EditBookmarkFragment : Fragment(R.layout.fragment_edit_bookmark) {
                             bookmarkNode?.let { bookmark ->
                                 FenixSnackbar.makeWithToolbarPadding(activity.getRootView()!!)
                                     .setText(
-                                        getString(R.string.bookmark_deletion_snackbar_message,
+                                        getString(
+                                            R.string.bookmark_deletion_snackbar_message,
                                             bookmark.url?.toShortUrl(context.components.publicSuffixList)
                                                 ?: bookmark.title
                                         )
@@ -225,6 +185,13 @@ class EditBookmarkFragment : Fragment(R.layout.fragment_edit_bookmark) {
         }
     }
 
+    private fun updateBookmarkFromTextChanges() {
+        progress_bar_bookmark.visibility = View.VISIBLE
+        val nameText = bookmarkNameEdit.text.toString()
+        val urlText = bookmarkUrlEdit.text.toString()
+        updateBookmarkNode(nameText, urlText)
+    }
+
     private fun updateBookmarkNode(title: String?, url: String?) {
         lifecycleScope.launch(IO) {
             try {
@@ -251,9 +218,7 @@ class EditBookmarkFragment : Fragment(R.layout.fragment_edit_bookmark) {
                 }
             }
         }
-    }
-
-    companion object {
-        private const val debouncePeriodInMs = 500L
+        progress_bar_bookmark.visibility = View.INVISIBLE
+        findNavController().popBackStack()
     }
 }

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

@@ -10,6 +10,17 @@
         android:layout_margin="16dp"
         android:orientation="vertical">
 
+    <ProgressBar
+        android:id="@+id/progress_bar_bookmark"
+        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+        android:indeterminate="true"
+        android:layout_width="match_parent"
+        android:layout_height="8dp"
+        android:translationY="-3dp"
+        android:visibility="gone"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
     <TextView
         android:id="@+id/bookmark_name_label"
         android:layout_width="match_parent"

app/src/main/res/menu/bookmarks_edit.xml

@@ -4,6 +4,15 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/save_bookmark_button"
+        android:icon= "@drawable/mozac_ic_check"
+        app:iconTint="?primaryText"
+        android:title="@string/bookmark_menu_save_button"
+        android:contentDescription="@string/bookmark_menu_save_button"
+        app:showAsAction="ifRoom" />
+
     <item
             android:id="@+id/delete_bookmark_button"
             android:icon="@drawable/ic_delete"

app/src/main/res/values/strings.xml

@@ -498,6 +498,8 @@
     <string name="bookmark_menu_open_in_private_tab_button">Open in private tab</string>
     <!-- Bookmark overflow menu delete button -->
     <string name="bookmark_menu_delete_button">Delete</string>
+    <!--Bookmark overflow menu save button -->
+    <string name="bookmark_menu_save_button">Save</string>
     <!-- Bookmark multi select title in app bar
      The first parameter is the number of bookmarks selected -->
     <string name="bookmarks_multi_select_title">%1$d selected</string>