X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FSaveWebpageDialog.kt;h=3402d4f7861c01231c95b8bb8818dd42d0429164;hp=d3420f3072432c4bf41fffc607135eb9c038cdd3;hb=1d656c562831f535aa33903d44198dd890393f4f;hpb=641d15ace34579762580ed8297f324133354499b

diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveWebpageDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveWebpageDialog.kt
index d3420f30..3402d4f7 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveWebpageDialog.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveWebpageDialog.kt
@@ -19,12 +19,10 @@
 
 package com.stoutner.privacybrowser.dialogs
 
-import android.annotation.SuppressLint
 import android.app.Dialog
 import android.content.Context
 import android.content.DialogInterface
 import android.content.Intent
-import android.content.res.Configuration
 import android.net.Uri
 import android.os.AsyncTask
 import android.os.Bundle
@@ -106,8 +104,6 @@ class SaveWebpageDialog : DialogFragment() {
         }
     }
 
-    // `@SuppressLint("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 from the bundle.
         val saveType = requireArguments().getInt(SAVE_TYPE)
@@ -120,9 +116,6 @@ class SaveWebpageDialog : DialogFragment() {
         // Use an alert dialog builder to create the alert dialog.
         val dialogBuilder = AlertDialog.Builder(requireContext(), R.style.PrivacyBrowserAlertDialog)
 
-        // Get the current theme status.
-        val currentThemeStatus = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
-
         // Configure the dialog according to the save type.
         when (saveType) {
             SAVE_URL -> {
@@ -130,11 +123,7 @@ class SaveWebpageDialog : DialogFragment() {
                 dialogBuilder.setTitle(R.string.save_url)
 
                 // Set the icon according to the theme.
-                if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
-                    dialogBuilder.setIcon(R.drawable.copy_enabled_day)
-                } else {
-                    dialogBuilder.setIcon(R.drawable.copy_enabled_night)
-                }
+                dialogBuilder.setIconAttribute(R.attr.copyBlueIcon)
             }
 
             SAVE_ARCHIVE -> {
@@ -142,11 +131,7 @@ class SaveWebpageDialog : DialogFragment() {
                 dialogBuilder.setTitle(R.string.save_archive)
 
                 // Set the icon according to the theme.
-                if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
-                    dialogBuilder.setIcon(R.drawable.dom_storage_cleared_day)
-                } else {
-                    dialogBuilder.setIcon(R.drawable.dom_storage_cleared_night)
-                }
+                dialogBuilder.setIconAttribute(R.attr.domStorageBlueIcon)
 
                 // Convert the URL to a URI.
                 val uri = Uri.parse(originalUrlString)
@@ -160,11 +145,7 @@ class SaveWebpageDialog : DialogFragment() {
                 dialogBuilder.setTitle(R.string.save_image)
 
                 // Set the icon according to the theme.
-                if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
-                    dialogBuilder.setIcon(R.drawable.images_enabled_day)
-                } else {
-                    dialogBuilder.setIcon(R.drawable.images_enabled_night)
-                }
+                dialogBuilder.setIconAttribute(R.attr.imagesBlueIcon)
 
                 // Convert the URL to a URI.
                 val uri = Uri.parse(originalUrlString)
@@ -174,8 +155,8 @@ class SaveWebpageDialog : DialogFragment() {
             }
         }
 
-        // Set the view.  The parent view is null because it will be assigned by the alert dialog.
-        dialogBuilder.setView(layoutInflater.inflate(R.layout.save_webpage_dialog, null))
+        // Set the view.
+        dialogBuilder.setView(R.layout.save_webpage_dialog)
 
         // Set the cancel button listener.  Using `null` as the listener closes the dialog without doing anything else.
         dialogBuilder.setNegativeButton(R.string.cancel, null)