Standardize suggested file names. https://redmine.stoutner.com/issues/951

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

diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkDialog.kt
index 5bfd99c392211fd3286d0870581a030f56c97f3e..145c895b88175fb1c51f97354038515572daff90 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkDialog.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkDialog.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2016-2022 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2023 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
  *
@@ -46,25 +46,7 @@ private const val TITLE = "title"
 private const val FAVORITE_ICON_BYTE_ARRAY = "favorite_icon_byte_array"
 
 class CreateBookmarkDialog : DialogFragment() {
-    // Declare the class variables
-    private lateinit var createBookmarkListener: CreateBookmarkListener
-
-    // The public interface is used to send information back to the parent activity.
-    interface CreateBookmarkListener {
-        fun onCreateBookmark(dialogFragment: DialogFragment, favoriteIconBitmap: Bitmap)
-    }
-
-    override fun onAttach(context: Context) {
-        // Run the default commands.
-        super.onAttach(context)
-
-        // Get a handle for the create bookmark listener from the launching context.
-        createBookmarkListener = context as CreateBookmarkListener
-    }
-
     companion object {
-        // `@JvmStatic` will no longer be required once all the code has transitioned to Kotlin.
-        @JvmStatic
         fun createBookmark(urlString: String, title: String, favoriteIconBitmap: Bitmap): CreateBookmarkDialog {
             // Create a favorite icon byte array output stream.
             val favoriteIconByteArrayOutputStream = ByteArrayOutputStream()
@@ -94,6 +76,22 @@ class CreateBookmarkDialog : DialogFragment() {
         }
     }
 
+    // Declare the class variables
+    private lateinit var createBookmarkListener: CreateBookmarkListener
+
+    // The public interface is used to send information back to the parent activity.
+    interface CreateBookmarkListener {
+        fun createBookmark(dialogFragment: DialogFragment, favoriteIconBitmap: Bitmap)
+    }
+
+    override fun onAttach(context: Context) {
+        // Run the default commands.
+        super.onAttach(context)
+
+        // Get a handle for the create bookmark listener from the launching context.
+        createBookmarkListener = context as CreateBookmarkListener
+    }
+
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         // Get the arguments.
         val arguments = requireArguments()
@@ -127,7 +125,7 @@ class CreateBookmarkDialog : DialogFragment() {
         // Set a listener on the create button.
         dialogBuilder.setPositiveButton(R.string.create) { _: DialogInterface, _: Int ->
             // Return the dialog fragment and the favorite icon bitmap to the parent activity.
-            createBookmarkListener.onCreateBookmark(this, favoriteIconBitmap)
+            createBookmarkListener.createBookmark(this, favoriteIconBitmap)
         }
 
         // Create an alert dialog from the builder.
@@ -161,7 +159,7 @@ class CreateBookmarkDialog : DialogFragment() {
             // Check the key code and event.
             if (keyCode == KeyEvent.KEYCODE_ENTER && keyEvent.action == KeyEvent.ACTION_DOWN) {  // The event is a key-down on the enter key.
                 // Trigger the create bookmark listener and return the dialog fragment and the favorite icon bitmap to the parent activity.
-                createBookmarkListener.onCreateBookmark(this, favoriteIconBitmap)
+                createBookmarkListener.createBookmark(this, favoriteIconBitmap)
 
                 // Manually dismiss the alert dialog.
                 alertDialog.dismiss()
@@ -179,7 +177,7 @@ class CreateBookmarkDialog : DialogFragment() {
             // Check the key code and event.
             if (keyCode == KeyEvent.KEYCODE_ENTER && keyEvent.action == KeyEvent.ACTION_DOWN) {  // The event is a key-down on the enter key.
                 // Trigger the create bookmark listener and return the dialog fragment and the favorite icon bitmap to the parent activity.
-                createBookmarkListener.onCreateBookmark(this, favoriteIconBitmap)
+                createBookmarkListener.createBookmark(this, favoriteIconBitmap)
 
                 // Manually dismiss the alert dialog.
                 alertDialog.dismiss()
@@ -195,4 +193,4 @@ class CreateBookmarkDialog : DialogFragment() {
         // Return the alert dialog.
         return alertDialog
     }
-}
\ No newline at end of file
+}