improvement(deck-description): use 'Save/Close' buttons

Requested in review, instead of icons

Issue 18749

Author: david-allison

AnkiDroid/src/main/java/com/ichi2/anki/dialogs/EditDeckDescriptionDialog.kt

@@ -18,12 +18,12 @@ package com.ichi2.anki.dialogs
 
 import android.app.Dialog
 import android.os.Bundle
-import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import android.widget.CheckBox
 import android.widget.ImageButton
 import androidx.activity.OnBackPressedCallback
+import androidx.appcompat.app.AlertDialog
 import androidx.core.os.bundleOf
 import androidx.core.widget.doOnTextChanged
 import androidx.fragment.app.DialogFragment
@@ -39,6 +39,9 @@ import com.ichi2.anki.dialogs.EditDeckDescriptionDialogViewModel.DismissType
 import com.ichi2.anki.libanki.DeckId
 import com.ichi2.anki.snackbar.showSnackbar
 import com.ichi2.utils.AndroidUiUtils.setFocusAndOpenKeyboard
+import com.ichi2.utils.create
+import com.ichi2.utils.negativeButton
+import com.ichi2.utils.positiveButton
 import com.ichi2.utils.show
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.launch
@@ -52,6 +55,7 @@ import timber.log.Timber
 class EditDeckDescriptionDialog : DialogFragment() {
     private val viewModel: EditDeckDescriptionDialogViewModel by viewModels()
 
+    private lateinit var alertDialog: AlertDialog
     private lateinit var dialogView: View
 
     private val deckDescriptionInput: TextInputEditText
@@ -63,9 +67,6 @@ class EditDeckDescriptionDialog : DialogFragment() {
     private val toolbar: MaterialToolbar
         get() = dialogView.findViewById(R.id.topAppBar)
 
-    private val saveMenuItem: MenuItem
-        get() = toolbar.menu.findItem(R.id.action_save)
-
     private val onUnsavedChangesBackCallback =
         object : OnBackPressedCallback(enabled = false) {
             override fun handleOnBackPressed() {
@@ -76,13 +77,21 @@ class EditDeckDescriptionDialog : DialogFragment() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         this.dialogView = layoutInflater.inflate(R.layout.dialog_deck_description, null)
         return MaterialAlertDialogBuilder(requireContext())
-            .show {
+            .create {
                 setView(dialogView)
+                positiveButton(R.string.save)
+                negativeButton(R.string.close)
             }.apply {
-                setupDialogView(dialogView)
+                alertDialog = this
+                setOnShowListener {
+                    positiveButton.setOnClickListener { viewModel.saveAndExit() }
+                    negativeButton.setOnClickListener { viewModel.onBackRequested() }
+                }
                 setCanceledOnTouchOutside(false)
                 setCancelable(false)
                 onBackPressedDispatcher.addCallback(this, onUnsavedChangesBackCallback)
+                show()
+                setupDialogView(dialogView)
             }
     }
 
@@ -111,23 +120,6 @@ class EditDeckDescriptionDialog : DialogFragment() {
             }
         }
 
-        // setup App Bar
-        toolbar.apply {
-            setNavigationOnClickListener {
-                viewModel.onBackRequested()
-            }
-
-            setOnMenuItemClickListener { menuItem ->
-                when (menuItem.itemId) {
-                    R.id.action_save -> {
-                        viewModel.saveAndExit()
-                        true
-                    }
-                    else -> false
-                }
-            }
-        }
-
         setupFlows()
     }
 
@@ -175,7 +167,7 @@ class EditDeckDescriptionDialog : DialogFragment() {
 
         lifecycleScope.launch {
             viewModel.flowOfHasChanges.collect {
-                saveMenuItem.isEnabled = it
+                alertDialog.positiveButton.isEnabled = it
                 onUnsavedChangesBackCallback.isEnabled = it
             }
         }

AnkiDroid/src/main/res/layout/dialog_deck_description.xml

@@ -19,7 +19,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:layout_marginHorizontal="8dp"
     >
 
@@ -29,9 +29,8 @@
         android:layout_height="wrap_content"
         android:minHeight="?attr/actionBarSize"
         android:layout_marginEnd="2dp"
+        android:layout_marginStart="8dp"
         app:layout_scrollFlags="enterAlways"
-        app:menu="@menu/menu_deck_description"
-        app:navigationIcon="@drawable/close_icon"
         app:navigationContentDescription="@string/close"
         tools:title="Deck name" />
 
@@ -41,7 +40,8 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
-        android:layout_marginHorizontal="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="22dp"
         android:layout_marginBottom="8dp"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
@@ -65,8 +65,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
-        android:layout_marginEnd="2dp"
-        android:layout_marginBottom="24dp">
+        android:layout_marginEnd="10dp">
 
         <CheckBox
             android:id="@+id/format_as_markdown"