/*
- * Copyright © 2016-2020 Soren Stoutner <soren@stoutner.com>.
+ * Copyright 2016-2024 Soren Stoutner <soren@stoutner.com>.
*
- * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
+ * This file is part of Privacy Browser Android <https://www.stoutner.com/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 <http://www.gnu.org/licenses/>.
+ * along with Privacy Browser Android. If not, see <http://www.gnu.org/licenses/>.
*/
package com.stoutner.privacybrowser.dialogs
-import android.annotation.SuppressLint
import android.app.Dialog
import android.content.Context
import android.content.DialogInterface
import android.graphics.Bitmap
import android.graphics.BitmapFactory
+import android.net.Uri
import android.os.Bundle
import android.text.Editable
import android.text.TextWatcher
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.activity.result.contract.ActivityResultContracts
import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.content.res.AppCompatResources
+import androidx.core.graphics.drawable.toBitmap
import androidx.fragment.app.DialogFragment
import androidx.preference.PreferenceManager
+import com.google.android.material.snackbar.Snackbar
+
import com.stoutner.privacybrowser.R
+import com.stoutner.privacybrowser.helpers.BOOKMARK_NAME
+import com.stoutner.privacybrowser.helpers.FAVORITE_ICON
import com.stoutner.privacybrowser.helpers.BookmarksDatabaseHelper
import java.io.ByteArrayOutputStream
-// Declare the class constants.
-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?)
- }
-
- // Declare the class variables.
- private lateinit var editBookmarkFolderListener: EditBookmarkFolderListener
- private lateinit var bookmarksDatabaseHelper: BookmarksDatabaseHelper
- private lateinit var currentFolderName: String
-
- // Declare the class views.
- private lateinit var currentIconRadioButton: RadioButton
- private lateinit var folderNameEditText: EditText
- private lateinit var saveButton: Button
-
- override fun onAttach(context: Context) {
- // Run the default commands.
- super.onAttach(context)
-
- // Get a handle for the edit bookmark folder listener from the launching context.
- editBookmarkFolderListener = context as EditBookmarkFolderListener
- }
+// Define the class constants.
+private const val DATABASE_ID = "A"
+private const val FAVORITE_ICON_BYTE_ARRAY = "B"
+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
- fun folderDatabaseId(databaseId: Int, favoriteIconBitmap: Bitmap): EditBookmarkFolderDialog {
+ fun editFolder(databaseId: Int, favoriteIconBitmap: Bitmap): EditBookmarkFolderDialog {
// Create a favorite icon byte array output stream.
val favoriteIconByteArrayOutputStream = ByteArrayOutputStream()
}
}
- // `@SuppressLint("InflateParams")` removes the warning about using `null` as the parent view group when inflating the alert dialog.
- @SuppressLint("InflateParams")
+ private val browseActivityResultLauncher = registerForActivityResult(ActivityResultContracts.GetContent()) { imageUri: Uri? ->
+ // Only do something if the user didn't press back from the file picker.
+ if (imageUri != null) {
+ // Get a handle for the content resolver.
+ val contentResolver = requireContext().contentResolver
+
+ // Get the image MIME type.
+ val mimeType = contentResolver.getType(imageUri)
+
+ // Decode the image according to the type.
+ if (mimeType == "image/svg+xml") { // The image is an SVG.
+ // Display a snackbar.
+ Snackbar.make(customIconImageView, getString(R.string.cannot_use_svg), Snackbar.LENGTH_LONG).show()
+ } else { // The image is not an SVG.
+ // Get an input stream for the image URI.
+ val inputStream = contentResolver.openInputStream(imageUri)
+
+ // Get the bitmap from the URI.
+ // `ImageDecoder.decodeBitmap` can't be used, because when running `Drawable.toBitmap` later the `Software rendering doesn't support hardware bitmaps` error message might be produced.
+ var imageBitmap = BitmapFactory.decodeStream(inputStream)
+
+ // Scale the image down if it is greater than 64 pixels in either direction.
+ if ((imageBitmap != null) && ((imageBitmap.height > 128) || (imageBitmap.width > 128)))
+ imageBitmap = Bitmap.createScaledBitmap(imageBitmap, 128, 128, true)
+
+ // Display the new custom favorite icon.
+ customIconImageView.setImageBitmap(imageBitmap)
+
+ // Select the custom icon radio button.
+ customIconLinearLayout.performClick()
+ }
+ }
+ }
+
+ // Declare the class views.
+ private lateinit var currentIconRadioButton: RadioButton
+ private lateinit var customIconLinearLayout: LinearLayout
+ private lateinit var customIconImageView: ImageView
+ private lateinit var folderNameEditText: EditText
+ private lateinit var saveButton: Button
+
+ // Declare the class variables.
+ private lateinit var currentFolderName: String
+ private lateinit var editBookmarkFolderListener: EditBookmarkFolderListener
+
+ // The public interface is used to send information back to the parent activity.
+ interface EditBookmarkFolderListener {
+ fun saveBookmarkFolder(dialogFragment: DialogFragment, selectedFolderDatabaseId: Int)
+ }
+
+ override fun onAttach(context: Context) {
+ // Run the default commands.
+ super.onAttach(context)
+
+ // Get a handle for the edit bookmark folder listener from the launching context.
+ editBookmarkFolderListener = context as EditBookmarkFolderListener
+ }
+
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
// Get a handle for the arguments.
val arguments = requireArguments()
// 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`.
- bookmarksDatabaseHelper = BookmarksDatabaseHelper(context, null, null, 0)
+ // Initialize the database helper.
+ val bookmarksDatabaseHelper = BookmarksDatabaseHelper(requireContext())
// Get a cursor with the selected folder.
val folderCursor = bookmarksDatabaseHelper.getBookmark(selectedFolderDatabaseId)
// 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 icon.
+ dialogBuilder.setIcon(R.drawable.folder)
+
+ // 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)
// Set the save button listener.
dialogBuilder.setPositiveButton(R.string.save) { _: DialogInterface?, _: Int ->
// Return the dialog fragment to the parent activity on save.
- editBookmarkFolderListener.onSaveBookmarkFolder(this, selectedFolderDatabaseId, favoriteIconBitmap)
+ editBookmarkFolderListener.saveBookmarkFolder(this, selectedFolderDatabaseId)
}
// 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)
alertDialog.show()
// Get handles for the views in the alert dialog.
- val iconRadioGroup = alertDialog.findViewById<RadioGroup>(R.id.edit_folder_icon_radio_group)!!
- currentIconRadioButton = alertDialog.findViewById(R.id.edit_folder_current_icon_radiobutton)!!
- val currentIconImageView = alertDialog.findViewById<ImageView>(R.id.edit_folder_current_icon_imageview)!!
- val webPageFavoriteIconImageView = alertDialog.findViewById<ImageView>(R.id.edit_folder_web_page_favorite_icon_imageview)!!
- folderNameEditText = alertDialog.findViewById(R.id.edit_folder_name_edittext)!!
+ val currentIconLinearLayout = alertDialog.findViewById<LinearLayout>(R.id.current_icon_linearlayout)!!
+ currentIconRadioButton = alertDialog.findViewById(R.id.current_icon_radiobutton)!!
+ val currentIconImageView = alertDialog.findViewById<ImageView>(R.id.current_icon_imageview)!!
+ val defaultFolderIconLinearLayout = alertDialog.findViewById<LinearLayout>(R.id.default_folder_icon_linearlayout)!!
+ val defaultFolderIconRadioButton = alertDialog.findViewById<RadioButton>(R.id.default_folder_icon_radiobutton)!!
+ val webpageFavoriteIconLinearLayout = alertDialog.findViewById<LinearLayout>(R.id.webpage_favorite_icon_linearlayout)!!
+ val webpageFavoriteIconRadioButton = alertDialog.findViewById<RadioButton>(R.id.webpage_favorite_icon_radiobutton)!!
+ val webpageFavoriteIconImageView = alertDialog.findViewById<ImageView>(R.id.webpage_favorite_icon_imageview)!!
+ customIconLinearLayout = alertDialog.findViewById(R.id.custom_icon_linearlayout)!!
+ val customIconRadioButton = alertDialog.findViewById<RadioButton>(R.id.custom_icon_radiobutton)!!
+ customIconImageView = alertDialog.findViewById(R.id.custom_icon_imageview)!!
+ val browseButton = alertDialog.findViewById<Button>(R.id.browse_button)!!
+ 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(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)
- // Display the current icon bitmap.
+ // Get the current folder name.
+ currentFolderName = folderCursor.getString(folderCursor.getColumnIndexOrThrow(BOOKMARK_NAME))
+
+ // Populate the views.
currentIconImageView.setImageBitmap(currentIconBitmap)
+ webpageFavoriteIconImageView.setImageBitmap(favoriteIconBitmap)
+ customIconImageView.setImageBitmap(AppCompatResources.getDrawable(requireContext(), R.drawable.folder)!!.toBitmap(128, 128, Bitmap.Config.ARGB_8888))
+ folderNameEditText.setText(currentFolderName)
- // Set the new favorite icon bitmap.
- webPageFavoriteIconImageView.setImageBitmap(favoriteIconBitmap)
+ // Set the radio button listeners. These perform a click on the linear layout, which contains the necessary logic.
+ currentIconRadioButton.setOnClickListener { currentIconLinearLayout.performClick() }
+ defaultFolderIconRadioButton.setOnClickListener { defaultFolderIconLinearLayout.performClick() }
+ webpageFavoriteIconRadioButton.setOnClickListener { webpageFavoriteIconLinearLayout.performClick() }
+ customIconRadioButton.setOnClickListener { customIconLinearLayout.performClick() }
- // Get the current folder name.
- currentFolderName = folderCursor.getString(folderCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_NAME))
+ // Set the current icon linear layout click listener.
+ currentIconLinearLayout.setOnClickListener {
+ // Check the current icon radio button.
+ currentIconRadioButton.isChecked = true
- // Display the current folder name.
- folderNameEditText.setText(currentFolderName)
+ // Uncheck the other radio buttons.
+ defaultFolderIconRadioButton.isChecked = false
+ webpageFavoriteIconRadioButton.isChecked = false
+ customIconRadioButton.isChecked = false
- // Initially disable the save button.
- saveButton.isEnabled = false
+ // Update the save button.
+ updateSaveButton()
+ }
+
+ // Set the default folder icon linear layout click listener.
+ defaultFolderIconLinearLayout.setOnClickListener {
+ // Check the default icon radio button.
+ defaultFolderIconRadioButton.isChecked = true
+
+ // Uncheck the other radio buttons.
+ currentIconRadioButton.isChecked = false
+ webpageFavoriteIconRadioButton.isChecked = false
+ customIconRadioButton.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
+ defaultFolderIconRadioButton.isChecked = false
+ customIconRadioButton.isChecked = false
+
+ // Update the save button.
+ updateSaveButton()
+ }
+
+ // Set the custom icon linear layout click listener.
+ customIconLinearLayout.setOnClickListener {
+ // Check the current icon radio button.
+ customIconRadioButton.isChecked = true
+
+ // Uncheck the other radio buttons.
+ currentIconRadioButton.isChecked = false
+ defaultFolderIconRadioButton.isChecked = false
+ webpageFavoriteIconRadioButton.isChecked = false
+
+ // Update the save button.
+ updateSaveButton()
+ }
+
+ browseButton.setOnClickListener {
+ // Open the file picker.
+ browseActivityResultLauncher.launch("image/*")
+ }
// 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) {
+ override fun beforeTextChanged(charSequence: CharSequence?, start: Int, count: Int, after: Int) {
// Do nothing.
}
- override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
+ override fun onTextChanged(charSequence: CharSequence?, start: Int, before: Int, count: Int) {
// Do nothing.
}
- override fun afterTextChanged(s: Editable) {
+ override fun afterTextChanged(editable: Editable?) {
// Update the save button.
updateSaveButton()
}
})
- // 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.
if (event.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.
- editBookmarkFolderListener.onSaveBookmarkFolder(this, selectedFolderDatabaseId, favoriteIconBitmap)
+ editBookmarkFolderListener.saveBookmarkFolder(this, selectedFolderDatabaseId)
// Manually dismiss the the alert dialog.
alertDialog.dismiss()
}
}
+ // Initially disable the save button.
+ saveButton.isEnabled = false
+
// Return the alert dialog.
return alertDialog
}
// Get the new folder name.
val newFolderName = folderNameEditText.text.toString()
- // Get a cursor for the new folder name if it exists.
- val folderExistsCursor = bookmarksDatabaseHelper.getFolder(newFolderName)
-
- // Is the new folder name empty?
- val folderNameEmpty = newFolderName.isEmpty()
-
- // Does the folder name already exist?
- val folderNameAlreadyExists = (newFolderName != currentFolderName) && folderExistsCursor.count > 0
-
// Has the folder been renamed?
- val folderRenamed = (newFolderName != currentFolderName) && !folderNameAlreadyExists
+ val folderRenamed = (newFolderName != currentFolderName)
// Has the favorite icon changed?
- val iconChanged = !currentIconRadioButton.isChecked && !folderNameAlreadyExists
+ val iconChanged = !currentIconRadioButton.isChecked
- // Enable the save button if something has been edited and the new folder name is valid.
- saveButton.isEnabled = !folderNameEmpty && (folderRenamed || iconChanged)
+ // Enable the save button if something has been edited and the new folder name is not valid.
+ saveButton.isEnabled = newFolderName.isNotBlank() && (folderRenamed || iconChanged)
}
-}
\ No newline at end of file
+}
projects / PrivacyBrowserAndroid.git / blobdiff