/*
- * Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2019 Soren Stoutner <soren@stoutner.com>.
*
* This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
*
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.os.Bundle;
-import android.support.annotation.IdRes;
-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.text.Editable;
import android.text.TextWatcher;
import android.view.KeyEvent;
import android.widget.RadioButton;
import android.widget.RadioGroup;
-import com.stoutner.privacybrowser.activities.BookmarksActivity;
-import com.stoutner.privacybrowser.activities.MainWebViewActivity;
+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 EditBookmarkDialog extends AppCompatDialogFragment {
+public class EditBookmarkDialog extends DialogFragment {
+ // Instantiate the class variables.
+ private EditBookmarkListener editBookmarkListener;
+ private EditText nameEditText;
+ private EditText urlEditText;
+ private RadioButton newIconRadioButton;
+ private Button editButton;
+ private String currentName;
+ private String currentUrl;
+
// The public interface is used to send information back to the parent activity.
public interface EditBookmarkListener {
- void onSaveEditBookmark(AppCompatDialogFragment dialogFragment);
+ void onSaveBookmark(DialogFragment dialogFragment, int selectedBookmarkDatabaseId);
}
- // `editBookmarkListener` is used in `onAttach()` and `onCreateDialog()`
- private EditBookmarkListener editBookmarkListener;
-
public void onAttach(Context context) {
+ // Run the default commands.
super.onAttach(context);
- // Get a handle for `EditBookmarkListener` from `context`.
- try {
- editBookmarkListener = (EditBookmarkListener) context;
- } catch(ClassCastException exception) {
- throw new ClassCastException(context.toString() + " must implement EditBookmarkListener.");
- }
+ // Get a handle for `EditBookmarkListener` from the launching context.
+ editBookmarkListener = (EditBookmarkListener) context;
}
- // Instantiate the class variables.
- EditText nameEditText;
- EditText urlEditText;
- RadioButton newIconRadioButton;
- Button editButton;
- String currentName;
- String currentUrl;
+ // Store the database ID in the arguments bundle.
+ public static EditBookmarkDialog bookmarkDatabaseId(int databaseId) {
+ // Create a bundle.
+ Bundle bundle = new Bundle();
+
+ // Store the bookmark database ID in the bundle.
+ bundle.putInt("Database ID", databaseId);
+
+ // Add the bundle to the dialog.
+ EditBookmarkDialog editBookmarkDialog = new EditBookmarkDialog();
+ editBookmarkDialog.setArguments(bundle);
+
+ // Return the new dialog.
+ return editBookmarkDialog;
+ }
// `@SuppressLing("InflateParams")` removes the warning about using `null` as the parent view group when inflating the `AlertDialog`.
@SuppressLint("InflateParams")
@Override
@NonNull
public Dialog onCreateDialog(Bundle savedInstanceState) {
- // Get a long array with the the databaseId of the selected bookmark and convert it to an `int`.
- long[] selectedBookmarkLongArray = BookmarksActivity.checkedItemIds;
- int selectedBookmarkDatabaseId = (int) selectedBookmarkLongArray[0];
+ // Remove the incorrect lint warning that `getInt()` might be null.
+ assert getArguments() != null;
+
+ // Store the bookmark database ID in the class variable.
+ int selectedBookmarkDatabaseId = getArguments().getInt("Database ID");
- // Get a `Cursor` with the specified bookmark and move it to the first position.
- Cursor bookmarkCursor = BookmarksActivity.bookmarksDatabaseHelper.getBookmarkCursor(selectedBookmarkDatabaseId);
+ // 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);
+
+ // Get a `Cursor` with the selected bookmark and move it to the first position.
+ Cursor bookmarkCursor = bookmarksDatabaseHelper.getBookmark(selectedBookmarkDatabaseId);
bookmarkCursor.moveToFirst();
- // Use `AlertDialog.Builder` to create the `AlertDialog`.
+ // Use an alert dialog builder to create the alert dialog.
AlertDialog.Builder dialogBuilder;
// Set the style according to the theme.
// Set the title.
dialogBuilder.setTitle(R.string.edit_bookmark);
- // Set the view. The parent view is `null` because it will be assigned by `AlertDialog`.
+ // Remove the incorrect lint warning that `getActivity().getLayoutInflater()` might be null.
+ assert getActivity() != null;
+
+ // Set the view. The parent view is null because it will be assigned by the alert dialog.
dialogBuilder.setView(getActivity().getLayoutInflater().inflate(R.layout.edit_bookmark_dialog, null));
- // Set an `onClick()` listener for the negative button.
- dialogBuilder.setNegativeButton(R.string.cancel, new Dialog.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- // Do nothing. The `AlertDialog` will close automatically.
- }
+ // Set the cancel button listener.
+ dialogBuilder.setNegativeButton(R.string.cancel, (DialogInterface dialog, int which) -> {
+ // Do nothing. The alert dialog will close automatically.
});
- // Set the `onClick()` listener fo the positive button.
- dialogBuilder.setPositiveButton(R.string.save, new Dialog.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- // Return the `DialogFragment` to the parent activity on save.
- editBookmarkListener.onSaveEditBookmark(EditBookmarkDialog.this);
- }
+ // Set the save button listener.
+ dialogBuilder.setPositiveButton(R.string.save, (DialogInterface dialog, int which) -> {
+ // Return the dialog fragment to the parent activity.
+ editBookmarkListener.onSaveBookmark(EditBookmarkDialog.this, selectedBookmarkDatabaseId);
});
- // Create an `AlertDialog` from the `AlertDialog.Builder`.
+ // Create an alert dialog from the builder.
final AlertDialog alertDialog = dialogBuilder.create();
- // Remove the warning below that `setSoftInputMode` might produce `java.lang.NullPointerException`.
+ // remove the incorrect lint warning below that `getWindow().addFlags()` might be null.
assert alertDialog.getWindow() != null;
- // Show the keyboard when `alertDialog` is displayed on the screen.
- alertDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+ // Disable screenshots if not allowed.
+ if (!MainWebViewActivity.allowScreenshots) {
+ alertDialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
+ }
- // The `AlertDialog` must be shown before items in the layout can be modified.
+ // The alert dialog must be shown before items in the layout can be modified.
alertDialog.show();
// Get handles for the layout items.
- RadioGroup iconRadioGroup = (RadioGroup) alertDialog.findViewById(R.id.edit_bookmark_icon_radiogroup);
- ImageView currentIconImageView = (ImageView) alertDialog.findViewById(R.id.edit_bookmark_current_icon);
- ImageView newFavoriteIconImageView = (ImageView) alertDialog.findViewById(R.id.edit_bookmark_web_page_favorite_icon);
- newIconRadioButton = (RadioButton) alertDialog.findViewById(R.id.edit_bookmark_web_page_favorite_icon_radiobutton);
- nameEditText = (EditText) alertDialog.findViewById(R.id.edit_bookmark_name_edittext);
- urlEditText = (EditText) alertDialog.findViewById(R.id.edit_bookmark_url_edittext);
+ 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);
editButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE);
- // Get the current favorite icon byte array from the `Cursor`.
+ // Get the current favorite icon byte array from the cursor.
byte[] currentIconByteArray = bookmarkCursor.getBlob(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.FAVORITE_ICON));
- // Convert the byte array to a `Bitmap` beginning at the first byte and ending at the last.
+ // Convert the byte array to a bitmap beginning at the first byte and ending at the last.
Bitmap currentIconBitmap = BitmapFactory.decodeByteArray(currentIconByteArray, 0, currentIconByteArray.length);
- // Display `currentIconBitmap` in `edit_bookmark_current_icon`.
+ // Display the current icon bitmap.
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);
+ // Get a copy of the favorite icon bitmap.
+ Bitmap favoriteIconBitmap = MainWebViewActivity.favoriteIconBitmap;
+
+ // Scale the favorite icon bitmap down if it is larger than 256 x 256. Filtering uses bilinear interpolation.
+ if ((favoriteIconBitmap.getHeight() > 256) || (favoriteIconBitmap.getWidth() > 256)) {
+ favoriteIconBitmap = Bitmap.createScaledBitmap(favoriteIconBitmap, 256, 256, true);
+ }
+
+ // Set the new favorite icon bitmap.
+ newFavoriteIconImageView.setImageBitmap(favoriteIconBitmap);
// Store the current bookmark name and URL.
currentName = bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_NAME));
currentUrl = bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_URL));
- // Populate the `EditTexts`.
+ // Populate the edit texts.
nameEditText.setText(currentName);
urlEditText.setText(currentUrl);
editButton.setEnabled(false);
// Update the edit button if the icon selection changes.
- iconRadioGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
- @Override
- public void onCheckedChanged(RadioGroup group, @IdRes int checkedId) {
- // Update the edit button.
- updateEditButton();
- }
+ iconRadioGroup.setOnCheckedChangeListener((RadioGroup group, int checkedId) -> {
+ // Update the edit button.
+ updateEditButton();
});
// Update the edit button if the bookmark name changes.
}
});
- // Allow the `enter` key on the keyboard to save the bookmark from `edit_bookmark_name_edittext`.
- nameEditText.setOnKeyListener(new View.OnKeyListener() {
- @Override
- public boolean onKey(View v, int keyCode, KeyEvent event) {
- // If the event is an `ACTION_DOWN` on the `enter` key, save the bookmark.
- if ((event.getAction() == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER) && editButton.isEnabled()) { // The enter key was pressed and the edit button is enabled.
- // Trigger `onSaveEditBookmark()` and return the `DialogFragment` to the parent activity.
- editBookmarkListener.onSaveEditBookmark(EditBookmarkDialog.this);
- // Manually dismiss `alertDialog`.
- alertDialog.dismiss();
- // Consume the event.
- return true;
- } else { // If any other key was pressed, or if the edit button is currently disabled, do not consume the event.
- return false;
- }
+ // Allow the enter key on the keyboard to save the bookmark from the bookmark name edit text.
+ nameEditText.setOnKeyListener((View v, int keyCode, KeyEvent event) -> {
+ // 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.
+ editBookmarkListener.onSaveBookmark(EditBookmarkDialog.this, selectedBookmarkDatabaseId);
+
+ // Manually dismiss `alertDialog`.
+ alertDialog.dismiss();
+
+ // Consume the event.
+ return true;
+ } else { // If any other key was pressed, or if the edit button is currently disabled, do not consume the event.
+ return false;
}
});
- // Allow the "enter" key on the keyboard to save the bookmark from `edit_bookmark_url_edittext`.
- urlEditText.setOnKeyListener(new View.OnKeyListener() {
- public boolean onKey(View v, int keyCode, KeyEvent event) {
- // If the event is a key-down on the `enter` button, select the PositiveButton `Save`.
- if ((event.getAction() == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER) && editButton.isEnabled()) { // The enter key was pressed and the edit button is enabled.
- // Trigger `editBookmarkListener` and return the DialogFragment to the parent activity.
- editBookmarkListener.onSaveEditBookmark(EditBookmarkDialog.this);
- // Manually dismiss the `AlertDialog`.
- alertDialog.dismiss();
- // Consume the event.
- return true;
- } else { // If any other key was pressed, or if the edit button is currently disabled, do not consume the event.
- return false;
- }
+ // Allow the enter key on the keyboard to save the bookmark from the URL edit text.
+ urlEditText.setOnKeyListener((View v, int keyCode, KeyEvent event) -> {
+ // 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.
+ editBookmarkListener.onSaveBookmark(EditBookmarkDialog.this, selectedBookmarkDatabaseId);
+
+ // Manually dismiss the alert dialog.
+ alertDialog.dismiss();
+
+ // Consume the event.
+ return true;
+ } else { // If any other key was pressed, or if the edit button is currently disabled, do not consume the event.
+ return false;
}
});
- // `onCreateDialog` requires the return of an `AlertDialog`.
+ // Return the alert dialog.
return alertDialog;
}
// Has the URL changed?
boolean urlChanged = !newUrl.equals(currentUrl);
+ // Update the enabled status of the edit button.
editButton.setEnabled(iconChanged || nameChanged || urlChanged);
}
}
\ No newline at end of file
projects / PrivacyBrowserAndroid.git / blobdiff