X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FOpenDialog.kt;h=0bd12f2ba61c855105bde2a344a71947eae8e183;hp=e62b6fa6624b4f0f0c3c5bd4842307c13f3eeccc;hb=1d656c562831f535aa33903d44198dd890393f4f;hpb=031def95c6d9bfc14113fe86b4a5690233d93ce2

diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/OpenDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/OpenDialog.kt
index e62b6fa6..0bd12f2b 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/OpenDialog.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/OpenDialog.kt
@@ -19,18 +19,19 @@
 
 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.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
+import android.view.View
 import android.view.WindowManager
 import android.widget.Button
+import android.widget.CheckBox
 import android.widget.EditText
+import android.widget.TextView
 
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
@@ -39,10 +40,16 @@ import androidx.preference.PreferenceManager
 import com.stoutner.privacybrowser.R
 import com.stoutner.privacybrowser.activities.MainWebViewActivity
 
+// Define the class constants.
+private const val MHT_EXPLANATION_VISIBILITY = "mht_explanation_visibility"
+
 class OpenDialog : DialogFragment() {
-    // Define the open listener.
+    // Declare the class variables.
     private lateinit var openListener: OpenListener
 
+    // Declare the class views.
+    private lateinit var mhtExplanationTextView: TextView
+
     // The public interface is used to send information back to the parent activity.
     interface OpenListener {
         fun onOpen(dialogFragment: DialogFragment)
@@ -56,27 +63,18 @@ class OpenDialog : DialogFragment() {
         openListener = context as OpenListener
     }
 
-    // `@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 {
         // 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
-
         // Set the icon according to the theme.
-        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
-            dialogBuilder.setIcon(R.drawable.proxy_enabled_day)
-        } else {
-            dialogBuilder.setIcon(R.drawable.proxy_enabled_night)
-        }
+        dialogBuilder.setIconAttribute(R.attr.proxyBlueIcon)
 
         // Set the title.
         dialogBuilder.setTitle(R.string.open)
 
-        // Set the view.  The parent view is null because it will be assigned by the alert dialog.
-        dialogBuilder.setView(layoutInflater.inflate(R.layout.open_dialog, null))
+        // Set the view.
+        dialogBuilder.setView(R.layout.open_dialog)
 
         // Set the cancel button listener.  Using `null` as the listener closes the dialog without doing anything else.
         dialogBuilder.setNegativeButton(R.string.cancel, null)
@@ -107,6 +105,8 @@ class OpenDialog : DialogFragment() {
         // Get handles for the layout items.
         val fileNameEditText = alertDialog.findViewById<EditText>(R.id.file_name_edittext)!!
         val browseButton = alertDialog.findViewById<Button>(R.id.browse_button)!!
+        val mhtCheckBox = alertDialog.findViewById<CheckBox>(R.id.mht_checkbox)!!
+        mhtExplanationTextView = alertDialog.findViewById(R.id.mht_explanation_textview)!!
         val openButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE)
 
         // Initially disable the open button.
@@ -146,7 +146,35 @@ class OpenDialog : DialogFragment() {
             requireActivity().startActivityForResult(browseIntent, MainWebViewActivity.BROWSE_OPEN_REQUEST_CODE)
         }
 
+        // Handle clicks on the MHT checkbox.
+        mhtCheckBox.setOnClickListener {
+            // Update the visibility of the MHT explanation text view.
+            if (mhtCheckBox.isChecked) {
+                mhtExplanationTextView.visibility = View.VISIBLE
+            } else {
+                mhtExplanationTextView.visibility = View.GONE
+            }
+        }
+
+        // Restore the MHT explanation text view visibility if the saved instance state is not null.
+        if (savedInstanceState != null) {
+            // Restore the MHT explanation text view visibility.
+            if (savedInstanceState.getBoolean(MHT_EXPLANATION_VISIBILITY)) {
+                mhtExplanationTextView.visibility = View.VISIBLE
+            } else {
+                mhtExplanationTextView.visibility = View.GONE
+            }
+        }
+
         // Return the alert dialog.
         return alertDialog
     }
+
+    override fun onSaveInstanceState(savedInstanceState: Bundle) {
+        // Run the default commands.
+        super.onSaveInstanceState(savedInstanceState)
+
+        // Add the MHT explanation visibility status to the bundle.
+        savedInstanceState.putBoolean(MHT_EXPLANATION_VISIBILITY, mhtExplanationTextView.visibility == View.VISIBLE)
+    }
 }
\ No newline at end of file