Convert a number of files to Kotlin. https://redmine.stoutner.com/issues/641

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

diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDialog.kt
index ea4ea4d443dfe0248f8b4c76520c26024744368f..578fcd28e8ffddde7f75984376c9157bb51e4fd7 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDialog.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDialog.kt
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright © 2016-2020 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2021 Soren Stoutner <soren@stoutner.com>.

  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *


@@ -50,12 +50,7 @@ import java.io.ByteArrayOutputStream
 private const val DATABASE_ID = "database_id"
 private const val FAVORITE_ICON_BYTE_ARRAY = "favorite_icon_byte_array"
 
 private const val DATABASE_ID = "database_id"
 private const val FAVORITE_ICON_BYTE_ARRAY = "favorite_icon_byte_array"
 

-class EditBookmarkFolderDialog: DialogFragment() {
-    // The public interface is used to send information back to the parent activity.
-    interface EditBookmarkFolderListener {
-        fun onSaveBookmarkFolder(dialogFragment: DialogFragment?, selectedFolderDatabaseId: Int, favoriteIconBitmap: Bitmap?)
-    }
-
+class EditBookmarkFolderDialog : DialogFragment() {

     // Declare the class variables.
     private lateinit var editBookmarkFolderListener: EditBookmarkFolderListener
     private lateinit var bookmarksDatabaseHelper: BookmarksDatabaseHelper
     // Declare the class variables.
     private lateinit var editBookmarkFolderListener: EditBookmarkFolderListener
     private lateinit var bookmarksDatabaseHelper: BookmarksDatabaseHelper


@@ -66,6 +61,11 @@ class EditBookmarkFolderDialog: DialogFragment() {
     private lateinit var folderNameEditText: EditText
     private lateinit var saveButton: Button
 
     private lateinit var folderNameEditText: EditText
     private lateinit var saveButton: Button
 

+    // The public interface is used to send information back to the parent activity.
+    interface EditBookmarkFolderListener {
+        fun onSaveBookmarkFolder(dialogFragment: DialogFragment, selectedFolderDatabaseId: Int, favoriteIconBitmap: Bitmap)
+    }
+

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


@@ -75,7 +75,7 @@ class EditBookmarkFolderDialog: DialogFragment() {
     }
 
     companion object {
     }
 
     companion object {

-        // `@JvmStatic` will no longer be required once all the code has transitioned to Kotlin.  Also, the function can then be moved out of a companion object and just become a package-level function.
+        // `@JvmStatic` will no longer be required once all the code has transitioned to Kotlin.

         @JvmStatic
         fun folderDatabaseId(databaseId: Int, favoriteIconBitmap: Bitmap): EditBookmarkFolderDialog {
             // Create a favorite icon byte array output stream.
         @JvmStatic
         fun folderDatabaseId(databaseId: Int, favoriteIconBitmap: Bitmap): EditBookmarkFolderDialog {
             // Create a favorite icon byte array output stream.