X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FAddDomainDialog.kt;h=ac65aa5a2f41fc4ae077339383222f3409ba85fc;hp=57068354e8fe3b457dced5c5af2817b6aaa5643c;hb=aba828cabddd0a277271c90816b50292bb64baf1;hpb=9df712df3780161d77d10c6f3a2444bf8f218c99 diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.kt index 57068354..ac65aa5a 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.kt @@ -1,26 +1,24 @@ /* - * Copyright © 2017-2020 Soren Stoutner . + * Copyright © 2017-2022 Soren Stoutner . * - * This file is part of Privacy Browser . + * This file is part of 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 . + * along with Privacy Browser Android. If not, see . */ 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 @@ -34,21 +32,25 @@ import android.view.WindowManager 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) @@ -58,14 +60,14 @@ class AddDomainDialog: DialogFragment() { } 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() @@ -78,50 +80,29 @@ class AddDomainDialog: DialogFragment() { } } - // `@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) @@ -130,6 +111,12 @@ class AddDomainDialog: DialogFragment() { // Create an alert dialog from the builder. val alertDialog = dialogBuilder.create() + // Get a handle for the shared preferences. + val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext()) + + // 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) @@ -142,8 +129,8 @@ class AddDomainDialog: DialogFragment() { 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(R.id.domain_name_edittext)!! + val domainNameAlreadyExistsTextView = alertDialog.findViewById(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.