Explain in the settings that displaying under cutouts also displays under the keyboar...

[PrivacyBrowserAndroid.git] / app / src / main / java / com / stoutner / privacybrowser / dialogs / AddDomainDialog.kt

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 1eb8858ac1585324355f9678a7357af5c620f111..be5af10b33e2e4bf83c4700ab2c41669414de0d4 100644 (file)
--- 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 <soren@stoutner.com>.
+ * Copyright 2017-2024 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser Android <https://www.stoutner.com/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,34 +55,7 @@ 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)
 
@@ -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) {
@@ -133,6 +102,9 @@ class AddDomainDialog : DialogFragment() {
         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) {
@@ -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
+}