X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FEditBookmarkFolderDatabaseViewDialog.kt;h=d7f29bf7bd301f73224cdf7162f8dd46b466c792;hp=603dff26494e690f28cc93acebfbf2ae25d8b250;hb=aba828cabddd0a277271c90816b50292bb64baf1;hpb=bc2e180db377eedadbe1ea455d8fb311ead8f9d6 diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDatabaseViewDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDatabaseViewDialog.kt index 603dff26..d7f29bf7 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDatabaseViewDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDatabaseViewDialog.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 @@ -49,26 +49,26 @@ 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 EditBookmarkFolderDatabaseViewDialog: DialogFragment() { - // The public interface is used to send information back to the parent activity. - interface EditBookmarkFolderDatabaseViewListener { - fun onSaveBookmarkFolder(dialogFragment: DialogFragment, selectedFolderDatabaseId: Int, favoriteIconBitmap: Bitmap) - } - +class EditBookmarkFolderDatabaseViewDialog : DialogFragment() { // Declare the class variables. private lateinit var editBookmarkFolderDatabaseViewListener: EditBookmarkFolderDatabaseViewListener // Declare the class views. + private lateinit var currentIconRadioButton: RadioButton private lateinit var nameEditText: EditText - private lateinit var folderSpinner: Spinner + private lateinit var parentFolderSpinner: Spinner private lateinit var displayOrderEditText: EditText - private lateinit var currentIconRadioButton: RadioButton private lateinit var saveButton: Button + // The public interface is used to send information back to the parent activity. + interface EditBookmarkFolderDatabaseViewListener { + fun onSaveBookmarkFolder(dialogFragment: DialogFragment, selectedFolderDatabaseId: Int, favoriteIconBitmap: Bitmap) + } + override fun onAttach(context: Context) { // Run the default commands. super.onAttach(context) @@ -78,7 +78,7 @@ class EditBookmarkFolderDatabaseViewDialog: 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 folderDatabaseId(databaseId: Int, favoriteIconBitmap: Bitmap): EditBookmarkFolderDatabaseViewDialog { // Create a favorite icon byte array output stream. @@ -108,8 +108,6 @@ class EditBookmarkFolderDatabaseViewDialog: 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 a handle for the arguments. val arguments = requireArguments() @@ -136,8 +134,8 @@ class EditBookmarkFolderDatabaseViewDialog: DialogFragment() { // Set the title. dialogBuilder.setTitle(R.string.edit_folder) - // 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_folder_databaseview_dialog, null)) + // Set the view. + dialogBuilder.setView(R.layout.edit_bookmark_folder_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) @@ -152,7 +150,7 @@ class EditBookmarkFolderDatabaseViewDialog: 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) @@ -165,27 +163,31 @@ class EditBookmarkFolderDatabaseViewDialog: DialogFragment() { // The alert dialog must be shown before items in the layout can be modified. alertDialog.show() - // Get handles for the layout items. - val databaseIdTextView = alertDialog.findViewById(R.id.edit_folder_database_id_textview)!! - val iconRadioGroup = alertDialog.findViewById(R.id.edit_folder_icon_radiogroup)!! - val currentIconImageView = alertDialog.findViewById(R.id.edit_folder_current_icon_imageview)!! - val newFavoriteIconImageView = alertDialog.findViewById(R.id.edit_folder_webpage_favorite_icon_imageview)!! - currentIconRadioButton = alertDialog.findViewById(R.id.edit_folder_current_icon_radiobutton)!! - nameEditText = alertDialog.findViewById(R.id.edit_folder_name_edittext)!! - folderSpinner = alertDialog.findViewById(R.id.edit_folder_parent_folder_spinner)!! - displayOrderEditText = alertDialog.findViewById(R.id.edit_folder_display_order_edittext)!! + // Get handles for the views in the alert dialog. + val databaseIdTextView = alertDialog.findViewById(R.id.folder_database_id_textview)!! + val currentIconLinearLayout = alertDialog.findViewById(R.id.current_icon_linearlayout)!! + currentIconRadioButton = alertDialog.findViewById(R.id.current_icon_radiobutton)!! + val currentIconImageView = alertDialog.findViewById(R.id.current_icon_imageview)!! + val defaultIconLinearLayout = alertDialog.findViewById(R.id.default_icon_linearlayout)!! + val defaultIconRadioButton = alertDialog.findViewById(R.id.default_icon_radiobutton)!! + val webpageFavoriteIconLinearLayout = alertDialog.findViewById(R.id.webpage_favorite_icon_linearlayout)!! + val webpageFavoriteIconRadioButton = alertDialog.findViewById(R.id.webpage_favorite_icon_radiobutton)!! + val webpageFavoriteIconImageView = alertDialog.findViewById(R.id.webpage_favorite_icon_imageview)!! + nameEditText = alertDialog.findViewById(R.id.folder_name_edittext)!! + parentFolderSpinner = alertDialog.findViewById(R.id.parent_folder_spinner)!! + displayOrderEditText = alertDialog.findViewById(R.id.display_order_edittext)!! saveButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE) // Store the current folder values. - val currentFolderName = folderCursor.getString(folderCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_NAME)) - val currentDisplayOrder = folderCursor.getInt(folderCursor.getColumnIndex(BookmarksDatabaseHelper.DISPLAY_ORDER)) - val parentFolder = folderCursor.getString(folderCursor.getColumnIndex(BookmarksDatabaseHelper.PARENT_FOLDER)) + val currentFolderName = folderCursor.getString(folderCursor.getColumnIndexOrThrow(BookmarksDatabaseHelper.BOOKMARK_NAME)) + val currentDisplayOrder = folderCursor.getInt(folderCursor.getColumnIndexOrThrow(BookmarksDatabaseHelper.DISPLAY_ORDER)) + val parentFolder = folderCursor.getString(folderCursor.getColumnIndexOrThrow(BookmarksDatabaseHelper.PARENT_FOLDER)) // Populate the database ID text view. - databaseIdTextView.text = folderCursor.getInt(folderCursor.getColumnIndex(BookmarksDatabaseHelper._ID)).toString() + databaseIdTextView.text = folderCursor.getInt(folderCursor.getColumnIndexOrThrow(BookmarksDatabaseHelper._ID)).toString() // Get the current favorite icon byte array from the cursor. - val currentIconByteArray = folderCursor.getBlob(folderCursor.getColumnIndex(BookmarksDatabaseHelper.FAVORITE_ICON)) + val currentIconByteArray = folderCursor.getBlob(folderCursor.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) @@ -193,8 +195,8 @@ class EditBookmarkFolderDatabaseViewDialog: DialogFragment() { // Populate the current icon image view. currentIconImageView.setImageBitmap(currentIconBitmap) - // Populate the new favorite icon image view. - newFavoriteIconImageView.setImageBitmap(favoriteIconBitmap) + // Populate the webpage favorite icon image view. + webpageFavoriteIconImageView.setImageBitmap(favoriteIconBitmap) // Populate the folder name edit text. nameEditText.setText(currentFolderName) @@ -230,7 +232,7 @@ class EditBookmarkFolderDatabaseViewDialog: DialogFragment() { spinnerItemImageView.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.folder_gray)) } else { // Set a user folder icon. // 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) @@ -240,20 +242,20 @@ class EditBookmarkFolderDatabaseViewDialog: 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)) } } // Set the folders cursor adapter drop drown view resource. foldersCursorAdapter.setDropDownViewResource(R.layout.databaseview_spinner_dropdown_items) - // Set the adapter for the folder `Spinner`. - folderSpinner.adapter = foldersCursorAdapter + // Set the parent folder spinner adapter. + parentFolderSpinner.adapter = foldersCursorAdapter // 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 as a long. - val parentFolderDatabaseId = bookmarksDatabaseHelper.getFolderDatabaseId(folderCursor.getString(folderCursor.getColumnIndex(BookmarksDatabaseHelper.PARENT_FOLDER))).toLong() + val parentFolderDatabaseId = bookmarksDatabaseHelper.getFolderDatabaseId(folderCursor.getString(folderCursor.getColumnIndexOrThrow(BookmarksDatabaseHelper.PARENT_FOLDER))).toLong() // Initialize the parent folder position and the iteration variable. var parentFolderPosition = 0 @@ -272,20 +274,58 @@ class EditBookmarkFolderDatabaseViewDialog: DialogFragment() { } while (parentFolderPosition == 0 && i < foldersCursorAdapter.count) // Select the parent folder in the spinner. - folderSpinner.setSelection(parentFolderPosition) + parentFolderSpinner.setSelection(parentFolderPosition) } // Store the current folder database ID. - val currentParentFolderDatabaseId = folderSpinner.selectedItemId.toInt() + val currentParentFolderDatabaseId = parentFolderSpinner.selectedItemId.toInt() // Populate the display order edit text. - displayOrderEditText.setText(folderCursor.getInt(folderCursor.getColumnIndex(BookmarksDatabaseHelper.DISPLAY_ORDER)).toString()) + displayOrderEditText.setText(folderCursor.getInt(folderCursor.getColumnIndexOrThrow(BookmarksDatabaseHelper.DISPLAY_ORDER)).toString()) // Initially disable the edit 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() } + defaultIconRadioButton.setOnClickListener { defaultIconLinearLayout.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 other radio buttons. + defaultIconRadioButton.isChecked = false + webpageFavoriteIconRadioButton.isChecked = false + + // Update the save button. + updateSaveButton(bookmarksDatabaseHelper, currentFolderName, currentParentFolderDatabaseId, currentDisplayOrder) + } + + // Set the default icon linear layout click listener. + defaultIconLinearLayout.setOnClickListener { + // Check the default icon radio button. + defaultIconRadioButton.isChecked = true + + // Uncheck the other radio buttons. + currentIconRadioButton.isChecked = false + webpageFavoriteIconRadioButton.isChecked = false + + // Update the save button. + updateSaveButton(bookmarksDatabaseHelper, currentFolderName, currentParentFolderDatabaseId, currentDisplayOrder) + } + + // Set the webpage favorite icon linear layout click listener. + webpageFavoriteIconLinearLayout.setOnClickListener { + // Check the webpage favorite icon radio button. + webpageFavoriteIconRadioButton.isChecked = true + + // Uncheck the other radio buttons. + currentIconRadioButton.isChecked = false + defaultIconRadioButton.isChecked = false + // Update the save button. updateSaveButton(bookmarksDatabaseHelper, currentFolderName, currentParentFolderDatabaseId, currentDisplayOrder) } @@ -306,15 +346,18 @@ class EditBookmarkFolderDatabaseViewDialog: DialogFragment() { } }) - // 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(bookmarksDatabaseHelper, currentFolderName, currentParentFolderDatabaseId, currentDisplayOrder) - } + // Wait to set the on item selected listener until the spinner has been inflated. Otherwise the dialog will crash on restart. + parentFolderSpinner.post { + // Update the save button if the parent folder changes. + parentFolderSpinner.onItemSelectedListener = object: OnItemSelectedListener { + override fun onItemSelected(parent: AdapterView<*>, view: View, position: Int, id: Long) { + // Update the save button. + updateSaveButton(bookmarksDatabaseHelper, currentFolderName, currentParentFolderDatabaseId, currentDisplayOrder) + } - override fun onNothingSelected(parent: AdapterView<*>?) { - // Do nothing. + override fun onNothingSelected(parent: AdapterView<*>) { + // Do nothing. + } } } @@ -375,7 +418,7 @@ class EditBookmarkFolderDatabaseViewDialog: DialogFragment() { private fun updateSaveButton(bookmarksDatabaseHelper: BookmarksDatabaseHelper, currentFolderName: String, currentParentFolderDatabaseId: Int, currentDisplayOrder: Int) { // Get the values from the views. val newFolderName = nameEditText.text.toString() - val newParentFolderDatabaseId = folderSpinner.selectedItemId.toInt() + val newParentFolderDatabaseId = parentFolderSpinner.selectedItemId.toInt() val newDisplayOrder = displayOrderEditText.text.toString() // Get a cursor for the new folder name if it exists. @@ -419,7 +462,7 @@ class EditBookmarkFolderDatabaseViewDialog: DialogFragment() { subfoldersCursor.moveToPosition(i) // Get the name of the subfolder. - val subfolderName = subfoldersCursor.getString(subfoldersCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_NAME)) + val subfolderName = subfoldersCursor.getString(subfoldersCursor.getColumnIndexOrThrow(BookmarksDatabaseHelper.BOOKMARK_NAME)) // Add a comma to the end of the existing string. currentAndSubfolderStringBuilder.append(",")