X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FEditBookmarkDatabaseViewDialog.kt;h=d5902f217b86a603afc4eaa2717c8884afc48115;hb=bc1692b6c9d99726e7c6b7cf6a5c24f67f042b18;hp=c0ace69f98de2254842c3de0906090d6785ddef8;hpb=91154b307513e7bc6958b27fba518e4f9b564cf9;p=PrivacyBrowserAndroid.git 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 c0ace69f..d5902f21 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDatabaseViewDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDatabaseViewDialog.kt @@ -1,25 +1,24 @@ /* - * Copyright © 2016-2021 Soren Stoutner . + * Copyright 2016-2023 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 @@ -39,55 +38,37 @@ 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 import androidx.appcompat.app.AlertDialog -import androidx.core.content.ContextCompat +import androidx.appcompat.content.res.AppCompatResources import androidx.cursoradapter.widget.ResourceCursorAdapter import androidx.fragment.app.DialogFragment import androidx.preference.PreferenceManager import com.stoutner.privacybrowser.R -import com.stoutner.privacybrowser.activities.BookmarksDatabaseViewActivity +import com.stoutner.privacybrowser.activities.HOME_FOLDER_DATABASE_ID +import com.stoutner.privacybrowser.activities.HOME_FOLDER_ID +import com.stoutner.privacybrowser.helpers.BOOKMARK_NAME +import com.stoutner.privacybrowser.helpers.BOOKMARK_URL +import com.stoutner.privacybrowser.helpers.DISPLAY_ORDER +import com.stoutner.privacybrowser.helpers.FAVORITE_ICON +import com.stoutner.privacybrowser.helpers.FOLDER_ID +import com.stoutner.privacybrowser.helpers.ID +import com.stoutner.privacybrowser.helpers.PARENT_FOLDER_ID 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() { - // Declare the class variables. - private lateinit var editBookmarkDatabaseViewListener: EditBookmarkDatabaseViewListener - - // Declare the class views. - private lateinit var newIconRadioButton: 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) - - // Get a handle for edit bookmark database view listener from the launching context. - editBookmarkDatabaseViewListener = context as EditBookmarkDatabaseViewListener - } - companion object { - // `@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. val favoriteIconByteArrayOutputStream = ByteArrayOutputStream() @@ -116,8 +97,30 @@ class EditBookmarkDatabaseViewDialog : DialogFragment() { } } - // `@SuppressLint("InflateParams")` removes the warning about using `null` as the parent view group when inflating the alert dialog. - @SuppressLint("InflateParams") + // Declare the class variables. + private lateinit var editBookmarkDatabaseViewListener: EditBookmarkDatabaseViewListener + + // Declare the class views. + 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 saveBookmark(dialogFragment: DialogFragment, selectedBookmarkDatabaseId: Int, favoriteIconBitmap: Bitmap) + } + + override fun onAttach(context: Context) { + // Run the default commands. + super.onAttach(context) + + // Get a handle for edit bookmark database view listener from the launching context. + editBookmarkDatabaseViewListener = context as EditBookmarkDatabaseViewListener + } + override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { // Get the arguments. val arguments = requireArguments() @@ -129,8 +132,8 @@ class EditBookmarkDatabaseViewDialog : DialogFragment() { // Convert the favorite icon byte array to a bitmap. val favoriteIconBitmap = BitmapFactory.decodeByteArray(favoriteIconByteArray, 0, favoriteIconByteArray.size) - // Initialize the database helper. The `0` specifies a database version, but that is ignored and set instead using a constant in `BookmarksDatabaseHelper`. - val bookmarksDatabaseHelper = BookmarksDatabaseHelper(context, null, null, 0) + // Initialize the database helper. + val bookmarksDatabaseHelper = BookmarksDatabaseHelper(requireContext()) // Get a cursor with the selected bookmark. val bookmarkCursor = bookmarksDatabaseHelper.getBookmark(bookmarkDatabaseId) @@ -144,8 +147,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) @@ -153,14 +156,14 @@ class EditBookmarkDatabaseViewDialog : DialogFragment() { // Set the save button listener. dialogBuilder.setPositiveButton(R.string.save) { _: DialogInterface, _: Int -> // Return the dialog fragment to the parent activity on save. - editBookmarkDatabaseViewListener.onSaveBookmark(this, bookmarkDatabaseId, favoriteIconBitmap) + editBookmarkDatabaseViewListener.saveBookmark(this, bookmarkDatabaseId, favoriteIconBitmap) } // Create an alert dialog from the alert dialog builder. 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) @@ -174,27 +177,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(BOOKMARK_NAME)) + val currentUrl = bookmarkCursor.getString(bookmarkCursor.getColumnIndexOrThrow(BOOKMARK_URL)) + val currentDisplayOrder = bookmarkCursor.getInt(bookmarkCursor.getColumnIndexOrThrow(DISPLAY_ORDER)) // Set the database ID. - databaseIdTextView.text = bookmarkCursor.getInt(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper._ID)).toString() + databaseIdTextView.text = bookmarkCursor.getInt(bookmarkCursor.getColumnIndexOrThrow(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(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) @@ -202,24 +207,24 @@ 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) urlEditText.setText(currentUrl) // Create an an array of column names for the matrix cursor comprised of the ID and the name. - val matrixCursorColumnNamesArray = arrayOf(BookmarksDatabaseHelper._ID, BookmarksDatabaseHelper.BOOKMARK_NAME) + val matrixCursorColumnNamesArray = arrayOf(ID, BOOKMARK_NAME, PARENT_FOLDER_ID) // Create a matrix cursor based on the column names array. val matrixCursor = MatrixCursor(matrixCursorColumnNamesArray) // Add `Home Folder` as the first entry in the matrix folder. - matrixCursor.addRow(arrayOf(BookmarksDatabaseViewActivity.HOME_FOLDER_DATABASE_ID, getString(R.string.home_folder))) + matrixCursor.addRow(arrayOf(HOME_FOLDER_DATABASE_ID, getString(R.string.home_folder), HOME_FOLDER_ID)) // Get a cursor with the list of all the folders. - val foldersCursor = bookmarksDatabaseHelper.allFolders + val foldersCursor = bookmarksDatabaseHelper.getFoldersExcept(listOf()) // Combine the matrix cursor and the folders cursor. val foldersMergeCursor = MergeCursor(arrayOf(matrixCursor, foldersCursor)) @@ -228,26 +233,39 @@ class EditBookmarkDatabaseViewDialog : DialogFragment() { val foldersCursorAdapter: ResourceCursorAdapter = object: ResourceCursorAdapter(context, R.layout.databaseview_spinner_item, foldersMergeCursor, 0) { override fun bindView(view: View, context: Context, cursor: Cursor) { // Get handles for the spinner views. - val spinnerItemImageView = view.findViewById(R.id.spinner_item_imageview) - val spinnerItemTextView = view.findViewById(R.id.spinner_item_textview) + val subfolderSpacerTextView = view.findViewById(R.id.subfolder_spacer_textview) + val folderIconImageView = view.findViewById(R.id.folder_icon_imageview) + val folderNameTextView = view.findViewById(R.id.folder_name_textview) + + // Populate the subfolder spacer if it is not null (the spinner is open). + if (subfolderSpacerTextView != null) { + // Indent subfolders. + if (cursor.getLong(cursor.getColumnIndexOrThrow(PARENT_FOLDER_ID)) != HOME_FOLDER_ID) { // The folder is not in the home folder. + // Get the subfolder spacer. + subfolderSpacerTextView.text = bookmarksDatabaseHelper.getSubfolderSpacer(cursor.getLong(cursor.getColumnIndexOrThrow(FOLDER_ID))) + } else { // The folder is in the home folder. + // Reset the subfolder spacer. + subfolderSpacerTextView.text = "" + } + } // Set the folder icon according to the type. if (foldersMergeCursor.position == 0) { // The home folder. - // Set the gray folder image. `ContextCompat` must be used until the minimum API >= 21. - spinnerItemImageView.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.folder_gray)) + // Set the gray folder image. + folderIconImageView.setImageDrawable(AppCompatResources.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(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) // Set the folder icon. - spinnerItemImageView.setImageBitmap(folderIconBitmap) + folderIconImageView.setImageBitmap(folderIconBitmap) } - // Set the text view to display the folder name. - spinnerItemTextView.text = cursor.getString(cursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_NAME)) + // Set the folder name. + folderNameTextView.text = cursor.getString(cursor.getColumnIndexOrThrow(BOOKMARK_NAME)) } } @@ -258,20 +276,20 @@ class EditBookmarkDatabaseViewDialog : DialogFragment() { folderSpinner.adapter = foldersCursorAdapter // Get the parent folder name. - val parentFolder = bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.PARENT_FOLDER)) + val parentFolderId = bookmarkCursor.getLong(bookmarkCursor.getColumnIndexOrThrow(PARENT_FOLDER_ID)) - // Select the current folder in the spinner if the bookmark isn't in the home folder. - if (parentFolder != "") { + // Select the parent folder in the spinner if the bookmark isn't in the home folder. + if (parentFolderId != HOME_FOLDER_ID) { // Get the database ID of the parent folder. - val folderDatabaseId = bookmarksDatabaseHelper.getFolderDatabaseId(bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.PARENT_FOLDER))) + val parentFolderDatabaseId = bookmarksDatabaseHelper.getFolderDatabaseId(parentFolderId) // Initialize the parent folder position and the iteration variable. var parentFolderPosition = 0 var i = 0 - // Find the parent folder position in folders cursor adapter. + // Find the parent folder position in the folders cursor adapter. do { - if (foldersCursorAdapter.getItemId(i) == folderDatabaseId.toLong()) { + if (foldersCursorAdapter.getItemId(i) == parentFolderDatabaseId.toLong()) { // Store the current position for the parent folder. parentFolderPosition = i } else { @@ -289,13 +307,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(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) } @@ -341,7 +381,7 @@ class EditBookmarkDatabaseViewDialog : DialogFragment() { updateSaveButton(currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder) } - override fun onNothingSelected(parent: AdapterView<*>?) { + override fun onNothingSelected(parent: AdapterView<*>) { // Do nothing. } } @@ -368,7 +408,7 @@ class EditBookmarkDatabaseViewDialog : DialogFragment() { // Check the key code, event, and button status. if (keyEvent.action == KeyEvent.ACTION_DOWN && keyCode == KeyEvent.KEYCODE_ENTER && saveButton.isEnabled) { // The enter key was pressed and the save button is enabled. // Trigger the listener and return the dialog fragment to the parent activity. - editBookmarkDatabaseViewListener.onSaveBookmark(this, bookmarkDatabaseId, favoriteIconBitmap) + editBookmarkDatabaseViewListener.saveBookmark(this, bookmarkDatabaseId, favoriteIconBitmap) // Manually dismiss the alert dialog. alertDialog.dismiss() @@ -385,7 +425,7 @@ class EditBookmarkDatabaseViewDialog : DialogFragment() { // Check the key code, event, and button status. if (keyEvent.action == KeyEvent.ACTION_DOWN && keyCode == KeyEvent.KEYCODE_ENTER && saveButton.isEnabled) { // The enter key was pressed and the save button is enabled. // Trigger the listener and return the dialog fragment to the parent activity. - editBookmarkDatabaseViewListener.onSaveBookmark(this, bookmarkDatabaseId, favoriteIconBitmap) + editBookmarkDatabaseViewListener.saveBookmark(this, bookmarkDatabaseId, favoriteIconBitmap) // Manually dismiss the alert dialog. alertDialog.dismiss() @@ -402,7 +442,7 @@ class EditBookmarkDatabaseViewDialog : DialogFragment() { // Check the key code, event, and button status. if (keyEvent.action == KeyEvent.ACTION_DOWN && keyCode == KeyEvent.KEYCODE_ENTER && saveButton.isEnabled) { // The enter key was pressed and the save button is enabled. // Trigger the listener and return the dialog fragment to the parent activity. - editBookmarkDatabaseViewListener.onSaveBookmark(this, bookmarkDatabaseId, favoriteIconBitmap) + editBookmarkDatabaseViewListener.saveBookmark(this, bookmarkDatabaseId, favoriteIconBitmap) // Manually dismiss the alert dialog. alertDialog.dismiss() @@ -426,7 +466,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) @@ -446,4 +486,4 @@ class EditBookmarkDatabaseViewDialog : DialogFragment() { // Update the enabled status of the save button. saveButton.isEnabled = (iconChanged || nameChanged || urlChanged || folderChanged || displayOrderChanged) && displayOrderNotEmpty } -} \ No newline at end of file +}