X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FCreateBookmarkFolderDialog.kt;fp=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FCreateBookmarkFolderDialog.kt;h=1bc8c0e9ae2278267dc85fdde5fccdbaab6241f1;hp=04d7d250c7553cdfcbf3418f51296ecc997bb9de;hb=e6befb69eb16e4c633623df508bfb9de370e204f;hpb=35dd941d73d9d72a1ae8c16add68f20615affada

diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkFolderDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkFolderDialog.kt
index 04d7d250..1bc8c0e9 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkFolderDialog.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkFolderDialog.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2016-2023 Soren Stoutner <soren@stoutner.com>.
+ * Copyright 2016-2024 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
  *
@@ -24,27 +24,33 @@ 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.view.KeyEvent
 import android.view.View
 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 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 java.io.ByteArrayOutputStream
 
 // Define the class constants.
-private const val FAVORITE_ICON_BYTE_ARRAY = "favorite_icon_byte_array"
+private const val FAVORITE_ICON_BYTE_ARRAY = "A"
 
 class CreateBookmarkFolderDialog : DialogFragment() {
     companion object {
@@ -75,12 +81,50 @@ class CreateBookmarkFolderDialog : 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 128 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 customIconImageView: ImageView
+    private lateinit var customIconLinearLayout: LinearLayout
+
     // Declare the class variables.
     private lateinit var createBookmarkFolderListener: CreateBookmarkFolderListener
 
     // The public interface is used to send information back to the parent activity.
     interface CreateBookmarkFolderListener {
-        fun createBookmarkFolder(dialogFragment: DialogFragment, favoriteIconBitmap: Bitmap)
+        fun createBookmarkFolder(dialogFragment: DialogFragment)
     }
 
     override fun onAttach(context: Context) {
@@ -107,6 +151,9 @@ class CreateBookmarkFolderDialog : DialogFragment() {
         // Set the title.
         dialogBuilder.setTitle(R.string.create_folder)
 
+        // Set the icon.
+        dialogBuilder.setIcon(R.drawable.folder)
+
         // Set the view.
         dialogBuilder.setView(R.layout.create_bookmark_folder_dialog)
 
@@ -116,7 +163,7 @@ class CreateBookmarkFolderDialog : DialogFragment() {
         // Set the create button listener.
         dialogBuilder.setPositiveButton(R.string.create) { _: DialogInterface, _: Int ->
             // Return the dialog fragment to the parent activity on create.
-            createBookmarkFolderListener.createBookmarkFolder(this, favoriteIconBitmap)
+            createBookmarkFolderListener.createBookmarkFolder(this)
         }
 
         // Create an alert dialog from the builder.
@@ -140,31 +187,35 @@ class CreateBookmarkFolderDialog : DialogFragment() {
         alertDialog.show()
 
         // Get handles for the views in the dialog.
-        val defaultIconLinearLayout = alertDialog.findViewById<LinearLayout>(R.id.default_icon_linearlayout)!!
-        val defaultIconRadioButton = alertDialog.findViewById<RadioButton>(R.id.default_icon_radiobutton)!!
+        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)!!
         val folderNameEditText = alertDialog.findViewById<EditText>(R.id.folder_name_edittext)!!
         val createButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE)
 
-        // Display the current favorite icon.
+        // Populate the views.  The vectored drawable must be converted to a bitmap or the save function will fail later.  `Bitmap.Config.RGBA_1010102` can be used once the minimum API >= 33.
         webpageFavoriteIconImageView.setImageBitmap(favoriteIconBitmap)
-
-        // Initially disable the create button.
-        createButton.isEnabled = false
+        customIconImageView.setImageBitmap(AppCompatResources.getDrawable(requireContext(), R.drawable.folder)!!.toBitmap(128, 128, Bitmap.Config.ARGB_8888))
 
         // Set the radio button listeners.  These perform a click on the linear layout, which contains the necessary logic.
-        defaultIconRadioButton.setOnClickListener { defaultIconLinearLayout.performClick() }
+        defaultFolderIconRadioButton.setOnClickListener { defaultFolderIconLinearLayout.performClick() }
         webpageFavoriteIconRadioButton.setOnClickListener { webpageFavoriteIconLinearLayout.performClick() }
+        customIconRadioButton.setOnClickListener { customIconLinearLayout.performClick() }
 
         // Set the default icon linear layout click listener.
-        defaultIconLinearLayout.setOnClickListener {
+        defaultFolderIconLinearLayout.setOnClickListener {
             // Check the default icon radio button.
-            defaultIconRadioButton.isChecked = true
+            defaultFolderIconRadioButton.isChecked = true
 
-            // Uncheck the webpage favorite icon radio button.
+            // Uncheck the other radio buttons.
             webpageFavoriteIconRadioButton.isChecked = false
+            customIconRadioButton.isChecked = false
         }
 
         // Set the webpage favorite icon linear layout click listener.
@@ -172,21 +223,37 @@ class CreateBookmarkFolderDialog : DialogFragment() {
             // Check the webpage favorite icon radio button.
             webpageFavoriteIconRadioButton.isChecked = true
 
-            // Uncheck the default icon radio button.
-            defaultIconRadioButton.isChecked = false
+            // Uncheck the other radio buttons.
+            defaultFolderIconRadioButton.isChecked = false
+            customIconRadioButton.isChecked = false
+        }
+
+        // Set the custom icon linear layout click listener.
+        customIconLinearLayout.setOnClickListener {
+            // Check the custom icon radio button.
+            customIconRadioButton.isChecked = true
+
+            // Uncheck the other radio buttons.
+            defaultFolderIconRadioButton.isChecked = false
+            webpageFavoriteIconRadioButton.isChecked = false
+        }
+
+        browseButton.setOnClickListener {
+            // Open the file picker.
+            browseActivityResultLauncher.launch("image/*")
         }
 
         // Enable the create button if the folder name is populated.
         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(editable: Editable) {
+            override fun afterTextChanged(editable: Editable?) {
                 // Convert the current text to a string.
                 val folderName = editable.toString()
 
@@ -200,7 +267,7 @@ class CreateBookmarkFolderDialog : DialogFragment() {
             // Check the key code, event, and button status.
             if (keyEvent.action == KeyEvent.ACTION_DOWN && keyCode == KeyEvent.KEYCODE_ENTER && createButton.isEnabled) {  // The event is a key-down on the enter key and the create button is enabled.
                 // Trigger the create bookmark folder listener and return the dialog fragment to the parent activity.
-                createBookmarkFolderListener.createBookmarkFolder(this, favoriteIconBitmap)
+                createBookmarkFolderListener.createBookmarkFolder(this)
 
                 // Manually dismiss the alert dialog.
                 alertDialog.dismiss()
@@ -212,6 +279,9 @@ class CreateBookmarkFolderDialog : DialogFragment() {
             }
         }
 
+        // Initially disable the create button.
+        createButton.isEnabled = false
+
         // Return the alert dialog.
         return alertDialog
     }