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=46082b89809bd94d46abef3a56ece29a18c2d844;hp=5ff29c5baa5d9e62df048ac3e7cd18bcdf5c91b2;hb=0e0e9f5c67bdc06877cbd19254fef6fc6cb69f2d;hpb=bc2e180db377eedadbe1ea455d8fb311ead8f9d6 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 5ff29c5b..46082b89 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDialog.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,8 +34,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 @@ -49,12 +50,7 @@ import java.io.ByteArrayOutputStream private const val DATABASE_ID = "database_id" private const val FAVORITE_ICON_BYTE_ARRAY = "favorite_icon_byte_array" -class EditBookmarkFolderDialog: DialogFragment() { - // The public interface is used to send information back to the parent activity. - interface EditBookmarkFolderListener { - fun onSaveBookmarkFolder(dialogFragment: DialogFragment?, selectedFolderDatabaseId: Int, favoriteIconBitmap: Bitmap?) - } - +class EditBookmarkFolderDialog : DialogFragment() { // Declare the class variables. private lateinit var editBookmarkFolderListener: EditBookmarkFolderListener private lateinit var bookmarksDatabaseHelper: BookmarksDatabaseHelper @@ -65,6 +61,11 @@ class EditBookmarkFolderDialog: DialogFragment() { private lateinit var folderNameEditText: EditText private lateinit var saveButton: Button + // The public interface is used to send information back to the parent activity. + interface EditBookmarkFolderListener { + fun onSaveBookmarkFolder(dialogFragment: DialogFragment, selectedFolderDatabaseId: Int, favoriteIconBitmap: Bitmap) + } + override fun onAttach(context: Context) { // Run the default commands. super.onAttach(context) @@ -74,7 +75,7 @@ class EditBookmarkFolderDialog: 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): EditBookmarkFolderDialog { // Create a favorite icon byte array output stream. @@ -132,7 +133,7 @@ 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`. + // 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_dialog, null)) // Set the cancel button listener. Using `null` as the listener closes the dialog without doing anything else. @@ -162,11 +163,15 @@ 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. @@ -178,8 +183,8 @@ 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)) @@ -190,6 +195,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) { @@ -206,12 +255,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.