import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-// `AppCompatDialogFragment` is required instead of `DialogFragment` or an error is produced on API <=22.
-import android.support.v4.content.ContextCompat;
-import android.support.v4.widget.ResourceCursorAdapter;
-import android.support.v7.app.AppCompatDialogFragment;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.KeyEvent;
import android.widget.ImageView;
import android.widget.RadioButton;
import android.widget.RadioGroup;
+import android.widget.ResourceCursorAdapter;
import android.widget.Spinner;
import android.widget.TextView;
import com.stoutner.privacybrowser.activities.MainWebViewActivity;
import com.stoutner.privacybrowser.helpers.BookmarksDatabaseHelper;
-public class EditBookmarkDatabaseViewDialog extends AppCompatDialogFragment {
- // Instantiate the constants.
+import java.io.ByteArrayOutputStream;
+
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.DialogFragment; // The AndroidX dialog fragment must be used or an error is produced on API <=22.
+
+public class EditBookmarkDatabaseViewDialog extends DialogFragment {
+ // Define the home folder database ID constant.
public static final int HOME_FOLDER_DATABASE_ID = -1;
- // Instantiate the class variables.
+ // Define the edit bookmark database view listener.
private EditBookmarkDatabaseViewListener editBookmarkDatabaseViewListener;
- private String currentBookmarkName;
- private String currentUrl;
- private int currentFolderDatabaseId;
- private String currentDisplayOrder;
- private RadioButton newIconRadioButton;
- private EditText nameEditText;
- private EditText urlEditText;
- private Spinner folderSpinner;
- private EditText displayOrderEditText;
- private Button editButton;
+
// The public interface is used to send information back to the parent activity.
public interface EditBookmarkDatabaseViewListener {
- void onSaveBookmark(AppCompatDialogFragment dialogFragment, int selectedBookmarkDatabaseId);
+ void onSaveBookmark(DialogFragment dialogFragment, int selectedBookmarkDatabaseId, Bitmap favoriteIconBitmap);
}
@Override
// Run the default commands.
super.onAttach(context);
- // Get a handle for `EditBookmarkDatabaseViewListener` from the launching context.
-
+ // Get a handle for edit bookmark database view listener from the launching context.
editBookmarkDatabaseViewListener = (EditBookmarkDatabaseViewListener) context;
}
- // Store the database ID in the arguments bundle.
- public static EditBookmarkDatabaseViewDialog bookmarkDatabaseId(int databaseId) {
- // Create a bundle.
- Bundle bundle = new Bundle();
- // Store the bookmark database ID in the bundle.
- bundle.putInt("Database ID", databaseId);
+ public static EditBookmarkDatabaseViewDialog bookmarkDatabaseId(int databaseId, 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();
- // Add the bundle to the dialog.
+ // Store the variables in the bundle.
+ argumentsBundle.putInt("database_id", databaseId);
+ argumentsBundle.putByteArray("favorite_icon_byte_array", favoriteIconByteArray);
+
+ // Create a new instance of the dialog.
EditBookmarkDatabaseViewDialog editBookmarkDatabaseViewDialog = new EditBookmarkDatabaseViewDialog();
- editBookmarkDatabaseViewDialog.setArguments(bundle);
+
+ // Add the arguments bundle to the dialog.
+ editBookmarkDatabaseViewDialog.setArguments(argumentsBundle);
// Return the new dialog.
return editBookmarkDatabaseViewDialog;
@Override
@NonNull
public Dialog onCreateDialog(Bundle savedInstanceState) {
- // Remove the incorrect lint warning below that `getInt()` might be null.
- assert getArguments() != null;
+ // Get the arguments.
+ Bundle arguments = getArguments();
+
+ // Remove the incorrect lint warning below that the arguments might be null.
+ assert arguments != null;
// Get the bookmark database ID from the bundle.
- int bookmarkDatabaseId = getArguments().getInt("Database ID");
+ int bookmarkDatabaseId = getArguments().getInt("database_id");
+
+ // 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);
// Initialize the database helper. The `0` specifies a database version, but that is ignored and set instead using a constant in `BookmarksDatabaseHelper`.
BookmarksDatabaseHelper bookmarksDatabaseHelper = new BookmarksDatabaseHelper(getContext(), null, null, 0);
// Do nothing. The `AlertDialog` will close automatically.
});
- // Set the listener fo the positive button.
+ // Set the listener for the positive button.
dialogBuilder.setPositiveButton(R.string.save, (DialogInterface dialog, int which) -> {
// Return the `DialogFragment` to the parent activity on save.
- editBookmarkDatabaseViewListener.onSaveBookmark(EditBookmarkDatabaseViewDialog.this, bookmarkDatabaseId);
+ editBookmarkDatabaseViewListener.onSaveBookmark(this, bookmarkDatabaseId, favoriteIconBitmap);
});
// Create an alert dialog from the alert dialog builder`.
alertDialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
}
- // Set the keyboard to be hidden when the `AlertDialog` is first shown. If this is not set, the `AlertDialog` will not shrink when the keyboard is displayed.
- alertDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
-
// The alert dialog must be shown before items in the layout can be modified.
alertDialog.show();
RadioGroup iconRadioGroup = alertDialog.findViewById(R.id.edit_bookmark_icon_radiogroup);
ImageView currentIconImageView = alertDialog.findViewById(R.id.edit_bookmark_current_icon);
ImageView newFavoriteIconImageView = alertDialog.findViewById(R.id.edit_bookmark_webpage_favorite_icon);
- newIconRadioButton = alertDialog.findViewById(R.id.edit_bookmark_webpage_favorite_icon_radiobutton);
- nameEditText = alertDialog.findViewById(R.id.edit_bookmark_name_edittext);
- urlEditText = alertDialog.findViewById(R.id.edit_bookmark_url_edittext);
- folderSpinner = alertDialog.findViewById(R.id.edit_bookmark_folder_spinner);
- displayOrderEditText = alertDialog.findViewById(R.id.edit_bookmark_display_order_edittext);
- editButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE);
+ RadioButton newIconRadioButton = alertDialog.findViewById(R.id.edit_bookmark_webpage_favorite_icon_radiobutton);
+ EditText nameEditText = alertDialog.findViewById(R.id.edit_bookmark_name_edittext);
+ EditText urlEditText = alertDialog.findViewById(R.id.edit_bookmark_url_edittext);
+ Spinner folderSpinner = alertDialog.findViewById(R.id.edit_bookmark_folder_spinner);
+ EditText displayOrderEditText = alertDialog.findViewById(R.id.edit_bookmark_display_order_edittext);
+ Button editButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE);
// Store the current bookmark values.
- currentBookmarkName = bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_NAME));
- currentUrl = bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_URL));
- currentDisplayOrder = bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.DISPLAY_ORDER));
+ String currentBookmarkName = bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_NAME));
+ String currentUrl = bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_URL));
+ int currentDisplayOrder = bookmarkCursor.getInt(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.DISPLAY_ORDER));
// Set the database ID.
databaseIdTextView.setText(String.valueOf(bookmarkCursor.getInt(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper._ID))));
// Display `currentIconBitmap` in `edit_bookmark_current_icon`.
currentIconImageView.setImageBitmap(currentIconBitmap);
- // Get a bitmap of the favorite icon from `MainWebViewActivity` and display it in `edit_bookmark_web_page_favorite_icon`.
- newFavoriteIconImageView.setImageBitmap(MainWebViewActivity.favoriteIconBitmap);
+ // Set the new favorite icon bitmap.
+ newFavoriteIconImageView.setImageBitmap(favoriteIconBitmap);
// Populate the bookmark name and URL `EditTexts`.
nameEditText.setText(currentBookmarkName);
}
// Store the current folder database ID.
- currentFolderDatabaseId = (int) folderSpinner.getSelectedItemId();
+ int currentFolderDatabaseId = (int) folderSpinner.getSelectedItemId();
// Populate the display order `EditText`.
displayOrderEditText.setText(String.valueOf(bookmarkCursor.getInt(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.DISPLAY_ORDER))));
// Update the edit button if the icon selection changes.
iconRadioGroup.setOnCheckedChangeListener((group, checkedId) -> {
// Update the edit button.
- updateEditButton();
+ updateEditButton(nameEditText, urlEditText, displayOrderEditText, folderSpinner, newIconRadioButton, editButton, currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder);
});
// Update the edit button if the bookmark name changes.
@Override
public void afterTextChanged(Editable s) {
// Update the edit button.
- updateEditButton();
+ updateEditButton(nameEditText, urlEditText, displayOrderEditText, folderSpinner, newIconRadioButton, editButton, currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder);
}
});
@Override
public void afterTextChanged(Editable s) {
// Update the edit button.
- updateEditButton();
+ updateEditButton(nameEditText, urlEditText, displayOrderEditText, folderSpinner, newIconRadioButton, editButton, currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder);
}
});
@Override
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
// Update the edit button.
- updateEditButton();
+ updateEditButton(nameEditText, urlEditText, displayOrderEditText, folderSpinner, newIconRadioButton, editButton, currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder);
}
@Override
@Override
public void afterTextChanged(Editable s) {
// Update the edit button.
- updateEditButton();
+ updateEditButton(nameEditText, urlEditText, displayOrderEditText, folderSpinner, newIconRadioButton, editButton, currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder);
}
});
// Save the bookmark if the event is a key-down on the "enter" button.
if ((event.getAction() == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER) && editButton.isEnabled()) { // The enter key was pressed and the edit button is enabled.
// Trigger the `Listener` and return the `DialogFragment` to the parent activity.
- editBookmarkDatabaseViewListener.onSaveBookmark(EditBookmarkDatabaseViewDialog.this, bookmarkDatabaseId);
+ editBookmarkDatabaseViewListener.onSaveBookmark(EditBookmarkDatabaseViewDialog.this, bookmarkDatabaseId, favoriteIconBitmap);
// Manually dismiss `alertDialog`.
alertDialog.dismiss();
// Save the bookmark if the event is a key-down on the "enter" button.
if ((event.getAction() == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER) && editButton.isEnabled()) { // The enter key was pressed and the edit button is enabled.
// Trigger the `Listener` and return the `DialogFragment` to the parent activity.
- editBookmarkDatabaseViewListener.onSaveBookmark(EditBookmarkDatabaseViewDialog.this, bookmarkDatabaseId);
+ editBookmarkDatabaseViewListener.onSaveBookmark(EditBookmarkDatabaseViewDialog.this, bookmarkDatabaseId, favoriteIconBitmap);
// Manually dismiss the `AlertDialog`.
alertDialog.dismiss();
// Save the bookmark if the event is a key-down on the "enter" button.
if ((event.getAction() == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER) && editButton.isEnabled()) { // The enter key was pressed and the edit button is enabled.
// Trigger the `Listener` and return the `DialogFragment` to the parent activity.
- editBookmarkDatabaseViewListener.onSaveBookmark(EditBookmarkDatabaseViewDialog.this, bookmarkDatabaseId);
+ editBookmarkDatabaseViewListener.onSaveBookmark(EditBookmarkDatabaseViewDialog.this, bookmarkDatabaseId, favoriteIconBitmap);
// Manually dismiss the `AlertDialog`.
alertDialog.dismiss();
return alertDialog;
}
- private void updateEditButton() {
+ private void updateEditButton(EditText nameEditText, EditText urlEditText, EditText displayOrderEditText, Spinner folderSpinner, RadioButton newIconRadioButton, Button editButton,
+ String currentBookmarkName, String currentUrl, int currentFolderDatabaseId, int currentDisplayOrder) {
// Get the values from the dialog.
String newName = nameEditText.getText().toString();
String newUrl = urlEditText.getText().toString();
boolean folderChanged = newFolderDatabaseId != currentFolderDatabaseId;
// Has the display order changed?
- boolean displayOrderChanged = !newDisplayOrder.equals(currentDisplayOrder);
+ boolean displayOrderChanged = !newDisplayOrder.equals(String.valueOf(currentDisplayOrder));
// Is the display order empty?
boolean displayOrderNotEmpty = !newDisplayOrder.isEmpty();
projects / PrivacyBrowserAndroid.git / blobdiff