X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FViewRequestDialog.kt;h=8c9aed2f581c55b5a0adbc156b25a72fdda099a7;hb=dc36dea65a4eb37496fb1ecbbd9f8e1906f50216;hp=2b7e345b99bf5179cf14b598e63bc4ce1d9301a4;hpb=031def95c6d9bfc14113fe86b4a5690233d93ce2;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/ViewRequestDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/ViewRequestDialog.kt index 2b7e345b..8c9aed2f 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/ViewRequestDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/ViewRequestDialog.kt @@ -1,35 +1,34 @@ /* - * Copyright © 2018-2021 Soren Stoutner . + * Copyright 2018-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.View import android.view.WindowManager import android.widget.TextView import androidx.appcompat.app.AlertDialog +import androidx.core.content.ContextCompat.getColor import androidx.fragment.app.DialogFragment import androidx.preference.PreferenceManager @@ -42,29 +41,7 @@ private const val IS_LAST_REQUEST = "is_last_request" private const val REQUEST_DETAILS = "request_details" class ViewRequestDialog : DialogFragment() { - // Define the class variables. - private lateinit var viewRequestListener: ViewRequestListener - - // The public interface is used to send information back to the parent activity. - interface ViewRequestListener { - // Show the previous request. - fun onPrevious(currentId: Int) - - // Show the next request. - fun onNext(currentId: Int) - } - - override fun onAttach(context: Context) { - // Run the default commands. - super.onAttach(context) - - // Get a handle for the listener from the launching context. - viewRequestListener = context as ViewRequestListener - } - companion object { - // `@JvmStatic` will no longer be required once all the code has transitioned to Kotlin. - @JvmStatic fun request(id: Int, isLastRequest: Boolean, requestDetails: Array): ViewRequestDialog { // Create a bundle. val bundle = Bundle() @@ -85,8 +62,26 @@ class ViewRequestDialog : DialogFragment() { } } - // `@SuppressLint("InflateParams")` removes the warning about using null as the parent view group when inflating the alert dialog. - @SuppressLint("InflateParams") + // Define the class variables. + private lateinit var viewRequestListener: ViewRequestListener + + // The public interface is used to send information back to the parent activity. + interface ViewRequestListener { + // Show the previous request. + fun onPrevious(currentId: Int) + + // Show the next request. + fun onNext(currentId: Int) + } + + override fun onAttach(context: Context) { + // Run the default commands. + super.onAttach(context) + + // Get a handle for the listener from the launching context. + viewRequestListener = context as ViewRequestListener + } + override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { // Get the arguments from the bundle. val id = requireArguments().getInt(ID) @@ -96,21 +91,14 @@ class ViewRequestDialog : DialogFragment() { // Use an alert dialog 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.block_ads_enabled_day) - } else { - dialogBuilder.setIcon(R.drawable.block_ads_enabled_night) - } + // Set the icon. + dialogBuilder.setIcon(R.drawable.block_ads_enabled) // Set the title. dialogBuilder.setTitle(resources.getString(R.string.request_details) + " - " + id) - // Set the view. The parent view is null because it will be assigned by the alert dialog. - dialogBuilder.setView(layoutInflater.inflate(R.layout.view_request_dialog, null)) + // Set the view. + dialogBuilder.setView(R.layout.view_request_dialog) // Set the close button. Using `null` as the listener closes the dialog without doing anything else. dialogBuilder.setNeutralButton(R.string.close, null) @@ -131,7 +119,7 @@ class ViewRequestDialog : DialogFragment() { val alertDialog = dialogBuilder.create() // Get a handle for the shared preferences. - val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context) + val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext()) // Get the screenshot preference. val allowScreenshots = sharedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false) @@ -171,50 +159,31 @@ class ViewRequestDialog : DialogFragment() { // Set the text. requestDisposition.setText(R.string.default_allowed) - // Set the background color. The deprecated `getColor()` must be used until the minimum API >= 23. - @Suppress("DEPRECATION") - requestDisposition.setBackgroundColor(resources.getColor(R.color.transparent)) + // Set the background color to be transparent. + requestDisposition.setBackgroundColor(getColor(requireContext(), R.color.transparent)) } BlocklistHelper.REQUEST_ALLOWED -> { // Set the text. requestDisposition.setText(R.string.allowed) - // Set the background color according to the theme. The deprecated `getColor()` must be used until the minimum API >= 23. - if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { - @Suppress("DEPRECATION") - requestDisposition.setBackgroundColor(resources.getColor(R.color.blue_100)) - } else { - @Suppress("DEPRECATION") - requestDisposition.setBackgroundColor(resources.getColor(R.color.blue_700_50)) - } + // Set the background color to be blue. + requestDisposition.setBackgroundColor(getColor(requireContext(), R.color.blue_background)) } BlocklistHelper.REQUEST_THIRD_PARTY -> { // Set the text. requestDisposition.setText(R.string.third_party_blocked) - // Set the background color according to the theme. The deprecated `getColor()` must be used until the minimum API >= 23. - if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { - @Suppress("DEPRECATION") - requestDisposition.setBackgroundColor(resources.getColor(R.color.yellow_100)) - } else { - @Suppress("DEPRECATION") - requestDisposition.setBackgroundColor(resources.getColor(R.color.yellow_700_50)) - } + // Set the background color to be yellow. + requestDisposition.setBackgroundColor(getColor(requireContext(), R.color.yellow_background)) } BlocklistHelper.REQUEST_BLOCKED -> { // Set the text. requestDisposition.setText(R.string.blocked) - // Set the background color according to the theme. The deprecated `getColor()` must be used until the minimum API >= 23. - if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { - @Suppress("DEPRECATION") - requestDisposition.setBackgroundColor(resources.getColor(R.color.red_100)) - } else { - @Suppress("DEPRECATION") - requestDisposition.setBackgroundColor(resources.getColor(R.color.red_700_40)) - } + // Set the background color to be red. + requestDisposition.setBackgroundColor(getColor(requireContext(), R.color.red_background)) } } @@ -266,4 +235,4 @@ class ViewRequestDialog : DialogFragment() { // Return the alert dialog. return alertDialog } -} \ No newline at end of file +}