/*
- * Copyright © 2017-2020 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2017-2021 Soren Stoutner <soren@stoutner.com>.
*
* This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
*
package com.stoutner.privacybrowser.dialogs
-import android.annotation.SuppressLint
-import android.app.AlertDialog
import android.app.Dialog
import android.content.Context
import android.content.DialogInterface
import android.widget.EditText
import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
import androidx.fragment.app.DialogFragment
import androidx.preference.PreferenceManager
import com.stoutner.privacybrowser.R
import com.stoutner.privacybrowser.helpers.DomainsDatabaseHelper
-class AddDomainDialog: DialogFragment() {
+// Define the class constants.
+private const val URL_STRING = "url_string"
+
+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)
}
- // 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)
}
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 addDomain(urlString: String): AddDomainDialog {
// Create an arguments bundle.
val argumentsBundle = Bundle()
// Store the URL in the bundle.
- argumentsBundle.putString("url_string", urlString)
+ argumentsBundle.putString(URL_STRING, urlString)
// Create a new instance of the dialog.
val addDomainDialog = 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 = arguments!!
+ val arguments = requireArguments()
// Get the URL from the bundle.
- val urlString = arguments.getString("url_string")
-
- // Get a handle for the shared preferences.
- val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
-
- // Get the screenshot and theme preferences.
- val allowScreenshots = sharedPreferences.getBoolean("allow_screenshots", false)
- val darkTheme = sharedPreferences.getBoolean("dark_theme", false)
+ val urlString = arguments.getString(URL_STRING)
// Use an alert dialog builder to create the alert dialog.
- val dialogBuilder: AlertDialog.Builder
-
- // USet the style and the icon according to the theme.
- if (darkTheme) {
- // Set the dark style.
- dialogBuilder = AlertDialog.Builder(context, R.style.PrivacyBrowserAlertDialogDark)
+ val dialogBuilder = AlertDialog.Builder(requireContext(), R.style.PrivacyBrowserAlertDialog)
- // Set the dark icon.
- dialogBuilder.setIcon(R.drawable.domains_dark)
- } else {
- // Set the light style.
- dialogBuilder = AlertDialog.Builder(context, R.style.PrivacyBrowserAlertDialogLight)
-
- // Set the light icon.
- dialogBuilder.setIcon(R.drawable.domains_light)
- }
+ // Set the icon according to the theme.
+ dialogBuilder.setIconAttribute(R.attr.domainsBlueIcon)
// 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(activity!!.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)
// Create an alert dialog from the builder.
val alertDialog = dialogBuilder.create()
+ // Get a handle for the shared preferences.
+ val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
+
+ // Get the screenshot preference.
+ val allowScreenshots = sharedPreferences.getBoolean(getString(R.string.allow_screenshots), false)
+
// Disable screenshots if not allowed.
if (!allowScreenshots) {
alertDialog.window!!.addFlags(WindowManager.LayoutParams.FLAG_SECURE)
val domainsDatabaseHelper = DomainsDatabaseHelper(context, null, null, 0)
// Get handles for the views in the alert dialog.
- val addDomainEditText: EditText = alertDialog.findViewById(R.id.domain_name_edittext)
- val domainNameAlreadyExistsTextView: TextView = alertDialog.findViewById(R.id.domain_name_already_exists_textview)
+ 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)
// Update the status of the warning text and the add button when the domain name changes.