import android.database.Cursor;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.Snackbar;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
+import android.util.SparseBooleanArray;
import android.view.ActionMode;
import android.view.Menu;
import android.view.MenuItem;
import android.view.ViewGroup;
import android.widget.AbsListView;
import android.widget.AdapterView;
+import android.widget.CheckBox;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.ListView;
import java.io.ByteArrayOutputStream;
-public class BookmarksActivity extends AppCompatActivity implements CreateBookmark.CreateBookmarkListener {
- private BookmarksDatabaseHandler bookmarksDatabaseHandler;
- private ListView bookmarksListView;
+public class BookmarksActivity extends AppCompatActivity implements CreateBookmark.CreateBookmarkListener, EditBookmark.EditBookmarkListener {
+ // `bookmarksDatabaseHandler` is public static so it can be accessed from EditBookmark. It is also used in `onCreate()`,
+ // `onCreateBookmarkCreate()`, `updateBookmarksListView()`, and `updateBookmarksListViewExcept()`.
+ public static BookmarksDatabaseHandler bookmarksDatabaseHandler;
- // deleteBookmarkMenuItem is used in onCreate() and onPrepareOptionsMenu().
- private MenuItem deleteBookmarkMenuItem;
+ // `bookmarksListView` is public static so it can be accessed from EditBookmark.
+ // It is also used in `onCreate()`, `updateBookmarksListView()`, and `updateBookmarksListViewExcept()`.
+ public static ListView bookmarksListView;
+
+ // `contextualActionMode` is used in `onCreate()` and `onEditBookmarkSave()`.
+ private ActionMode contextualActionMode;
+
+ // `selectedBookmarkPosition` is used in `onCreate()` and `onEditBookarkSave()`.
+ private int selectedBookmarkPosition;
@Override
protected void onCreate(Bundle savedInstanceState) {
appBar.setDisplayHomeAsUpEnabled(true);
// Initialize the database handler and the ListView.
+ // `this` specifies the context. The two `null`s do not specify the database name or a `CursorFactory`.
+ // The `0` is to specify a database version, but that is set instead using a constant in BookmarksDatabaseHandler.
bookmarksDatabaseHandler = new BookmarksDatabaseHandler(this, null, null, 0);
bookmarksListView = (ListView) findViewById(R.id.bookmarks_listview);
// Display the bookmarks in the ListView.
updateBookmarksListView();
- // Set a listener so that tapping a list item loads the URL. We need to store the activity in a variable so that we can return to the parent activity after loading the URL.
+ // Set a listener so that tapping a list item loads the URL. We need to store the activity
+ // in a variable so that we can return to the parent activity after loading the URL.
final Activity bookmarksActivity = this;
bookmarksListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
}
});
- // registerForContextMenu(bookmarksListView);
-
+ // `MultiChoiceModeListener` handles long clicks.
bookmarksListView.setMultiChoiceModeListener(new AbsListView.MultiChoiceModeListener() {
- @Override
- public void onItemCheckedStateChanged(ActionMode mode, int position, long id, boolean checked) {
- String numberSelectedString;
- long[] selectedItemsLongArray = bookmarksListView.getCheckedItemIds();
+ // `moveBookmarkUpMenuItem` is used in `onCreateActionMode()` and `onItemCheckedStateChanged`.
+ MenuItem moveBookmarkUpMenuItem;
- numberSelectedString = selectedItemsLongArray.length + " " + getString(R.string.selected);
+ // `moveBookmarkDownMenuItem` is used in `onCreateActionMode()` and `onItemCheckedStateChanged`.
+ MenuItem moveBookmarkDownMenuItem;
- mode.setSubtitle(numberSelectedString);
- }
+ // `editBookmarkMenuItem` is used in `onCreateActionMode()` and `onItemCheckedStateChanged`.
+ MenuItem editBookmarkMenuItem;
+
+ // `selectAllBookmarks` is used in `onCreateActionMode()` and `onItemCheckedStateChanges`.
+ MenuItem selectAllBookmarksMenuItem;
@Override
public boolean onCreateActionMode(ActionMode mode, Menu menu) {
- // Inflate the menu for the contextual app bar.
+ // Inflate the menu for the contextual app bar and set the title.
getMenuInflater().inflate(R.menu.bookmarks_context_menu, menu);
-
mode.setTitle(R.string.bookmarks);
+ // Get a handle for MenuItems we need to selectively disable.
+ moveBookmarkUpMenuItem = menu.findItem(R.id.move_bookmark_up);
+ moveBookmarkDownMenuItem = menu.findItem(R.id.move_bookmark_down);
+ editBookmarkMenuItem = menu.findItem(R.id.edit_bookmark);
+ selectAllBookmarksMenuItem = menu.findItem(R.id.context_menu_select_all_bookmarks);
+
return true;
}
return false;
}
+ @Override
+ public void onItemCheckedStateChanged(ActionMode mode, int position, long id, boolean checked) {
+ // Get an array of the selected bookmarks.
+ long[] selectedBookmarksLongArray = bookmarksListView.getCheckedItemIds();
+
+ // Calculate the number of selected bookmarks.
+ int numberOfSelectedBookmarks = selectedBookmarksLongArray.length;
+
+ // List the number of selected bookmarks in the subtitle.
+ mode.setSubtitle(numberOfSelectedBookmarks + " " + getString(R.string.selected));
+
+ if (numberOfSelectedBookmarks == 1) {
+ // Show the `Move Up`, `Move Down`, and `Edit` option only if 1 bookmark is selected.
+ moveBookmarkUpMenuItem.setVisible(true);
+ moveBookmarkDownMenuItem.setVisible(true);
+ editBookmarkMenuItem.setVisible(true);
+
+ // Get the database IDs for the bookmarks.
+ int selectedBookmarkDatabaseId = (int) selectedBookmarksLongArray[0];
+ int firstBookmarkDatabaseId = (int) bookmarksListView.getItemIdAtPosition(0);
+ // bookmarksListView is 0 indexed.
+ int lastBookmarkDatabaseId = (int) bookmarksListView.getItemIdAtPosition(bookmarksListView.getCount() - 1);
+
+ // Disable `moveBookmarkUpMenuItem` if the selected bookmark is at the top of the ListView.
+ if (selectedBookmarkDatabaseId == firstBookmarkDatabaseId) {
+ moveBookmarkUpMenuItem.setEnabled(false);
+ moveBookmarkUpMenuItem.setIcon(R.drawable.move_bookmark_up_disabled);
+ } else { // Otherwise enable `moveBookmarkUpMenuItem`.
+ moveBookmarkUpMenuItem.setEnabled(true);
+ moveBookmarkUpMenuItem.setIcon(R.drawable.move_bookmark_up_enabled);
+ }
+
+ // Disable `moveBookmarkDownMenuItem` if the selected bookmark is at the bottom of the ListView.
+ if (selectedBookmarkDatabaseId == lastBookmarkDatabaseId) {
+ moveBookmarkDownMenuItem.setEnabled(false);
+ moveBookmarkDownMenuItem.setIcon(R.drawable.move_bookmark_down_disabled);
+ } else { // Otherwise enable `moveBookmarkDownMenuItem`.
+ moveBookmarkDownMenuItem.setEnabled(true);
+ moveBookmarkDownMenuItem.setIcon(R.drawable.move_bookmark_down_enabled);
+ }
+ } else { // Hide the MenuItems because more than one bookmark is selected.
+ moveBookmarkUpMenuItem.setVisible(false);
+ moveBookmarkDownMenuItem.setVisible(false);
+ editBookmarkMenuItem.setVisible(false);
+ }
+
+ // Do not show `Select All` if all the bookmarks are already checked.
+ if (bookmarksListView.getCheckedItemIds().length == bookmarksListView.getCount()) {
+ selectAllBookmarksMenuItem.setVisible(false);
+ } else {
+ selectAllBookmarksMenuItem.setVisible(true);
+ }
+ }
+
@Override
public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
int menuItemId = item.getItemId();
+ // `numberOfBookmarks` is used in `R.id.move_bookmark_up_enabled`, `R.id.move_bookmark_down_enabled`, and `R.id.context_menu_select_all_bookmarks`.
+ int numberOfBookmarks;
+
+ // `selectedBookmarkLongArray` is used in `R.id.move_bookmark_up` and `R.id.move_bookmark_down`.
+ long[]selectedBookmarkLongArray;
+ // `selectedBookmarkDatabaseId` is used in `R.id.move_bookmark_up` and `R.id.move_bookmark_down`.
+ int selectedBookmarkDatabaseId;
+ // `selectedBookmarkNewPosition` is used in `R.id.move_bookmark_up` and `R.id.move_bookmark_down`.
+ int selectedBookmarkNewPosition;
+
switch (menuItemId) {
+ case R.id.move_bookmark_up:
+ // Get the selected bookmark database ID.
+ selectedBookmarkLongArray = bookmarksListView.getCheckedItemIds();
+ selectedBookmarkDatabaseId = (int) selectedBookmarkLongArray[0];
+
+ // Initialize `selectedBookmarkNewPosition`.
+ selectedBookmarkNewPosition = 0;
+
+ for (int i = 0; i < bookmarksListView.getCount(); i++) {
+ int databaseId = (int) bookmarksListView.getItemIdAtPosition(i);
+ int nextBookmarkDatabaseId = (int) bookmarksListView.getItemIdAtPosition(i + 1);
+
+ if (databaseId == selectedBookmarkDatabaseId || nextBookmarkDatabaseId == selectedBookmarkDatabaseId) {
+ if (databaseId == selectedBookmarkDatabaseId) {
+ // Move the selected bookmark up one and store the new bookmark position.
+ bookmarksDatabaseHandler.updateBookmarkDisplayOrder(databaseId, i - 1);
+ selectedBookmarkNewPosition = i - 1;
+ } else { // Move the bookmark above the selected bookmark down one.
+ bookmarksDatabaseHandler.updateBookmarkDisplayOrder(databaseId, i + 1);
+ }
+ } else {
+ // Reset the rest of the bookmarks' DISPLAY_ORDER to match the position in the ListView.
+ // This isn't necessary, but it clears out any stray values that might have crept into the database.
+ bookmarksDatabaseHandler.updateBookmarkDisplayOrder(databaseId, i);
+ }
+ }
+
+ // Refresh the ListView.
+ updateBookmarksListView();
+
+ // Select the previously selected bookmark in the new location.
+ bookmarksListView.setItemChecked(selectedBookmarkNewPosition, true);
+
+ bookmarksListView.setSelection(selectedBookmarkNewPosition - 5);
+
+ break;
+
+ case R.id.move_bookmark_down:
+ // Get the selected bookmark database ID.
+ selectedBookmarkLongArray = bookmarksListView.getCheckedItemIds();
+ selectedBookmarkDatabaseId = (int) selectedBookmarkLongArray[0];
+
+ // Initialize `selectedBookmarkNewPosition`.
+ selectedBookmarkNewPosition = 0;
+
+ for (int i = 0; i <bookmarksListView.getCount(); i++) {
+ int databaseId = (int) bookmarksListView.getItemIdAtPosition(i);
+ int previousBookmarkDatabaseId = (int) bookmarksListView.getItemIdAtPosition(i - 1);
+
+ if (databaseId == selectedBookmarkDatabaseId || previousBookmarkDatabaseId == selectedBookmarkDatabaseId) {
+ if (databaseId == selectedBookmarkDatabaseId) {
+ // Move the selected bookmark down one and store the new bookmark position.
+ bookmarksDatabaseHandler.updateBookmarkDisplayOrder(databaseId, i + 1);
+ selectedBookmarkNewPosition = i + 1;
+ } else { // Move the bookmark below the selected bookmark up one.
+ bookmarksDatabaseHandler.updateBookmarkDisplayOrder(databaseId, i - 1);
+ }
+ } else {
+ // Reset the rest of the bookmark' DISPLAY_ORDER to match the position in the ListView.
+ // This isn't necessary, but it clears out any stray values that might have crept into the database.
+ bookmarksDatabaseHandler.updateBookmarkDisplayOrder(databaseId, i);
+ }
+ }
+
+ // Refresh the ListView.
+ updateBookmarksListView();
+
+ // Select the previously selected bookmark in the new location.
+ bookmarksListView.setItemChecked(selectedBookmarkNewPosition, true);
+
+ bookmarksListView.setSelection(selectedBookmarkNewPosition - 5);
+ break;
+
+ case R.id.edit_bookmark:
+ // Get a handle for `selectedBookmarkPosition` so we can scroll to it after refreshing the ListView.
+ SparseBooleanArray bookmarkPositionSparseBooleanArray = bookmarksListView.getCheckedItemPositions();
+ selectedBookmarkPosition = bookmarkPositionSparseBooleanArray.keyAt(0);
+
+ // Get a handle for `contextualActionMode` so we can close it when `editBookmarkDialog` is finished.
+ contextualActionMode = mode;
+
+ // Show the `EditBookmark` `AlertDialog` and name the instance `@string/edit_bookmark`.
+ DialogFragment editBookmarkDialog = new EditBookmark();
+ editBookmarkDialog.show(getFragmentManager(), "@string/edit_bookmark");
+ break;
+
case R.id.delete_bookmark:
// Get an array of the selected rows.
- final long[] selectedItemsLongArray = bookmarksListView.getCheckedItemIds();
+ final long[] selectedBookmarksLongArray = bookmarksListView.getCheckedItemIds();
String snackbarMessage;
// Determine how many items are in the array and prepare an appropriate Snackbar message.
- if (selectedItemsLongArray.length == 1) {
+ if (selectedBookmarksLongArray.length == 1) {
snackbarMessage = getString(R.string.one_bookmark_deleted);
} else {
- snackbarMessage = selectedItemsLongArray.length + " " + getString(R.string.bookmarks_deleted);
+ snackbarMessage = selectedBookmarksLongArray.length + " " + getString(R.string.bookmarks_deleted);
}
- updateBookmarksListViewExcept(selectedItemsLongArray);
+ updateBookmarksListViewExcept(selectedBookmarksLongArray);
// Show a SnackBar.
Snackbar.make(findViewById(R.id.bookmarks_coordinatorlayout), snackbarMessage, Snackbar.LENGTH_LONG)
// The Snackbar was dismissed without the "Undo" button being pushed.
default:
// Delete each selected row.
- for (long databaseIdLong : selectedItemsLongArray) {
+ for (long databaseIdLong : selectedBookmarksLongArray) {
// Convert `databaseIdLong` to an int.
int databaseIdInt = (int) databaseIdLong;
// Close the contextual app bar.
mode.finish();
+ break;
+
+ case R.id.context_menu_select_all_bookmarks:
+ numberOfBookmarks = bookmarksListView.getCount();
+
+ for (int i = 0; i < numberOfBookmarks; i++) {
+ bookmarksListView.setItemChecked(i, true);
+ }
+ break;
}
+ // Consume the click.
return true;
}
createBookmarkFAB.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- // Show the CreateBookmark AlertDialog and name the instance "@string/create_bookmark".
+ // Show the `CreateBookmark` `AlertDialog` and name the instance `@string/create_bookmark`.
DialogFragment createBookmarkDialog = new CreateBookmark();
createBookmarkDialog.show(getFragmentManager(), "@string/create_bookmark");
}
});
}
- /*
@Override
- public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
- super.onCreateContextMenu(menu, v, menuInfo);
- getMenuInflater().inflate(R.menu.bookmarks_context_menu, menu);
- } */
-
- /*@Override
public boolean onCreateOptionsMenu(Menu menu) {
- getMenuInflater().inflate(R.menu.menu_bookmarks_options, menu);
+ //Inflate the menu.
+ getMenuInflater().inflate(R.menu.bookmarks_options_menu, menu);
return true;
}
@Override
public boolean onPrepareOptionsMenu(Menu menu) {
- // Disable the delete icon.
- deleteBookmarkMenuItem = menu.findItem(R.id.delete_bookmark);
- deleteBookmarkMenuItem.setVisible(false);
-
- // Run all the other default commands.
super.onPrepareOptionsMenu(menu);
- // `return true` displays the menu;
return true;
- }*/
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem menuItem) {
+ int menuItemId = menuItem.getItemId();
+
+ switch (menuItemId) {
+ case android.R.id.home:
+ NavUtils.navigateUpFromSameTask(this);
+ break;
+
+ case R.id.options_menu_select_all_bookmarks:
+ int numberOfBookmarks = bookmarksListView.getCount();
+
+ for (int i = 0; i < numberOfBookmarks; i++) {
+ bookmarksListView.setItemChecked(i, true);
+ }
+ break;
+ }
+ return true;
+ }
@Override
public void onCreateBookmarkCancel(DialogFragment createBookmarkDialogFragment) {
- // Do nothing because the user selected "Cancel".
+ // Do nothing because the user selected `Cancel`.
}
@Override
public void onCreateBookmarkCreate(DialogFragment createBookmarkDialogFragment) {
- // Get the EditTexts from the DialogFragment and extract the strings.
+ // Get the `EditText`s from the `createBookmarkDialogFragment` and extract the strings.
EditText createBookmarkNameEditText = (EditText) createBookmarkDialogFragment.getDialog().findViewById(R.id.create_bookmark_name_edittext);
String bookmarkNameString = createBookmarkNameEditText.getText().toString();
- EditText createBookmarkURLEditText = (EditText) createBookmarkDialogFragment.getDialog().findViewById(R.id.create_bookmark_url_edittext);
- String bookmarkURLString = createBookmarkURLEditText.getText().toString();
+ EditText createBookmarkUrlEditText = (EditText) createBookmarkDialogFragment.getDialog().findViewById(R.id.create_bookmark_url_edittext);
+ String bookmarkUrlString = createBookmarkUrlEditText.getText().toString();
- // Convert the favoriteIcon Bitmap to a byte array.
+ // Convert the favoriteIcon Bitmap to a byte array. `0` is for lossless compression (the only option for a PNG).
ByteArrayOutputStream favoriteIconByteArrayOutputStream = new ByteArrayOutputStream();
MainWebViewActivity.favoriteIcon.compress(Bitmap.CompressFormat.PNG, 0, favoriteIconByteArrayOutputStream);
byte[] favoriteIconByteArray = favoriteIconByteArrayOutputStream.toByteArray();
+ // Display the new bookmark below the current items in the (0 indexed) list.
+ int newBookmarkDisplayOrder = bookmarksListView.getCount();
+
// Create the bookmark.
- bookmarksDatabaseHandler.createBookmark(bookmarkNameString, bookmarkURLString, favoriteIconByteArray);
+ bookmarksDatabaseHandler.createBookmark(bookmarkNameString, bookmarkUrlString, newBookmarkDisplayOrder, favoriteIconByteArray);
- // Refresh the ListView.
+ // Refresh the ListView. `setSelection` scrolls to the bottom of the list.
updateBookmarksListView();
+ bookmarksListView.setSelection(bookmarksListView.getCount());
+ }
+
+ @Override
+ public void onEditBookmarkCancel(DialogFragment editBookmarkDialogFragment) {
+ // Do nothing because the user selected `Cancel`.
+ }
+
+ @Override
+ public void onEditBookmarkSave(DialogFragment editBookmarkDialogFragment) {
+ // Get the `EditText`s from the `editBookmarkDialogFragment` and extract the strings.
+ EditText editBookmarkNameEditText = (EditText) editBookmarkDialogFragment.getDialog().findViewById(R.id.edit_bookmark_name_edittext);
+ String bookmarkNameString = editBookmarkNameEditText.getText().toString();
+ EditText editBookmarkUrlEditText = (EditText) editBookmarkDialogFragment.getDialog().findViewById(R.id.edit_bookmark_url_edittext);
+ String bookmarkUrlString = editBookmarkUrlEditText.getText().toString();
+
+ CheckBox useNewFavoriteIconBitmap = (CheckBox) editBookmarkDialogFragment.getDialog().findViewById(R.id.edit_bookmark_use_new_favorite_icon_checkbox);
+ byte[] favoriteIconByteArray;
+
+ // 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 (useNewFavoriteIconBitmap.isChecked()) {
+ // Get the new favorite icon from the Dialog and convert it into a Bitmap.
+ ImageView newFavoriteIconImageView = (ImageView) editBookmarkDialogFragment.getDialog().findViewById(R.id.edit_bookmark_new_favorite_icon);
+ Drawable favoriteIconDrawable = newFavoriteIconImageView.getDrawable();
+ Bitmap favoriteIconBitmap = ((BitmapDrawable) favoriteIconDrawable).getBitmap();
+
+ // Convert the new `favoriteIconBitmap` into a Byte Array.
+ ByteArrayOutputStream favoriteIconByteArrayOutputStream = new ByteArrayOutputStream();
+ favoriteIconBitmap.compress(Bitmap.CompressFormat.PNG, 0, favoriteIconByteArrayOutputStream);
+ favoriteIconByteArray = favoriteIconByteArrayOutputStream.toByteArray();
+
+ // Update the bookmark and the favorite icon.
+ bookmarksDatabaseHandler.updateBookmark(selectedBookmarkDatabaseId, bookmarkNameString, bookmarkUrlString, favoriteIconByteArray);
+ } else { // Update the bookmark without changing the favorite icon.
+ bookmarksDatabaseHandler.updateBookmark(selectedBookmarkDatabaseId, bookmarkNameString, bookmarkUrlString);
+ }
+
+ // Close the contextual action mode.
+ contextualActionMode.finish();
+
+ // Refresh the `ListView`. `setSelection` scrolls to that position.
+ updateBookmarksListView();
+ bookmarksListView.setSelection(selectedBookmarkPosition);
}
private void updateBookmarksListView() {
// Get a Cursor with the current contents of the bookmarks database.
- final Cursor bookmarksCursor = bookmarksDatabaseHandler.getBookmarksCursor();
+ final Cursor bookmarksCursor = bookmarksDatabaseHandler.getAllBookmarksCursor();
// Setup bookmarksCursorAdapter with `this` context. The `false` disables autoRequery.
CursorAdapter bookmarksCursorAdapter = new CursorAdapter(this, bookmarksCursor, false) {
@Override
public void bindView(View view, Context context, Cursor cursor) {
- // Get the favorite icon byte array from the cursor.
- byte[] favoriteIconByteArray = cursor.getBlob(cursor.getColumnIndex(BookmarksDatabaseHandler.FAVORITEICON));
+ // Get the favorite icon byte array from the `Cursor`.
+ byte[] favoriteIconByteArray = cursor.getBlob(cursor.getColumnIndex(BookmarksDatabaseHandler.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 favoriteIconBitmap = BitmapFactory.decodeByteArray(favoriteIconByteArray, 0, favoriteIconByteArray.length);
// Display the bitmap in `bookmarkFavoriteIcon`.
@Override
public void bindView(View view, Context context, Cursor cursor) {
// Get the favorite icon byte array from the cursor.
- byte[] favoriteIconByteArray = cursor.getBlob(cursor.getColumnIndex(BookmarksDatabaseHandler.FAVORITEICON));
+ byte[] favoriteIconByteArray = cursor.getBlob(cursor.getColumnIndex(BookmarksDatabaseHandler.FAVORITE_ICON));
// Convert the byte array to a Bitmap beginning at the first byte and ending at the last.
Bitmap favoriteIconBitmap = BitmapFactory.decodeByteArray(favoriteIconByteArray, 0, favoriteIconByteArray.length);
projects / PrivacyBrowserAndroid.git / blobdiff