X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FEditBookmarkDatabaseViewDialog.kt;h=4e4600deb46921a6dd81d15c2420294133ff3faa;hp=a3c164521bdf22f98b72b80eab8b92f1a467c406;hb=aba828cabddd0a277271c90816b50292bb64baf1;hpb=b82022327701273b1b56419e8d6042895c0bc7b9 diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDatabaseViewDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDatabaseViewDialog.kt index a3c16452..4e4600de 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDatabaseViewDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDatabaseViewDialog.kt @@ -1,24 +1,24 @@ /* - * Copyright © 2016-2020 Soren Stoutner . + * Copyright © 2016-2022 Soren Stoutner . * - * This file is part of Privacy Browser . + * This file is part of Privacy Browser Android . * - * Privacy Browser is free software: you can redistribute it and/or modify + * Privacy Browser Android is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Privacy Browser is distributed in the hope that it will be useful, + * Privacy Browser Android is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Privacy Browser. If not, see . + * along with Privacy Browser Android. If not, see . */ + package com.stoutner.privacybrowser.dialogs -import android.annotation.SuppressLint import android.app.Dialog import android.content.Context import android.content.DialogInterface @@ -33,11 +33,19 @@ import android.text.TextWatcher import android.view.KeyEvent import android.view.View import android.view.WindowManager -import android.widget.* +import android.widget.AdapterView import android.widget.AdapterView.OnItemSelectedListener +import android.widget.Button +import android.widget.EditText +import android.widget.ImageView +import android.widget.LinearLayout +import android.widget.RadioButton +import android.widget.Spinner +import android.widget.TextView import androidx.appcompat.app.AlertDialog import androidx.core.content.ContextCompat +import androidx.cursoradapter.widget.ResourceCursorAdapter import androidx.fragment.app.DialogFragment import androidx.preference.PreferenceManager @@ -47,22 +55,26 @@ import com.stoutner.privacybrowser.helpers.BookmarksDatabaseHelper import java.io.ByteArrayOutputStream -class EditBookmarkDatabaseViewDialog: DialogFragment() { - // The public interface is used to send information back to the parent activity. - interface EditBookmarkDatabaseViewListener { - fun onSaveBookmark(dialogFragment: DialogFragment, selectedBookmarkDatabaseId: Int, favoriteIconBitmap: Bitmap) - } +// Define the class constants. +private const val DATABASE_ID = "database_id" +private const val FAVORITE_ICON_BYTE_ARRAY = "favorite_icon_byte_array" - // Define the edit bookmark database view listener. +class EditBookmarkDatabaseViewDialog : DialogFragment() { + // Declare the class variables. private lateinit var editBookmarkDatabaseViewListener: EditBookmarkDatabaseViewListener - // Define the handles for the views that need to be accessed from `updateEditButton()`. - private lateinit var newIconRadioButton: RadioButton + // Declare the class views. + private lateinit var webpageFavoriteIconRadioButton: RadioButton private lateinit var nameEditText: EditText private lateinit var urlEditText: EditText private lateinit var folderSpinner: Spinner private lateinit var displayOrderEditText: EditText - private lateinit var editButton: Button + private lateinit var saveButton: Button + + // The public interface is used to send information back to the parent activity. + interface EditBookmarkDatabaseViewListener { + fun onSaveBookmark(dialogFragment: DialogFragment, selectedBookmarkDatabaseId: Int, favoriteIconBitmap: Bitmap) + } override fun onAttach(context: Context) { // Run the default commands. @@ -73,7 +85,7 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() { } companion object { - // `@JvmStatic` will no longer be required once all the code has transitioned to Kotlin. Also, the function can then be moved out of a companion object and just become a package-level function. + // `@JvmStatic` will no longer be required once all the code has transitioned to Kotlin. @JvmStatic fun bookmarkDatabaseId(databaseId: Int, favoriteIconBitmap: Bitmap): EditBookmarkDatabaseViewDialog { // Create a favorite icon byte array output stream. @@ -89,8 +101,8 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() { val argumentsBundle = Bundle() // Store the variables in the bundle. - argumentsBundle.putInt("database_id", databaseId) - argumentsBundle.putByteArray("favorite_icon_byte_array", favoriteIconByteArray) + argumentsBundle.putInt(DATABASE_ID, databaseId) + argumentsBundle.putByteArray(FAVORITE_ICON_BYTE_ARRAY, favoriteIconByteArray) // Create a new instance of the dialog. val editBookmarkDatabaseViewDialog = EditBookmarkDatabaseViewDialog() @@ -103,17 +115,13 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() { } } - // `@SuppressLing("InflateParams")` removes the warning about using `null` as the parent view group when inflating the alert dialog. - @SuppressLint("InflateParams") override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { // Get the arguments. val arguments = requireArguments() - // Get the bookmark database ID from the bundle. - val bookmarkDatabaseId = arguments.getInt("database_id") - - // Get the favorite icon byte array. - val favoriteIconByteArray = arguments.getByteArray("favorite_icon_byte_array")!! + // Get the variables from the arguments. + val bookmarkDatabaseId = arguments.getInt(DATABASE_ID) + val favoriteIconByteArray = arguments.getByteArray(FAVORITE_ICON_BYTE_ARRAY)!! // Convert the favorite icon byte array to a bitmap. val favoriteIconBitmap = BitmapFactory.decodeByteArray(favoriteIconByteArray, 0, favoriteIconByteArray.size) @@ -133,13 +141,13 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() { // Set the title. dialogBuilder.setTitle(R.string.edit_bookmark) - // Set the view. The parent view is `null` because it will be assigned by the alert dialog. - dialogBuilder.setView(requireActivity().layoutInflater.inflate(R.layout.edit_bookmark_databaseview_dialog, null)) + // Set the view. + dialogBuilder.setView(R.layout.edit_bookmark_databaseview_dialog) - // Set the listener for the cancel button. Using `null` as the listener closes the dialog without doing anything else. + // Set the cancel button listener. Using `null` as the listener closes the dialog without doing anything else. dialogBuilder.setNegativeButton(R.string.cancel, null) - // Set the listener for the save button. + // Set the save button listener. dialogBuilder.setPositiveButton(R.string.save) { _: DialogInterface, _: Int -> // Return the dialog fragment to the parent activity on save. editBookmarkDatabaseViewListener.onSaveBookmark(this, bookmarkDatabaseId, favoriteIconBitmap) @@ -149,10 +157,10 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() { val alertDialog = dialogBuilder.create() // Get a handle for the shared preferences. - val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context) + val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext()) // Get the screenshot preference. - val allowScreenshots = sharedPreferences.getBoolean("allow_screenshots", false) + val allowScreenshots = sharedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false) // Disable screenshots if not allowed. if (!allowScreenshots) { @@ -163,27 +171,29 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() { alertDialog.show() // Get handles for the layout items. - val databaseIdTextView = alertDialog.findViewById(R.id.edit_bookmark_database_id_textview)!! - val iconRadioGroup = alertDialog.findViewById(R.id.edit_bookmark_icon_radiogroup)!! - val currentIconImageView = alertDialog.findViewById(R.id.edit_bookmark_current_icon)!! - val newFavoriteIconImageView = alertDialog.findViewById(R.id.edit_bookmark_webpage_favorite_icon)!! - newIconRadioButton = alertDialog.findViewById(R.id.edit_bookmark_webpage_favorite_icon_radiobutton)!! - nameEditText = alertDialog.findViewById(R.id.edit_bookmark_name_edittext)!! - urlEditText = alertDialog.findViewById(R.id.edit_bookmark_url_edittext)!! - folderSpinner = alertDialog.findViewById(R.id.edit_bookmark_folder_spinner)!! - displayOrderEditText = alertDialog.findViewById(R.id.edit_bookmark_display_order_edittext)!! - editButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE) + val databaseIdTextView = alertDialog.findViewById(R.id.bookmark_database_id_textview)!! + val currentIconLinearLayout = alertDialog.findViewById(R.id.current_icon_linearlayout)!! + val currentIconRadioButton = alertDialog.findViewById(R.id.current_icon_radiobutton)!! + val currentIconImageView = alertDialog.findViewById(R.id.current_icon_imageview)!! + val webpageFavoriteIconLinearLayout = alertDialog.findViewById(R.id.webpage_favorite_icon_linearlayout)!! + webpageFavoriteIconRadioButton = alertDialog.findViewById(R.id.webpage_favorite_icon_radiobutton)!! + val webpageFavoriteIconImageView = alertDialog.findViewById(R.id.webpage_favorite_icon_imageview)!! + nameEditText = alertDialog.findViewById(R.id.bookmark_name_edittext)!! + urlEditText = alertDialog.findViewById(R.id.bookmark_url_edittext)!! + folderSpinner = alertDialog.findViewById(R.id.bookmark_folder_spinner)!! + displayOrderEditText = alertDialog.findViewById(R.id.bookmark_display_order_edittext)!! + saveButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE) // Store the current bookmark values. - val currentBookmarkName = bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_NAME)) - val currentUrl = bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_URL)) - val currentDisplayOrder = bookmarkCursor.getInt(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.DISPLAY_ORDER)) + val currentBookmarkName = bookmarkCursor.getString(bookmarkCursor.getColumnIndexOrThrow(BookmarksDatabaseHelper.BOOKMARK_NAME)) + val currentUrl = bookmarkCursor.getString(bookmarkCursor.getColumnIndexOrThrow(BookmarksDatabaseHelper.BOOKMARK_URL)) + val currentDisplayOrder = bookmarkCursor.getInt(bookmarkCursor.getColumnIndexOrThrow(BookmarksDatabaseHelper.DISPLAY_ORDER)) // Set the database ID. - databaseIdTextView.text = bookmarkCursor.getInt(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper._ID)).toString() + databaseIdTextView.text = bookmarkCursor.getInt(bookmarkCursor.getColumnIndexOrThrow(BookmarksDatabaseHelper._ID)).toString() // Get the current favorite icon byte array from the cursor. - val currentIconByteArray = bookmarkCursor.getBlob(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.FAVORITE_ICON)) + val currentIconByteArray = bookmarkCursor.getBlob(bookmarkCursor.getColumnIndexOrThrow(BookmarksDatabaseHelper.FAVORITE_ICON)) // Convert the byte array to a bitmap beginning at the first byte and ending at the last. val currentIconBitmap = BitmapFactory.decodeByteArray(currentIconByteArray, 0, currentIconByteArray.size) @@ -191,8 +201,8 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() { // Display the current icon bitmap. currentIconImageView.setImageBitmap(currentIconBitmap) - // Set the new favorite icon bitmap. - newFavoriteIconImageView.setImageBitmap(favoriteIconBitmap) + // Set the webpage favorite icon bitmap. + webpageFavoriteIconImageView.setImageBitmap(favoriteIconBitmap) // Populate the bookmark name and URL edit texts. nameEditText.setText(currentBookmarkName) @@ -226,7 +236,7 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() { spinnerItemImageView.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.folder_gray)) } else { // A user folder // Get the folder icon byte array. - val folderIconByteArray = cursor.getBlob(cursor.getColumnIndex(BookmarksDatabaseHelper.FAVORITE_ICON)) + val folderIconByteArray = cursor.getBlob(cursor.getColumnIndexOrThrow(BookmarksDatabaseHelper.FAVORITE_ICON)) // Convert the byte array to a bitmap beginning at the first byte and ending at the last. val folderIconBitmap = BitmapFactory.decodeByteArray(folderIconByteArray, 0, folderIconByteArray.size) @@ -236,7 +246,7 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() { } // Set the text view to display the folder name. - spinnerItemTextView.text = cursor.getString(cursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_NAME)) + spinnerItemTextView.text = cursor.getString(cursor.getColumnIndexOrThrow(BookmarksDatabaseHelper.BOOKMARK_NAME)) } } @@ -247,12 +257,12 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() { folderSpinner.adapter = foldersCursorAdapter // Get the parent folder name. - val parentFolder = bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.PARENT_FOLDER)) + val parentFolder = bookmarkCursor.getString(bookmarkCursor.getColumnIndexOrThrow(BookmarksDatabaseHelper.PARENT_FOLDER)) // Select the current folder in the spinner if the bookmark isn't in the home folder. if (parentFolder != "") { // Get the database ID of the parent folder. - val folderDatabaseId = bookmarksDatabaseHelper.getFolderDatabaseId(bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.PARENT_FOLDER))) + val folderDatabaseId = bookmarksDatabaseHelper.getFolderDatabaseId(bookmarkCursor.getString(bookmarkCursor.getColumnIndexOrThrow(BookmarksDatabaseHelper.PARENT_FOLDER))) // Initialize the parent folder position and the iteration variable. var parentFolderPosition = 0 @@ -278,18 +288,40 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() { val currentFolderDatabaseId = folderSpinner.selectedItemId.toInt() // Populate the display order edit text. - displayOrderEditText.setText(bookmarkCursor.getInt(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.DISPLAY_ORDER)).toString()) + displayOrderEditText.setText(bookmarkCursor.getInt(bookmarkCursor.getColumnIndexOrThrow(BookmarksDatabaseHelper.DISPLAY_ORDER)).toString()) + + // Initially disable the save button. + saveButton.isEnabled = false + + // Set the radio button listeners. These perform a click on the linear layout, which contains the necessary logic. + currentIconRadioButton.setOnClickListener { currentIconLinearLayout.performClick() } + webpageFavoriteIconRadioButton.setOnClickListener { webpageFavoriteIconLinearLayout.performClick() } + + // Set the current icon linear layout click listener. + currentIconLinearLayout.setOnClickListener { + // Check the current icon radio button. + currentIconRadioButton.isChecked = true + + // Uncheck the webpage favorite icon radio button. + webpageFavoriteIconRadioButton.isChecked = false + + // Update the save button. + updateSaveButton(currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder) + } + + // Set the webpage favorite icon linear layout click listener. + webpageFavoriteIconLinearLayout.setOnClickListener { + // Check the webpage favorite icon radio button. + webpageFavoriteIconRadioButton.isChecked = true - // Initially disable the edit button. - editButton.isEnabled = false + // Uncheck the current icon radio button. + currentIconRadioButton.isChecked = false - // Update the edit button if the icon selection changes. - iconRadioGroup.setOnCheckedChangeListener { _: RadioGroup, _: Int -> - // Update the edit button. - updateEditButton(currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder) + // Update the save button. + updateSaveButton(currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder) } - // Update the edit button if the bookmark name changes. + // Update the save button if the bookmark name changes. nameEditText.addTextChangedListener(object: TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { // Do nothing. @@ -300,12 +332,12 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() { } override fun afterTextChanged(s: Editable) { - // Update the edit button. - updateEditButton(currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder) + // Update the Save button. + updateSaveButton(currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder) } }) - // Update the edit button if the URL changes. + // Update the save button if the URL changes. urlEditText.addTextChangedListener(object: TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { // Do nothing. @@ -316,28 +348,28 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() { } override fun afterTextChanged(s: Editable) { - // Update the edit button. - updateEditButton(currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder) + // Update the save button. + updateSaveButton(currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder) } }) // Wait to set the on item selected listener until the spinner has been inflated. Otherwise the dialog will crash on restart. folderSpinner.post { - // Update the edit button if the folder changes. - folderSpinner.onItemSelectedListener = object : OnItemSelectedListener { + // Update the save button if the folder changes. + folderSpinner.onItemSelectedListener = object: OnItemSelectedListener { override fun onItemSelected(parent: AdapterView<*>, view: View, position: Int, id: Long) { - // Update the edit button. - updateEditButton(currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder) + // Update the save button. + updateSaveButton(currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder) } - override fun onNothingSelected(parent: AdapterView<*>?) { + override fun onNothingSelected(parent: AdapterView<*>) { // Do nothing. } } } - // Update the edit button if the display order changes. - displayOrderEditText.addTextChangedListener(object : TextWatcher { + // Update the save button if the display order changes. + displayOrderEditText.addTextChangedListener(object: TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { // Do nothing. } @@ -347,24 +379,24 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() { } override fun afterTextChanged(s: Editable) { - // Update the edit button. - updateEditButton(currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder) + // Update the save button. + updateSaveButton(currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder) } }) // Allow the enter key on the keyboard to save the bookmark from the bookmark name edit text. nameEditText.setOnKeyListener { _: View, keyCode: Int, keyEvent: KeyEvent -> // Check the key code, event, and button status. - if (keyEvent.action == KeyEvent.ACTION_DOWN && keyCode == KeyEvent.KEYCODE_ENTER && editButton.isEnabled) { // The enter key was pressed and the edit button is enabled. + if (keyEvent.action == KeyEvent.ACTION_DOWN && keyCode == KeyEvent.KEYCODE_ENTER && saveButton.isEnabled) { // The enter key was pressed and the save button is enabled. // Trigger the listener and return the dialog fragment to the parent activity. - editBookmarkDatabaseViewListener.onSaveBookmark(this@EditBookmarkDatabaseViewDialog, bookmarkDatabaseId, favoriteIconBitmap) + editBookmarkDatabaseViewListener.onSaveBookmark(this, bookmarkDatabaseId, favoriteIconBitmap) // Manually dismiss the alert dialog. alertDialog.dismiss() // Consume the event. return@setOnKeyListener true - } else { // If any other key was pressed, or if the edit button is currently disabled, do not consume the event. + } else { // If any other key was pressed, or if the save button is currently disabled, do not consume the event. return@setOnKeyListener false } } @@ -372,16 +404,16 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() { // Allow the enter key on the keyboard to save the bookmark from the URL edit text. urlEditText.setOnKeyListener { _: View, keyCode: Int, keyEvent: KeyEvent -> // Check the key code, event, and button status. - if (keyEvent.action == KeyEvent.ACTION_DOWN && keyCode == KeyEvent.KEYCODE_ENTER && editButton.isEnabled) { // The enter key was pressed and the edit button is enabled. + if (keyEvent.action == KeyEvent.ACTION_DOWN && keyCode == KeyEvent.KEYCODE_ENTER && saveButton.isEnabled) { // The enter key was pressed and the save button is enabled. // Trigger the listener and return the dialog fragment to the parent activity. - editBookmarkDatabaseViewListener.onSaveBookmark(this@EditBookmarkDatabaseViewDialog, bookmarkDatabaseId, favoriteIconBitmap) + editBookmarkDatabaseViewListener.onSaveBookmark(this, bookmarkDatabaseId, favoriteIconBitmap) // Manually dismiss the alert dialog. alertDialog.dismiss() // Consume the event. return@setOnKeyListener true - } else { // If any other key was pressed, or if the edit button is currently disabled, do not consume the event. + } else { // If any other key was pressed, or if the save button is currently disabled, do not consume the event. return@setOnKeyListener false } } @@ -389,16 +421,16 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() { // Allow the enter key on the keyboard to save the bookmark from the display order edit text. displayOrderEditText.setOnKeyListener { _: View, keyCode: Int, keyEvent: KeyEvent -> // Check the key code, event, and button status. - if (keyEvent.action == KeyEvent.ACTION_DOWN && keyCode == KeyEvent.KEYCODE_ENTER && editButton.isEnabled) { // The enter key was pressed and the edit button is enabled. + if (keyEvent.action == KeyEvent.ACTION_DOWN && keyCode == KeyEvent.KEYCODE_ENTER && saveButton.isEnabled) { // The enter key was pressed and the save button is enabled. // Trigger the listener and return the dialog fragment to the parent activity. - editBookmarkDatabaseViewListener.onSaveBookmark(this@EditBookmarkDatabaseViewDialog, bookmarkDatabaseId, favoriteIconBitmap) + editBookmarkDatabaseViewListener.onSaveBookmark(this, bookmarkDatabaseId, favoriteIconBitmap) // Manually dismiss the alert dialog. alertDialog.dismiss() // Consume the event. return@setOnKeyListener true - } else { // If any other key was pressed, or if the edit button is currently disabled, do not consume the event. + } else { // If any other key was pressed, or if the save button is currently disabled, do not consume the event. return@setOnKeyListener false } } @@ -407,7 +439,7 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() { return alertDialog } - private fun updateEditButton(currentBookmarkName: String, currentUrl: String, currentFolderDatabaseId: Int, currentDisplayOrder: Int) { + private fun updateSaveButton(currentBookmarkName: String, currentUrl: String, currentFolderDatabaseId: Int, currentDisplayOrder: Int) { // Get the values from the dialog. val newName = nameEditText.text.toString() val newUrl = urlEditText.text.toString() @@ -415,7 +447,7 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() { val newDisplayOrder = displayOrderEditText.text.toString() // Has the favorite icon changed? - val iconChanged = newIconRadioButton.isChecked + val iconChanged = webpageFavoriteIconRadioButton.isChecked // Has the name changed? val nameChanged = (newName != currentBookmarkName) @@ -432,7 +464,7 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() { // Is the display order empty? val displayOrderNotEmpty = newDisplayOrder.isNotEmpty() - // Update the enabled status of the edit button. - editButton.isEnabled = (iconChanged || nameChanged || urlChanged || folderChanged || displayOrderChanged) && displayOrderNotEmpty + // Update the enabled status of the save button. + saveButton.isEnabled = (iconChanged || nameChanged || urlChanged || folderChanged || displayOrderChanged) && displayOrderNotEmpty } } \ No newline at end of file