/*
- * Copyright © 2016-2020 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2022 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.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 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?)
- }
-
+class EditBookmarkFolderDialog : DialogFragment() {
// Declare the class variables.
private lateinit var editBookmarkFolderListener: EditBookmarkFolderListener
private lateinit var bookmarksDatabaseHelper: BookmarksDatabaseHelper
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)
}
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 folderDatabaseId(databaseId: Int, favoriteIconBitmap: Bitmap): EditBookmarkFolderDialog {
// 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 a handle for the arguments.
val arguments = requireArguments()
// 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 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)
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 defaultIconLinearLayout = alertDialog.findViewById<LinearLayout>(R.id.default_icon_linearlayout)!!
+ val defaultIconRadioButton = alertDialog.findViewById<RadioButton>(R.id.default_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)!!
+ 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(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.
- webPageFavoriteIconImageView.setImageBitmap(favoriteIconBitmap)
+ // Set the webpage favorite icon bitmap.
+ webpageFavoriteIconImageView.setImageBitmap(favoriteIconBitmap)
// Get the current folder name.
- currentFolderName = folderCursor.getString(folderCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_NAME))
+ currentFolderName = folderCursor.getString(folderCursor.getColumnIndexOrThrow(BookmarksDatabaseHelper.BOOKMARK_NAME))
// Display the current folder name.
folderNameEditText.setText(currentFolderName)
// Initially disable the save button.
saveButton.isEnabled = false
+ // Set the radio button listeners. These perform a click on the linear layout, which contains the necessary logic.
+ currentIconRadioButton.setOnClickListener { currentIconLinearLayout.performClick() }
+ defaultIconRadioButton.setOnClickListener { defaultIconLinearLayout.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 other radio buttons.
+ defaultIconRadioButton.isChecked = false
+ webpageFavoriteIconRadioButton.isChecked = false
+
+ // Update the save button.
+ updateSaveButton()
+ }
+
+ // Set the default icon linear layout click listener.
+ defaultIconLinearLayout.setOnClickListener {
+ // Check the default icon radio button.
+ defaultIconRadioButton.isChecked = true
+
+ // Uncheck the other radio buttons.
+ currentIconRadioButton.isChecked = false
+ webpageFavoriteIconRadioButton.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
+ defaultIconRadioButton.isChecked = false
+
+ // Update the save button.
+ updateSaveButton()
+ }
+
// 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) {
}
})
- // 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.
projects / PrivacyBrowserAndroid.git / blobdiff