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=953f938de3c32702a45e22e3dd2f6cb12897a833;hp=e6f3110ba5e0f11c38a67d41a91becba92b1328e;hb=1d656c562831f535aa33903d44198dd890393f4f;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..953f938d 100644 --- 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-2020 Soren Stoutner . + * Copyright © 2019-2021 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -16,13 +16,13 @@ * You should have received a copy of the GNU General Public License * along with Privacy Browser. If not, see . */ + 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) @@ -91,8 +89,8 @@ class FontSizeDialog: DialogFragment() { // 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)