X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FCreateBookmarkDialog.kt;h=145c895b88175fb1c51f97354038515572daff90;hb=3b5b81db53b0ee6f448ac3144a176c6d9042f4c8;hp=e787e1e315451b5b68aaa65132043ddc732e5173;hpb=031def95c6d9bfc14113fe86b4a5690233d93ce2;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkDialog.kt index e787e1e3..145c895b 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkDialog.kt @@ -1,25 +1,24 @@ /* - * Copyright © 2016-2021 Soren Stoutner . + * Copyright © 2016-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 @@ -47,25 +46,7 @@ private const val TITLE = "title" private const val FAVORITE_ICON_BYTE_ARRAY = "favorite_icon_byte_array" class CreateBookmarkDialog : DialogFragment() { - // Declare the class variables - private lateinit var createBookmarkListener: CreateBookmarkListener - - // The public interface is used to send information back to the parent activity. - interface CreateBookmarkListener { - fun onCreateBookmark(dialogFragment: DialogFragment, favoriteIconBitmap: Bitmap) - } - - override fun onAttach(context: Context) { - // Run the default commands. - super.onAttach(context) - - // Get a handle for the create bookmark listener from the launching context. - createBookmarkListener = context as CreateBookmarkListener - } - companion object { - // `@JvmStatic` will no longer be required once all the code has transitioned to Kotlin. - @JvmStatic fun createBookmark(urlString: String, title: String, favoriteIconBitmap: Bitmap): CreateBookmarkDialog { // Create a favorite icon byte array output stream. val favoriteIconByteArrayOutputStream = ByteArrayOutputStream() @@ -95,8 +76,22 @@ class CreateBookmarkDialog : 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 createBookmarkListener: CreateBookmarkListener + + // The public interface is used to send information back to the parent activity. + interface CreateBookmarkListener { + fun createBookmark(dialogFragment: DialogFragment, favoriteIconBitmap: Bitmap) + } + + override fun onAttach(context: Context) { + // Run the default commands. + super.onAttach(context) + + // Get a handle for the create bookmark listener from the launching context. + createBookmarkListener = context as CreateBookmarkListener + } + override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { // Get the arguments. val arguments = requireArguments() @@ -121,8 +116,8 @@ class CreateBookmarkDialog : DialogFragment() { // 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(layoutInflater.inflate(R.layout.create_bookmark_dialog, null)) + // Set the view. + dialogBuilder.setView(R.layout.create_bookmark_dialog) // Set a listener on the cancel button. Using `null` as the listener closes the dialog without doing anything else. dialogBuilder.setNegativeButton(R.string.cancel, null) @@ -130,7 +125,7 @@ class CreateBookmarkDialog : DialogFragment() { // Set a listener on the create button. dialogBuilder.setPositiveButton(R.string.create) { _: DialogInterface, _: Int -> // Return the dialog fragment and the favorite icon bitmap to the parent activity. - createBookmarkListener.onCreateBookmark(this, favoriteIconBitmap) + createBookmarkListener.createBookmark(this, favoriteIconBitmap) } // Create an alert dialog from the builder. @@ -138,7 +133,7 @@ class CreateBookmarkDialog : DialogFragment() { // 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) @@ -164,7 +159,7 @@ class CreateBookmarkDialog : DialogFragment() { // Check the key code and event. if (keyCode == KeyEvent.KEYCODE_ENTER && keyEvent.action == KeyEvent.ACTION_DOWN) { // The event is a key-down on the enter key. // Trigger the create bookmark listener and return the dialog fragment and the favorite icon bitmap to the parent activity. - createBookmarkListener.onCreateBookmark(this, favoriteIconBitmap) + createBookmarkListener.createBookmark(this, favoriteIconBitmap) // Manually dismiss the alert dialog. alertDialog.dismiss() @@ -182,7 +177,7 @@ class CreateBookmarkDialog : DialogFragment() { // Check the key code and event. if (keyCode == KeyEvent.KEYCODE_ENTER && keyEvent.action == KeyEvent.ACTION_DOWN) { // The event is a key-down on the enter key. // Trigger the create bookmark listener and return the dialog fragment and the favorite icon bitmap to the parent activity. - createBookmarkListener.onCreateBookmark(this, favoriteIconBitmap) + createBookmarkListener.createBookmark(this, favoriteIconBitmap) // Manually dismiss the alert dialog. alertDialog.dismiss() @@ -198,4 +193,4 @@ class CreateBookmarkDialog : DialogFragment() { // Return the alert dialog. return alertDialog } -} \ No newline at end of file +}