X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FViewRequestDialog.kt;h=2c80301ba416df58bc863398186043b5ac17a10f;hp=2b7e345b99bf5179cf14b598e63bc4ce1d9301a4;hb=aba828cabddd0a277271c90816b50292bb64baf1;hpb=031def95c6d9bfc14113fe86b4a5690233d93ce2 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..2c80301b 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/ViewRequestDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/ViewRequestDialog.kt @@ -1,25 +1,24 @@ /* - * Copyright © 2018-2021 Soren Stoutner . + * Copyright © 2018-2022 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 @@ -85,8 +84,6 @@ class ViewRequestDialog : 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 arguments from the bundle. val id = requireArguments().getInt(ID) @@ -100,17 +97,13 @@ class ViewRequestDialog : DialogFragment() { 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) - } + dialogBuilder.setIconAttribute(R.attr.blockAdsBlueIcon) // 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 +124,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)