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=75ef4e4517a88caa2bd9840e8097ae0db82d428d;hb=HEAD;hpb=bc2e180db377eedadbe1ea455d8fb311ead8f9d6 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 75ef4e45..86e82efc 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 . + * Copyright © 2019-2023 Soren Stoutner . * - * This file is part of Privacy Browser . + * This file is part of 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 . + * along with Privacy Browser Android. 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,29 +35,11 @@ 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() { - // 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) - - // Get a handle for the update font size listener from the launching context. - updateFontSizeListener = context as UpdateFontSizeListener - } - +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 fun displayDialog(fontSize: Int): FontSizeDialog { // Create an arguments bundle. val argumentsBundle = Bundle() @@ -76,8 +58,22 @@ class FontSizeDialog: DialogFragment() { } } - // `@SuppressLint("InflateParams")` removes the warning about using null as the parent view group when inflating the alert dialog. - @SuppressLint("InflateParams") + // 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) @@ -85,21 +81,14 @@ class FontSizeDialog: DialogFragment() { // Use a builder to create the alert dialog. val dialogBuilder = AlertDialog.Builder(requireContext(), R.style.PrivacyBrowserAlertDialog) - // Get the current theme status. - val currentThemeStatus = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK - // Set the icon according to the theme. - if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { - dialogBuilder.setIcon(R.drawable.font_size_day) - } else { - dialogBuilder.setIcon(R.drawable.font_size_night) - } + 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) @@ -107,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. @@ -117,7 +106,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) @@ -147,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() @@ -162,4 +151,4 @@ class FontSizeDialog: DialogFragment() { // Return the alert dialog. return alertDialog } -} \ No newline at end of file +}