/*
- * Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
*
* This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
*
@Override
protected void onCreate(Bundle savedInstanceState) {
+ // Set the activity theme.
+ if (MainWebViewActivity.darkTheme) {
+ setTheme(R.style.PrivacyBrowserDark_SecondaryActivity);
+ } else {
+ setTheme(R.style.PrivacyBrowserLight_SecondaryActivity);
+ }
+
+ // Run the default commands.
super.onCreate(savedInstanceState);
+
+ // Set the content view.
setContentView(R.layout.bookmarks_coordinatorlayout);
// We need to use the `SupportActionBar` from `android.support.v7.app.ActionBar` until the minimum API is >= 21.
editBookmarkMenuItem = menu.findItem(R.id.edit_bookmark);
selectAllBookmarksMenuItem = menu.findItem(R.id.context_menu_select_all_bookmarks);
- // Get a handle for `contextualActionMode` so we can close it programatically.
+ // Store `contextualActionMode` so we can close it programatically.
contextualActionMode = mode;
return true;
// 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);
+ moveBookmarkUpMenuItem.setIcon(R.drawable.move_up_disabled);
} else { // Otherwise enable `moveBookmarkUpMenuItem`.
moveBookmarkUpMenuItem.setEnabled(true);
- moveBookmarkUpMenuItem.setIcon(R.drawable.move_bookmark_up_enabled);
+
+ // Set the icon according to the theme.
+ if (MainWebViewActivity.darkTheme) {
+ moveBookmarkUpMenuItem.setIcon(R.drawable.move_up_enabled_dark);
+ } else {
+ moveBookmarkUpMenuItem.setIcon(R.drawable.move_up_enabled_light);
+ }
}
// 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);
+ moveBookmarkDownMenuItem.setIcon(R.drawable.move_down_disabled);
} else { // Otherwise enable `moveBookmarkDownMenuItem`.
moveBookmarkDownMenuItem.setEnabled(true);
- moveBookmarkDownMenuItem.setIcon(R.drawable.move_bookmark_down_enabled);
+
+ // Set the icon according to the theme.
+ if (MainWebViewActivity.darkTheme) {
+ moveBookmarkDownMenuItem.setIcon(R.drawable.move_down_enabled_dark);
+ } else {
+ moveBookmarkDownMenuItem.setIcon(R.drawable.move_down_enabled_light);
+ }
}
} else { // More than one bookmark is selected.
// List the number of selected bookmarks in the subtitle.
// Scroll to where the deleted bookmark was located.
bookmarksListView.setSelection(selectedBookmarkPosition - 5);
+ // Initialize `snackbarMessage`.
String snackbarMessage;
// Determine how many items are in the array and prepare an appropriate Snackbar message.
.addCallback(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.
+ // The user pushed the `Undo` button.
case Snackbar.Callback.DISMISS_EVENT_ACTION:
// Refresh the ListView to show the rows again.
updateBookmarksListView(currentFolder);
// Scroll to where the deleted bookmark was located.
bookmarksListView.setSelection(selectedBookmarkPosition - 5);
-
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.
+ // The `Snackbar` was dismissed without the `Undo` button being pushed.
default:
// Delete each selected row.
for (long databaseIdLong : selectedBookmarksLongArray) {
// 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);
+ MainWebViewActivity.favoriteIconBitmap.compress(Bitmap.CompressFormat.PNG, 0, favoriteIconByteArrayOutputStream);
byte[] favoriteIconByteArray = favoriteIconByteArrayOutputStream.toByteArray();
// Display the new bookmark below the current items in the (0 indexed) list.
BitmapDrawable folderIconBitmapDrawable = (BitmapDrawable) folderIconDrawable;
folderIconBitmap = folderIconBitmapDrawable.getBitmap();
} else { // Assign `favoriteIcon` from the `WebView`.
- folderIconBitmap = MainWebViewActivity.favoriteIcon;
+ folderIconBitmap = MainWebViewActivity.favoriteIconBitmap;
}
// Convert `folderIconBitmap` to a byte array. `0` is for lossless compression (the only option for a PNG).
bookmarksDatabaseHelper.updateBookmark(selectedBookmarkDatabaseId, bookmarkNameString, bookmarkUrlString);
} else { // Update the bookmark using the `WebView` favorite icon.
ByteArrayOutputStream newFavoriteIconByteArrayOutputStream = new ByteArrayOutputStream();
- MainWebViewActivity.favoriteIcon.compress(Bitmap.CompressFormat.PNG, 0, newFavoriteIconByteArrayOutputStream);
+ MainWebViewActivity.favoriteIconBitmap.compress(Bitmap.CompressFormat.PNG, 0, newFavoriteIconByteArrayOutputStream);
byte[] newFavoriteIconByteArray = newFavoriteIconByteArrayOutputStream.toByteArray();
// Update the bookmark and the favorite icon.
BitmapDrawable folderIconBitmapDrawable = (BitmapDrawable) folderIconDrawable;
folderIconBitmap = folderIconBitmapDrawable.getBitmap();
} else { // Get the web page icon `ImageView` from the `Dialog`.
- folderIconBitmap = MainWebViewActivity.favoriteIcon;
+ folderIconBitmap = MainWebViewActivity.favoriteIconBitmap;
}
// Convert the folder `Bitmap` to a byte array. `0` is for lossless compression (the only option for a PNG).