X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FCreateBookmarkFolderDialog.java;h=2b012683da722179600aa7833002c1c404d5eb3a;hp=98fb9dcbaf8690f223604dffdb1aa13ca19dfe60;hb=f52255e6eeb1a6be9f190e733563cc37b5d1f2b5;hpb=0a5d2eabceeafb49a957598538aa74d4f11dfce0 diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkFolderDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkFolderDialog.java index 98fb9dcb..2b012683 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkFolderDialog.java +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkFolderDialog.java @@ -1,5 +1,5 @@ /* - * Copyright © 2016-2018 Soren Stoutner . + * Copyright © 2016-2019 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -24,42 +24,70 @@ import android.app.AlertDialog; import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; +import android.content.SharedPreferences; import android.database.Cursor; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; import android.os.Bundle; -import android.support.annotation.NonNull; -// We have to use `AppCompatDialogFragment` instead of `DialogFragment` or an error is produced on API <=22. -import android.support.v7.app.AppCompatDialogFragment; +import android.preference.PreferenceManager; import android.text.Editable; import android.text.TextWatcher; import android.view.KeyEvent; import android.view.View; +import android.view.Window; import android.view.WindowManager; import android.widget.Button; import android.widget.EditText; import android.widget.ImageView; +import androidx.annotation.NonNull; +import androidx.fragment.app.DialogFragment; // The AndroidX dialog fragment must be used or an error is produced on API <=22. + import com.stoutner.privacybrowser.R; -import com.stoutner.privacybrowser.activities.MainWebViewActivity; import com.stoutner.privacybrowser.helpers.BookmarksDatabaseHelper; -public class CreateBookmarkFolderDialog extends AppCompatDialogFragment { +import java.io.ByteArrayOutputStream; + +public class CreateBookmarkFolderDialog extends DialogFragment { // The public interface is used to send information back to the parent activity. public interface CreateBookmarkFolderListener { - void onCreateBookmarkFolder(AppCompatDialogFragment dialogFragment); + void onCreateBookmarkFolder(DialogFragment dialogFragment, Bitmap favoriteIconBitmap); } // `createBookmarkFolderListener` is used in `onAttach()` and `onCreateDialog`. private CreateBookmarkFolderListener createBookmarkFolderListener; - public void onAttach(Context context) { + public void onAttach(@NonNull Context context) { super.onAttach(context); - // Get a handle for `createBookmarkFolderListener` from `context`. - try { - createBookmarkFolderListener = (CreateBookmarkFolderListener) context; - } catch(ClassCastException exception) { - throw new ClassCastException(context.toString() + " must implement CreateBookmarkFolderListener."); - } + // Get a handle for `createBookmarkFolderListener` from the launching context. + createBookmarkFolderListener = (CreateBookmarkFolderListener) context; + } + + public static CreateBookmarkFolderDialog createBookmarkFolder(Bitmap favoriteIconBitmap) { + // Create a favorite icon byte array output stream. + ByteArrayOutputStream favoriteIconByteArrayOutputStream = new ByteArrayOutputStream(); + + // Convert the favorite icon to a PNG and place it in the byte array output stream. `0` is for lossless compression (the only option for a PNG). + favoriteIconBitmap.compress(Bitmap.CompressFormat.PNG, 0, favoriteIconByteArrayOutputStream); + + // Convert the byte array output stream to a byte array. + byte[] favoriteIconByteArray = favoriteIconByteArrayOutputStream.toByteArray(); + + // Create an arguments bundle. + Bundle argumentsBundle = new Bundle(); + + // Store the favorite icon in the bundle. + argumentsBundle.putByteArray("favorite_icon_byte_array", favoriteIconByteArray); + + // Create a new instance of the dialog. + CreateBookmarkFolderDialog createBookmarkFolderDialog = new CreateBookmarkFolderDialog(); + + // Add the bundle to the dialog. + createBookmarkFolderDialog.setArguments(argumentsBundle); + + // Return the new dialog. + return createBookmarkFolderDialog; } // `@SuppressLing("InflateParams")` removes the warning about using `null` as the parent view group when inflating the `AlertDialog`. @@ -67,11 +95,33 @@ public class CreateBookmarkFolderDialog extends AppCompatDialogFragment { @Override @NonNull public Dialog onCreateDialog(Bundle savedInstanceState) { + // Get the arguments. + Bundle arguments = getArguments(); + + // Remove the incorrect lint warning below that the arguments might be null. + assert arguments != null; + + // Get the favorite icon byte array. + byte[] favoriteIconByteArray = arguments.getByteArray("favorite_icon_byte_array"); + + // Remove the incorrect lint warning below that the favorite icon byte array might be null. + assert favoriteIconByteArray != null; + + // Convert the favorite icon byte array to a bitmap. + Bitmap favoriteIconBitmap = BitmapFactory.decodeByteArray(favoriteIconByteArray, 0, favoriteIconByteArray.length); + // Use an alert dialog builder to create the alert dialog. AlertDialog.Builder dialogBuilder; + // Get a handle for the shared preferences. + SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getContext()); + + // Get the screenshot and theme preferences. + boolean allowScreenshots = sharedPreferences.getBoolean("allow_screenshots", false); + boolean darkTheme = sharedPreferences.getBoolean("dark_theme", false); + // Set the style according to the theme. - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { dialogBuilder = new AlertDialog.Builder(getActivity(), R.style.PrivacyBrowserAlertDialogDark); } else { dialogBuilder = new AlertDialog.Builder(getActivity(), R.style.PrivacyBrowserAlertDialogLight); @@ -83,7 +133,7 @@ public class CreateBookmarkFolderDialog extends AppCompatDialogFragment { // Remove the warning below that `getLayoutInflater()` might be null. assert getActivity() != null; - // Set the view. The parent view is `null` because it will be assigned by the `AlertDialog`. + // Set the view. The parent view is null because it will be assigned by the alert dialog. dialogBuilder.setView(getActivity().getLayoutInflater().inflate(R.layout.create_bookmark_folder_dialog, null)); // Set an `onClick()` listener for the negative button. @@ -94,25 +144,28 @@ public class CreateBookmarkFolderDialog extends AppCompatDialogFragment { // Set an `onClick()` listener fo the positive button. dialogBuilder.setPositiveButton(R.string.create, (DialogInterface dialog, int which) -> { // Return the `DialogFragment` to the parent activity on create. - createBookmarkFolderListener.onCreateBookmarkFolder(CreateBookmarkFolderDialog.this); + createBookmarkFolderListener.onCreateBookmarkFolder(this, favoriteIconBitmap); }); - // Create an `AlertDialog` from the `AlertDialog.Builder`. + // Create an alert dialog from the `AlertDialog.Builder`. final AlertDialog alertDialog = dialogBuilder.create(); - // Remove the warning below that `getWindow()` might be null. - assert alertDialog.getWindow() != null; + // Get the alert dialog window. + Window dialogWindow = alertDialog.getWindow(); + + // Remove the incorrect lint warning below that the dialog window might be null. + assert dialogWindow != null; // Disable screenshots if not allowed. - if (!MainWebViewActivity.allowScreenshots) { + if (!allowScreenshots) { alertDialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE); } - // Show the keyboard when the `Dialog` is displayed on the screen. - alertDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE); + // Display the keyboard. + dialogWindow.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE); - // The `AlertDialog` must be shown before items in the alert dialog can be modified. + // The alert dialog must be shown before items in the alert dialog can be modified. alertDialog.show(); // Get handles for the views in the dialog. @@ -144,21 +197,23 @@ public class CreateBookmarkFolderDialog extends AppCompatDialogFragment { String folderName = s.toString(); // Check if a folder with the name already exists. - Cursor folderExistsCursor = bookmarksDatabaseHelper.getFolderCursor(folderName); + Cursor folderExistsCursor = bookmarksDatabaseHelper.getFolder(folderName); // Enable the create button if the new folder name is not empty and doesn't already exist. createButton.setEnabled(!folderName.isEmpty() && (folderExistsCursor.getCount() == 0)); } }); - // Allow the `enter` key on the keyboard to create the folder from `create_folder_name_edittext`. - folderNameEditText.setOnKeyListener((View v, int keyCode, KeyEvent event) -> { - // If the event is a key-down on the `enter` key, select the `PositiveButton` `Create`. - if ((event.getAction() == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER) && createButton.isEnabled()) { // The enter key was pressed and the create button is enabled. - // Trigger `createBookmarkFolderListener` and return the `DialogFragment` to the parent activity. - createBookmarkFolderListener.onCreateBookmarkFolder(CreateBookmarkFolderDialog.this); - // Manually dismiss the `AlertDialog`. + // Set the enter key on the keyboard to create the folder from the edit text. + folderNameEditText.setOnKeyListener((View view, int keyCode, KeyEvent keyEvent) -> { + // If the key event is a key-down on the `enter` key create the bookmark folder. + if ((keyEvent.getAction() == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER) && createButton.isEnabled()) { // The enter key was pressed 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); + + // Manually dismiss the alert dialog. alertDialog.dismiss(); + // Consume the event. return true; } else { // If any other key was pressed, or if the create button is currently disabled, do not consume the event. @@ -167,9 +222,9 @@ public class CreateBookmarkFolderDialog extends AppCompatDialogFragment { }); // Display the current favorite icon. - webPageIconImageView.setImageBitmap(MainWebViewActivity.favoriteIconBitmap); + webPageIconImageView.setImageBitmap(favoriteIconBitmap); - // `onCreateDialog()` requires the return of an `AlertDialog`. + // Return the alert dialog. return alertDialog; } } \ No newline at end of file