From: Soren Stoutner Date: Mon, 20 Apr 2020 23:08:52 +0000 (-0700) Subject: Migrate five dialogs to Kotlin. https://redmine.stoutner.com/issues/543 X-Git-Tag: v3.5~11 X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=commitdiff_plain;h=6bc00e202749ba0cb337be462825002ba74be8fc;hp=9df712df3780161d77d10c6f3a2444bf8f218c99 Migrate five dialogs to Kotlin. https://redmine.stoutner.com/issues/543 --- diff --git a/app/build.gradle b/app/build.gradle index 85f5cacf..f1890a36 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -84,7 +84,7 @@ dependencies { implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0' implementation "androidx.core:core-ktx:1.2.0" implementation 'androidx.drawerlayout:drawerlayout:1.0.0' - implementation 'androidx.preference:preference:1.1.0' + implementation 'androidx.preference:preference:1.1.1' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0' implementation 'androidx.viewpager:viewpager:1.0.0' implementation 'androidx.webkit:webkit:1.2.0' @@ -96,5 +96,5 @@ dependencies { implementation 'com.google.android.material:material:1.1.0' // Only compile Firebase ads for the free flavor. - freeImplementation 'com.google.firebase:firebase-ads:19.0.1' + freeImplementation 'com.google.firebase:firebase-ads:19.1.0' } \ No newline at end of file diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksDatabaseViewActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksDatabaseViewActivity.java index 61b5e845..9844f184 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksDatabaseViewActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksDatabaseViewActivity.java @@ -51,6 +51,7 @@ import android.widget.ResourceCursorAdapter; import android.widget.Spinner; import android.widget.TextView; +import androidx.annotation.NonNull; import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; // The AndroidX toolbar must be used until the minimum API is >= 21. @@ -72,7 +73,7 @@ public class BookmarksDatabaseViewActivity extends AppCompatActivity implements EditBookmarkFolderDatabaseViewDialog.EditBookmarkFolderDatabaseViewListener { // Instantiate the constants. private static final int ALL_FOLDERS_DATABASE_ID = -2; - private static final int HOME_FOLDER_DATABASE_ID = -1; + public static final int HOME_FOLDER_DATABASE_ID = -1; // `bookmarksDatabaseHelper` is used in `onCreate()`, `updateBookmarksListView()`, `selectAllBookmarksInFolder()`, and `onDestroy()`. private BookmarksDatabaseHelper bookmarksDatabaseHelper; @@ -753,7 +754,7 @@ public class BookmarksDatabaseViewActivity extends AppCompatActivity implements } @Override - public void onSaveBookmark(DialogFragment dialogFragment, int selectedBookmarkDatabaseId, Bitmap favoriteIconBitmap) { + public void onSaveBookmark(DialogFragment dialogFragment, int selectedBookmarkDatabaseId, @NonNull Bitmap favoriteIconBitmap) { // Get the dialog from the dialog fragment. Dialog dialog = dialogFragment.getDialog(); @@ -777,7 +778,7 @@ public class BookmarksDatabaseViewActivity extends AppCompatActivity implements String parentFolderNameString; // Set the parent folder name. - if (folderDatabaseId == EditBookmarkDatabaseViewDialog.HOME_FOLDER_DATABASE_ID) { // The home folder is selected. Use `""`. + if (folderDatabaseId == HOME_FOLDER_DATABASE_ID) { // The home folder is selected. Use `""`. parentFolderNameString = ""; } else { // Get the parent folder name from the database. parentFolderNameString = bookmarksDatabaseHelper.getFolderName(folderDatabaseId); @@ -829,7 +830,7 @@ public class BookmarksDatabaseViewActivity extends AppCompatActivity implements String parentFolderNameString; // Set the parent folder name. - if (parentFolderDatabaseId == EditBookmarkFolderDatabaseViewDialog.HOME_FOLDER_DATABASE_ID) { // The home folder is selected. Use `""`. + if (parentFolderDatabaseId == HOME_FOLDER_DATABASE_ID) { // The home folder is selected. Use `""`. parentFolderNameString = ""; } else { // Get the parent folder name from the database. parentFolderNameString = bookmarksDatabaseHelper.getFolderName(parentFolderDatabaseId); diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.kt index 57068354..8b56f2d4 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.kt @@ -82,7 +82,7 @@ class AddDomainDialog: DialogFragment() { @SuppressLint("InflateParams") override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { // Get the arguments. - val arguments = arguments!! + val arguments = requireArguments() // Get the URL from the bundle. val urlString = arguments.getString("url_string") @@ -116,7 +116,7 @@ class AddDomainDialog: DialogFragment() { dialogBuilder.setTitle(R.string.add_domain) // Set the view. The parent view is `null` because it will be assigned by the alert dialog. - dialogBuilder.setView(activity!!.layoutInflater.inflate(R.layout.add_domain_dialog, null)) + dialogBuilder.setView(requireActivity().layoutInflater.inflate(R.layout.add_domain_dialog, null)) // Set a listener on the cancel button. Using `null` as the listener closes the dialog without doing anything else. dialogBuilder.setNegativeButton(R.string.cancel, null) @@ -142,8 +142,8 @@ class AddDomainDialog: DialogFragment() { val domainsDatabaseHelper = DomainsDatabaseHelper(context, null, null, 0) // Get handles for the views in the alert dialog. - val addDomainEditText: EditText = alertDialog.findViewById(R.id.domain_name_edittext) - val domainNameAlreadyExistsTextView: TextView = alertDialog.findViewById(R.id.domain_name_already_exists_textview) + val addDomainEditText = alertDialog.findViewById(R.id.domain_name_edittext) + val domainNameAlreadyExistsTextView = alertDialog.findViewById(R.id.domain_name_already_exists_textview) val addButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE) // Update the status of the warning text and the add button when the domain name changes. diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkDialog.kt index 5bc2da25..0b1dea00 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkDialog.kt @@ -94,7 +94,7 @@ class CreateBookmarkDialog: DialogFragment() { @SuppressLint("InflateParams") override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { // Get the arguments. - val arguments = arguments!! + val arguments = requireArguments() // Get the contents of the arguments. val urlString = arguments.getString("url_string") @@ -128,7 +128,7 @@ class CreateBookmarkDialog: DialogFragment() { dialogBuilder.setIcon(favoriteIconDrawable) // Set the view. The parent view is `null` because it will be assigned by the alert dialog. - dialogBuilder.setView(activity!!.layoutInflater.inflate(R.layout.create_bookmark_dialog, null)) + dialogBuilder.setView(requireActivity().layoutInflater.inflate(R.layout.create_bookmark_dialog, null)) // Set a listener on the cancel button. Using `null` as the listener closes the dialog without doing anything else. dialogBuilder.setNegativeButton(R.string.cancel, null) @@ -151,8 +151,8 @@ class CreateBookmarkDialog: DialogFragment() { alertDialog.show() // Get a handle for the edit texts. - val createBookmarkNameEditText: EditText = alertDialog.findViewById(R.id.create_bookmark_name_edittext) - val createBookmarkUrlEditText: EditText = alertDialog.findViewById(R.id.create_bookmark_url_edittext) + val createBookmarkNameEditText = alertDialog.findViewById(R.id.create_bookmark_name_edittext) + val createBookmarkUrlEditText = alertDialog.findViewById(R.id.create_bookmark_url_edittext) // Set the initial texts for the edit texts. createBookmarkNameEditText.setText(titleString) diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkFolderDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkFolderDialog.kt index 0cca2881..d4f12193 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkFolderDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateBookmarkFolderDialog.kt @@ -93,7 +93,7 @@ class CreateBookmarkFolderDialog: DialogFragment() { @SuppressLint("InflateParams") override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { // Get the arguments. - val arguments = arguments!! + val arguments = requireArguments() // Get the favorite icon byte array. val favoriteIconByteArray = arguments.getByteArray("favorite_icon_byte_array")!! @@ -119,7 +119,7 @@ class CreateBookmarkFolderDialog: DialogFragment() { dialogBuilder.setTitle(R.string.create_folder) // Set the view. The parent view is null because it will be assigned by the alert dialog. - dialogBuilder.setView(activity!!.layoutInflater.inflate(R.layout.create_bookmark_folder_dialog, null)) + dialogBuilder.setView(requireActivity().layoutInflater.inflate(R.layout.create_bookmark_folder_dialog, null)) // Set a listener on the cancel button. Using `null` as the listener closes the dialog without doing anything else. dialogBuilder.setNegativeButton(R.string.cancel, null) @@ -145,8 +145,8 @@ class CreateBookmarkFolderDialog: DialogFragment() { alertDialog.show() // Get handles for the views in the dialog. - val webPageIconImageView: ImageView = alertDialog.findViewById(R.id.create_folder_web_page_icon) - val folderNameEditText: EditText = alertDialog.findViewById(R.id.create_folder_name_edittext) + val webPageIconImageView = alertDialog.findViewById(R.id.create_folder_web_page_icon) + val folderNameEditText = alertDialog.findViewById(R.id.create_folder_name_edittext) val createButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE) // Display the current favorite icon. diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateHomeScreenShortcutDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateHomeScreenShortcutDialog.kt index 092d28c5..ddcc72cc 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateHomeScreenShortcutDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateHomeScreenShortcutDialog.kt @@ -92,7 +92,7 @@ class CreateHomeScreenShortcutDialog: DialogFragment() { @SuppressLint("InflateParams") override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { // Get the arguments. - val arguments = arguments!! + val arguments = requireArguments() // Get the strings from the arguments. val initialShortcutName = arguments.getString("shortcut_name") @@ -113,9 +113,9 @@ class CreateHomeScreenShortcutDialog: DialogFragment() { // Use an alert dialog builder to create the dialog and set the style according to the theme. val dialogBuilder = if (darkTheme) { - AlertDialog.Builder(activity!!, R.style.PrivacyBrowserAlertDialogDark) + AlertDialog.Builder(requireContext(), R.style.PrivacyBrowserAlertDialogDark) } else { - AlertDialog.Builder(activity!!, R.style.PrivacyBrowserAlertDialogLight) + AlertDialog.Builder(requireContext(), R.style.PrivacyBrowserAlertDialogLight) } // Create a drawable version of the favorite icon. @@ -126,7 +126,7 @@ class CreateHomeScreenShortcutDialog: DialogFragment() { dialogBuilder.setIcon(favoriteIconDrawable) // Set the view. The parent view is null because it will be assigned by the alert dialog. - dialogBuilder.setView(activity!!.layoutInflater.inflate(R.layout.create_home_screen_shortcut_dialog, null)) + dialogBuilder.setView(requireActivity().layoutInflater.inflate(R.layout.create_home_screen_shortcut_dialog, null)) // Set a listener on the close button. Using null closes the dialog without doing anything else. dialogBuilder.setNegativeButton(R.string.cancel, null) @@ -240,9 +240,6 @@ class CreateHomeScreenShortcutDialog: DialogFragment() { } private fun createHomeScreenShortcut(favoriteIconBitmap: Bitmap) { - // Get a handle for the context. - val context = context!! - // Get the strings from the edit texts. val shortcutName = shortcutNameEditText.text.toString() val urlString = urlEditText.text.toString() @@ -263,7 +260,7 @@ class CreateHomeScreenShortcutDialog: DialogFragment() { shortcutIntent.data = Uri.parse(urlString) // Create a shortcut info builder. The shortcut name becomes the shortcut ID. - val shortcutInfoBuilder = ShortcutInfoCompat.Builder(context, shortcutName) + val shortcutInfoBuilder = ShortcutInfoCompat.Builder(requireContext(), shortcutName) // Add the required fields to the shortcut info builder. shortcutInfoBuilder.setIcon(favoriteIcon) @@ -271,6 +268,6 @@ class CreateHomeScreenShortcutDialog: DialogFragment() { shortcutInfoBuilder.setShortLabel(shortcutName) // Add the shortcut to the home screen. `ShortcutManagerCompat` can be switched to `ShortcutManager` once the minimum API >= 26. - ShortcutManagerCompat.requestPinShortcut(context, shortcutInfoBuilder.build(), null) + ShortcutManagerCompat.requestPinShortcut(requireContext(), shortcutInfoBuilder.build(), null) } } \ No newline at end of file diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDatabaseViewDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDatabaseViewDialog.java deleted file mode 100644 index b19c2063..00000000 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDatabaseViewDialog.java +++ /dev/null @@ -1,472 +0,0 @@ -/* - * Copyright © 2016-2019 Soren Stoutner . - * - * This file is part of Privacy Browser . - * - * Privacy Browser is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Privacy Browser is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Privacy Browser. If not, see . - */ - -package com.stoutner.privacybrowser.dialogs; - -import android.annotation.SuppressLint; -import android.app.AlertDialog; -import android.app.Dialog; -import android.content.Context; -import android.content.DialogInterface; -import android.content.SharedPreferences; -import android.database.Cursor; -import android.database.MatrixCursor; -import android.database.MergeCursor; -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; -import android.os.Bundle; -import android.preference.PreferenceManager; -import android.text.Editable; -import android.text.TextWatcher; -import android.view.KeyEvent; -import android.view.View; -import android.view.WindowManager; -import android.widget.AdapterView; -import android.widget.Button; -import android.widget.EditText; -import android.widget.ImageView; -import android.widget.RadioButton; -import android.widget.RadioGroup; -import android.widget.ResourceCursorAdapter; -import android.widget.Spinner; -import android.widget.TextView; - -import com.stoutner.privacybrowser.R; -import com.stoutner.privacybrowser.helpers.BookmarksDatabaseHelper; - -import java.io.ByteArrayOutputStream; - -import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; -import androidx.fragment.app.DialogFragment; // The AndroidX dialog fragment must be used or an error is produced on API <=22. - -public class EditBookmarkDatabaseViewDialog extends DialogFragment { - // Define the home folder database ID constant. - public static final int HOME_FOLDER_DATABASE_ID = -1; - - // Define the edit bookmark database view listener. - private EditBookmarkDatabaseViewListener editBookmarkDatabaseViewListener; - - - // The public interface is used to send information back to the parent activity. - public interface EditBookmarkDatabaseViewListener { - void onSaveBookmark(DialogFragment dialogFragment, int selectedBookmarkDatabaseId, Bitmap favoriteIconBitmap); - } - - @Override - public void onAttach(@NonNull Context context) { - // Run the default commands. - super.onAttach(context); - - // Get a handle for edit bookmark database view listener from the launching context. - editBookmarkDatabaseViewListener = (EditBookmarkDatabaseViewListener) context; - } - - - public static EditBookmarkDatabaseViewDialog bookmarkDatabaseId(int databaseId, Bitmap favoriteIconBitmap) { - // Create a favorite icon byte array output stream. - ByteArrayOutputStream favoriteIconByteArrayOutputStream = new ByteArrayOutputStream(); - - // Convert the favorite icon to a PNG and place it in the byte array output stream. `0` is for lossless compression (the only option for a PNG). - favoriteIconBitmap.compress(Bitmap.CompressFormat.PNG, 0, favoriteIconByteArrayOutputStream); - - // Convert the byte array output stream to a byte array. - byte[] favoriteIconByteArray = favoriteIconByteArrayOutputStream.toByteArray(); - - // Create an arguments bundle. - Bundle argumentsBundle = new Bundle(); - - // Store the variables in the bundle. - argumentsBundle.putInt("database_id", databaseId); - argumentsBundle.putByteArray("favorite_icon_byte_array", favoriteIconByteArray); - - // Create a new instance of the dialog. - EditBookmarkDatabaseViewDialog editBookmarkDatabaseViewDialog = new EditBookmarkDatabaseViewDialog(); - - // Add the arguments bundle to the dialog. - editBookmarkDatabaseViewDialog.setArguments(argumentsBundle); - - // Return the new dialog. - return editBookmarkDatabaseViewDialog; - } - - // `@SuppressLing("InflateParams")` removes the warning about using `null` as the parent view group when inflating the `AlertDialog`. - @SuppressLint("InflateParams") - @Override - @NonNull - public Dialog onCreateDialog(Bundle savedInstanceState) { - // Get the arguments. - Bundle arguments = getArguments(); - - // Remove the incorrect lint warning below that the arguments might be null. - assert arguments != null; - - // Get the bookmark database ID from the bundle. - int bookmarkDatabaseId = getArguments().getInt("database_id"); - - // Get the favorite icon byte array. - byte[] favoriteIconByteArray = arguments.getByteArray("favorite_icon_byte_array"); - - // Remove the incorrect lint warning below that the favorite icon byte array might be null. - assert favoriteIconByteArray != null; - - // Convert the favorite icon byte array to a bitmap. - Bitmap favoriteIconBitmap = BitmapFactory.decodeByteArray(favoriteIconByteArray, 0, favoriteIconByteArray.length); - - // Initialize the database helper. The `0` specifies a database version, but that is ignored and set instead using a constant in `BookmarksDatabaseHelper`. - BookmarksDatabaseHelper bookmarksDatabaseHelper = new BookmarksDatabaseHelper(getContext(), null, null, 0); - - // Get a cursor with the selected bookmark and move it to the first position. - Cursor bookmarkCursor = bookmarksDatabaseHelper.getBookmark(bookmarkDatabaseId); - bookmarkCursor.moveToFirst(); - - // Use an alert dialog builder to create the alert dialog. - AlertDialog.Builder dialogBuilder; - - // Get a handle for the shared preferences. - SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getContext()); - - // Get the screenshot and theme preferences. - boolean allowScreenshots = sharedPreferences.getBoolean("allow_screenshots", false); - boolean darkTheme = sharedPreferences.getBoolean("dark_theme", false); - - // Set the style according to the theme. - if (darkTheme) { - dialogBuilder = new AlertDialog.Builder(getActivity(), R.style.PrivacyBrowserAlertDialogDark); - } else { - dialogBuilder = new AlertDialog.Builder(getActivity(), R.style.PrivacyBrowserAlertDialogLight); - } - - // Set the title. - dialogBuilder.setTitle(R.string.edit_bookmark); - - // Remove the incorrect lint warning below that `getLayoutInflater()` might be null. - assert getActivity() != null; - - // Set the view. The parent view is `null` because it will be assigned by `AlertDialog`. - dialogBuilder.setView(getActivity().getLayoutInflater().inflate(R.layout.edit_bookmark_databaseview_dialog, null)); - - // Set the listener for the negative button. - dialogBuilder.setNegativeButton(R.string.cancel, (DialogInterface dialog, int which) -> { - // Do nothing. The `AlertDialog` will close automatically. - }); - - // Set the listener for the positive button. - dialogBuilder.setPositiveButton(R.string.save, (DialogInterface dialog, int which) -> { - // Return the `DialogFragment` to the parent activity on save. - editBookmarkDatabaseViewListener.onSaveBookmark(this, bookmarkDatabaseId, favoriteIconBitmap); - }); - - // Create an alert dialog from the alert dialog builder`. - final AlertDialog alertDialog = dialogBuilder.create(); - - // Remove the warning below that `getWindow()` might be null. - assert alertDialog.getWindow() != null; - - // Disable screenshots if not allowed. - if (!allowScreenshots) { - alertDialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE); - } - - // The alert dialog must be shown before items in the layout can be modified. - alertDialog.show(); - - // Get handles for the layout items. - TextView databaseIdTextView = alertDialog.findViewById(R.id.edit_bookmark_database_id_textview); - RadioGroup iconRadioGroup = alertDialog.findViewById(R.id.edit_bookmark_icon_radiogroup); - ImageView currentIconImageView = alertDialog.findViewById(R.id.edit_bookmark_current_icon); - ImageView newFavoriteIconImageView = alertDialog.findViewById(R.id.edit_bookmark_webpage_favorite_icon); - RadioButton newIconRadioButton = alertDialog.findViewById(R.id.edit_bookmark_webpage_favorite_icon_radiobutton); - EditText nameEditText = alertDialog.findViewById(R.id.edit_bookmark_name_edittext); - EditText urlEditText = alertDialog.findViewById(R.id.edit_bookmark_url_edittext); - Spinner folderSpinner = alertDialog.findViewById(R.id.edit_bookmark_folder_spinner); - EditText displayOrderEditText = alertDialog.findViewById(R.id.edit_bookmark_display_order_edittext); - Button editButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE); - - // Store the current bookmark values. - String currentBookmarkName = bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_NAME)); - String currentUrl = bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_URL)); - int currentDisplayOrder = bookmarkCursor.getInt(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.DISPLAY_ORDER)); - - // Set the database ID. - databaseIdTextView.setText(String.valueOf(bookmarkCursor.getInt(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper._ID)))); - - // Get the current favorite icon byte array from the `Cursor`. - byte[] currentIconByteArray = bookmarkCursor.getBlob(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.FAVORITE_ICON)); - - // Convert the byte array to a `Bitmap` beginning at the first byte and ending at the last. - Bitmap currentIconBitmap = BitmapFactory.decodeByteArray(currentIconByteArray, 0, currentIconByteArray.length); - - // Display `currentIconBitmap` in `edit_bookmark_current_icon`. - currentIconImageView.setImageBitmap(currentIconBitmap); - - // Set the new favorite icon bitmap. - newFavoriteIconImageView.setImageBitmap(favoriteIconBitmap); - - // Populate the bookmark name and URL `EditTexts`. - nameEditText.setText(currentBookmarkName); - urlEditText.setText(currentUrl); - - // Setup a matrix cursor for "Home Folder". - String[] matrixCursorColumnNames = {BookmarksDatabaseHelper._ID, BookmarksDatabaseHelper.BOOKMARK_NAME}; - MatrixCursor matrixCursor = new MatrixCursor(matrixCursorColumnNames); - matrixCursor.addRow(new Object[]{HOME_FOLDER_DATABASE_ID, getString(R.string.home_folder)}); - - // Get a cursor with the list of all the folders. - Cursor foldersCursor = bookmarksDatabaseHelper.getAllFolders(); - - // Combine `matrixCursor` and `foldersCursor`. - MergeCursor foldersMergeCursor = new MergeCursor(new Cursor[]{matrixCursor, foldersCursor}); - - // Remove the incorrect lint warning below that `getContext()` might be null. - assert getContext() != null; - - // Create a resource cursor adapter for the spinner. - ResourceCursorAdapter foldersCursorAdapter = new ResourceCursorAdapter(getContext(), R.layout.databaseview_spinner_item, foldersMergeCursor, 0) { - @Override - public void bindView(View view, Context context, Cursor cursor) { - // Get handles for the spinner views. - ImageView spinnerItemImageView = view.findViewById(R.id.spinner_item_imageview); - TextView spinnerItemTextView = view.findViewById(R.id.spinner_item_textview); - - // Set the folder icon according to the type. - if (foldersMergeCursor.getPosition() == 0) { // Set the `Home Folder` icon. - // Set the gray folder image. `ContextCompat` must be used until the minimum API >= 21. - spinnerItemImageView.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.folder_gray)); - } else { // Set a user folder icon. - // Get the folder icon byte array. - byte[] folderIconByteArray = cursor.getBlob(cursor.getColumnIndex(BookmarksDatabaseHelper.FAVORITE_ICON)); - - // Convert the byte array to a bitmap beginning at the first byte and ending at the last. - Bitmap folderIconBitmap = BitmapFactory.decodeByteArray(folderIconByteArray, 0, folderIconByteArray.length); - - // Set the folder icon. - spinnerItemImageView.setImageBitmap(folderIconBitmap); - } - - // Set the text view to display the folder name. - spinnerItemTextView.setText(cursor.getString(cursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_NAME))); - } - }; - - // Set the `ResourceCursorAdapter` drop drown view resource. - foldersCursorAdapter.setDropDownViewResource(R.layout.databaseview_spinner_dropdown_items); - - // Set the adapter for the folder `Spinner`. - folderSpinner.setAdapter(foldersCursorAdapter); - - // Get the parent folder name. - String parentFolder = bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.PARENT_FOLDER)); - - // Select the current folder in the `Spinner` if the bookmark isn't in the "Home Folder". - if (!parentFolder.equals("")) { - // Get the database ID of the parent folder. - int folderDatabaseId = bookmarksDatabaseHelper.getFolderDatabaseId(bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.PARENT_FOLDER))); - - // Initialize `parentFolderPosition` and the iteration variable. - int parentFolderPosition = 0; - int i = 0; - - // Find the parent folder position in folders `ResourceCursorAdapter`. - do { - if (foldersCursorAdapter.getItemId(i) == folderDatabaseId) { - // Store the current position for the parent folder. - parentFolderPosition = i; - } else { - // Try the next entry. - i++; - } - // Stop when the parent folder position is found or all the items in the `ResourceCursorAdapter` have been checked. - } while ((parentFolderPosition == 0) && (i < foldersCursorAdapter.getCount())); - - // Select the parent folder in the `Spinner`. - folderSpinner.setSelection(parentFolderPosition); - } - - // Store the current folder database ID. - int currentFolderDatabaseId = (int) folderSpinner.getSelectedItemId(); - - // Populate the display order `EditText`. - displayOrderEditText.setText(String.valueOf(bookmarkCursor.getInt(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.DISPLAY_ORDER)))); - - // Initially disable the edit button. - editButton.setEnabled(false); - - // Update the edit button if the icon selection changes. - iconRadioGroup.setOnCheckedChangeListener((group, checkedId) -> { - // Update the edit button. - updateEditButton(nameEditText, urlEditText, displayOrderEditText, folderSpinner, newIconRadioButton, editButton, currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder); - }); - - // Update the edit button if the bookmark name changes. - nameEditText.addTextChangedListener(new TextWatcher() { - @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) { - // Do nothing. - } - - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { - // Do nothing. - } - - @Override - public void afterTextChanged(Editable s) { - // Update the edit button. - updateEditButton(nameEditText, urlEditText, displayOrderEditText, folderSpinner, newIconRadioButton, editButton, currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder); - } - }); - - // Update the edit button if the URL changes. - urlEditText.addTextChangedListener(new TextWatcher() { - @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) { - // Do nothing. - } - - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { - // Do nothing. - } - - @Override - public void afterTextChanged(Editable s) { - // Update the edit button. - updateEditButton(nameEditText, urlEditText, displayOrderEditText, folderSpinner, newIconRadioButton, editButton, currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder); - } - }); - - // Update the edit button if the folder changes. - folderSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { - @Override - public void onItemSelected(AdapterView parent, View view, int position, long id) { - // Update the edit button. - updateEditButton(nameEditText, urlEditText, displayOrderEditText, folderSpinner, newIconRadioButton, editButton, currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder); - } - - @Override - public void onNothingSelected(AdapterView parent) { - - } - }); - - // Update the edit button if the display order changes. - displayOrderEditText.addTextChangedListener(new TextWatcher() { - @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) { - // Do nothing. - } - - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { - // Do nothing. - } - - @Override - public void afterTextChanged(Editable s) { - // Update the edit button. - updateEditButton(nameEditText, urlEditText, displayOrderEditText, folderSpinner, newIconRadioButton, editButton, currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder); - } - }); - - // Allow the `enter` key on the keyboard to save the bookmark from the bookmark name `EditText`. - nameEditText.setOnKeyListener((View v, int keyCode, KeyEvent event) -> { - // Save the bookmark if the event is a key-down on the "enter" button. - if ((event.getAction() == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER) && editButton.isEnabled()) { // The enter key was pressed and the edit button is enabled. - // Trigger the `Listener` and return the `DialogFragment` to the parent activity. - editBookmarkDatabaseViewListener.onSaveBookmark(EditBookmarkDatabaseViewDialog.this, bookmarkDatabaseId, favoriteIconBitmap); - - // Manually dismiss `alertDialog`. - alertDialog.dismiss(); - - // Consume the event. - return true; - } else { // If any other key was pressed, or if the edit button is currently disabled, do not consume the event. - return false; - } - }); - - // Allow the "enter" key on the keyboard to save the bookmark from the URL `EditText`. - urlEditText.setOnKeyListener((View v, int keyCode, KeyEvent event) -> { - // Save the bookmark if the event is a key-down on the "enter" button. - if ((event.getAction() == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER) && editButton.isEnabled()) { // The enter key was pressed and the edit button is enabled. - // Trigger the `Listener` and return the `DialogFragment` to the parent activity. - editBookmarkDatabaseViewListener.onSaveBookmark(EditBookmarkDatabaseViewDialog.this, bookmarkDatabaseId, favoriteIconBitmap); - - // Manually dismiss the `AlertDialog`. - alertDialog.dismiss(); - - // Consume the event. - return true; - } else { // If any other key was pressed, or if the edit button is currently disabled, do not consume the event. - return false; - } - }); - - // Allow the "enter" key on the keyboard to save the bookmark from the display order `EditText`. - displayOrderEditText.setOnKeyListener((View v, int keyCode, KeyEvent event) -> { - // Save the bookmark if the event is a key-down on the "enter" button. - if ((event.getAction() == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER) && editButton.isEnabled()) { // The enter key was pressed and the edit button is enabled. - // Trigger the `Listener` and return the `DialogFragment` to the parent activity. - editBookmarkDatabaseViewListener.onSaveBookmark(EditBookmarkDatabaseViewDialog.this, bookmarkDatabaseId, favoriteIconBitmap); - - // Manually dismiss the `AlertDialog`. - alertDialog.dismiss(); - - // Consume the event. - return true; - } else { // If any other key was pressed, or if the edit button is currently disabled, do not consume the event. - return false; - } - }); - - // `onCreateDialog` requires the return of an `AlertDialog`. - return alertDialog; - } - - private void updateEditButton(EditText nameEditText, EditText urlEditText, EditText displayOrderEditText, Spinner folderSpinner, RadioButton newIconRadioButton, Button editButton, - String currentBookmarkName, String currentUrl, int currentFolderDatabaseId, int currentDisplayOrder) { - // Get the values from the dialog. - String newName = nameEditText.getText().toString(); - String newUrl = urlEditText.getText().toString(); - int newFolderDatabaseId = (int) folderSpinner.getSelectedItemId(); - String newDisplayOrder = displayOrderEditText.getText().toString(); - - // Has the favorite icon changed? - boolean iconChanged = newIconRadioButton.isChecked(); - - // Has the name changed? - boolean nameChanged = !newName.equals(currentBookmarkName); - - // Has the URL changed? - boolean urlChanged = !newUrl.equals(currentUrl); - - // Has the folder changed? - boolean folderChanged = newFolderDatabaseId != currentFolderDatabaseId; - - // Has the display order changed? - boolean displayOrderChanged = !newDisplayOrder.equals(String.valueOf(currentDisplayOrder)); - - // Is the display order empty? - boolean displayOrderNotEmpty = !newDisplayOrder.isEmpty(); - - // Update the enabled status of the edit button. - editButton.setEnabled((iconChanged || nameChanged || urlChanged || folderChanged || displayOrderChanged) && displayOrderNotEmpty); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDatabaseViewDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDatabaseViewDialog.kt new file mode 100644 index 00000000..57f764be --- /dev/null +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkDatabaseViewDialog.kt @@ -0,0 +1,440 @@ +/* + * Copyright © 2016-2020 Soren Stoutner . + * + * This file is part of Privacy Browser . + * + * Privacy Browser is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Privacy Browser is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Privacy Browser. If not, see . + */ +package com.stoutner.privacybrowser.dialogs + +import android.annotation.SuppressLint +import android.app.AlertDialog +import android.app.Dialog +import android.content.Context +import android.content.DialogInterface +import android.database.Cursor +import android.database.MatrixCursor +import android.database.MergeCursor +import android.graphics.Bitmap +import android.graphics.BitmapFactory +import android.os.Bundle +import android.text.Editable +import android.text.TextWatcher +import android.view.KeyEvent +import android.view.View +import android.view.WindowManager +import android.widget.* +import android.widget.AdapterView.OnItemSelectedListener + +import androidx.core.content.ContextCompat +import androidx.fragment.app.DialogFragment +import androidx.preference.PreferenceManager + +import com.stoutner.privacybrowser.R +import com.stoutner.privacybrowser.activities.BookmarksDatabaseViewActivity +import com.stoutner.privacybrowser.helpers.BookmarksDatabaseHelper + +import java.io.ByteArrayOutputStream + +class EditBookmarkDatabaseViewDialog: DialogFragment() { + // The public interface is used to send information back to the parent activity. + interface EditBookmarkDatabaseViewListener { + fun onSaveBookmark(dialogFragment: DialogFragment, selectedBookmarkDatabaseId: Int, favoriteIconBitmap: Bitmap) + } + + // Define the edit bookmark database view listener. + private lateinit var editBookmarkDatabaseViewListener: EditBookmarkDatabaseViewListener + + // Define the handles for the views that need to be accessed from `updateEditButton()`. + private lateinit var newIconRadioButton: RadioButton + private lateinit var nameEditText: EditText + private lateinit var urlEditText: EditText + private lateinit var folderSpinner: Spinner + private lateinit var displayOrderEditText: EditText + private lateinit var editButton: Button + + override fun onAttach(context: Context) { + // Run the default commands. + super.onAttach(context) + + // Get a handle for edit bookmark database view listener from the launching context. + editBookmarkDatabaseViewListener = context as EditBookmarkDatabaseViewListener + } + + companion object { + // `@JvmStatic` will no longer be required once all the code has transitioned to Kotlin. Also, the function can then be moved out of a companion object and just become a package-level function. + @JvmStatic + fun bookmarkDatabaseId(databaseId: Int, favoriteIconBitmap: Bitmap): EditBookmarkDatabaseViewDialog { + // Create a favorite icon byte array output stream. + val favoriteIconByteArrayOutputStream = ByteArrayOutputStream() + + // Convert the favorite icon to a PNG and place it in the byte array output stream. `0` is for lossless compression (the only option for a PNG). + favoriteIconBitmap.compress(Bitmap.CompressFormat.PNG, 0, favoriteIconByteArrayOutputStream) + + // Convert the byte array output stream to a byte array. + val favoriteIconByteArray = favoriteIconByteArrayOutputStream.toByteArray() + + // Create an arguments bundle. + val argumentsBundle = Bundle() + + // Store the variables in the bundle. + argumentsBundle.putInt("database_id", databaseId) + argumentsBundle.putByteArray("favorite_icon_byte_array", favoriteIconByteArray) + + // Create a new instance of the dialog. + val editBookmarkDatabaseViewDialog = EditBookmarkDatabaseViewDialog() + + // Add the arguments bundle to the dialog. + editBookmarkDatabaseViewDialog.arguments = argumentsBundle + + // Return the new dialog. + return editBookmarkDatabaseViewDialog + } + } + + // `@SuppressLing("InflateParams")` removes the warning about using `null` as the parent view group when inflating the alert dialog. + @SuppressLint("InflateParams") + override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { + // Get the arguments. + val arguments = requireArguments() + + // Get the bookmark database ID from the bundle. + val bookmarkDatabaseId = arguments.getInt("database_id") + + // Get the favorite icon byte array. + val favoriteIconByteArray = arguments.getByteArray("favorite_icon_byte_array")!! + + // Convert the favorite icon byte array to a bitmap. + val favoriteIconBitmap = BitmapFactory.decodeByteArray(favoriteIconByteArray, 0, favoriteIconByteArray.size) + + // Initialize the database helper. The `0` specifies a database version, but that is ignored and set instead using a constant in `BookmarksDatabaseHelper`. + val bookmarksDatabaseHelper = BookmarksDatabaseHelper(context, null, null, 0) + + // Get a cursor with the selected bookmark. + val bookmarkCursor = bookmarksDatabaseHelper.getBookmark(bookmarkDatabaseId) + + // Move the cursor to the first position. + bookmarkCursor.moveToFirst() + + // Get a handle for the shared preferences. + val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context) + + // Get the screenshot and theme preferences. + val allowScreenshots = sharedPreferences.getBoolean("allow_screenshots", false) + val darkTheme = sharedPreferences.getBoolean("dark_theme", false) + + // Use an alert dialog builder to create the dialog and set the style according to the theme. + val dialogBuilder = if (darkTheme) { + AlertDialog.Builder(context, R.style.PrivacyBrowserAlertDialogDark) + } else { + AlertDialog.Builder(context, R.style.PrivacyBrowserAlertDialogLight) + } + + // Set the title. + dialogBuilder.setTitle(R.string.edit_bookmark) + + // Set the view. The parent view is `null` because it will be assigned by the alert dialog. + dialogBuilder.setView(requireActivity().layoutInflater.inflate(R.layout.edit_bookmark_databaseview_dialog, null)) + + // Set the listener for the cancel button. Using `null` as the listener closes the dialog without doing anything else. + dialogBuilder.setNegativeButton(R.string.cancel, null) + + // Set the listener for the save button. + dialogBuilder.setPositiveButton(R.string.save) { _: DialogInterface, _: Int -> + // Return the dialog fragment to the parent activity on save. + editBookmarkDatabaseViewListener.onSaveBookmark(this, bookmarkDatabaseId, favoriteIconBitmap) + } + + // Create an alert dialog from the alert dialog builder. + val alertDialog = dialogBuilder.create() + + // Disable screenshots if not allowed. + if (!allowScreenshots) { + alertDialog.window!!.addFlags(WindowManager.LayoutParams.FLAG_SECURE) + } + + // The alert dialog must be shown before items in the layout can be modified. + alertDialog.show() + + // Get handles for the layout items. + val databaseIdTextView = alertDialog.findViewById(R.id.edit_bookmark_database_id_textview) + val iconRadioGroup = alertDialog.findViewById(R.id.edit_bookmark_icon_radiogroup) + val currentIconImageView = alertDialog.findViewById(R.id.edit_bookmark_current_icon) + val newFavoriteIconImageView = alertDialog.findViewById(R.id.edit_bookmark_webpage_favorite_icon) + newIconRadioButton = alertDialog.findViewById(R.id.edit_bookmark_webpage_favorite_icon_radiobutton) + nameEditText = alertDialog.findViewById(R.id.edit_bookmark_name_edittext) + urlEditText = alertDialog.findViewById(R.id.edit_bookmark_url_edittext) + folderSpinner = alertDialog.findViewById(R.id.edit_bookmark_folder_spinner) + displayOrderEditText = alertDialog.findViewById(R.id.edit_bookmark_display_order_edittext) + editButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE) + + // Store the current bookmark values. + val currentBookmarkName = bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_NAME)) + val currentUrl = bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_URL)) + val currentDisplayOrder = bookmarkCursor.getInt(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.DISPLAY_ORDER)) + + // Set the database ID. + databaseIdTextView.text = bookmarkCursor.getInt(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper._ID)).toString() + + // Get the current favorite icon byte array from the cursor. + val currentIconByteArray = bookmarkCursor.getBlob(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.FAVORITE_ICON)) + + // Convert the byte array to a bitmap beginning at the first byte and ending at the last. + val currentIconBitmap = BitmapFactory.decodeByteArray(currentIconByteArray, 0, currentIconByteArray.size) + + // Display the current icon bitmap. + currentIconImageView.setImageBitmap(currentIconBitmap) + + // Set the new favorite icon bitmap. + newFavoriteIconImageView.setImageBitmap(favoriteIconBitmap) + + // Populate the bookmark name and URL edit texts. + nameEditText.setText(currentBookmarkName) + urlEditText.setText(currentUrl) + + // Create an an array of column names for the matrix cursor comprised of the ID and the name. + val matrixCursorColumnNamesArray = arrayOf(BookmarksDatabaseHelper._ID, BookmarksDatabaseHelper.BOOKMARK_NAME) + + // Create a matrix cursor based on the column names array. + val matrixCursor = MatrixCursor(matrixCursorColumnNamesArray) + + // Add `Home Folder` as the first entry in the matrix folder. + matrixCursor.addRow(arrayOf(BookmarksDatabaseViewActivity.HOME_FOLDER_DATABASE_ID, getString(R.string.home_folder))) + + // Get a cursor with the list of all the folders. + val foldersCursor = bookmarksDatabaseHelper.allFolders + + // Combine the matrix cursor and the folders cursor. + val foldersMergeCursor = MergeCursor(arrayOf(matrixCursor, foldersCursor)) + + // Create a resource cursor adapter for the spinner. + val foldersCursorAdapter: ResourceCursorAdapter = object: ResourceCursorAdapter(context, R.layout.databaseview_spinner_item, foldersMergeCursor, 0) { + override fun bindView(view: View, context: Context, cursor: Cursor) { + // Get handles for the spinner views. + val spinnerItemImageView = view.findViewById(R.id.spinner_item_imageview) + val spinnerItemTextView = view.findViewById(R.id.spinner_item_textview) + + // Set the folder icon according to the type. + if (foldersMergeCursor.position == 0) { // The home folder. + // Set the gray folder image. `ContextCompat` must be used until the minimum API >= 21. + spinnerItemImageView.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.folder_gray)) + } else { // A user folder + // Get the folder icon byte array. + val folderIconByteArray = cursor.getBlob(cursor.getColumnIndex(BookmarksDatabaseHelper.FAVORITE_ICON)) + + // Convert the byte array to a bitmap beginning at the first byte and ending at the last. + val folderIconBitmap = BitmapFactory.decodeByteArray(folderIconByteArray, 0, folderIconByteArray.size) + + // Set the folder icon. + spinnerItemImageView.setImageBitmap(folderIconBitmap) + } + + // Set the text view to display the folder name. + spinnerItemTextView.text = cursor.getString(cursor.getColumnIndex(BookmarksDatabaseHelper.BOOKMARK_NAME)) + } + } + + // Set the folder cursor adapter drop drown view resource. + foldersCursorAdapter.setDropDownViewResource(R.layout.databaseview_spinner_dropdown_items) + + // Set the adapter for the folder spinner. + folderSpinner.adapter = foldersCursorAdapter + + // Get the parent folder name. + val parentFolder = bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.PARENT_FOLDER)) + + // Select the current folder in the spinner if the bookmark isn't in the home folder. + if (parentFolder != "") { + // Get the database ID of the parent folder. + val folderDatabaseId = bookmarksDatabaseHelper.getFolderDatabaseId(bookmarkCursor.getString(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.PARENT_FOLDER))) + + // Initialize the parent folder position and the iteration variable. + var parentFolderPosition = 0 + var i = 0 + + // Find the parent folder position in folders cursor adapter. + do { + if (foldersCursorAdapter.getItemId(i) == folderDatabaseId.toLong()) { + // Store the current position for the parent folder. + parentFolderPosition = i + } else { + // Try the next entry. + i++ + } + // Stop when the parent folder position is found or all the items in the folders cursor adapter have been checked. + } while (parentFolderPosition == 0 && i < foldersCursorAdapter.count) + + // Select the parent folder in the spinner. + folderSpinner.setSelection(parentFolderPosition) + } + + // Store the current folder database ID. + val currentFolderDatabaseId = folderSpinner.selectedItemId.toInt() + + // Populate the display order edit text. + displayOrderEditText.setText(bookmarkCursor.getInt(bookmarkCursor.getColumnIndex(BookmarksDatabaseHelper.DISPLAY_ORDER)).toString()) + + // Initially disable the edit button. + editButton.isEnabled = false + + // Update the edit button if the icon selection changes. + iconRadioGroup.setOnCheckedChangeListener { _: RadioGroup, _: Int -> + // Update the edit button. + updateEditButton(currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder) + } + + // Update the edit button if the bookmark name changes. + nameEditText.addTextChangedListener(object: TextWatcher { + override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { + // Do nothing. + } + + override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) { + // Do nothing. + } + + override fun afterTextChanged(s: Editable) { + // Update the edit button. + updateEditButton(currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder) + } + }) + + // Update the edit button if the URL changes. + urlEditText.addTextChangedListener(object: TextWatcher { + override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { + // Do nothing. + } + + override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) { + // Do nothing. + } + + override fun afterTextChanged(s: Editable) { + // Update the edit button. + updateEditButton(currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder) + } + }) + + // Update the edit button if the folder changes. + folderSpinner.onItemSelectedListener = object: OnItemSelectedListener { + override fun onItemSelected(parent: AdapterView<*>, view: View, position: Int, id: Long) { + // Update the edit button. + updateEditButton(currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder) + } + + override fun onNothingSelected(parent: AdapterView<*>?) { + // Do nothing. + } + } + + // Update the edit button if the display order changes. + displayOrderEditText.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { + // Do nothing. + } + + override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) { + // Do nothing. + } + + override fun afterTextChanged(s: Editable) { + // Update the edit button. + updateEditButton(currentBookmarkName, currentUrl, currentFolderDatabaseId, currentDisplayOrder) + } + }) + + // Allow the enter key on the keyboard to save the bookmark from the bookmark name edit text. + nameEditText.setOnKeyListener { _: View, keyCode: Int, keyEvent: KeyEvent -> + // Check the key code, event, and button status. + if (keyEvent.action == KeyEvent.ACTION_DOWN && keyCode == KeyEvent.KEYCODE_ENTER && editButton.isEnabled) { // The enter key was pressed and the edit button is enabled. + // Trigger the listener and return the dialog fragment to the parent activity. + editBookmarkDatabaseViewListener.onSaveBookmark(this@EditBookmarkDatabaseViewDialog, bookmarkDatabaseId, favoriteIconBitmap) + + // Manually dismiss the alert dialog. + alertDialog.dismiss() + + // Consume the event. + return@setOnKeyListener true + } else { // If any other key was pressed, or if the edit button is currently disabled, do not consume the event. + return@setOnKeyListener false + } + } + + // Allow the enter key on the keyboard to save the bookmark from the URL edit text. + urlEditText.setOnKeyListener { _: View, keyCode: Int, keyEvent: KeyEvent -> + // Check the key code, event, and button status. + if (keyEvent.action == KeyEvent.ACTION_DOWN && keyCode == KeyEvent.KEYCODE_ENTER && editButton.isEnabled) { // The enter key was pressed and the edit button is enabled. + // Trigger the listener and return the dialog fragment to the parent activity. + editBookmarkDatabaseViewListener.onSaveBookmark(this@EditBookmarkDatabaseViewDialog, bookmarkDatabaseId, favoriteIconBitmap) + + // Manually dismiss the alert dialog. + alertDialog.dismiss() + + // Consume the event. + return@setOnKeyListener true + } else { // If any other key was pressed, or if the edit button is currently disabled, do not consume the event. + return@setOnKeyListener false + } + } + + // Allow the enter key on the keyboard to save the bookmark from the display order edit text. + displayOrderEditText.setOnKeyListener { _: View, keyCode: Int, keyEvent: KeyEvent -> + // Check the key code, event, and button status. + if (keyEvent.action == KeyEvent.ACTION_DOWN && keyCode == KeyEvent.KEYCODE_ENTER && editButton.isEnabled) { // The enter key was pressed and the edit button is enabled. + // Trigger the listener and return the dialog fragment to the parent activity. + editBookmarkDatabaseViewListener.onSaveBookmark(this@EditBookmarkDatabaseViewDialog, bookmarkDatabaseId, favoriteIconBitmap) + + // Manually dismiss the alert dialog. + alertDialog.dismiss() + + // Consume the event. + return@setOnKeyListener true + } else { // If any other key was pressed, or if the edit button is currently disabled, do not consume the event. + return@setOnKeyListener false + } + } + + // Return the alert dialog. + return alertDialog + } + + private fun updateEditButton(currentBookmarkName: String, currentUrl: String, currentFolderDatabaseId: Int, currentDisplayOrder: Int) { + // Get the values from the dialog. + val newName = nameEditText.text.toString() + val newUrl = urlEditText.text.toString() + val newFolderDatabaseId = folderSpinner.selectedItemId.toInt() + val newDisplayOrder = displayOrderEditText.text.toString() + + // Has the favorite icon changed? + val iconChanged = newIconRadioButton.isChecked + + // Has the name changed? + val nameChanged = (newName != currentBookmarkName) + + // Has the URL changed? + val urlChanged = (newUrl != currentUrl) + + // Has the folder changed? + val folderChanged = (newFolderDatabaseId != currentFolderDatabaseId) + + // Has the display order changed? + val displayOrderChanged = (newDisplayOrder != currentDisplayOrder.toString()) + + // Is the display order empty? + val displayOrderNotEmpty = newDisplayOrder.isNotEmpty() + + // Update the enabled status of the edit button. + editButton.isEnabled = (iconChanged || nameChanged || urlChanged || folderChanged || displayOrderChanged) && displayOrderNotEmpty + } +} \ No newline at end of file diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDatabaseViewDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDatabaseViewDialog.java index 6f481a08..0f7eff1a 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDatabaseViewDialog.java +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/EditBookmarkFolderDatabaseViewDialog.java @@ -54,14 +54,12 @@ import androidx.core.content.ContextCompat; import androidx.fragment.app.DialogFragment; // The AndroidX dialog fragment must be used or an error is produced on API <=22. import com.stoutner.privacybrowser.R; +import com.stoutner.privacybrowser.activities.BookmarksDatabaseViewActivity; import com.stoutner.privacybrowser.helpers.BookmarksDatabaseHelper; import java.io.ByteArrayOutputStream; public class EditBookmarkFolderDatabaseViewDialog extends DialogFragment { - // Define the home folder database ID constant. - public static final int HOME_FOLDER_DATABASE_ID = -1; - // Define the edit bookmark folder database view listener. private EditBookmarkFolderDatabaseViewListener editBookmarkFolderDatabaseViewListener; @@ -224,7 +222,7 @@ public class EditBookmarkFolderDatabaseViewDialog extends DialogFragment { // Setup a matrix cursor for "Home Folder". String[] matrixCursorColumnNames = {BookmarksDatabaseHelper._ID, BookmarksDatabaseHelper.BOOKMARK_NAME}; MatrixCursor matrixCursor = new MatrixCursor(matrixCursorColumnNames); - matrixCursor.addRow(new Object[]{HOME_FOLDER_DATABASE_ID, getString(R.string.home_folder)}); + matrixCursor.addRow(new Object[]{BookmarksDatabaseViewActivity.HOME_FOLDER_DATABASE_ID, getString(R.string.home_folder)}); // Add all subfolders of the current folder to the list of folders not to display. String exceptFolders = getStringOfSubfolders(currentFolderName, bookmarksDatabaseHelper); diff --git a/build.gradle b/build.gradle index 30be6ef0..ee75696a 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.6.2' + classpath 'com.android.tools.build:gradle:3.6.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72" // NOTE: Do not place your application dependencies here; they belong