X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FEditBookmarkFolderDialog.kt;h=86c521afca4278c2b24df829f7c9fbb44bee66af;hp=578fcd28e8ffddde7f75984376c9157bb51e4fd7;hb=484f0b0f0143c53a4722cee3a31e714df0c8c49a;hpb=91154b307513e7bc6958b27fba518e4f9b564cf9 diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDialog.kt index 578fcd28..86c521af 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDialog.kt @@ -19,7 +19,6 @@ package com.stoutner.privacybrowser.dialogs -import android.annotation.SuppressLint import android.app.Dialog import android.content.Context import android.content.DialogInterface @@ -34,8 +33,8 @@ import android.view.WindowManager 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 androidx.appcompat.app.AlertDialog import androidx.fragment.app.DialogFragment @@ -46,7 +45,7 @@ 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" @@ -105,8 +104,6 @@ class EditBookmarkFolderDialog : 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() @@ -133,8 +130,8 @@ class EditBookmarkFolderDialog : DialogFragment() { // Set the title. dialogBuilder.setTitle(R.string.edit_folder) - // Set the view. The parent view is `null` because it will be assigned by `AlertDialog`. - dialogBuilder.setView(requireActivity().layoutInflater.inflate(R.layout.edit_bookmark_folder_dialog, null)) + // Set the view. + dialogBuilder.setView(R.layout.edit_bookmark_folder_dialog) // Set the cancel button listener. Using `null` as the listener closes the dialog without doing anything else. dialogBuilder.setNegativeButton(R.string.cancel, null) @@ -163,15 +160,19 @@ class EditBookmarkFolderDialog : DialogFragment() { alertDialog.show() // Get handles for the views in the alert dialog. - val iconRadioGroup = alertDialog.findViewById(R.id.edit_folder_icon_radio_group)!! - currentIconRadioButton = alertDialog.findViewById(R.id.edit_folder_current_icon_radiobutton)!! - val currentIconImageView = alertDialog.findViewById(R.id.edit_folder_current_icon_imageview)!! - val webPageFavoriteIconImageView = alertDialog.findViewById(R.id.edit_folder_web_page_favorite_icon_imageview)!! - folderNameEditText = alertDialog.findViewById(R.id.edit_folder_name_edittext)!! + 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)!! + folderNameEditText = alertDialog.findViewById(R.id.folder_name_edittext)!! saveButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE) // 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) @@ -179,11 +180,11 @@ class EditBookmarkFolderDialog : DialogFragment() { // Display the current icon bitmap. currentIconImageView.setImageBitmap(currentIconBitmap) - // Set the new favorite icon bitmap. - webPageFavoriteIconImageView.setImageBitmap(favoriteIconBitmap) + // Set the webpage favorite icon bitmap. + webpageFavoriteIconImageView.setImageBitmap(favoriteIconBitmap) // Get the current folder name. - currentFolderName = folderCursor.getString(folderCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_NAME)) + currentFolderName = folderCursor.getString(folderCursor.getColumnIndexOrThrow(BookmarksDatabaseHelper.BOOKMARK_NAME)) // Display the current folder name. folderNameEditText.setText(currentFolderName) @@ -191,6 +192,50 @@ class EditBookmarkFolderDialog : DialogFragment() { // 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() } + 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() + } + + // 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() + } + + // 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() + } + // Update the status of the save button when the folder name is changed. folderNameEditText.addTextChangedListener(object: TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -207,12 +252,6 @@ class EditBookmarkFolderDialog : DialogFragment() { } }) - // Update the status of the save button when the icon is changed. - iconRadioGroup.setOnCheckedChangeListener { _: RadioGroup?, _: Int -> - // Update the save button. - updateSaveButton() - } - // Allow the enter key on the keyboard to save the bookmark from the edit bookmark name edit text. folderNameEditText.setOnKeyListener { _: View?, keyCode: Int, event: KeyEvent -> // Check the key code, event, and button status.