Migrate five dialogs to Kotlin. https://redmine.stoutner.com/issues/604

[PrivacyBrowserAndroid.git] / app / src / main / java / com / stoutner / privacybrowser / dialogs / EditBookmarkDatabaseViewDialog.kt

diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDatabaseViewDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDatabaseViewDialog.kt
index a3c164521bdf22f98b72b80eab8b92f1a467c406..7c2012c6d27dc7471043b0409d6dc66cd2dd6824 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDatabaseViewDialog.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDatabaseViewDialog.kt
@@ -33,11 +33,19 @@ import android.text.TextWatcher
 import android.view.KeyEvent
 import android.view.View
 import android.view.WindowManager
 import android.view.KeyEvent
 import android.view.View
 import android.view.WindowManager

-import android.widget.*
+import android.widget.AdapterView

 import android.widget.AdapterView.OnItemSelectedListener
 import android.widget.AdapterView.OnItemSelectedListener

+import android.widget.Button
+import android.widget.EditText
+import android.widget.ImageView
+import android.widget.RadioButton
+import android.widget.RadioGroup
+import android.widget.Spinner
+import android.widget.TextView

 
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat

+import androidx.cursoradapter.widget.ResourceCursorAdapter

 import androidx.fragment.app.DialogFragment
 import androidx.preference.PreferenceManager
 
 import androidx.fragment.app.DialogFragment
 import androidx.preference.PreferenceManager
 


@@ -47,22 +55,26 @@ import com.stoutner.privacybrowser.helpers.BookmarksDatabaseHelper
 
 import java.io.ByteArrayOutputStream
 
 
 import java.io.ByteArrayOutputStream
 

+// Declare the class constants.
+private const val DATABASE_ID = "database_id"
+private const val FAVORITE_ICON_BYTE_ARRAY = "favorite_icon_byte_array"
+

 class EditBookmarkDatabaseViewDialog: DialogFragment() {
     // The public interface is used to send information back to the parent activity.
     interface EditBookmarkDatabaseViewListener {
         fun onSaveBookmark(dialogFragment: DialogFragment, selectedBookmarkDatabaseId: Int, favoriteIconBitmap: Bitmap)
     }
 
 class EditBookmarkDatabaseViewDialog: DialogFragment() {
     // The public interface is used to send information back to the parent activity.
     interface EditBookmarkDatabaseViewListener {
         fun onSaveBookmark(dialogFragment: DialogFragment, selectedBookmarkDatabaseId: Int, favoriteIconBitmap: Bitmap)
     }
 

-    // Define the edit bookmark database view listener.
+    // Declare the class variables.

     private lateinit var editBookmarkDatabaseViewListener: EditBookmarkDatabaseViewListener
 
     private lateinit var editBookmarkDatabaseViewListener: EditBookmarkDatabaseViewListener
 

-    // Define the handles for the views that need to be accessed from `updateEditButton()`.
+    // Declare the class views.

     private lateinit var newIconRadioButton: RadioButton
     private lateinit var nameEditText: EditText
     private lateinit var urlEditText: EditText
     private lateinit var folderSpinner: Spinner
     private lateinit var displayOrderEditText: EditText
     private lateinit var newIconRadioButton: RadioButton
     private lateinit var nameEditText: EditText
     private lateinit var urlEditText: EditText
     private lateinit var folderSpinner: Spinner
     private lateinit var displayOrderEditText: EditText

-    private lateinit var editButton: Button
+    private lateinit var saveButton: Button

 
     override fun onAttach(context: Context) {
         // Run the default commands.
 
     override fun onAttach(context: Context) {
         // Run the default commands.


@@ -89,8 +101,8 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() {
             val argumentsBundle = Bundle()
 
             // Store the variables in the bundle.
             val argumentsBundle = Bundle()
 
             // Store the variables in the bundle.

-            argumentsBundle.putInt("database_id", databaseId)
-            argumentsBundle.putByteArray("favorite_icon_byte_array", favoriteIconByteArray)
+            argumentsBundle.putInt(DATABASE_ID, databaseId)
+            argumentsBundle.putByteArray(FAVORITE_ICON_BYTE_ARRAY, favoriteIconByteArray)

 
             // Create a new instance of the dialog.
             val editBookmarkDatabaseViewDialog = EditBookmarkDatabaseViewDialog()
 
             // Create a new instance of the dialog.
             val editBookmarkDatabaseViewDialog = EditBookmarkDatabaseViewDialog()


@@ -103,17 +115,15 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() {
         }
     }
 
         }
     }
 

-    // `@SuppressLing("InflateParams")` removes the warning about using `null` as the parent view group when inflating the alert dialog.
+    // `@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.
         val arguments = requireArguments()
 
     @SuppressLint("InflateParams")
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         // Get the arguments.
         val arguments = requireArguments()
 

-        // Get the bookmark database ID from the bundle.
-        val bookmarkDatabaseId = arguments.getInt("database_id")
-
-        // Get the favorite icon byte array.
-        val favoriteIconByteArray = arguments.getByteArray("favorite_icon_byte_array")!!
+        // Get the variables from the arguments.
+        val bookmarkDatabaseId = arguments.getInt(DATABASE_ID)
+        val favoriteIconByteArray = arguments.getByteArray(FAVORITE_ICON_BYTE_ARRAY)!!

 
         // Convert the favorite icon byte array to a bitmap.
         val favoriteIconBitmap = BitmapFactory.decodeByteArray(favoriteIconByteArray, 0, favoriteIconByteArray.size)
 
         // Convert the favorite icon byte array to a bitmap.
         val favoriteIconBitmap = BitmapFactory.decodeByteArray(favoriteIconByteArray, 0, favoriteIconByteArray.size)


@@ -136,10 +146,10 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() {
         // Set the view.  The parent view is `null` because it will be assigned by the alert dialog.
         dialogBuilder.setView(requireActivity().layoutInflater.inflate(R.layout.edit_bookmark_databaseview_dialog, null))
 
         // Set the view.  The parent view is `null` because it will be assigned by the alert dialog.
         dialogBuilder.setView(requireActivity().layoutInflater.inflate(R.layout.edit_bookmark_databaseview_dialog, null))
 

-        // Set the listener for the cancel button.  Using `null` as the listener closes the dialog without doing anything else.
+        // Set the cancel button listener.  Using `null` as the listener closes the dialog without doing anything else.

         dialogBuilder.setNegativeButton(R.string.cancel, null)
 
         dialogBuilder.setNegativeButton(R.string.cancel, null)
 

-        // Set the listener for the save button.
+        // Set the save button listener.

         dialogBuilder.setPositiveButton(R.string.save) { _: DialogInterface, _: Int ->
             // Return the dialog fragment to the parent activity on save.
             editBookmarkDatabaseViewListener.onSaveBookmark(this, bookmarkDatabaseId, favoriteIconBitmap)
         dialogBuilder.setPositiveButton(R.string.save) { _: DialogInterface, _: Int ->
             // Return the dialog fragment to the parent activity on save.
             editBookmarkDatabaseViewListener.onSaveBookmark(this, bookmarkDatabaseId, favoriteIconBitmap)


@@ -152,7 +162,7 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() {
         val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
 
         // Get the screenshot preference.
         val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
 
         // Get the screenshot preference.

-        val allowScreenshots = sharedPreferences.getBoolean("allow_screenshots", false)
+        val allowScreenshots = sharedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false)

 
         // Disable screenshots if not allowed.
         if (!allowScreenshots) {
 
         // Disable screenshots if not allowed.
         if (!allowScreenshots) {


@@ -172,7 +182,7 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() {
         urlEditText = alertDialog.findViewById(R.id.edit_bookmark_url_edittext)!!
         folderSpinner = alertDialog.findViewById(R.id.edit_bookmark_folder_spinner)!!
         displayOrderEditText = alertDialog.findViewById(R.id.edit_bookmark_display_order_edittext)!!
         urlEditText = alertDialog.findViewById(R.id.edit_bookmark_url_edittext)!!
         folderSpinner = alertDialog.findViewById(R.id.edit_bookmark_folder_spinner)!!
         displayOrderEditText = alertDialog.findViewById(R.id.edit_bookmark_display_order_edittext)!!

-        editButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE)
+        saveButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE)

 
         // Store the current bookmark values.
         val currentBookmarkName = bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_NAME))
 
         // Store the current bookmark values.
         val currentBookmarkName = bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_NAME))


@@ -280,16 +290,16 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() {
         // Populate the display order edit text.
         displayOrderEditText.setText(bookmarkCursor.getInt(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.DISPLAY_ORDER)).toString())
 
         // Populate the display order edit text.
         displayOrderEditText.setText(bookmarkCursor.getInt(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.DISPLAY_ORDER)).toString())
 

-        // Initially disable the edit button.
-        editButton.isEnabled = false
+        // Initially disable the save button.
+        saveButton.isEnabled = false

 
 

-        // Update the edit button if the icon selection changes.
+        // Update the save button if the icon selection changes.

         iconRadioGroup.setOnCheckedChangeListener { _: RadioGroup, _: Int ->
         iconRadioGroup.setOnCheckedChangeListener { _: RadioGroup, _: Int ->

-            // Update the edit button.
-            updateEditButton(currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder)
+            // Update the save button.
+            updateSaveButton(currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder)

         }
 
         }
 

-        // Update the edit button if the bookmark name changes.
+        // Update the save button if the bookmark name changes.

         nameEditText.addTextChangedListener(object: TextWatcher {
             override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {
                 // Do nothing.
         nameEditText.addTextChangedListener(object: TextWatcher {
             override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {
                 // Do nothing.


@@ -300,12 +310,12 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() {
             }
 
             override fun afterTextChanged(s: Editable) {
             }
 
             override fun afterTextChanged(s: Editable) {

-                // Update the edit button.
-                updateEditButton(currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder)
+                // Update the Save button.
+                updateSaveButton(currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder)

             }
         })
 
             }
         })
 

-        // Update the edit button if the URL changes.
+        // Update the save button if the URL changes.

         urlEditText.addTextChangedListener(object: TextWatcher {
             override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {
                 // Do nothing.
         urlEditText.addTextChangedListener(object: TextWatcher {
             override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {
                 // Do nothing.


@@ -316,18 +326,18 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() {
             }
 
             override fun afterTextChanged(s: Editable) {
             }
 
             override fun afterTextChanged(s: Editable) {

-                // Update the edit button.
-                updateEditButton(currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder)
+                // Update the save button.
+                updateSaveButton(currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder)

             }
         })
 
         // Wait to set the on item selected listener until the spinner has been inflated.  Otherwise the dialog will crash on restart.
         folderSpinner.post {
             }
         })
 
         // Wait to set the on item selected listener until the spinner has been inflated.  Otherwise the dialog will crash on restart.
         folderSpinner.post {

-            // Update the edit button if the folder changes.
-            folderSpinner.onItemSelectedListener = object : OnItemSelectedListener {
+            // Update the save button if the folder changes.
+            folderSpinner.onItemSelectedListener = object: OnItemSelectedListener {

                 override fun onItemSelected(parent: AdapterView<*>, view: View, position: Int, id: Long) {
                 override fun onItemSelected(parent: AdapterView<*>, view: View, position: Int, id: Long) {

-                    // Update the edit button.
-                    updateEditButton(currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder)
+                    // Update the save button.
+                    updateSaveButton(currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder)

                 }
 
                 override fun onNothingSelected(parent: AdapterView<*>?) {
                 }
 
                 override fun onNothingSelected(parent: AdapterView<*>?) {


@@ -336,8 +346,8 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() {
             }
         }
 
             }
         }
 

-        // Update the edit button if the display order changes.
-        displayOrderEditText.addTextChangedListener(object : TextWatcher {
+        // Update the save button if the display order changes.
+        displayOrderEditText.addTextChangedListener(object: TextWatcher {

             override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {
                 // Do nothing.
             }
             override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {
                 // Do nothing.
             }


@@ -347,24 +357,24 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() {
             }
 
             override fun afterTextChanged(s: Editable) {
             }
 
             override fun afterTextChanged(s: Editable) {

-                // Update the edit button.
-                updateEditButton(currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder)
+                // Update the save button.
+                updateSaveButton(currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder)

             }
         })
 
         // Allow the enter key on the keyboard to save the bookmark from the bookmark name edit text.
         nameEditText.setOnKeyListener { _: View, keyCode: Int, keyEvent: KeyEvent ->
             // Check the key code, event, and button status.
             }
         })
 
         // Allow the enter key on the keyboard to save the bookmark from the bookmark name edit text.
         nameEditText.setOnKeyListener { _: View, keyCode: Int, keyEvent: KeyEvent ->
             // Check the key code, event, and button status.

-            if (keyEvent.action == KeyEvent.ACTION_DOWN && keyCode == KeyEvent.KEYCODE_ENTER && editButton.isEnabled) {  // The enter key was pressed and the edit button is enabled.
+            if (keyEvent.action == KeyEvent.ACTION_DOWN && keyCode == KeyEvent.KEYCODE_ENTER && saveButton.isEnabled) {  // The enter key was pressed and the save button is enabled.

                 // Trigger the listener and return the dialog fragment to the parent activity.
                 // Trigger the listener and return the dialog fragment to the parent activity.

-                editBookmarkDatabaseViewListener.onSaveBookmark(this@EditBookmarkDatabaseViewDialog, bookmarkDatabaseId, favoriteIconBitmap)
+                editBookmarkDatabaseViewListener.onSaveBookmark(this, bookmarkDatabaseId, favoriteIconBitmap)

 
                 // Manually dismiss the alert dialog.
                 alertDialog.dismiss()
 
                 // Consume the event.
                 return@setOnKeyListener true
 
                 // Manually dismiss the alert dialog.
                 alertDialog.dismiss()
 
                 // Consume the event.
                 return@setOnKeyListener true

-            } else {  // If any other key was pressed, or if the edit button is currently disabled, do not consume the event.
+            } else {  // If any other key was pressed, or if the save button is currently disabled, do not consume the event.

                 return@setOnKeyListener false
             }
         }
                 return@setOnKeyListener false
             }
         }


@@ -372,16 +382,16 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() {
         // Allow the enter key on the keyboard to save the bookmark from the URL edit text.
         urlEditText.setOnKeyListener { _: View, keyCode: Int, keyEvent: KeyEvent ->
             // Check the key code, event, and button status.
         // Allow the enter key on the keyboard to save the bookmark from the URL edit text.
         urlEditText.setOnKeyListener { _: View, keyCode: Int, keyEvent: KeyEvent ->
             // Check the key code, event, and button status.

-            if (keyEvent.action == KeyEvent.ACTION_DOWN && keyCode == KeyEvent.KEYCODE_ENTER && editButton.isEnabled) {  // The enter key was pressed and the edit button is enabled.
+            if (keyEvent.action == KeyEvent.ACTION_DOWN && keyCode == KeyEvent.KEYCODE_ENTER && saveButton.isEnabled) {  // The enter key was pressed and the save button is enabled.

                 // Trigger the listener and return the dialog fragment to the parent activity.
                 // Trigger the listener and return the dialog fragment to the parent activity.

-                editBookmarkDatabaseViewListener.onSaveBookmark(this@EditBookmarkDatabaseViewDialog, bookmarkDatabaseId, favoriteIconBitmap)
+                editBookmarkDatabaseViewListener.onSaveBookmark(this, bookmarkDatabaseId, favoriteIconBitmap)

 
                 // Manually dismiss the alert dialog.
                 alertDialog.dismiss()
 
                 // Consume the event.
                 return@setOnKeyListener true
 
                 // Manually dismiss the alert dialog.
                 alertDialog.dismiss()
 
                 // Consume the event.
                 return@setOnKeyListener true

-            } else { // If any other key was pressed, or if the edit button is currently disabled, do not consume the event.
+            } else { // If any other key was pressed, or if the save button is currently disabled, do not consume the event.

                 return@setOnKeyListener false
             }
         }
                 return@setOnKeyListener false
             }
         }


@@ -389,16 +399,16 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() {
         // Allow the enter key on the keyboard to save the bookmark from the display order edit text.
         displayOrderEditText.setOnKeyListener { _: View, keyCode: Int, keyEvent: KeyEvent ->
             // Check the key code, event, and button status.
         // Allow the enter key on the keyboard to save the bookmark from the display order edit text.
         displayOrderEditText.setOnKeyListener { _: View, keyCode: Int, keyEvent: KeyEvent ->
             // Check the key code, event, and button status.

-            if (keyEvent.action == KeyEvent.ACTION_DOWN && keyCode == KeyEvent.KEYCODE_ENTER && editButton.isEnabled) {  // The enter key was pressed and the edit button is enabled.
+            if (keyEvent.action == KeyEvent.ACTION_DOWN && keyCode == KeyEvent.KEYCODE_ENTER && saveButton.isEnabled) {  // The enter key was pressed and the save button is enabled.

                 // Trigger the listener and return the dialog fragment to the parent activity.
                 // Trigger the listener and return the dialog fragment to the parent activity.

-                editBookmarkDatabaseViewListener.onSaveBookmark(this@EditBookmarkDatabaseViewDialog, bookmarkDatabaseId, favoriteIconBitmap)
+                editBookmarkDatabaseViewListener.onSaveBookmark(this, bookmarkDatabaseId, favoriteIconBitmap)

 
                 // Manually dismiss the alert dialog.
                 alertDialog.dismiss()
 
                 // Consume the event.
                 return@setOnKeyListener true
 
                 // Manually dismiss the alert dialog.
                 alertDialog.dismiss()
 
                 // Consume the event.
                 return@setOnKeyListener true

-            } else { // If any other key was pressed, or if the edit button is currently disabled, do not consume the event.
+            } else { // If any other key was pressed, or if the save button is currently disabled, do not consume the event.

                 return@setOnKeyListener false
             }
         }
                 return@setOnKeyListener false
             }
         }


@@ -407,7 +417,7 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() {
         return alertDialog
     }
 
         return alertDialog
     }
 

-    private fun updateEditButton(currentBookmarkName: String, currentUrl: String, currentFolderDatabaseId: Int, currentDisplayOrder: Int) {
+    private fun updateSaveButton(currentBookmarkName: String, currentUrl: String, currentFolderDatabaseId: Int, currentDisplayOrder: Int) {

         // Get the values from the dialog.
         val newName = nameEditText.text.toString()
         val newUrl = urlEditText.text.toString()
         // Get the values from the dialog.
         val newName = nameEditText.text.toString()
         val newUrl = urlEditText.text.toString()


@@ -432,7 +442,7 @@ class EditBookmarkDatabaseViewDialog: DialogFragment() {
         // Is the display order empty?
         val displayOrderNotEmpty = newDisplayOrder.isNotEmpty()
 
         // Is the display order empty?
         val displayOrderNotEmpty = newDisplayOrder.isNotEmpty()
 

-        // Update the enabled status of the edit button.
-        editButton.isEnabled = (iconChanged || nameChanged || urlChanged || folderChanged || displayOrderChanged) && displayOrderNotEmpty
+        // Update the enabled status of the save button.
+        saveButton.isEnabled = (iconChanged || nameChanged || urlChanged || folderChanged || displayOrderChanged) && displayOrderNotEmpty

     }
 }
\ No newline at end of file
     }
 }
\ No newline at end of file