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=a386acba5fcdc35659c0fbfad97eeaebf4402042;hp=86c521afca4278c2b24df829f7c9fbb44bee66af;hb=HEAD;hpb=484f0b0f0143c53a4722cee3a31e714df0c8c49a 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 86c521af..3c19eb13 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDialog.kt @@ -1,20 +1,20 @@ /* - * Copyright © 2016-2021 Soren Stoutner . + * Copyright 2016-2024 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 @@ -24,6 +24,7 @@ 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 @@ -36,47 +37,29 @@ import android.widget.ImageView import android.widget.LinearLayout import android.widget.RadioButton +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 // Define the class constants. -private const val DATABASE_ID = "database_id" -private const val FAVORITE_ICON_BYTE_ARRAY = "favorite_icon_byte_array" +private const val DATABASE_ID = "A" +private const val FAVORITE_ICON_BYTE_ARRAY = "B" class EditBookmarkFolderDialog : DialogFragment() { - // 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 - - // 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) - - // Get a handle for the edit bookmark folder listener from the launching context. - editBookmarkFolderListener = context as EditBookmarkFolderListener - } - companion object { - // `@JvmStatic` will no longer be required once all the code has transitioned to Kotlin. - @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() @@ -104,6 +87,64 @@ class EditBookmarkFolderDialog : DialogFragment() { } } + 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() @@ -115,8 +156,8 @@ class EditBookmarkFolderDialog : 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`. - 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) @@ -130,6 +171,9 @@ class EditBookmarkFolderDialog : DialogFragment() { // Set the title. dialogBuilder.setTitle(R.string.edit_folder) + // Set the icon. + dialogBuilder.setIcon(R.drawable.folder) + // Set the view. dialogBuilder.setView(R.layout.edit_bookmark_folder_dialog) @@ -139,14 +183,14 @@ class EditBookmarkFolderDialog : DialogFragment() { // 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) @@ -163,39 +207,38 @@ class EditBookmarkFolderDialog : DialogFragment() { 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 defaultFolderIconLinearLayout = alertDialog.findViewById(R.id.default_folder_icon_linearlayout)!! + val defaultFolderIconRadioButton = alertDialog.findViewById(R.id.default_folder_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)!! + customIconLinearLayout = alertDialog.findViewById(R.id.custom_icon_linearlayout)!! + val customIconRadioButton = alertDialog.findViewById(R.id.custom_icon_radiobutton)!! + customIconImageView = alertDialog.findViewById(R.id.custom_icon_imageview)!! + val browseButton = alertDialog.findViewById