From b2b407b630e40bcf914e72bfe7609e093a54d42c Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Fri, 22 Sep 2017 10:43:24 -0700 Subject: [PATCH] Disable the move bookmark to folder button until a folder is selected. https://redmine.stoutner.com/issues/156. --- .../activities/BookmarksActivity.java | 59 ++++++++----------- .../dialogs/MoveToFolderDialog.java | 21 ++++++- app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values-es/strings.xml | 1 - app/src/main/res/values-it/strings.xml | 1 - app/src/main/res/values/strings.xml | 1 - 6 files changed, 44 insertions(+), 40 deletions(-) diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksActivity.java index efdb06a7..a178d49a 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksActivity.java @@ -626,44 +626,35 @@ public class BookmarksActivity extends AppCompatActivity implements CreateBookma EditText createFolderNameEditText = (EditText) dialogFragment.getDialog().findViewById(R.id.create_folder_name_edittext); String folderNameString = createFolderNameEditText.getText().toString(); - // Check to see if the folder already exists. - Cursor bookmarkFolderCursor = bookmarksDatabaseHelper.getFolderCursor(folderNameString); - int existingFoldersWithNewName = bookmarkFolderCursor.getCount(); - bookmarkFolderCursor.close(); - if (folderNameString.isEmpty() || (existingFoldersWithNewName > 0)) { - 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 `Bitmap`. - RadioButton defaultFolderIconRadioButton = (RadioButton) dialogFragment.getDialog().findViewById(R.id.create_folder_default_icon_radiobutton); - Bitmap folderIconBitmap; - if (defaultFolderIconRadioButton.isChecked()) { - // 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 { // Assign `favoriteIcon` from the `WebView`. - folderIconBitmap = MainWebViewActivity.favoriteIconBitmap; - } + // 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 `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 { // Assign `favoriteIcon` from the `WebView`. + folderIconBitmap = MainWebViewActivity.favoriteIconBitmap; + } - // 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(); + // 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(); - // Move all the bookmarks down one in the display order. - for (int i = 0; i < bookmarksListView.getCount(); i++) { - int databaseId = (int) bookmarksListView.getItemIdAtPosition(i); - bookmarksDatabaseHelper.updateBookmarkDisplayOrder(databaseId, i + 1); - } + // Move all the bookmarks down one in the display order. + for (int i = 0; i < bookmarksListView.getCount(); i++) { + int databaseId = (int) bookmarksListView.getItemIdAtPosition(i); + bookmarksDatabaseHelper.updateBookmarkDisplayOrder(databaseId, i + 1); + } - // Create the folder, placing it at the top of the ListView - bookmarksDatabaseHelper.createFolder(folderNameString, 0, currentFolder, folderIconByteArray); + // Create the folder, placing it at the top of the ListView + bookmarksDatabaseHelper.createFolder(folderNameString, 0, currentFolder, folderIconByteArray); - // Refresh the ListView. - updateBookmarksListView(currentFolder); - } + // Refresh the ListView. + updateBookmarksListView(currentFolder); } @Override diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/MoveToFolderDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/MoveToFolderDialog.java index 6eb09a31..8ced87d3 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/MoveToFolderDialog.java +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/MoveToFolderDialog.java @@ -35,10 +35,12 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.v4.content.ContextCompat; -// We have to use `AppCompatDialogFragment` instead of `DialogFragment` or an error is produced on API <=22. +// `AppCompatDialogFragment` must be used instead of `DialogFragment` or an error is produced on API <=22. import android.support.v7.app.AppCompatDialogFragment; import android.view.View; import android.view.ViewGroup; +import android.widget.AdapterView; +import android.widget.Button; import android.widget.CursorAdapter; import android.widget.ImageView; import android.widget.ListView; @@ -115,9 +117,15 @@ public class MoveToFolderDialog extends AppCompatDialogFragment { // Create an `AlertDialog` from the `AlertDialog.Builder`. final AlertDialog alertDialog = dialogBuilder.create(); - // We need to show the `AlertDialog` before we can modify items in the layout. + // Show the `AlertDialog` so the items in the layout can be modified. alertDialog.show(); + // Get a handle for the positive button. + final Button moveButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE); + + // Initially disable the positive button. + moveButton.setEnabled(false); + // Initialize the `Cursor` and `CursorAdapter` variables. Cursor foldersCursor; CursorAdapter foldersCursorAdapter; @@ -251,6 +259,15 @@ public class MoveToFolderDialog extends AppCompatDialogFragment { ListView foldersListView = (ListView) alertDialog.findViewById(R.id.move_to_folder_listview); foldersListView.setAdapter(foldersCursorAdapter); + // Enable the move button when a folder is selected. + foldersListView.setOnItemClickListener(new AdapterView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView parent, View view, int position, long id) { + // Enable the move button. + moveButton.setEnabled(true); + } + }); + // `onCreateDialog` requires the return of an `AlertDialog`. return alertDialog; } diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index bb9bcfe6..b81e5d92 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -153,7 +153,6 @@ Name des Ordners URL für das Lesezeichen Ordnernamen müssen einmalig sein - Kann diesen Ordner nicht erstellen, da der Name bereits existiert: Kann diesen Ordner nicht umbenennen, da der neue Name bereits existiert: Kann die markierten Lesezeichen nicht verschieben, da kein neuer Ordner ausgewählt wurde. Lesezeichen Bearbeiten diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 3bd410c5..c832ded3 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -170,7 +170,6 @@ Nombre de carpeta Marcador URL Los nombres de carpetas deben ser únicos - No se creó la carpeta porque el nombre no fue único: No se guardó la carpeta porque el nuevo nombre no fue único: No se movió los marcadores selectionados porque ninguna carpeta nueva fue seleccionada. Editar marcador diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 5755086a..e0a6c198 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -172,7 +172,6 @@ Nome Cartella URL Segnalibro I nomi delle cartelle devono essere unici - Non è possibile creare la cartella perché già esistente: Non è possibile salvare la cartella perché già esistente: Non è possibile spostare il segnalibro, nessuna cartella selezionata. Modifica Segnalibro diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 815abe87..75511e64 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -175,7 +175,6 @@ Folder name Bookmark URL Folder names must be unique - Cannot create the folder because the name is not unique: Cannot save the folder because the new name is not unique: Cannot move the selected bookmarks because no new folder was selected. Edit Bookmark -- 2.45.2