X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;ds=sidebyside;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FCreateHomeScreenShortcutDialog.kt;h=887ce94213ef38473dbe1a5ac66727122e3ef536;hb=HEAD;hp=784d0f1237f131fba020942384693b5e27093d0b;hpb=8142ac5fc2489de735de4b6fa21a1eae733ccfce;p=PrivacyBrowserAndroid.git 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 784d0f12..4eac20cf 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateHomeScreenShortcutDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateHomeScreenShortcutDialog.kt @@ -1,20 +1,20 @@ -/* - * Copyright © 2015-2022 Soren Stoutner . +/* SPDX-License-Identifier: GPL-3.0-or-later + * SPDX-FileCopyrightText: 2015-2025 Soren Stoutner * - * This file is part of Privacy Browser Android . + * This file is part of Privacy Browser Android . * - * 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. + * This program 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 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. + * This program 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 Android. If not, see . + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . */ package com.stoutner.privacybrowser.dialogs @@ -24,9 +24,7 @@ import android.content.DialogInterface import android.content.Intent import android.graphics.Bitmap import android.graphics.BitmapFactory -import android.graphics.drawable.BitmapDrawable import android.graphics.drawable.Drawable -import android.net.Uri import android.os.Bundle import android.text.Editable import android.text.TextWatcher @@ -41,6 +39,8 @@ import androidx.appcompat.app.AlertDialog import androidx.core.content.pm.ShortcutInfoCompat import androidx.core.content.pm.ShortcutManagerCompat import androidx.core.graphics.drawable.IconCompat +import androidx.core.graphics.drawable.toDrawable +import androidx.core.net.toUri import androidx.fragment.app.DialogFragment import androidx.preference.PreferenceManager @@ -49,20 +49,13 @@ import com.stoutner.privacybrowser.R import java.io.ByteArrayOutputStream -// Define 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" +// 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() { - // Declare the class views. - private lateinit var shortcutNameEditText: EditText - private lateinit var urlEditText: EditText - private lateinit var openWithPrivacyBrowserRadioButton: RadioButton - companion object { - // `@JvmStatic` will no longer be required once all the code has transitioned to Kotlin. - @JvmStatic fun createDialog(shortcutName: String, urlString: String, favoriteIconBitmap: Bitmap): CreateHomeScreenShortcutDialog { // Create a favorite icon byte array output stream. val favoriteIconByteArrayOutputStream = ByteArrayOutputStream() @@ -92,6 +85,11 @@ class CreateHomeScreenShortcutDialog : DialogFragment() { } } + // 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() @@ -105,7 +103,7 @@ class CreateHomeScreenShortcutDialog : DialogFragment() { val favoriteIconBitmap = BitmapFactory.decodeByteArray(favoriteIconByteArray, 0, favoriteIconByteArray.size) // Create a drawable version of the favorite icon. - val favoriteIconDrawable: Drawable = BitmapDrawable(resources, favoriteIconBitmap) + val favoriteIconDrawable: Drawable = favoriteIconBitmap.toDrawable(resources) // Use an alert dialog builder to create the dialog. val dialogBuilder = AlertDialog.Builder(requireContext(), R.style.PrivacyBrowserAlertDialog) @@ -132,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) @@ -241,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. @@ -254,7 +252,7 @@ class CreateHomeScreenShortcutDialog : DialogFragment() { } // Add the URL to the intent. - shortcutIntent.data = Uri.parse(urlString) + shortcutIntent.data = urlString.toUri() // Create a shortcut info builder. The shortcut name becomes the shortcut ID. val shortcutInfoBuilder = ShortcutInfoCompat.Builder(requireContext(), shortcutName) @@ -264,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