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=c67e23b0870fb910ad3541888c251c20cee398e8;hp=527e0d7d031996f66b9e3a5a7de439158f462368;hb=1b27ac6f2b7c046945fc97e2aff9adbde8a152ce;hpb=74655c0cd0ba72c80ac6c48df55bc3d2f5280ad2 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 527e0d7d..c67e23b0 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.kt @@ -1,29 +1,27 @@ /* - * 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.Dialog import android.content.Context import android.content.DialogInterface -import android.content.res.Configuration import android.net.Uri import android.os.Bundle import android.text.Editable @@ -41,15 +39,18 @@ 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) @@ -59,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() @@ -79,40 +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 = requireArguments() // Get the URL from the bundle. - val urlString = arguments.getString("url_string") + 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) - - // Get the current theme status. - val currentThemeStatus = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK - - // Set the icon according to the theme. - if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) { - // Set the dark icon. - dialogBuilder.setIcon(R.drawable.domains_night) - } else { - // Set the light icon. - dialogBuilder.setIcon(R.drawable.domains_light) - } + val dialogBuilder = AlertDialog.Builder(requireContext(), R.style.PrivacyBrowserAlertDialog) + + // 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) @@ -122,10 +112,10 @@ class AddDomainDialog: DialogFragment() { 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), false) // Disable screenshots if not allowed. if (!allowScreenshots) {