X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FHttpAuthenticationDialog.kt;h=d7fe8f9bcbe767ccd2ffb37e33ea24cb2f81ef25;hb=48ae68b846bb5bb035e0d86659e4736b6db6f12d;hp=f0cfa904eb9b4a69e0342606f1e0b21c29d0f31a;hpb=8142ac5fc2489de735de4b6fa21a1eae733ccfce;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 f0cfa904..d7fe8f9b 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/HttpAuthenticationDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/HttpAuthenticationDialog.kt @@ -21,7 +21,6 @@ package com.stoutner.privacybrowser.dialogs import android.app.Dialog import android.content.DialogInterface -import android.content.res.Configuration import android.os.Bundle import android.text.SpannableStringBuilder import android.text.Spanned @@ -106,8 +105,8 @@ class HttpAuthenticationDialog : DialogFragment() { // 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.lockBlueIcon) + // Set the icon. + dialogBuilder.setIcon(R.drawable.lock) // Set the title. dialogBuilder.setTitle(R.string.http_authentication) @@ -139,7 +138,7 @@ class HttpAuthenticationDialog : DialogFragment() { val dialogWindow = alertDialog.window!! // 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(getString(R.string.allow_screenshots_key), false) @@ -168,17 +167,8 @@ class HttpAuthenticationDialog : DialogFragment() { val hostLabel = getString(R.string.host) + " " val hostStringBuilder = SpannableStringBuilder(hostLabel + httpAuthHost) - // Get the current theme status. - val currentThemeStatus = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK - - // Set the blue color span according to the theme. The deprecated `getColor()` must be used until API >= 23. - val blueColorSpan = if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { - @Suppress("DEPRECATION") - ForegroundColorSpan(resources.getColor(R.color.blue_700)) - } else { - @Suppress("DEPRECATION") - ForegroundColorSpan(resources.getColor(R.color.violet_700)) - } + // Set the blue color span. + val blueColorSpan = ForegroundColorSpan(requireContext().getColor(R.color.blue_text)) // Setup the span to display the host name in blue. `SPAN_INCLUSIVE_INCLUSIVE` allows the span to grow in either direction. hostStringBuilder.setSpan(blueColorSpan, hostLabel.length, hostStringBuilder.length, Spanned.SPAN_INCLUSIVE_INCLUSIVE)