X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FAddDomainDialog.kt;h=be5af10b33e2e4bf83c4700ab2c41669414de0d4;hb=2562fecd31bce18ba708033e5b69736dc82e737d;hp=ac65aa5a2f41fc4ae077339383222f3409ba85fc;hpb=aba828cabddd0a277271c90816b50292bb64baf1;p=PrivacyBrowserAndroid.git 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 ac65aa5a..be5af10b 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.kt @@ -1,5 +1,5 @@ /* - * Copyright © 2017-2022 Soren Stoutner . + * Copyright 2017-2024 Soren Stoutner . * * This file is part of Privacy Browser Android . * @@ -22,7 +22,6 @@ package com.stoutner.privacybrowser.dialogs 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 @@ -39,16 +38,13 @@ import androidx.preference.PreferenceManager import com.stoutner.privacybrowser.R import com.stoutner.privacybrowser.helpers.DomainsDatabaseHelper -// 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) + fun addDomain(dialogFragment: DialogFragment) } override fun onAttach(context: Context) { @@ -59,39 +55,12 @@ class AddDomainDialog : DialogFragment() { addDomainListener = context as AddDomainListener } - companion object { - // `@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) - - // 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 - } - } - 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(requireContext(), R.style.PrivacyBrowserAlertDialog) - // Set the icon according to the theme. - dialogBuilder.setIconAttribute(R.attr.domainsBlueIcon) + // Set the icon. + dialogBuilder.setIcon(R.drawable.domains) // Set the title. dialogBuilder.setTitle(R.string.add_domain) @@ -105,7 +74,7 @@ class AddDomainDialog : DialogFragment() { // 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. @@ -115,7 +84,7 @@ class AddDomainDialog : DialogFragment() { val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext()) // Get the screenshot preference. - val allowScreenshots = sharedPreferences.getBoolean(getString(R.string.allow_screenshots), false) + val allowScreenshots = sharedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false) // Disable screenshots if not allowed. if (!allowScreenshots) { @@ -125,14 +94,17 @@ class AddDomainDialog : DialogFragment() { // 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(R.id.domain_name_edittext)!! val domainNameAlreadyExistsTextView = alertDialog.findViewById(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) { @@ -143,7 +115,7 @@ class AddDomainDialog : DialogFragment() { // 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 @@ -154,24 +126,18 @@ class AddDomainDialog : DialogFragment() { // 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() @@ -187,4 +153,4 @@ class AddDomainDialog : DialogFragment() { // Return the alert dialog. return alertDialog } -} \ No newline at end of file +}