X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FCreateHomeScreenShortcutDialog.kt;h=887ce94213ef38473dbe1a5ac66727122e3ef536;hp=21e40d47f0a1a19311d87fbf55b056306f2bb69d;hb=HEAD;hpb=bc2e180db377eedadbe1ea455d8fb311ead8f9d6 diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateHomeScreenShortcutDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateHomeScreenShortcutDialog.kt index 21e40d47..841456e3 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateHomeScreenShortcutDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateHomeScreenShortcutDialog.kt @@ -1,25 +1,24 @@ /* - * Copyright © 2015-2020 Soren Stoutner . + * Copyright © 2015-2024 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.DialogInterface import android.content.Intent @@ -50,20 +49,13 @@ import com.stoutner.privacybrowser.R import java.io.ByteArrayOutputStream -// Declare the class constants. -private const val SHORTCUT_NAME = "shortcut_name" -private const val URL_STRING = "url_string" -private const val FAVORITE_ICON_BYTE_ARRAY = "favorite_icon_byte_array" - -class CreateHomeScreenShortcutDialog: DialogFragment() { - // Declare the class views. - private lateinit var shortcutNameEditText: EditText - private lateinit var urlEditText: EditText - private lateinit var openWithPrivacyBrowserRadioButton: RadioButton +// Define the private class constants. +private const val SHORTCUT_NAME = "A" +private const val URL_STRING = "B" +private const val FAVORITE_ICON_BYTE_ARRAY = "C" +class CreateHomeScreenShortcutDialog : 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 createDialog(shortcutName: String, urlString: String, favoriteIconBitmap: Bitmap): CreateHomeScreenShortcutDialog { // Create a favorite icon byte array output stream. val favoriteIconByteArrayOutputStream = ByteArrayOutputStream() @@ -71,7 +63,7 @@ class CreateHomeScreenShortcutDialog: DialogFragment() { // Convert the favorite icon to a PNG and place it in the byte array output stream. `0` is for lossless compression (the only option for a PNG). favoriteIconBitmap.compress(Bitmap.CompressFormat.PNG, 0, favoriteIconByteArrayOutputStream) - // Convert the byte array output stream to a byte array. + // Convert the favorite icon byte array output stream to a byte array. val favoriteIconByteArray = favoriteIconByteArrayOutputStream.toByteArray() // Create an arguments bundle. @@ -93,8 +85,11 @@ class CreateHomeScreenShortcutDialog: 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 shortcutNameEditText: EditText + private lateinit var urlEditText: EditText + private lateinit var openWithPrivacyBrowserRadioButton: RadioButton + override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { // Get the arguments. val arguments = requireArguments() @@ -107,18 +102,20 @@ class CreateHomeScreenShortcutDialog: DialogFragment() { // Convert the favorite icon byte array to a bitmap. val favoriteIconBitmap = BitmapFactory.decodeByteArray(favoriteIconByteArray, 0, favoriteIconByteArray.size) - // Use an alert dialog builder to create the dialog. - val dialogBuilder = AlertDialog.Builder(requireContext(), R.style.PrivacyBrowserAlertDialog) - // Create a drawable version of the favorite icon. val favoriteIconDrawable: Drawable = BitmapDrawable(resources, favoriteIconBitmap) - // Set the title and icon. + // Use an alert dialog builder to create the dialog. + val dialogBuilder = AlertDialog.Builder(requireContext(), R.style.PrivacyBrowserAlertDialog) + + // Set the title. dialogBuilder.setTitle(R.string.create_shortcut) + + // Set the icon. dialogBuilder.setIcon(favoriteIconDrawable) - // Set the view. The parent view is null because it will be assigned by the alert dialog. - dialogBuilder.setView(requireActivity().layoutInflater.inflate(R.layout.create_home_screen_shortcut_dialog, null)) + // Set the view. + dialogBuilder.setView(R.layout.create_home_screen_shortcut_dialog) // Set a listener on the close button. Using null closes the dialog without doing anything else. dialogBuilder.setNegativeButton(R.string.cancel, null) @@ -133,7 +130,7 @@ class CreateHomeScreenShortcutDialog: 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) @@ -242,7 +239,7 @@ class CreateHomeScreenShortcutDialog: DialogFragment() { val shortcutName = shortcutNameEditText.text.toString() val urlString = urlEditText.text.toString() - // Convert the favorite icon bitmap to an icon. `IconCompat` must be used until the minimum API >= 26. + // Convert the favorite icon bitmap to an icon. val favoriteIcon = IconCompat.createWithBitmap(favoriteIconBitmap) // Create a shortcut intent. @@ -265,7 +262,7 @@ class CreateHomeScreenShortcutDialog: DialogFragment() { shortcutInfoBuilder.setIntent(shortcutIntent) shortcutInfoBuilder.setShortLabel(shortcutName) - // Add the shortcut to the home screen. `ShortcutManagerCompat` can be switched to `ShortcutManager` once the minimum API >= 26. + // Add the shortcut to the home screen. ShortcutManagerCompat.requestPinShortcut(requireContext(), shortcutInfoBuilder.build(), null) } } \ No newline at end of file