X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FBookmarksActivity.java;fp=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FBookmarksActivity.java;h=556bd60cafb215618bef6f40fc6ee6a04d4c1d54;hb=c6907b02eb70e1a4bde274e66101f9f54f77a660;hp=6d0819913cbb7bf009b597d7e7f6ed028b3130d3;hpb=9c582d802e641b2b6d27271310fc16898020b470;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/java/com/stoutner/privacybrowser/BookmarksActivity.java b/app/src/main/java/com/stoutner/privacybrowser/BookmarksActivity.java index 6d081991..556bd60c 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/BookmarksActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/BookmarksActivity.java @@ -21,21 +21,29 @@ package com.stoutner.privacybrowser; import android.app.Activity; import android.app.DialogFragment; +import android.content.Context; import android.database.Cursor; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.os.Bundle; import android.support.design.widget.FloatingActionButton; +import android.support.design.widget.Snackbar; import android.support.v4.app.NavUtils; +import android.support.v4.widget.CursorAdapter; import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; +import android.view.ActionMode; +import android.view.Menu; +import android.view.MenuItem; import android.view.View; +import android.view.ViewGroup; +import android.widget.AbsListView; import android.widget.AdapterView; import android.widget.EditText; import android.widget.ImageView; import android.widget.ListView; -import android.widget.SimpleCursorAdapter; +import android.widget.TextView; import java.io.ByteArrayOutputStream; @@ -43,13 +51,16 @@ public class BookmarksActivity extends AppCompatActivity implements CreateBookma private BookmarksDatabaseHandler bookmarksDatabaseHandler; private ListView bookmarksListView; + // deleteBookmarkMenuItem is used in onCreate() and onPrepareOptionsMenu(). + private MenuItem deleteBookmarkMenuItem; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.bookmarks_coordinatorlayout); // We need to use the SupportActionBar from android.support.v7.app.ActionBar until the minimum API is >= 21. - Toolbar bookmarksAppBar = (Toolbar) findViewById(R.id.bookmarks_toolbar); + final Toolbar bookmarksAppBar = (Toolbar) findViewById(R.id.bookmarks_toolbar); setSupportActionBar(bookmarksAppBar); // Display the home arrow on supportAppBar. @@ -81,6 +92,101 @@ public class BookmarksActivity extends AppCompatActivity implements CreateBookma } }); + // registerForContextMenu(bookmarksListView); + + bookmarksListView.setMultiChoiceModeListener(new AbsListView.MultiChoiceModeListener() { + @Override + public void onItemCheckedStateChanged(ActionMode mode, int position, long id, boolean checked) { + String numberSelectedString; + long[] selectedItemsLongArray = bookmarksListView.getCheckedItemIds(); + + numberSelectedString = selectedItemsLongArray.length + " " + getString(R.string.selected); + + mode.setSubtitle(numberSelectedString); + } + + @Override + public boolean onCreateActionMode(ActionMode mode, Menu menu) { + // Inflate the menu for the contextual app bar. + getMenuInflater().inflate(R.menu.bookmarks_context_menu, menu); + + mode.setTitle(R.string.bookmarks); + + return true; + } + + @Override + public boolean onPrepareActionMode(ActionMode mode, Menu menu) { + return false; + } + + @Override + public boolean onActionItemClicked(ActionMode mode, MenuItem item) { + int menuItemId = item.getItemId(); + + switch (menuItemId) { + case R.id.delete_bookmark: + // Get an array of the selected rows. + final long[] selectedItemsLongArray = bookmarksListView.getCheckedItemIds(); + + String snackbarMessage; + + // Determine how many items are in the array and prepare an appropriate Snackbar message. + if (selectedItemsLongArray.length == 1) { + snackbarMessage = getString(R.string.one_bookmark_deleted); + } else { + snackbarMessage = selectedItemsLongArray.length + " " + getString(R.string.bookmarks_deleted); + } + + updateBookmarksListViewExcept(selectedItemsLongArray); + + // Show a SnackBar. + Snackbar.make(findViewById(R.id.bookmarks_coordinatorlayout), snackbarMessage, Snackbar.LENGTH_LONG) + .setAction(R.string.undo, new View.OnClickListener() { + @Override + public void onClick(View view) { + // Do nothing because everything will be handled by `onDismissed()` below. + } + }) + .setCallback(new Snackbar.Callback() { + @Override + public void onDismissed(Snackbar snackbar, int event) { + switch (event) { + // The user pushed the "Undo" button. + case Snackbar.Callback.DISMISS_EVENT_ACTION: + // Refresh the ListView to show the rows again. + updateBookmarksListView(); + + break; + + // The Snackbar was dismissed without the "Undo" button being pushed. + default: + // Delete each selected row. + for (long databaseIdLong : selectedItemsLongArray) { + // Convert `databaseIdLong` to an int. + int databaseIdInt = (int) databaseIdLong; + + // Delete the database row. + bookmarksDatabaseHandler.deleteBookmark(databaseIdInt); + } + break; + } + } + }) + .show(); + + // Close the contextual app bar. + mode.finish(); + } + return true; + } + + @Override + public void onDestroyActionMode(ActionMode mode) { + + } + }); + // Set a FloatingActionButton for creating new bookmarks. FloatingActionButton createBookmarkFAB = (FloatingActionButton) findViewById(R.id.create_bookmark_fab); assert createBookmarkFAB != null; @@ -94,6 +200,33 @@ public class BookmarksActivity extends AppCompatActivity implements CreateBookma }); } + /* + @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); + + 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 void onCreateBookmarkCancel(DialogFragment createBookmarkDialogFragment) { // Do nothing because the user selected "Cancel". @@ -123,35 +256,73 @@ public class BookmarksActivity extends AppCompatActivity implements CreateBookma // Get a Cursor with the current contents of the bookmarks database. final Cursor bookmarksCursor = bookmarksDatabaseHandler.getBookmarksCursor(); - // The last argument is 0 because no special behavior is required. - SimpleCursorAdapter bookmarksAdapter = new SimpleCursorAdapter(this, - R.layout.bookmarks_item_linearlayout, - bookmarksCursor, - new String[] { BookmarksDatabaseHandler.FAVORITEICON, BookmarksDatabaseHandler.BOOKMARK_NAME }, - new int[] { R.id.bookmark_favorite_icon, R.id.bookmark_name }, - 0); - - // Override the handling of R.id.bookmark_favorite_icon to load an image instead of a string. - bookmarksAdapter.setViewBinder(new SimpleCursorAdapter.ViewBinder() { - public boolean setViewValue(View view, Cursor cursor, int columnIndex) { - if (view.getId() == R.id.bookmark_favorite_icon) { - // Get the byte array from the database. - byte[] favoriteIconByteArray = cursor.getBlob(columnIndex); - - // 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); - - // Set the favoriteIconBitmap. - ImageView bookmarkFavoriteIcon = (ImageView) view; - bookmarkFavoriteIcon.setImageBitmap(favoriteIconBitmap); - return true; - } else { // Process the rest of the bookmarksAdapter with default settings. - return false; - } + // Setup bookmarksCursorAdapter with `this` context. The `false` disables autoRequery. + CursorAdapter bookmarksCursorAdapter = new CursorAdapter(this, bookmarksCursor, false) { + @Override + public View newView(Context context, Cursor cursor, ViewGroup parent) { + // Inflate the individual item layout. `false` does not attach it to the root. + return getLayoutInflater().inflate(R.layout.bookmarks_item_linearlayout, parent, 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)); + + // 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`. + ImageView bookmarkFavoriteIcon = (ImageView) view.findViewById(R.id.bookmark_favorite_icon); + bookmarkFavoriteIcon.setImageBitmap(favoriteIconBitmap); + + + // Get the bookmark name from the cursor and display it in `bookmarkNameTextView`. + String bookmarkNameString = cursor.getString(cursor.getColumnIndex(BookmarksDatabaseHandler.BOOKMARK_NAME)); + TextView bookmarkNameTextView = (TextView) view.findViewById(R.id.bookmark_name); + assert bookmarkNameTextView != null; // This assert removes the warning that bookmarkNameTextView might be null. + bookmarkNameTextView.setText(bookmarkNameString); + } + }; + + // Update the ListView. + bookmarksListView.setAdapter(bookmarksCursorAdapter); + } + + private void updateBookmarksListViewExcept(long[] exceptIdLongArray) { + // Get a Cursor with the current contents of the bookmarks database except for the specified database IDs. + final Cursor bookmarksCursor = bookmarksDatabaseHandler.getBookmarksCursorExcept(exceptIdLongArray); + + // Setup bookmarksCursorAdapter with `this` context. The `false` disables autoRequery. + CursorAdapter bookmarksCursorAdapter = new CursorAdapter(this, bookmarksCursor, false) { + @Override + public View newView(Context context, Cursor cursor, ViewGroup parent) { + // Inflate the individual item layout. `false` does not attach it to the root. + return getLayoutInflater().inflate(R.layout.bookmarks_item_linearlayout, parent, 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)); + + // 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`. + ImageView bookmarkFavoriteIcon = (ImageView) view.findViewById(R.id.bookmark_favorite_icon); + bookmarkFavoriteIcon.setImageBitmap(favoriteIconBitmap); + + + // Get the bookmark name from the cursor and display it in `bookmarkNameTextView`. + String bookmarkNameString = cursor.getString(cursor.getColumnIndex(BookmarksDatabaseHandler.BOOKMARK_NAME)); + TextView bookmarkNameTextView = (TextView) view.findViewById(R.id.bookmark_name); + assert bookmarkNameTextView != null; // This assert removes the warning that bookmarkNameTextView might be null. + bookmarkNameTextView.setText(bookmarkNameString); + } + }; // Update the ListView. - bookmarksListView.setAdapter(bookmarksAdapter); + bookmarksListView.setAdapter(bookmarksCursorAdapter); } } \ No newline at end of file