First wrong button text in View Headers in night theme. https://redmine.stoutner...

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

diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/FontSizeDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/FontSizeDialog.kt
index a6ab28dd2e47161fe9ef7732bf6f105f2b3b7910..86e82efca059ceb176434a6566060bcac26fcffd 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/FontSizeDialog.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/FontSizeDialog.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2019-2022 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2019-2023 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
  *
@@ -39,25 +39,7 @@ import com.stoutner.privacybrowser.R
 private const val FONT_SIZE = "font_size"
 
 class FontSizeDialog : DialogFragment() {
-    // Declare the class variables.
-    private lateinit var updateFontSizeListener: UpdateFontSizeListener
-
-    // The public interface is used to send information back to the parent activity.
-    interface UpdateFontSizeListener {
-        fun onApplyNewFontSize(dialogFragment: DialogFragment?)
-    }
-
-    override fun onAttach(context: Context) {
-        // Run the default commands.
-        super.onAttach(context)
-
-        // Get a handle for the update font size listener from the launching context.
-        updateFontSizeListener = context as UpdateFontSizeListener
-    }
-
     companion object {
-        // `@JvmStatic` will no longer be required once all the code has transitioned to Kotlin.
-        @JvmStatic
         fun displayDialog(fontSize: Int): FontSizeDialog {
             // Create an arguments bundle.
             val argumentsBundle = Bundle()
@@ -76,6 +58,22 @@ class FontSizeDialog : DialogFragment() {
         }
     }
 
+    // Declare the class variables.
+    private lateinit var updateFontSizeListener: UpdateFontSizeListener
+
+    // The public interface is used to send information back to the parent activity.
+    interface UpdateFontSizeListener {
+        fun updateFontSize(dialogFragment: DialogFragment)
+    }
+
+    override fun onAttach(context: Context) {
+        // Run the default commands.
+        super.onAttach(context)
+
+        // Get a handle for the update font size listener from the launching context.
+        updateFontSizeListener = context as UpdateFontSizeListener
+    }
+
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         // Get the current font size from the arguments.
         val currentFontSize = requireArguments().getInt(FONT_SIZE)
@@ -84,7 +82,7 @@ class FontSizeDialog : DialogFragment() {
         val dialogBuilder = AlertDialog.Builder(requireContext(), R.style.PrivacyBrowserAlertDialog)
 
         // Set the icon according to the theme.
-        dialogBuilder.setIconAttribute(R.attr.fontSizeBlueIcon)
+        dialogBuilder.setIcon(R.drawable.font_size)
 
         // Set the title.
         dialogBuilder.setTitle(R.string.font_size)
@@ -98,7 +96,7 @@ class FontSizeDialog : DialogFragment() {
         // Set the apply button listener.
         dialogBuilder.setPositiveButton(R.string.apply) { _: DialogInterface?, _: Int ->
             // Return the dialog fragment to the parent activity.
-            updateFontSizeListener.onApplyNewFontSize(this)
+            updateFontSizeListener.updateFontSize(this)
         }
 
         // Create an alert dialog from the builder.
@@ -138,7 +136,7 @@ class FontSizeDialog : DialogFragment() {
             // Check the key code, event, and button status.
             if (keyEvent.action == KeyEvent.ACTION_DOWN && keyCode == KeyEvent.KEYCODE_ENTER) {  // The enter key was pressed.
                 // Trigger the update font size listener and return the dialog fragment to the parent activity.
-                updateFontSizeListener.onApplyNewFontSize(this)
+                updateFontSizeListener.updateFontSize(this)
 
                 // Manually dismiss the alert dialog.
                 alertDialog.dismiss()
@@ -153,4 +151,4 @@ class FontSizeDialog : DialogFragment() {
         // Return the alert dialog.
         return alertDialog
     }
-}
\ No newline at end of file
+}