X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FCreateBookmarkDialog.kt;h=145c895b88175fb1c51f97354038515572daff90;hb=60e583d7aa5272bc0293797af77e6167f18887b3;hp=5bc2da25c4a01896b861a64184333826fb84481a;hpb=9df712df3780161d77d10c6f3a2444bf8f218c99;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 5bc2da25..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,26 +1,24 @@ /* - * Copyright © 2016-2020 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.AlertDialog import android.app.Dialog import android.content.Context import android.content.DialogInterface @@ -34,6 +32,7 @@ import android.view.View import android.view.WindowManager import android.widget.EditText +import androidx.appcompat.app.AlertDialog import androidx.fragment.app.DialogFragment import androidx.preference.PreferenceManager @@ -41,27 +40,14 @@ import com.stoutner.privacybrowser.R import java.io.ByteArrayOutputStream -class CreateBookmarkDialog: DialogFragment() { - // The public interface is used to send information back to the parent activity. - interface CreateBookmarkListener { - fun onCreateBookmark(dialogFragment: DialogFragment, favoriteIconBitmap: Bitmap) - } - - // The create bookmark listener is initialized in `onAttach()` and used in `onCreateDialog()`. - private lateinit var createBookmarkListener: CreateBookmarkListener - - 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 - } +// Define the class constants. +private const val URL_STRING = "url_string" +private const val TITLE = "title" +private const val FAVORITE_ICON_BYTE_ARRAY = "favorite_icon_byte_array" +class CreateBookmarkDialog : 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 createBookmark(urlString: String, titleString: String, favoriteIconBitmap: Bitmap): CreateBookmarkDialog { + fun createBookmark(urlString: String, title: String, favoriteIconBitmap: Bitmap): CreateBookmarkDialog { // Create a favorite icon byte array output stream. val favoriteIconByteArrayOutputStream = ByteArrayOutputStream() @@ -75,9 +61,9 @@ class CreateBookmarkDialog: DialogFragment() { val argumentsBundle = Bundle() // Store the variables in the bundle. - argumentsBundle.putString("url_string", urlString) - argumentsBundle.putString("title_string", titleString) - argumentsBundle.putByteArray("favorite_icon_byte_array", favoriteIconByteArray) + argumentsBundle.putString(URL_STRING, urlString) + argumentsBundle.putString(TITLE, title) + argumentsBundle.putByteArray(FAVORITE_ICON_BYTE_ARRAY, favoriteIconByteArray) // Create a new instance of the dialog. val createBookmarkDialog = CreateBookmarkDialog() @@ -90,33 +76,36 @@ class CreateBookmarkDialog: DialogFragment() { } } - // `@SuppressLing("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 = arguments!! + val arguments = requireArguments() // Get the contents of the arguments. - val urlString = arguments.getString("url_string") - val titleString = arguments.getString("title_string") - val favoriteIconByteArray = arguments.getByteArray("favorite_icon_byte_array")!! + val urlString = arguments.getString(URL_STRING) + val title = arguments.getString(TITLE) + val favoriteIconByteArray = arguments.getByteArray(FAVORITE_ICON_BYTE_ARRAY)!! // Convert the favorite icon byte array to a bitmap. val favoriteIconBitmap = BitmapFactory.decodeByteArray(favoriteIconByteArray, 0, favoriteIconByteArray.size) - // Get a handle for the shared preferences. - val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context) - - // Get the screenshot and theme preferences. - val allowScreenshots = sharedPreferences.getBoolean("allow_screenshots", false) - val darkTheme = sharedPreferences.getBoolean("dark_theme", false) - - // Use an alert dialog builder to create the dialog and set the style according to the theme. - val dialogBuilder = if (darkTheme) { - AlertDialog.Builder(context, R.style.PrivacyBrowserAlertDialogDark) - } else { - AlertDialog.Builder(context, R.style.PrivacyBrowserAlertDialogLight) - } + // 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_bookmark) @@ -127,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(activity!!.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) @@ -136,12 +125,19 @@ 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. val alertDialog = dialogBuilder.create() + + // Get a handle for the shared preferences. + val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext()) + + // Get the screenshot preference. + val allowScreenshots = sharedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false) + // Disable screenshots if not allowed. if (!allowScreenshots) { alertDialog.window!!.addFlags(WindowManager.LayoutParams.FLAG_SECURE) @@ -151,11 +147,11 @@ class CreateBookmarkDialog: DialogFragment() { alertDialog.show() // Get a handle for the edit texts. - val createBookmarkNameEditText: EditText = alertDialog.findViewById(R.id.create_bookmark_name_edittext) - val createBookmarkUrlEditText: EditText = alertDialog.findViewById(R.id.create_bookmark_url_edittext) + val createBookmarkNameEditText = alertDialog.findViewById(R.id.create_bookmark_name_edittext)!! + val createBookmarkUrlEditText = alertDialog.findViewById(R.id.create_bookmark_url_edittext)!! // Set the initial texts for the edit texts. - createBookmarkNameEditText.setText(titleString) + createBookmarkNameEditText.setText(title) createBookmarkUrlEditText.setText(urlString) // Allow the enter key on the keyboard to create the bookmark from the create bookmark name edit text. @@ -163,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() @@ -181,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() @@ -197,4 +193,4 @@ class CreateBookmarkDialog: DialogFragment() { // Return the alert dialog. return alertDialog } -} \ No newline at end of file +}