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=5d6fe9227b8490cbe2b21f7854164840df171cdf;hp=e319de030ad3b34fdf4830c9cd04380b3f1c3154;hb=1d656c562831f535aa33903d44198dd890393f4f;hpb=91154b307513e7bc6958b27fba518e4f9b564cf9 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 e319de03..5d6fe922 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDatabaseViewDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDatabaseViewDialog.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 @@ -50,7 +49,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" @@ -59,10 +58,10 @@ class EditBookmarkFolderDatabaseViewDialog : DialogFragment() { 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. @@ -109,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() @@ -137,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) @@ -166,15 +163,19 @@ 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. @@ -194,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) @@ -248,8 +249,8 @@ class EditBookmarkFolderDatabaseViewDialog : DialogFragment() { // 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 != "") { @@ -273,11 +274,11 @@ 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()) @@ -285,8 +286,46 @@ class EditBookmarkFolderDatabaseViewDialog : DialogFragment() { // 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) } @@ -307,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. + } } } @@ -376,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.