X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FBookmarksActivity.java;h=108dcc043625b0595a39b4e3f1b6235299087fdc;hb=8951c7351854bbfc9f2815e74b81cc2a4d606bf0;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..108dcc04 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/BookmarksActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/BookmarksActivity.java @@ -21,27 +21,46 @@ 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.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.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.CheckBox; import android.widget.EditText; import android.widget.ImageView; import android.widget.ListView; -import android.widget.SimpleCursorAdapter; +import android.widget.TextView; 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; + + // `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; @Override protected void onCreate(Bundle savedInstanceState) { @@ -49,7 +68,7 @@ public class BookmarksActivity extends AppCompatActivity implements CreateBookma 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. @@ -58,13 +77,16 @@ public class BookmarksActivity extends AppCompatActivity implements CreateBookma 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 @@ -81,13 +103,131 @@ public class BookmarksActivity extends AppCompatActivity implements CreateBookma } }); + // `MultiChoiceModeListener` handles long clicks. + bookmarksListView.setMultiChoiceModeListener(new AbsListView.MultiChoiceModeListener() { + // `editBookmarkMenuItem` is used in `onCreateActionMode()` and `onItemCheckedStateChanged`. + MenuItem editBookmarkMenuItem; + + @Override + public boolean onCreateActionMode(ActionMode mode, Menu menu) { + // 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 `R.id.edit_bookmark`. + editBookmarkMenuItem = menu.findItem(R.id.edit_bookmark); + + return true; + } + + @Override + public boolean onPrepareActionMode(ActionMode mode, Menu menu) { + 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)); + + // Show the `Edit` option only if 1 bookmark is selected. + if (numberOfSelectedBookmarks == 1) { + editBookmarkMenuItem.setVisible(true); + } else { + editBookmarkMenuItem.setVisible(false); + } + } + + @Override + public boolean onActionItemClicked(ActionMode mode, MenuItem item) { + int menuItemId = item.getItemId(); + + switch (menuItemId) { + case R.id.edit_bookmark: + // Show the `EditBookmark` `AlertDialog` and name the instance `@string/edit_bookmark`. + DialogFragment editBookmarkDialog = new EditBookmark(); + editBookmarkDialog.show(getFragmentManager(), "@string/edit_bookmark"); + + contextualActionMode = mode; + break; + + case R.id.delete_bookmark: + // Get an array of the selected rows. + final long[] selectedBookmarksLongArray = bookmarksListView.getCheckedItemIds(); + + String snackbarMessage; + + // Determine how many items are in the array and prepare an appropriate Snackbar message. + if (selectedBookmarksLongArray.length == 1) { + snackbarMessage = getString(R.string.one_bookmark_deleted); + } else { + snackbarMessage = selectedBookmarksLongArray.length + " " + getString(R.string.bookmarks_deleted); + } + + updateBookmarksListViewExcept(selectedBookmarksLongArray); + + // 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 : selectedBookmarksLongArray) { + // 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(); + break; + } + // Consume the click. + 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; 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"); } @@ -96,62 +236,140 @@ public class BookmarksActivity extends AppCompatActivity implements CreateBookma @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(); // Create the bookmark. - bookmarksDatabaseHandler.createBookmark(bookmarkNameString, bookmarkURLString, favoriteIconByteArray); + bookmarksDatabaseHandler.createBookmark(bookmarkNameString, bookmarkUrlString, favoriteIconByteArray); // Refresh the ListView. updateBookmarksListView(); } + @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()) { + ImageView newFavoriteIconImageView = (ImageView) editBookmarkDialogFragment.getDialog().findViewById(R.id.edit_bookmark_new_favorite_icon); + Drawable favoriteIconDrawable = newFavoriteIconImageView.getDrawable(); + Bitmap favoriteIconBitmap = ((BitmapDrawable) favoriteIconDrawable).getBitmap(); + ByteArrayOutputStream favoriteIconByteArrayOutputStream = new ByteArrayOutputStream(); + favoriteIconBitmap.compress(Bitmap.CompressFormat.PNG, 0, favoriteIconByteArrayOutputStream); + favoriteIconByteArray = favoriteIconByteArrayOutputStream.toByteArray(); + bookmarksDatabaseHandler.updateBookmark(selectedBookmarkDatabaseId, bookmarkNameString, bookmarkUrlString, favoriteIconByteArray); + + } else { + // Update the bookmark. + bookmarksDatabaseHandler.updateBookmark(selectedBookmarkDatabaseId, bookmarkNameString, bookmarkUrlString); + } + + contextualActionMode.finish(); + + // Refresh the `ListView`. + updateBookmarksListView(); + } + private void updateBookmarksListView() { // 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; - } + final Cursor bookmarksCursor = bookmarksDatabaseHandler.getAllBookmarksCursor(); + + // 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.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); + + // 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.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); + + // 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