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=c0ace69f98de2254842c3de0906090d6785ddef8;hp=4de3543173402cdd18c9d8fef528c161a9c3a610;hb=91154b307513e7bc6958b27fba518e4f9b564cf9;hpb=74655c0cd0ba72c80ac6c48df55bc3d2f5280ad2 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 4de35431..c0ace69f 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDatabaseViewDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDatabaseViewDialog.kt @@ -1,5 +1,5 @@ /* - * Copyright © 2016-2020 Soren Stoutner . + * Copyright © 2016-2021 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -16,6 +16,7 @@ * You should have received a copy of the GNU General Public License * along with Privacy Browser. If not, see . */ + package com.stoutner.privacybrowser.dialogs import android.annotation.SuppressLint @@ -33,11 +34,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.RadioButton +import android.widget.RadioGroup +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 +56,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) - } +// Declare 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()`. + // Declare the class views. private lateinit var newIconRadioButton: 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 +86,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 +102,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 +116,15 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() { } } - // `@SuppressLing("InflateParams")` removes the warning about using `null` as the parent view group when inflating the alert dialog. + // `@SuppressLint("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) @@ -136,10 +147,10 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() { // 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 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) @@ -152,7 +163,7 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() { val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context) // 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) { @@ -172,7 +183,7 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() { 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) + saveButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE) // Store the current bookmark values. val currentBookmarkName = bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_NAME)) @@ -205,7 +216,7 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() { val matrixCursor = MatrixCursor(matrixCursorColumnNamesArray) // Add `Home Folder` as the first entry in the matrix folder. - matrixCursor.addRow(arrayOf(BookmarksDatabaseViewActivity.HOME_FOLDER_DATABASE_ID, getString(R.string.home_folder))) + matrixCursor.addRow(arrayOf(BookmarksDatabaseViewActivity.HOME_FOLDER_DATABASE_ID, getString(R.string.home_folder))) // Get a cursor with the list of all the folders. val foldersCursor = bookmarksDatabaseHelper.allFolders @@ -280,16 +291,16 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() { // Populate the display order edit text. displayOrderEditText.setText(bookmarkCursor.getInt(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.DISPLAY_ORDER)).toString()) - // Initially disable the edit button. - editButton.isEnabled = false + // Initially disable the save button. + saveButton.isEnabled = false - // Update the edit button if the icon selection changes. + // Update the save 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 +311,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,25 +327,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) } }) - // Update the edit 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) - } + // 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 save button if the folder changes. + folderSpinner.onItemSelectedListener = object: OnItemSelectedListener { + override fun onItemSelected(parent: AdapterView<*>, view: View, position: Int, id: Long) { + // Update the save button. + updateSaveButton(currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder) + } - override fun onNothingSelected(parent: AdapterView<*>?) { - // Do nothing. + 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. } @@ -344,24 +358,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 } } @@ -369,16 +383,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 } } @@ -386,16 +400,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 } } @@ -404,7 +418,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() @@ -429,7 +443,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