X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FCreateBookmarkFolderDialog.kt;h=2f413b0bbf808fcf898639f4646bd1277e5238a5;hb=be1d361c9ca97f21ca9298d72b07e4a57788fe56;hp=42f9a16779a59891760ee2de72a9f2293b84701e;hpb=031def95c6d9bfc14113fe86b4a5690233d93ce2;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkFolderDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkFolderDialog.kt index 42f9a167..2f413b0b 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkFolderDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkFolderDialog.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 @@ -49,25 +48,7 @@ import java.io.ByteArrayOutputStream private const val FAVORITE_ICON_BYTE_ARRAY = "favorite_icon_byte_array" class CreateBookmarkFolderDialog : DialogFragment() { - // Declare the class variables. - private lateinit var createBookmarkFolderListener: CreateBookmarkFolderListener - - // The public interface is used to send information back to the parent activity. - interface CreateBookmarkFolderListener { - fun onCreateBookmarkFolder(dialogFragment: DialogFragment, favoriteIconBitmap: Bitmap) - } - - override fun onAttach(context: Context) { - // Run the default commands. - super.onAttach(context) - - // Get a handle for the create bookmark folder listener from the launching context. - createBookmarkFolderListener = context as CreateBookmarkFolderListener - } - companion object { - // `@JvmStatic` will no longer be required once all the code has transitioned to Kotlin. - @JvmStatic fun createBookmarkFolder(favoriteIconBitmap: Bitmap): CreateBookmarkFolderDialog { // Create a favorite icon byte array output stream. val favoriteIconByteArrayOutputStream = ByteArrayOutputStream() @@ -95,8 +76,22 @@ class CreateBookmarkFolderDialog : 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 createBookmarkFolderListener: CreateBookmarkFolderListener + + // The public interface is used to send information back to the parent activity. + interface CreateBookmarkFolderListener { + fun createBookmarkFolder(dialogFragment: DialogFragment, favoriteIconBitmap: Bitmap) + } + + override fun onAttach(context: Context) { + // Run the default commands. + super.onAttach(context) + + // Get a handle for the create bookmark folder listener from the launching context. + createBookmarkFolderListener = context as CreateBookmarkFolderListener + } + override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { // Get the arguments. val arguments = requireArguments() @@ -113,8 +108,8 @@ class CreateBookmarkFolderDialog : DialogFragment() { // Set the title. dialogBuilder.setTitle(R.string.create_folder) - // 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_folder_dialog, null)) + // Set the view. + dialogBuilder.setView(R.layout.create_bookmark_folder_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) @@ -122,14 +117,14 @@ class CreateBookmarkFolderDialog : DialogFragment() { // Set the create button listener. dialogBuilder.setPositiveButton(R.string.create) { _: DialogInterface, _: Int -> // Return the dialog fragment to the parent activity on create. - createBookmarkFolderListener.onCreateBookmarkFolder(this, favoriteIconBitmap) + createBookmarkFolderListener.createBookmarkFolder(this, favoriteIconBitmap) } // Create an alert dialog from the builder. 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) @@ -182,8 +177,8 @@ class CreateBookmarkFolderDialog : DialogFragment() { defaultIconRadioButton.isChecked = false } - // Initialize the database helper. The `0` specifies a database version, but that is ignored and set instead using a constant in `BookmarksDatabaseHelper`. - val bookmarksDatabaseHelper = BookmarksDatabaseHelper(context, null, null, 0) + // Initialize the database helper. + val bookmarksDatabaseHelper = BookmarksDatabaseHelper(requireContext()) // Enable the create button if the new folder name is unique. folderNameEditText.addTextChangedListener(object: TextWatcher { @@ -212,7 +207,7 @@ class CreateBookmarkFolderDialog : DialogFragment() { // Check the key code, event, and button status. if (keyEvent.action == KeyEvent.ACTION_DOWN && keyCode == KeyEvent.KEYCODE_ENTER && createButton.isEnabled) { // The event is a key-down on the enter key and the create button is enabled. // Trigger the create bookmark folder listener and return the dialog fragment to the parent activity. - createBookmarkFolderListener.onCreateBookmarkFolder(this, favoriteIconBitmap) + createBookmarkFolderListener.createBookmarkFolder(this, favoriteIconBitmap) // Manually dismiss the alert dialog. alertDialog.dismiss() @@ -227,4 +222,4 @@ class CreateBookmarkFolderDialog : DialogFragment() { // Return the alert dialog. return alertDialog } -} \ No newline at end of file +}