package com.stoutner.privacybrowser;
import android.app.Activity;
-import android.app.DialogFragment;
import android.content.Context;
import android.content.Intent;
import android.database.Cursor;
import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.Snackbar;
import android.support.v4.app.NavUtils;
-import android.support.v4.content.ContextCompat;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
+import android.support.v7.app.AppCompatDialogFragment;
import android.support.v7.widget.Toolbar;
import android.util.SparseBooleanArray;
import android.view.ActionMode;
public class BookmarksActivity extends AppCompatActivity implements CreateBookmark.CreateBookmarkListener,
CreateBookmarkFolder.CreateBookmarkFolderListener, EditBookmark.EditBookmarkListener,
EditBookmarkFolder.EditBookmarkFolderListener, MoveToFolder.MoveToFolderListener {
+
// `bookmarksDatabaseHandler` is public static so it can be accessed from `EditBookmark` and `MoveToFolder`. It is also used in `onCreate()`,
// `onCreateBookmarkCreate()`, `updateBookmarksListView()`, and `updateBookmarksListViewExcept()`.
public static BookmarksDatabaseHandler bookmarksDatabaseHandler;
- // `bookmarksListView` is public static so it can be accessed from `EditBookmark`.
- // It is also used in `onCreate()`, `updateBookmarksListView()`, and `updateBookmarksListViewExcept()`.
- public static ListView bookmarksListView;
-
// `currentFolder` is public static so it can be accessed from `MoveToFolder`.
// It is used in `onCreate`, `onOptionsItemSelected()`, `onCreateBookmarkCreate`, `onCreateBookmarkFolderCreate`, and `onEditBookmarkSave`.
public static String currentFolder;
+ // `checkedItemIds` is public static so it can be accessed from `EditBookmark`, `EditBookmarkFolder`, and `MoveToFolder`.
+ // It is also used in `onActionItemClicked`.
+ public static long[] checkedItemIds;
+
+
+ // `bookmarksListView` is used in `onCreate()`, `updateBookmarksListView()`, and `updateBookmarksListViewExcept()`.
+ private ListView bookmarksListView;
+
// `contextualActionMode` is used in `onCreate()` and `onEditBookmarkSave()`.
private ActionMode contextualActionMode;
- // `selectedBookmarkPosition` is used in `onCreate()` and `onEditBookarkSave()`.
+ // `selectedBookmarkPosition` is used in `onCreate()` and `onEditBookmarkSave()`.
private int selectedBookmarkPosition;
// `appBar` is used in `onCreate()` and `updateBookmarksListView()`.
// Reload the ListView with `currentFolder`.
updateBookmarksListView(currentFolder);
} else { // Load the URL into `mainWebView`.
- // Get the bookmark URL and assign it to formattedUrlString.
+ // Get the bookmark URL and assign it to formattedUrlString. `mainWebView` will automatically reload when `BookmarksActivity` closes.
MainWebViewActivity.formattedUrlString = bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHandler.BOOKMARK_URL));
- // Load formattedUrlString and return to the main activity.
- MainWebViewActivity.mainWebView.loadUrl(MainWebViewActivity.formattedUrlString);
NavUtils.navigateUpFromSameTask(bookmarksActivity);
}
break;
case R.id.move_to_folder:
+ // Store `checkedItemIds` for use by the `AlertDialog`.
+ checkedItemIds = bookmarksListView.getCheckedItemIds();
+
// Show the `MoveToFolder` `AlertDialog` and name the instance `@string/move_to_folder
- DialogFragment moveToFolderDialog = new MoveToFolder();
- moveToFolderDialog.show(getFragmentManager(), getResources().getString(R.string.move_to_folder));
+ AppCompatDialogFragment moveToFolderDialog = new MoveToFolder();
+ moveToFolderDialog.show(getSupportFragmentManager(), getResources().getString(R.string.move_to_folder));
break;
case R.id.edit_bookmark:
bookmarksCursor.moveToPosition(selectedBookmarkPosition);
boolean isFolder = (bookmarksCursor.getInt(bookmarksCursor.getColumnIndex(BookmarksDatabaseHandler.IS_FOLDER)) == 1);
+ // Store `checkedItemIds` for use by the `AlertDialog`.
+ checkedItemIds = bookmarksListView.getCheckedItemIds();
+
if (isFolder) {
// Save the current folder name.
oldFolderNameString = bookmarksCursor.getString(bookmarksCursor.getColumnIndex(BookmarksDatabaseHandler.BOOKMARK_NAME));
// Show the `EditBookmarkFolder` `AlertDialog` and name the instance `@string/edit_folder`.
- DialogFragment editFolderDialog = new EditBookmarkFolder();
- editFolderDialog.show(getFragmentManager(), getResources().getString(R.string.edit_folder));
+ AppCompatDialogFragment editFolderDialog = new EditBookmarkFolder();
+ editFolderDialog.show(getSupportFragmentManager(), getResources().getString(R.string.edit_folder));
} else {
// Show the `EditBookmark` `AlertDialog` and name the instance `@string/edit_bookmark`.
- DialogFragment editBookmarkDialog = new EditBookmark();
- editBookmarkDialog.show(getFragmentManager(), getResources().getString(R.string.edit_bookmark));
+ AppCompatDialogFragment editBookmarkDialog = new EditBookmark();
+ editBookmarkDialog.show(getSupportFragmentManager(), getResources().getString(R.string.edit_bookmark));
}
break;
.setCallback(new Snackbar.Callback() {
@Override
public void onDismissed(Snackbar snackbar, int event) {
+ // Android Studio wants to see entries for every possible `Snackbar.Callback` even if they aren't used.
switch (event) {
// The user pushed the "Undo" button.
case Snackbar.Callback.DISMISS_EVENT_ACTION:
break;
+ case Snackbar.Callback.DISMISS_EVENT_CONSECUTIVE:
+ // Do nothing and let the default behavior run.
+
+ case Snackbar.Callback.DISMISS_EVENT_MANUAL:
+ // Do nothing and let the default behavior run.
+
+ case Snackbar.Callback.DISMISS_EVENT_SWIPE:
+ // Do nothing and let the default behavior run.
+
+ case Snackbar.Callback.DISMISS_EVENT_TIMEOUT:
+ // Do nothing and let the default behavior run.
+
// The Snackbar was dismissed without the "Undo" button being pushed.
default:
// Delete each selected row.
// Set a FloatingActionButton for creating new bookmarks.
FloatingActionButton createBookmarkFAB = (FloatingActionButton) findViewById(R.id.create_bookmark_fab);
- assert createBookmarkFAB != null;
createBookmarkFAB.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
// Show the `CreateBookmark` `AlertDialog` and name the instance `@string/create_bookmark`.
- DialogFragment createBookmarkDialog = new CreateBookmark();
- createBookmarkDialog.show(getFragmentManager(), getResources().getString(R.string.create_bookmark));
+ AppCompatDialogFragment createBookmarkDialog = new CreateBookmark();
+ createBookmarkDialog.show(getSupportFragmentManager(), getResources().getString(R.string.create_bookmark));
}
});
}
case R.id.create_folder:
// Show the `CreateBookmarkFolder` `AlertDialog` and name the instance `@string/create_folder`.
- DialogFragment createBookmarkFolderDialog = new CreateBookmarkFolder();
- createBookmarkFolderDialog.show(getFragmentManager(), getResources().getString(R.string.create_folder));
+ AppCompatDialogFragment createBookmarkFolderDialog = new CreateBookmarkFolder();
+ createBookmarkFolderDialog.show(getSupportFragmentManager(), getResources().getString(R.string.create_folder));
break;
case R.id.options_menu_select_all_bookmarks:
}
@Override
- public void onCancelCreateBookmark(DialogFragment dialogFragment) {
- // Do nothing because the user selected `Cancel`.
- }
-
- @Override
- public void onCreateBookmark(DialogFragment dialogFragment) {
+ public void onCreateBookmark(AppCompatDialogFragment dialogFragment) {
// Get the `EditText`s from the `createBookmarkDialogFragment` and extract the strings.
EditText createBookmarkNameEditText = (EditText) dialogFragment.getDialog().findViewById(R.id.create_bookmark_name_edittext);
String bookmarkNameString = createBookmarkNameEditText.getText().toString();
EditText createBookmarkUrlEditText = (EditText) dialogFragment.getDialog().findViewById(R.id.create_bookmark_url_edittext);
String bookmarkUrlString = createBookmarkUrlEditText.getText().toString();
- // Convert the favoriteIcon Bitmap to a byte array. `0` is for lossless compression (the only option for a PNG).
+ // Convert the favoriteIcon Bitmap to a byte array.
ByteArrayOutputStream favoriteIconByteArrayOutputStream = new ByteArrayOutputStream();
+ // `0` is for lossless compression (the only option for a PNG).
MainWebViewActivity.favoriteIcon.compress(Bitmap.CompressFormat.PNG, 0, favoriteIconByteArrayOutputStream);
byte[] favoriteIconByteArray = favoriteIconByteArrayOutputStream.toByteArray();
}
@Override
- public void onCancelCreateBookmarkFolder(DialogFragment dialogFragment) {
- // Do nothing because the user selected `Cancel`.
- }
-
- @Override
- public void onCreateBookmarkFolder(DialogFragment dialogFragment) {
+ public void onCreateBookmarkFolder(AppCompatDialogFragment dialogFragment) {
// Get `create_folder_name_edit_text` and extract the string.
EditText createFolderNameEditText = (EditText) dialogFragment.getDialog().findViewById(R.id.create_folder_name_edittext);
String folderNameString = createFolderNameEditText.getText().toString();
String cannotCreateFolder = getResources().getString(R.string.cannot_create_folder) + " \"" + folderNameString + "\"";
Snackbar.make(findViewById(R.id.bookmarks_coordinatorlayout), cannotCreateFolder, Snackbar.LENGTH_INDEFINITE).show();
} else { // Create the folder.
- // Get the new folder icon.
- RadioButton defaultFolderIconRadioButton = (RadioButton) dialogFragment.getDialog().findViewById(R.id.create_folder_default_icon_radiobuttion);
+ // Get the new folder icon `Bitmap`.
+ RadioButton defaultFolderIconRadioButton = (RadioButton) dialogFragment.getDialog().findViewById(R.id.create_folder_default_icon_radiobutton);
Bitmap folderIconBitmap;
if (defaultFolderIconRadioButton.isChecked()) {
- // Get the default folder icon drawable and convert it to a `Bitmap`. `this` specifies the current context.
- Drawable folderIconDrawable = ContextCompat.getDrawable(this, R.drawable.folder_blue_bitmap);
+ // Get the default folder icon `ImageView` from the `Dialog` and convert it to a `Bitmap`.
+ ImageView folderIconImageView = (ImageView) dialogFragment.getDialog().findViewById(R.id.create_folder_default_icon);
+ Drawable folderIconDrawable = folderIconImageView.getDrawable();
BitmapDrawable folderIconBitmapDrawable = (BitmapDrawable) folderIconDrawable;
folderIconBitmap = folderIconBitmapDrawable.getBitmap();
- } else {
+ } else { // Assign `favoriteIcon` from the `WebView`.
folderIconBitmap = MainWebViewActivity.favoriteIcon;
}
- // Convert the folder `Bitmap` to a byte array. `0` is for lossless compression (the only option for a PNG).
+ // Convert `folderIconBitmap` to a byte array. `0` is for lossless compression (the only option for a PNG).
ByteArrayOutputStream folderIconByteArrayOutputStream = new ByteArrayOutputStream();
folderIconBitmap.compress(Bitmap.CompressFormat.PNG, 0, folderIconByteArrayOutputStream);
byte[] folderIconByteArray = folderIconByteArrayOutputStream.toByteArray();
}
@Override
- public void onCancelEditBookmark(DialogFragment dialogFragment) {
- // Do nothing because the user selected `Cancel`.
- }
-
- @Override
- public void onSaveEditBookmark(DialogFragment dialogFragment) {
+ public void onSaveEditBookmark(AppCompatDialogFragment dialogFragment) {
// Get a long array with the the databaseId of the selected bookmark and convert it to an `int`.
long[] selectedBookmarksLongArray = bookmarksListView.getCheckedItemIds();
int selectedBookmarkDatabaseId = (int) selectedBookmarksLongArray[0];
if (currentBookmarkIconRadioButton.isChecked()) { // Update the bookmark without changing the favorite icon.
bookmarksDatabaseHandler.updateBookmark(selectedBookmarkDatabaseId, bookmarkNameString, bookmarkUrlString);
- } else { // Update the bookmark and the favorite icon.
- // Get the new favorite icon from the `Dialog` and convert it into a `Bitmap`.
- ImageView newFavoriteIconImageView = (ImageView) dialogFragment.getDialog().findViewById(R.id.edit_bookmark_web_page_favorite_icon);
- Drawable newFavoriteIconDrawable = newFavoriteIconImageView.getDrawable();
- Bitmap newFavoriteIconBitmap = ((BitmapDrawable) newFavoriteIconDrawable).getBitmap();
-
- // Convert `newFavoriteIconBitmap` into a Byte Array.
+ } else { // Update the bookmark using the `WebView` favorite icon.
ByteArrayOutputStream newFavoriteIconByteArrayOutputStream = new ByteArrayOutputStream();
- newFavoriteIconBitmap.compress(Bitmap.CompressFormat.PNG, 0, newFavoriteIconByteArrayOutputStream);
+ MainWebViewActivity.favoriteIcon.compress(Bitmap.CompressFormat.PNG, 0, newFavoriteIconByteArrayOutputStream);
byte[] newFavoriteIconByteArray = newFavoriteIconByteArrayOutputStream.toByteArray();
// Update the bookmark and the favorite icon.
}
@Override
- public void onCancelEditBookmarkFolder(DialogFragment dialogFragment) {
- // Do nothing because the user selected `Cancel`.
- }
-
- @Override
- public void onSaveEditBookmarkFolder(DialogFragment dialogFragment) {
+ public void onSaveEditBookmarkFolder(AppCompatDialogFragment dialogFragment) {
// Get the new folder name.
EditText editFolderNameEditText = (EditText) dialogFragment.getDialog().findViewById(R.id.edit_folder_name_edittext);
String newFolderNameString = editFolderNameEditText.getText().toString();
// Get the `RadioButtons` from the `Dialog`.
RadioButton currentFolderIconRadioButton = (RadioButton) dialogFragment.getDialog().findViewById(R.id.edit_folder_current_icon_radiobutton);
RadioButton defaultFolderIconRadioButton = (RadioButton) dialogFragment.getDialog().findViewById(R.id.edit_folder_default_icon_radiobutton);
- Bitmap folderIconBitmap;
- // Prepare the favorite icon.
+ // Check if the favorite icon has changed.
if (currentFolderIconRadioButton.isChecked()) {
- // Update the folder name if it has changed.
+ // Update the folder name if it has changed without modifying the favorite icon.
if (!newFolderNameString.equals(oldFolderNameString)) {
bookmarksDatabaseHandler.updateFolder(selectedFolderDatabaseId, oldFolderNameString, newFolderNameString);
updateBookmarksListView(currentFolder);
bookmarksListView.setSelection(selectedBookmarkPosition);
}
- } else { // Prepare the new favorite icon.
+ } else { // Update the folder icon.
+ // Get the new folder icon `Bitmap`.
+ Bitmap folderIconBitmap;
if (defaultFolderIconRadioButton.isChecked()) {
- // Get the default folder icon drawable and convert it to a `Bitmap`. `this` specifies the current context.
- Drawable folderIconDrawable = ContextCompat.getDrawable(this, R.drawable.folder_blue_bitmap);
+ // Get the default folder icon `ImageView` from the `Drawable` and convert it to a `Bitmap`.
+ ImageView folderIconImageView = (ImageView) dialogFragment.getDialog().findViewById(R.id.edit_folder_default_icon);
+ Drawable folderIconDrawable = folderIconImageView.getDrawable();
BitmapDrawable folderIconBitmapDrawable = (BitmapDrawable) folderIconDrawable;
folderIconBitmap = folderIconBitmapDrawable.getBitmap();
- } else { // Use the web page favorite icon.
+ } else { // Get the web page icon `ImageView` from the `Dialog`.
folderIconBitmap = MainWebViewActivity.favoriteIcon;
}
String cannot_rename_folder = getResources().getString(R.string.cannot_rename_folder) + " \"" + newFolderNameString + "\"";
Snackbar.make(findViewById(R.id.bookmarks_coordinatorlayout), cannot_rename_folder, Snackbar.LENGTH_INDEFINITE).show();
}
- }
- @Override
- public void onCancelMoveToFolder(DialogFragment dialogFragment) {
- // Do nothing because the user selected `Cancel`.
+ // Close the contextual action mode.
+ contextualActionMode.finish();
}
@Override
- public void onMoveToFolder(DialogFragment dialogFragment) {
+ public void onMoveToFolder(AppCompatDialogFragment dialogFragment) {
// Get the new folder database id.
ListView folderListView = (ListView) dialogFragment.getDialog().findViewById(R.id.move_to_folder_listview);
long[] newFolderLongArray = folderListView.getCheckedItemIds();
// Make the font bold for folders.
if (cursor.getInt(cursor.getColumnIndex(BookmarksDatabaseHandler.IS_FOLDER)) == 1) {
- // The first argument is `null` because we don't want to chage the font.
- bookmarkNameTextView.setTypeface(null, Typeface.BOLD);
- } else { // Reset the font to default.
+ bookmarkNameTextView.setTypeface(Typeface.DEFAULT_BOLD);
+ } else { // Reset the font to default for normal bookmarks.
bookmarkNameTextView.setTypeface(Typeface.DEFAULT);
}
}
// Make the font bold for folders.
if (cursor.getInt(cursor.getColumnIndex(BookmarksDatabaseHandler.IS_FOLDER)) == 1) {
- // The first argument is `null` because we don't want to chage the font.
+ // The first argument is `null` because we don't want to change the font.
bookmarkNameTextView.setTypeface(null, Typeface.BOLD);
} else { // Reset the font to default.
bookmarkNameTextView.setTypeface(Typeface.DEFAULT);
projects / PrivacyBrowserAndroid.git / blobdiff