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=7c2012c6d27dc7471043b0409d6dc66cd2dd6824;hb=aba828cabddd0a277271c90816b50292bb64baf1;hpb=bc2e180db377eedadbe1ea455d8fb311ead8f9d6 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 7c2012c6..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 @@ -38,8 +38,8 @@ 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.RadioGroup import android.widget.Spinner import android.widget.TextView @@ -55,27 +55,27 @@ import com.stoutner.privacybrowser.helpers.BookmarksDatabaseHelper import java.io.ByteArrayOutputStream -// Declare the class constants. +// Define the class constants. private const val DATABASE_ID = "database_id" private const val FAVORITE_ICON_BYTE_ARRAY = "favorite_icon_byte_array" -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) - } - +class EditBookmarkDatabaseViewDialog : DialogFragment() { // Declare the class variables. private lateinit var editBookmarkDatabaseViewListener: EditBookmarkDatabaseViewListener // Declare the class views. - private lateinit var newIconRadioButton: RadioButton + 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 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. super.onAttach(context) @@ -85,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. @@ -115,8 +115,6 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() { } } - // `@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() @@ -143,8 +141,8 @@ 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 cancel button listener. Using `null` as the listener closes the dialog without doing anything else. dialogBuilder.setNegativeButton(R.string.cancel, null) @@ -159,7 +157,7 @@ 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(getString(R.string.allow_screenshots_key), false) @@ -173,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)!! + 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) @@ -201,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) @@ -236,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) @@ -246,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)) } } @@ -257,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 @@ -288,13 +288,35 @@ 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 - // Update the save button if the icon selection changes. - iconRadioGroup.setOnCheckedChangeListener { _: RadioGroup, _: Int -> + // 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 + + // Uncheck the current icon radio button. + currentIconRadioButton.isChecked = false + // Update the save button. updateSaveButton(currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder) } @@ -340,7 +362,7 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() { updateSaveButton(currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder) } - override fun onNothingSelected(parent: AdapterView<*>?) { + override fun onNothingSelected(parent: AdapterView<*>) { // Do nothing. } } @@ -425,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)