X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FCreateBookmarkDialog.kt;h=60d199cac820216e91c46c6f6efcc083bed4c52e;hb=HEAD;hp=8758d70fd9e0ec68b2f340bb7c8a8c536f27ec29;hpb=8142ac5fc2489de735de4b6fa21a1eae733ccfce;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkDialog.kt
index 8758d70f..60d199ca 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkDialog.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkDialog.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2016-2022 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,47 +24,38 @@ import android.content.Context
 import android.content.DialogInterface
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
-import android.graphics.drawable.BitmapDrawable
-import android.graphics.drawable.Drawable
+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.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 URL_STRING = "url_string"
-private const val TITLE = "title"
-private const val FAVORITE_ICON_BYTE_ARRAY = "favorite_icon_byte_array"
+private const val URL_STRING = "A"
+private const val TITLE = "B"
+private const val FAVORITE_ICON_BYTE_ARRAY = "C"
 
 class CreateBookmarkDialog : DialogFragment() {
-    // Declare the class variables
-    private lateinit var createBookmarkListener: CreateBookmarkListener
-
-    // The public interface is used to send information back to the parent activity.
-    interface CreateBookmarkListener {
-        fun onCreateBookmark(dialogFragment: DialogFragment, favoriteIconBitmap: Bitmap)
-    }
-
-    override fun onAttach(context: Context) {
-        // Run the default commands.
-        super.onAttach(context)
-
-        // Get a handle for the create bookmark listener from the launching context.
-        createBookmarkListener = context as CreateBookmarkListener
-    }
-
     companion object {
-        // `@JvmStatic` will no longer be required once all the code has transitioned to Kotlin.
-        @JvmStatic
         fun createBookmark(urlString: String, title: String, favoriteIconBitmap: Bitmap): CreateBookmarkDialog {
             // Create a favorite icon byte array output stream.
             val favoriteIconByteArrayOutputStream = ByteArrayOutputStream()
@@ -94,6 +85,63 @@ class CreateBookmarkDialog : 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(bookmarkNameEditText, 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 bookmarkNameEditText: EditText
+    private lateinit var bookmarkUrlEditText: EditText
+    private lateinit var createButton: Button
+    private lateinit var customIconImageView: ImageView
+    private lateinit var customIconLinearLayout: LinearLayout
+
+    // Declare the class variables
+    private lateinit var createBookmarkListener: CreateBookmarkListener
+
+    // The public interface is used to send information back to the parent activity.
+    interface CreateBookmarkListener {
+        fun createBookmark(dialogFragment: DialogFragment)
+    }
+
+    override fun onAttach(context: Context) {
+        // Run the default commands.
+        super.onAttach(context)
+
+        // Get a handle for the create bookmark listener from the launching context.
+        createBookmarkListener = context as CreateBookmarkListener
+    }
+
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         // Get the arguments.
         val arguments = requireArguments()
@@ -112,11 +160,8 @@ class CreateBookmarkDialog : DialogFragment() {
         // Set the title.
         dialogBuilder.setTitle(R.string.create_bookmark)
 
-        // Create a drawable version of the favorite icon.
-        val favoriteIconDrawable: Drawable = BitmapDrawable(resources, favoriteIconBitmap)
-
         // Set the icon.
-        dialogBuilder.setIcon(favoriteIconDrawable)
+        dialogBuilder.setIcon(R.drawable.bookmark)
 
         // Set the view.
         dialogBuilder.setView(R.layout.create_bookmark_dialog)
@@ -127,7 +172,7 @@ class CreateBookmarkDialog : DialogFragment() {
         // Set a listener on the create button.
         dialogBuilder.setPositiveButton(R.string.create) { _: DialogInterface, _: Int ->
             // Return the dialog fragment and the favorite icon bitmap to the parent activity.
-            createBookmarkListener.onCreateBookmark(this, favoriteIconBitmap)
+            createBookmarkListener.createBookmark(this)
         }
 
         // Create an alert dialog from the builder.
@@ -135,7 +180,7 @@ class CreateBookmarkDialog : DialogFragment() {
 
 
         // 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)
@@ -149,19 +194,88 @@ class CreateBookmarkDialog : DialogFragment() {
         alertDialog.show()
 
         // Get a handle for the edit texts.
-        val createBookmarkNameEditText = alertDialog.findViewById<EditText>(R.id.create_bookmark_name_edittext)!!
-        val createBookmarkUrlEditText = alertDialog.findViewById<EditText>(R.id.create_bookmark_url_edittext)!!
+        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)!!
+        bookmarkNameEditText = alertDialog.findViewById(R.id.bookmark_name_edittext)!!
+        bookmarkUrlEditText = alertDialog.findViewById(R.id.bookmark_url_edittext)!!
+        createButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE)
+
+        // Populate the views.
+        webpageFavoriteIconImageView.setImageBitmap(favoriteIconBitmap)
+        customIconImageView.setImageDrawable(AppCompatResources.getDrawable(requireContext(), R.drawable.world))
+        bookmarkNameEditText.setText(title)
+        bookmarkUrlEditText.setText(urlString)
+
+        // Set the radio button listeners.  These perform a click on the linear layout, which contains the necessary logic.
+        webpageFavoriteIconRadioButton.setOnClickListener { webpageFavoriteIconLinearLayout.performClick() }
+        customIconRadioButton.setOnClickListener { customIconLinearLayout.performClick() }
+
+        // Set the webpage favorite icon linear layout click listener.
+        webpageFavoriteIconLinearLayout.setOnClickListener {
+            // Check the webpage favorite icon radio button.
+            webpageFavoriteIconRadioButton.isChecked = true
+
+            // Uncheck the custom icon radio button.
+            customIconRadioButton.isChecked = false
+        }
+
+        // Set the custom icon linear layout click listener.
+        customIconLinearLayout.setOnClickListener {
+            // Check the custom icon radio button.
+            customIconRadioButton.isChecked = true
+
+            // Uncheck the webpage favorite icon radio button.
+            webpageFavoriteIconRadioButton.isChecked = false
+        }
+
+        browseButton.setOnClickListener {
+            // Open the file picker.
+            browseActivityResultLauncher.launch("image/*")
+        }
+
+        // Update the UI when the bookmark name changes.
+        bookmarkNameEditText.addTextChangedListener(object : TextWatcher {
+            override fun beforeTextChanged(charSequence: CharSequence?, start: Int, count: Int, after: Int) {
+                // Do nothing.
+            }
+
+            override fun onTextChanged(charSequence: CharSequence?, start: Int, before: Int, count: Int) {
+                // Do nothing.
+            }
+
+            override fun afterTextChanged(editable: Editable?) {
+                // Update the UI.
+                updateUi()
+            }
+        })
+
+        // Update the UI when the bookmark name changes.
+        bookmarkUrlEditText.addTextChangedListener(object : TextWatcher {
+            override fun beforeTextChanged(charSequence: CharSequence?, start: Int, count: Int, after: Int) {
+                // Do nothing.
+            }
+
+            override fun onTextChanged(charSequence: CharSequence?, start: Int, befire: Int, count: Int) {
+                // Do nothing.
+            }
 
-        // Set the initial texts for the edit texts.
-        createBookmarkNameEditText.setText(title)
-        createBookmarkUrlEditText.setText(urlString)
+            override fun afterTextChanged(editable: Editable?) {
+                // Update the UI.
+                updateUi()
+            }
+        })
 
         // Allow the enter key on the keyboard to create the bookmark from the create bookmark name edit text.
-        createBookmarkNameEditText.setOnKeyListener { _: View, keyCode: Int, keyEvent: KeyEvent ->
+        bookmarkNameEditText.setOnKeyListener { _: View, keyCode: Int, keyEvent: KeyEvent ->
             // Check the key code and event.
             if (keyCode == KeyEvent.KEYCODE_ENTER && keyEvent.action == KeyEvent.ACTION_DOWN) {  // The event is a key-down on the enter key.
                 // Trigger the create bookmark listener and return the dialog fragment and the favorite icon bitmap to the parent activity.
-                createBookmarkListener.onCreateBookmark(this, favoriteIconBitmap)
+                createBookmarkListener.createBookmark(this)
 
                 // Manually dismiss the alert dialog.
                 alertDialog.dismiss()
@@ -175,11 +289,11 @@ class CreateBookmarkDialog : DialogFragment() {
         }
 
         // Allow the enter key on the keyboard to create the bookmark from create bookmark URL edit text.
-        createBookmarkUrlEditText.setOnKeyListener { _: View, keyCode: Int, keyEvent: KeyEvent ->
+        bookmarkUrlEditText.setOnKeyListener { _: View, keyCode: Int, keyEvent: KeyEvent ->
             // Check the key code and event.
             if (keyCode == KeyEvent.KEYCODE_ENTER && keyEvent.action == KeyEvent.ACTION_DOWN) {  // The event is a key-down on the enter key.
                 // Trigger the create bookmark listener and return the dialog fragment and the favorite icon bitmap to the parent activity.
-                createBookmarkListener.onCreateBookmark(this, favoriteIconBitmap)
+                createBookmarkListener.createBookmark(this)
 
                 // Manually dismiss the alert dialog.
                 alertDialog.dismiss()
@@ -192,7 +306,19 @@ class CreateBookmarkDialog : DialogFragment() {
             }
         }
 
+        // Populate the UI.
+        updateUi()
+
         // Return the alert dialog.
         return alertDialog
     }
-}
\ No newline at end of file
+
+    private fun updateUi() {
+        // Get the contents of the edit texts.
+        val bookmarkName = bookmarkNameEditText.text.toString()
+        val bookmarkUrl = bookmarkUrlEditText.text.toString()
+
+        // Enable the create button if the edit texts are populated.
+        createButton.isEnabled = bookmarkName.isNotBlank() && bookmarkUrl.isNotBlank()
+    }
+}