/*
- * Copyright © 2016-2020 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2021 Soren Stoutner <soren@stoutner.com>.
*
* This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
*
* You should have received a copy of the GNU General Public License
* along with Privacy Browser. 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.widget.Button
import android.widget.EditText
import android.widget.ImageView
+import android.widget.LinearLayout
import android.widget.RadioButton
-import android.widget.RadioGroup
import androidx.appcompat.app.AlertDialog
import androidx.fragment.app.DialogFragment
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 EditBookmarkDialog: DialogFragment() {
- // The public interface is used to send information back to the parent activity.
- interface EditBookmarkListener {
- fun onSaveBookmark(dialogFragment: DialogFragment, selectedBookmarkDatabaseId: Int, favoriteIconBitmap: Bitmap)
- }
-
+class EditBookmarkDialog : DialogFragment() {
// Declare the class variables.
private lateinit var editBookmarkListener: EditBookmarkListener
// Declare the class views.
+ private lateinit var webpageFavoriteIconRadioButton: RadioButton
private lateinit var nameEditText: EditText
private lateinit var urlEditText: EditText
- private lateinit var newIconRadioButton: RadioButton
private lateinit var saveButton: Button
+ // The public interface is used to send information back to the parent activity.
+ interface EditBookmarkListener {
+ fun onSaveBookmark(dialogFragment: DialogFragment, selectedBookmarkDatabaseId: Int, favoriteIconBitmap: Bitmap)
+ }
+
override fun onAttach(context: Context) {
// Run the default commands.
super.onAttach(context)
}
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` will no longer be required once all the code has transitioned to Kotlin.
@JvmStatic
fun bookmarkDatabaseId(databaseId: Int, favoriteIconBitmap: Bitmap): EditBookmarkDialog {
// Create a favorite icon byte array output stream.
}
}
- // `@SuppressLint("InflateParams")` removes the warning about using `null` as the parent view group when inflating the alert dialog.
- @SuppressLint("InflateParams")
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
// Get the arguments.
val arguments = requireArguments()
// 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_dialog, null))
+ // Set the view.
+ dialogBuilder.setView(R.layout.edit_bookmark_dialog)
// Set the cancel button listener. Using `null` as the listener closes the dialog without doing anything else.
dialogBuilder.setNegativeButton(R.string.cancel, null)
alertDialog.show()
// Get handles for the layout items.
- val iconRadioGroup = alertDialog.findViewById<RadioGroup>(R.id.edit_bookmark_icon_radiogroup)!!
- val currentIconImageView = alertDialog.findViewById<ImageView>(R.id.edit_bookmark_current_icon)!!
- val newFavoriteIconImageView = alertDialog.findViewById<ImageView>(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)!!
+ val currentIconLinearLayout = alertDialog.findViewById<LinearLayout>(R.id.current_icon_linearlayout)!!
+ val currentIconRadioButton = alertDialog.findViewById<RadioButton>(R.id.current_icon_radiobutton)!!
+ val currentIconImageView = alertDialog.findViewById<ImageView>(R.id.current_icon_imageview)!!
+ val webpageFavoriteIconLinearLayout = alertDialog.findViewById<LinearLayout>(R.id.webpage_favorite_icon_linearlayout)!!
+ webpageFavoriteIconRadioButton = alertDialog.findViewById(R.id.webpage_favorite_icon_radiobutton)!!
+ val webpageFavoriteIconImageView = alertDialog.findViewById<ImageView>(R.id.webpage_favorite_icon_imageview)!!
+ nameEditText = alertDialog.findViewById(R.id.bookmark_name_edittext)!!
+ urlEditText = alertDialog.findViewById(R.id.bookmark_url_edittext)!!
saveButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE)
// 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(BookmarksDatabaseHelper.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.
currentIconImageView.setImageBitmap(currentIconBitmap)
- // Set the new favorite icon bitmap.
- newFavoriteIconImageView.setImageBitmap(favoriteIconBitmap)
+ // Set the webpage favorite icon bitmap.
+ webpageFavoriteIconImageView.setImageBitmap(favoriteIconBitmap)
// Store the current bookmark name and URL.
- val currentName = bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_NAME))
- val currentUrl = bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_URL))
+ val currentName = bookmarkCursor.getString(bookmarkCursor.getColumnIndexOrThrow(BookmarksDatabaseHelper.BOOKMARK_NAME))
+ val currentUrl = bookmarkCursor.getString(bookmarkCursor.getColumnIndexOrThrow(BookmarksDatabaseHelper.BOOKMARK_URL))
// Populate the edit texts.
nameEditText.setText(currentName)
// 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(currentName, currentUrl)
+ }
+
+ // 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(currentName, currentUrl)
}
val newUrl = urlEditText.text.toString()
// Has the favorite icon changed?
- val iconChanged = newIconRadioButton.isChecked
+ val iconChanged = webpageFavoriteIconRadioButton.isChecked
// Has the name changed?
val nameChanged = newName != currentName
projects / PrivacyBrowserAndroid.git / blobdiff