X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FFontSizeDialog.kt;h=a8167e3ec8fcbf5e72a2bd5a2f60cac9902e334c;hp=e6f3110ba5e0f11c38a67d41a91becba92b1328e;hb=1b27ac6f2b7c046945fc97e2aff9adbde8a152ce;hpb=9cb208c1f5c7a905f787f4ec4795a92e72195fba

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 e6f3110b..a8167e3e 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/FontSizeDialog.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/FontSizeDialog.kt
@@ -1,28 +1,28 @@
 /*
- * Copyright © 2019-2020 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2019-2022 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 Android <https://www.stoutner.com/privacy-browser-android>.
  *
- * Privacy Browser is free software: you can redistribute it and/or modify
+ * Privacy Browser Android is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * Privacy Browser is distributed in the hope that it will be useful,
+ * Privacy Browser Android is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 package com.stoutner.privacybrowser.dialogs
 
-import android.annotation.SuppressLint
 import android.app.Dialog
 import android.content.Context
 import android.content.DialogInterface
-import android.content.res.Configuration
+
 import android.os.Bundle
 import android.view.KeyEvent
 import android.view.View
@@ -35,18 +35,18 @@ import androidx.preference.PreferenceManager
 
 import com.stoutner.privacybrowser.R
 
-// Declare the class constants.
+// Define the class constants.
 private const val FONT_SIZE = "font_size"
 
-class FontSizeDialog: DialogFragment() {
+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?)
     }
 
-    // Declare the class variables.
-    private lateinit var updateFontSizeListener: UpdateFontSizeListener
-
     override fun onAttach(context: Context) {
         // Run the default commands.
         super.onAttach(context)
@@ -56,7 +56,7 @@ class FontSizeDialog: DialogFragment() {
     }
 
     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 displayDialog(fontSize: Int): FontSizeDialog {
             // Create an arguments bundle.
@@ -76,8 +76,6 @@ class FontSizeDialog: DialogFragment() {
         }
     }
 
-    // `@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 current font size from the arguments.
         val currentFontSize = requireArguments().getInt(FONT_SIZE)
@@ -86,13 +84,13 @@ 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)
 
-        // Set the view.  The parent view is null because it will be assigned by the alert dialog.
-        dialogBuilder.setView(requireActivity().layoutInflater.inflate(R.layout.font_size_dialog, null))
+        // Set the view.
+        dialogBuilder.setView(R.layout.font_size_dialog)
 
         // Set the close button listener.  Using `null` as the listener closes the dialog without doing anything else.
         dialogBuilder.setNegativeButton(R.string.close, null)
@@ -110,7 +108,7 @@ class FontSizeDialog: DialogFragment() {
         val dialogWindow = alertDialog.window!!
 
         // Get a handle for the shared preferences.
-        val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
+        val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
 
         // Get the screenshot preferences.
         val allowScreenshots = sharedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false)