X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FCreateBookmark.java;h=8bd0930aea50131bd6b37e71074bcf8bc308ef4f;hb=1bd5ba3b9f91e69517fa8a39665256f0badc408b;hp=f844ca340ba820b1f6eb8f2ebfc5e11b435a157f;hpb=9c582d802e641b2b6d27271310fc16898020b470;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/java/com/stoutner/privacybrowser/CreateBookmark.java b/app/src/main/java/com/stoutner/privacybrowser/CreateBookmark.java index f844ca34..8bd0930a 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/CreateBookmark.java +++ b/app/src/main/java/com/stoutner/privacybrowser/CreateBookmark.java @@ -19,99 +19,100 @@ package com.stoutner.privacybrowser; -import android.app.Activity; +import android.annotation.SuppressLint; import android.app.Dialog; -import android.app.DialogFragment; +import android.content.Context; import android.content.DialogInterface; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.support.annotation.NonNull; -// If we don't use android.support.v7.app.AlertDialog instead of android.app.AlertDialog then the dialog will be covered by the keyboard. +// If we don't use `android.support.v7.app.AlertDialog` instead of `android.app.AlertDialog` then the dialog will be covered by the keyboard. import android.support.v7.app.AlertDialog; +// We have to use `AppCompatDialogFragment` instead of `DialogFragment` or an error is produced on API <=22. +import android.support.v7.app.AppCompatDialogFragment; import android.view.KeyEvent; -import android.view.LayoutInflater; import android.view.View; import android.view.WindowManager; import android.widget.EditText; -public class CreateBookmark extends DialogFragment { +public class CreateBookmark extends AppCompatDialogFragment { // The public interface is used to send information back to the parent activity. public interface CreateBookmarkListener { - void onCreateBookmarkCancel(DialogFragment createBookmarkDialogFragment); - - void onCreateBookmarkCreate(DialogFragment createBookmarkDialogFragment); + void onCreateBookmark(AppCompatDialogFragment dialogFragment); } - // createBookmarkListener is used in onAttach() and onCreateDialog() + // `createBookmarkListener` is used in `onAttach()` and `onCreateDialog()` private CreateBookmarkListener createBookmarkListener; - // Check to make sure the parent activity implements the listener. - public void onAttach(Activity parentActivity) { - super.onAttach(parentActivity); + + public void onAttach(Context context) { + super.onAttach(context); + + // Get a handle for `CreateBookmarkListener` from `context`. try { - createBookmarkListener = (CreateBookmarkListener) parentActivity; + createBookmarkListener = (CreateBookmarkListener) context; } catch(ClassCastException exception) { - throw new ClassCastException(parentActivity.toString() + " must implement CreateBookmarkListener."); + throw new ClassCastException(context.toString() + " must implement CreateBookmarkListener."); } } - // onCreateDialog requires @NonNull. + // `@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) { // Create a drawable version of the favorite icon. Drawable favoriteIconDrawable = new BitmapDrawable(getResources(), MainWebViewActivity.favoriteIcon); - // Get the activity's layout inflater. - LayoutInflater customDialogInflater = getActivity().getLayoutInflater(); + // Use `AlertDialog.Builder` to create the `AlertDialog`. The style formats the color of the button text. + AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(getActivity(), R.style.LightAlertDialog); + dialogBuilder.setTitle(R.string.create_bookmark); + dialogBuilder.setIcon(favoriteIconDrawable); + // The parent view is `null` because it will be assigned by the `AlertDialog`. + dialogBuilder.setView(getActivity().getLayoutInflater().inflate(R.layout.create_bookmark_dialog, null)); - // Use AlertDialog.Builder to create the AlertDialog. The style formats the color of the button text. - AlertDialog.Builder createBookmarkDialogBuilder = new AlertDialog.Builder(getActivity(), R.style.PrivacyBrowser_AlertDialog); - createBookmarkDialogBuilder.setTitle(R.string.create_bookmark); - createBookmarkDialogBuilder.setIcon(favoriteIconDrawable); - // The parent view is "null" because it will be assigned by AlertDialog. - createBookmarkDialogBuilder.setView(customDialogInflater.inflate(R.layout.create_bookmark_dialog, null)); - - // Set an onClick listener on the negative button. - createBookmarkDialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { + // Set an `onClick()` listener for the negative button. + dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - createBookmarkListener.onCreateBookmarkCancel(CreateBookmark.this); + // Do nothing. The `AlertDialog` will close automatically. } }); - // Set an onClick listener on the positive button. - createBookmarkDialogBuilder.setPositiveButton(R.string.create, new DialogInterface.OnClickListener() { + // Set an `onClick()` listener for the positive button. + dialogBuilder.setPositiveButton(R.string.create, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - createBookmarkListener.onCreateBookmarkCreate(CreateBookmark.this); + // Return the `DialogFragment` to the parent activity on create. + createBookmarkListener.onCreateBookmark(CreateBookmark.this); } }); - // Create an AlertDialog from the AlertDialog.Builder. - final AlertDialog createBookmarkDialog = createBookmarkDialogBuilder.create(); + // Create an `AlertDialog` from the `AlertDialog.Builder`. + final AlertDialog alertDialog = dialogBuilder.create(); + + // Remove the warning below that `setSoftInputMode` might produce `java.lang.NullPointerException`. + assert alertDialog.getWindow() != null; - // Show the keyboard when the Dialog is displayed on the screen. - createBookmarkDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE); + // Show the keyboard when the `Dialog` is displayed on the screen. + alertDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE); - // We need to show the AlertDialog before we can call setOnKeyListener() below. - createBookmarkDialog.show(); + // We need to show the `AlertDialog` before we can call `setOnKeyListener()` below. + alertDialog.show(); - // Allow the "enter" key on the keyboard to create the bookmark from "create_bookmark_name_edittext". - EditText createBookmarkNameEditText = (EditText) createBookmarkDialog.findViewById(R.id.create_bookmark_name_edittext); - assert createBookmarkNameEditText != null; // Remove the warning below that createBookmarkNameEditText might be null. + // Allow the `enter` key on the keyboard to create the bookmark from `create_bookmark_name_edittext`. + EditText createBookmarkNameEditText = (EditText) alertDialog.findViewById(R.id.create_bookmark_name_edittext); + assert createBookmarkNameEditText != null; // Remove the warning below that `createBookmarkNameEditText` might be `null`. createBookmarkNameEditText.setOnKeyListener(new View.OnKeyListener() { public boolean onKey(View v, int keyCode, KeyEvent event) { - // If the event is a key-down on the "enter" button, select the PositiveButton "Create". + // If the event is a key-down on the `enter` button, select the `PositiveButton` `Create`. if ((event.getAction() == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER)) { - // Trigger the createBookmarkListener. - createBookmarkListener.onCreateBookmarkCreate(CreateBookmark.this); - - // Manually dismiss the AlertDialog. - createBookmarkDialog.dismiss(); - + // Trigger `createBookmarkListener` and return the `DialogFragment` to the parent activity. + createBookmarkListener.onCreateBookmark(CreateBookmark.this); + // Manually dismiss the `AlertDialog`. + alertDialog.dismiss(); // Consume the event. return true; } else { // If any other key was pressed, do not consume the event. @@ -120,22 +121,20 @@ public class CreateBookmark extends DialogFragment { } }); - // Set the formattedUrlString as the initial text of "create_bookmark_url_edittext". - EditText createBookmarkUrlEditText = (EditText) createBookmarkDialog.findViewById(R.id.create_bookmark_url_edittext); - assert createBookmarkUrlEditText != null;// Remove the warning below that createBookmarkUrlEditText might be null. + // Set the formattedUrlString as the initial text of `create_bookmark_url_edittext`. + EditText createBookmarkUrlEditText = (EditText) alertDialog.findViewById(R.id.create_bookmark_url_edittext); + assert createBookmarkUrlEditText != null;// Remove the warning below that `createBookmarkUrlEditText` might be `null`. createBookmarkUrlEditText.setText(MainWebViewActivity.formattedUrlString); - // Allow the "enter" key on the keyboard to create the bookmark from "create_bookmark_url_edittext". + // Allow the `enter` key on the keyboard to create the bookmark from `create_bookmark_url_edittext`. createBookmarkUrlEditText.setOnKeyListener(new View.OnKeyListener() { public boolean onKey(View v, int keyCode, KeyEvent event) { // If the event is a key-down on the "enter" button, select the PositiveButton "Create". if ((event.getAction() == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER)) { - // Trigger the create listener. - createBookmarkListener.onCreateBookmarkCreate(CreateBookmark.this); - - // Manually dismiss the AlertDialog. - createBookmarkDialog.dismiss(); - + // Trigger `createBookmarkListener` and return the DialogFragment to the parent activity. + createBookmarkListener.onCreateBookmark(CreateBookmark.this); + // Manually dismiss the `AlertDialog`. + alertDialog.dismiss(); // Consume the event. return true; } else { // If any other key was pressed, do not consume the event. @@ -144,7 +143,7 @@ public class CreateBookmark extends DialogFragment { } }); - // onCreateDialog requires the return of an AlertDialog - return createBookmarkDialog; + // `onCreateDialog()` requires the return of an `AlertDialog`. + return alertDialog; } } \ No newline at end of file