/*
- * Copyright © 2017-2020 Soren Stoutner <soren@stoutner.com>.
+ * Copyright 2017-2024 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.net.Uri
import android.os.Bundle
import android.text.Editable
import android.text.TextWatcher
import com.stoutner.privacybrowser.R
import com.stoutner.privacybrowser.helpers.DomainsDatabaseHelper
-class AddDomainDialog: DialogFragment() {
+class AddDomainDialog : DialogFragment() {
+ // Declare the class variables
+ private lateinit var addDomainListener: AddDomainListener
+
// The public interface is used to send information back to the parent activity.
interface AddDomainListener {
- fun onAddDomain(dialogFragment: DialogFragment)
+ fun addDomain(dialogFragment: DialogFragment)
}
- // The add domain listener is initialized in `onAttach()` and used in `onCreateDialog()`.
- private lateinit var addDomainListener: AddDomainListener
-
override fun onAttach(context: Context) {
// Run the default commands.
super.onAttach(context)
addDomainListener = context as AddDomainListener
}
- 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
- fun addDomain(urlString: String): AddDomainDialog {
- // Create an arguments bundle.
- val argumentsBundle = Bundle()
-
- // Store the URL in the bundle.
- argumentsBundle.putString("url_string", urlString)
-
- // Create a new instance of the dialog.
- val addDomainDialog = AddDomainDialog()
-
- // Add the arguments bundle to the dialog.
- addDomainDialog.arguments = argumentsBundle
-
- // Return the new dialog.
- return addDomainDialog
- }
- }
-
- // `@SuppressLing("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()
-
- // Get the URL from the bundle.
- val urlString = arguments.getString("url_string")
-
// Use an alert dialog builder to create the alert dialog.
- val dialogBuilder: AlertDialog.Builder = AlertDialog.Builder(requireContext(), R.style.PrivacyBrowserAlertDialog)
+ val dialogBuilder = AlertDialog.Builder(requireContext(), R.style.PrivacyBrowserAlertDialog)
- // Set the icon according to the theme.
- dialogBuilder.setIconAttribute(R.attr.domainsIcon)
+ // Set the icon.
+ dialogBuilder.setIcon(R.drawable.domains)
// Set the title.
dialogBuilder.setTitle(R.string.add_domain)
- // Set the view. The parent view is `null` because it will be assigned by the alert dialog.
- dialogBuilder.setView(requireActivity().layoutInflater.inflate(R.layout.add_domain_dialog, null))
+ // Set the view.
+ dialogBuilder.setView(R.layout.add_domain_dialog)
- // Set a listener on the cancel button. Using `null` as the listener closes the dialog without doing anything else.
+ // Set the cancel button listener. Using `null` as the listener closes the dialog without doing anything else.
dialogBuilder.setNegativeButton(R.string.cancel, null)
- // Set a listener on the add button.
+ // Set the add button listener.
dialogBuilder.setPositiveButton(R.string.add) { _: DialogInterface, _: Int ->
// Return the dialog fragment to the parent activity on add.
- addDomainListener.onAddDomain(this)
+ addDomainListener.addDomain(this)
}
// Create an alert dialog from the 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("allow_screenshots", false)
+ val allowScreenshots = sharedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false)
// Disable screenshots if not allowed.
if (!allowScreenshots) {
// The alert dialog must be shown before the contents can be modified.
alertDialog.show()
- // Initialize the domains database helper. The `0` specifies the database version, but that is ignored and set instead using a constant in domains database helper.
- val domainsDatabaseHelper = DomainsDatabaseHelper(context, null, null, 0)
+ // Initialize the domains database helper.
+ val domainsDatabaseHelper = DomainsDatabaseHelper(requireContext())
// Get handles for the views in the alert dialog.
val addDomainEditText = alertDialog.findViewById<EditText>(R.id.domain_name_edittext)!!
val domainNameAlreadyExistsTextView = alertDialog.findViewById<TextView>(R.id.domain_name_already_exists_textview)!!
val addButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE)
+ // Initially disable the add button.
+ addButton.isEnabled = false
+
// Update the status of the warning text and the add button when the domain name changes.
addDomainEditText.addTextChangedListener(object: TextWatcher {
override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {
// Do nothing.
}
- override fun afterTextChanged(s: Editable) {
+ override fun afterTextChanged(editable: Editable) {
if (domainsDatabaseHelper.getCursorForDomainName(addDomainEditText.text.toString()).count > 0) { // The domain already exists.
// Show the warning text.
domainNameAlreadyExistsTextView.visibility = View.VISIBLE
// Hide the warning text.
domainNameAlreadyExistsTextView.visibility = View.GONE
- // Enable the add button.
- addButton.isEnabled = true
+ // Enable the add button if the domain name is not empty.
+ addButton.isEnabled = editable.isNotEmpty()
}
}
})
- // Convert the URL string to a URI.
- val currentUri = Uri.parse(urlString)
-
- // Display the host in the add domain edit text.
- addDomainEditText.setText(currentUri.host)
-
// Allow the enter key on the keyboard to create the domain from the add domain edit text.
addDomainEditText.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 add domain listener and return the dialog fragment to the parent activity.
- addDomainListener.onAddDomain(this)
+ addDomainListener.addDomain(this)
// Manually dismiss the alert dialog.
alertDialog.dismiss()
// Return the alert dialog.
return alertDialog
}
-}
\ No newline at end of file
+}
projects / PrivacyBrowserAndroid.git / blobdiff