X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FCreateBookmarkFolderDialog.kt;h=553e5b839618c28eda944a680b371dffcc324748;hp=0cca2881aa461631d004c86ee5a0ade8d77eabc9;hb=aba828cabddd0a277271c90816b50292bb64baf1;hpb=9df712df3780161d77d10c6f3a2444bf8f218c99 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 0cca2881..553e5b83 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-2020 Soren Stoutner . + * Copyright © 2016-2022 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 @@ -33,7 +32,10 @@ import android.view.View import android.view.WindowManager import android.widget.EditText import android.widget.ImageView +import android.widget.LinearLayout +import android.widget.RadioButton +import androidx.appcompat.app.AlertDialog import androidx.fragment.app.DialogFragment import androidx.preference.PreferenceManager @@ -42,15 +44,18 @@ import com.stoutner.privacybrowser.helpers.BookmarksDatabaseHelper import java.io.ByteArrayOutputStream -class CreateBookmarkFolderDialog: DialogFragment() { +// Define the class constants. +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) } - // The create bookmark folder listener is initialized in `onAttach()` and used in `onCreateDialog()`. - private lateinit var createBookmarkFolderListener: CreateBookmarkFolderListener - override fun onAttach(context: Context) { // Run the default commands. super.onAttach(context) @@ -60,7 +65,7 @@ class CreateBookmarkFolderDialog: 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` 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. @@ -76,7 +81,7 @@ class CreateBookmarkFolderDialog: DialogFragment() { val argumentsBundle = Bundle() // Store the favorite icon in the bundle. - argumentsBundle.putByteArray("favorite_icon_byte_array", favoriteIconByteArray) + argumentsBundle.putByteArray(FAVORITE_ICON_BYTE_ARRAY, favoriteIconByteArray) // Create a new instance of the dialog. val createBookmarkFolderDialog = CreateBookmarkFolderDialog() @@ -89,42 +94,29 @@ class CreateBookmarkFolderDialog: DialogFragment() { } } - // `@SuppressLing("InflateParams")` removes the warning about using `null` as the parent view group when inflating the alert dialog. - @SuppressLint("InflateParams") override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { // Get the arguments. - val arguments = arguments!! + val arguments = requireArguments() // Get the favorite icon byte array. - val favoriteIconByteArray = arguments.getByteArray("favorite_icon_byte_array")!! + 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_folder) - // 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_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) - // Set a listener on the create button. + // 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) @@ -133,6 +125,12 @@ class CreateBookmarkFolderDialog: DialogFragment() { // 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) @@ -145,16 +143,42 @@ class CreateBookmarkFolderDialog: DialogFragment() { alertDialog.show() // Get handles for the views in the dialog. - val webPageIconImageView: ImageView = alertDialog.findViewById(R.id.create_folder_web_page_icon) - val folderNameEditText: EditText = alertDialog.findViewById(R.id.create_folder_name_edittext) + val defaultIconLinearLayout = alertDialog.findViewById(R.id.default_icon_linearlayout)!! + val defaultIconRadioButton = alertDialog.findViewById(R.id.default_icon_radiobutton)!! + val webpageFavoriteIconLinearLayout = alertDialog.findViewById(R.id.webpage_favorite_icon_linearlayout)!! + val webpageFavoriteIconRadioButton = alertDialog.findViewById(R.id.webpage_favorite_icon_radiobutton)!! + val webpageFavoriteIconImageView = alertDialog.findViewById(R.id.webpage_favorite_icon_imageview)!! + val folderNameEditText = alertDialog.findViewById(R.id.folder_name_edittext)!! val createButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE) // Display the current favorite icon. - webPageIconImageView.setImageBitmap(favoriteIconBitmap) + webpageFavoriteIconImageView.setImageBitmap(favoriteIconBitmap) // Initially disable the create button. createButton.isEnabled = false + // Set the radio button listeners. These perform a click on the linear layout, which contains the necessary logic. + defaultIconRadioButton.setOnClickListener { defaultIconLinearLayout.performClick() } + webpageFavoriteIconRadioButton.setOnClickListener { webpageFavoriteIconLinearLayout.performClick() } + + // Set the default icon linear layout click listener. + defaultIconLinearLayout.setOnClickListener { + // Check the default icon radio button. + defaultIconRadioButton.isChecked = true + + // Uncheck the webpage favorite icon radio button. + webpageFavoriteIconRadioButton.isChecked = false + } + + // Set the webpage favorite icon linear layout click listener. + webpageFavoriteIconLinearLayout.setOnClickListener { + // Check the webpage favorite icon radio button. + webpageFavoriteIconRadioButton.isChecked = true + + // Uncheck the default icon radio button. + 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)