X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FSaveDialog.kt;h=78eacc1593f6690bdb2b5efcdfea4df051f9ffe6;hp=d643aa7c4a23915efa9a1ae9c9c06f6c342dc32c;hb=bda37dc9784e900cb64b87af3e221e11320d9d01;hpb=91154b307513e7bc6958b27fba518e4f9b564cf9

diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveDialog.kt
index d643aa7c..78eacc15 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveDialog.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveDialog.kt
@@ -19,34 +19,25 @@
 
 package com.stoutner.privacybrowser.dialogs
 
-import android.Manifest
 import android.annotation.SuppressLint
-import android.os.Bundle
 import android.app.Dialog
 import android.content.Context
 import android.content.DialogInterface
 import android.content.Intent
-import android.content.pm.PackageManager
-import android.content.res.Configuration
-import android.view.View
+import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
 import android.view.WindowManager
 import android.widget.Button
 import android.widget.EditText
-import android.widget.TextView
-import android.text.TextWatcher
-import android.text.Editable
 
 import androidx.appcompat.app.AlertDialog
-import androidx.core.content.ContextCompat
 import androidx.fragment.app.DialogFragment
 import androidx.preference.PreferenceManager
 
 import com.stoutner.privacybrowser.R
-import com.stoutner.privacybrowser.helpers.DownloadLocationHelper
 
-import java.io.File
-
-// Declare the class constants.
+// Define the class constants.
 private const val SAVE_TYPE = "save_type"
 
 class SaveDialog : DialogFragment() {
@@ -68,7 +59,7 @@ class SaveDialog : DialogFragment() {
     }
 
     companion object {
-        // Declare the companion object constants.  These can be moved to class constants once all of the code has transitioned to Kotlin.
+        // Define the companion object constants.  These can be moved to class constants once all of the code has transitioned to Kotlin.
         const val SAVE_LOGCAT = 0
         const val SAVE_ABOUT_VERSION_TEXT = 1
         const val SAVE_ABOUT_VERSION_IMAGE = 2
@@ -85,7 +76,7 @@ class SaveDialog : DialogFragment() {
             // Create a new instance of the save dialog.
             val saveDialog = SaveDialog()
 
-            // Add the arguments bundle to the dialog.
+            // Add the arguments bundle to the new dialog.
             saveDialog.arguments = argumentsBundle
 
             // Return the new dialog.
@@ -102,9 +93,6 @@ class SaveDialog : 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
-
         // Set the title and the icon according to the save type.
         when (saveType) {
             SAVE_LOGCAT -> {
@@ -112,11 +100,7 @@ class SaveDialog : DialogFragment() {
                 dialogBuilder.setTitle(R.string.save_logcat)
 
                 // Set the icon according to the theme.
-                if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
-                    dialogBuilder.setIcon(R.drawable.save_dialog_day)
-                } else {
-                    dialogBuilder.setIcon(R.drawable.save_dialog_night)
-                }
+                dialogBuilder.setIconAttribute(R.attr.saveBlueIcon)
             }
 
             SAVE_ABOUT_VERSION_TEXT -> {
@@ -124,11 +108,7 @@ class SaveDialog : DialogFragment() {
                 dialogBuilder.setTitle(R.string.save_text)
 
                 // Set the icon according to the theme.
-                if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
-                    dialogBuilder.setIcon(R.drawable.save_text_blue_day)
-                } else {
-                    dialogBuilder.setIcon(R.drawable.save_text_blue_night)
-                }
+                dialogBuilder.setIconAttribute(R.attr.saveTextBlueIcon)
             }
 
             SAVE_ABOUT_VERSION_IMAGE -> {
@@ -136,16 +116,12 @@ class SaveDialog : 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)
             }
         }
 
         // Set the view.  The parent view is null because it will be assigned by the alert dialog.
-        dialogBuilder.setView(requireActivity().layoutInflater.inflate(R.layout.save_dialog, null))
+        dialogBuilder.setView(layoutInflater.inflate(R.layout.save_dialog, null))
 
         // Set the cancel button listener.  Using `null` as the listener closes the dialog without doing anything else.
         dialogBuilder.setNegativeButton(R.string.cancel, null)
@@ -176,10 +152,11 @@ class SaveDialog : 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 fileExistsWarningTextView = alertDialog.findViewById<TextView>(R.id.file_exists_warning_textview)!!
-        val storagePermissionTextView = alertDialog.findViewById<TextView>(R.id.storage_permission_textview)!!
         val saveButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE)
 
+        // Initially disable the save button.
+        saveButton.isEnabled = false
+
         // Update the status of the save button when the file name changes.
         fileNameEditText.addTextChangedListener(object : TextWatcher {
             override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {
@@ -194,18 +171,6 @@ class SaveDialog : DialogFragment() {
                 // Get the current file name.
                 val fileNameString = fileNameEditText.text.toString()
 
-                // Convert the file name string to a file.
-                val file = File(fileNameString)
-
-                // Check to see if the file exists.
-                if (file.exists()) {
-                    // Show the file exists warning.
-                    fileExistsWarningTextView.visibility = View.VISIBLE
-                } else {
-                    // Hide the file exists warning.
-                    fileExistsWarningTextView.visibility = View.GONE
-                }
-
                 // Enable the save button if the file name is populated.
                 saveButton.isEnabled = fileNameString.isNotEmpty()
             }
@@ -218,20 +183,6 @@ class SaveDialog : DialogFragment() {
             SAVE_ABOUT_VERSION_IMAGE -> fileName = getString(R.string.privacy_browser_version_png)
         }
 
-        // Instantiate the download location helper.
-        val downloadLocationHelper = DownloadLocationHelper()
-
-        // Get the default file path.
-        val defaultFilePath = downloadLocationHelper.getDownloadLocation(context) + "/" + fileName
-
-        // Display the default file path.
-        fileNameEditText.setText(defaultFilePath)
-
-        // Hide the storage permission text view if the permission has already been granted.
-        if (ContextCompat.checkSelfPermission(requireContext(), Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
-            storagePermissionTextView.visibility = View.GONE
-        }
-
         // Handle clicks on the browse button.
         browseButton.setOnClickListener {
             // Create the file picker intent.
@@ -246,7 +197,7 @@ class SaveDialog : DialogFragment() {
             // Request a file that can be opened.
             browseIntent.addCategory(Intent.CATEGORY_OPENABLE)
 
-            // Launch the file picker.  There is only one `startActivityForResult()`, so the request code is simply set to 0, but it must be run under `activity` so the request code is correct.
+            // Launch the file picker.  There is only one `startActivityForResult()`, so the request code is simply set to 0, but it must be run under `activity` so the response is processed correctly.
             requireActivity().startActivityForResult(browseIntent, 0)
         }