X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;ds=sidebyside;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FHttpAuthenticationDialog.kt;h=42e43d91a4cfe1b00e618a8a28b6ae12d717ced8;hb=031def95c6d9bfc14113fe86b4a5690233d93ce2;hp=dca6032dc74abe26f574139166fcc057e3db8495;hpb=9cb208c1f5c7a905f787f4ec4795a92e72195fba;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/HttpAuthenticationDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/HttpAuthenticationDialog.kt index dca6032d..42e43d91 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/HttpAuthenticationDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/HttpAuthenticationDialog.kt @@ -1,5 +1,5 @@ /* - * Copyright © 2017-2020 Soren Stoutner . + * Copyright © 2017-2021 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -16,6 +16,7 @@ * You should have received a copy of the GNU General Public License * along with Privacy Browser. If not, see . */ + package com.stoutner.privacybrowser.dialogs import android.annotation.SuppressLint @@ -41,21 +42,21 @@ import com.stoutner.privacybrowser.R import com.stoutner.privacybrowser.activities.MainWebViewActivity import com.stoutner.privacybrowser.views.NestedScrollWebView -// Declare the class constants. +// Define the class constants. private const val HOST = "host" private const val REALM = "realm" private const val WEBVIEW_FRAGMENT_ID = "webview_fragment_id" -class HttpAuthenticationDialog: DialogFragment() { +class HttpAuthenticationDialog : DialogFragment() { // Define the class variables. private var dismissDialog: Boolean = false - // Define the class views. + // Declare the class views. private lateinit var usernameEditText: EditText private lateinit var passwordEditText: EditText 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 displayDialog(host: String, realm: String, webViewFragmentId: Long): HttpAuthenticationDialog { // Create an arguments bundle. @@ -114,10 +115,7 @@ class HttpAuthenticationDialog: DialogFragment() { // Set the title. dialogBuilder.setTitle(R.string.http_authentication) - // Get the activity's layout inflater. - val layoutInflater = requireActivity().layoutInflater - - // Set the layout. The parent view is `null` because it will be assigned by the alert dialog. + // Set the view. The parent view is `null` because it will be assigned by the alert dialog. dialogBuilder.setView(layoutInflater.inflate(R.layout.http_authentication_dialog, null)) // Set the close button listener. @@ -184,7 +182,7 @@ class HttpAuthenticationDialog: DialogFragment() { ForegroundColorSpan(resources.getColor(R.color.blue_700)) } else { @Suppress("DEPRECATION") - ForegroundColorSpan(resources.getColor(R.color.violet_500)) + ForegroundColorSpan(resources.getColor(R.color.violet_700)) } // Setup the span to display the host name in blue. `SPAN_INCLUSIVE_INCLUSIVE` allows the span to grow in either direction.