X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2FCreateHomeScreenShortcut.java;h=1eb74fb6dcdefe36ae21eea7f158e91fdb5b9a59;hb=e29020961c70d97a06c810aaff28ef1fd6af4ae7;hp=f4f4034eac9c8ce69d09008550c7078f470e3281;hpb=9c582d802e641b2b6d27271310fc16898020b470;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/java/com/stoutner/privacybrowser/CreateHomeScreenShortcut.java b/app/src/main/java/com/stoutner/privacybrowser/CreateHomeScreenShortcut.java
index f4f4034e..1eb74fb6 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/CreateHomeScreenShortcut.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/CreateHomeScreenShortcut.java
@@ -26,7 +26,6 @@ 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.
 import android.support.v7.app.AlertDialog;
 import android.view.KeyEvent;
@@ -38,12 +37,10 @@ import android.widget.EditText;
 public class CreateHomeScreenShortcut extends DialogFragment {
     // The public interface is used to send information back to the parent activity.
     public interface CreateHomeScreenSchortcutListener {
-        void onCreateHomeScreenShortcutCancel(DialogFragment dialogFragment);
-
-        void onCreateHomeScreenShortcutCreate(DialogFragment dialogFragment);
+        void onCreateHomeScreenShortcut(DialogFragment dialogFragment);
     }
 
-    //createHomeScreenShortcutListener is used in onAttach and and onCreateDialog.
+    //`createHomeScreenShortcutListener` is used in `onAttach()` and `onCreateDialog()`.
     private CreateHomeScreenSchortcutListener createHomeScreenShortcutListener;
 
     // Check to make sure that the parent activity implements the listener.
@@ -56,61 +53,59 @@ public class CreateHomeScreenShortcut extends DialogFragment {
         }
     }
 
-    // onCreateDialog requires @NonNull.
     @Override
-    @NonNull
     public Dialog onCreateDialog(Bundle savedInstanceState) {
+        // Get the activity's layout inflater.
+        LayoutInflater layoutInflater = getActivity().getLayoutInflater();
+
         // 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 createHomeScreenShorcutDialogBuilder = new AlertDialog.Builder(getActivity(), R.style.PrivacyBrowser_AlertDialog);
-        createHomeScreenShorcutDialogBuilder.setTitle(R.string.create_shortcut);
-        createHomeScreenShorcutDialogBuilder.setIcon(favoriteIconDrawable);
-        // The parent view is "null" because it will be assigned by AlertDialog.
-        createHomeScreenShorcutDialogBuilder.setView(customDialogInflater.inflate(R.layout.create_home_screen_shortcut_dialog, null));
+        // Use `AlertDialog.Builder` to create the `AlertDialog`.  `R.style.LightAlertDialog` formats the color of the button text.
+        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(getActivity(), R.style.LightAlertDialog);
+        dialogBuilder.setTitle(R.string.create_shortcut);
+        dialogBuilder.setIcon(favoriteIconDrawable);
+        // The parent view is `null` because it will be assigned by `AlertDialog`.
+        dialogBuilder.setView(layoutInflater.inflate(R.layout.create_home_screen_shortcut_dialog, null));
 
-        // Set an onClick listener on the negative button.
-        createHomeScreenShorcutDialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+        // Set an `onClick` listener on the negative button.
+        dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
-                createHomeScreenShortcutListener.onCreateHomeScreenShortcutCancel(CreateHomeScreenShortcut.this);
+                // Do nothing if `Cancel` is clicked.
             }
         });
 
-        // Set an onClick listener on the positive button.
-        createHomeScreenShorcutDialogBuilder.setPositiveButton(R.string.create, new DialogInterface.OnClickListener() {
+        // Set an `onClick` listener on the positive button.
+        dialogBuilder.setPositiveButton(R.string.create, new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
-                createHomeScreenShortcutListener.onCreateHomeScreenShortcutCreate(CreateHomeScreenShortcut.this);
+                createHomeScreenShortcutListener.onCreateHomeScreenShortcut(CreateHomeScreenShortcut.this);
             }
         });
 
 
-        // Create an AlertDialog from the AlertDialogBuilder.
-        final AlertDialog createHomeScreenShortcutAlertDialog = createHomeScreenShorcutDialogBuilder.create();
+        // Create an `AlertDialog` from the `AlertDialog.Builder`.
+        final AlertDialog alertDialog = dialogBuilder.create();
 
         // Show the keyboard when the Dialog is displayed on the screen.
-        createHomeScreenShortcutAlertDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+        alertDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
 
-        // We need to show the AlertDialog before we can call setOnKeyListener() below.
-        createHomeScreenShortcutAlertDialog.show();
+        // We need to show `alertDialog` before we can call `setOnKeyListener()` below.
+        alertDialog.show();
 
         // Allow the "enter" key on the keyboard to create the shortcut.
-        EditText shortcutNameEditText = (EditText) createHomeScreenShortcutAlertDialog.findViewById(R.id.shortcut_name_edittext);
+        EditText shortcutNameEditText = (EditText) alertDialog.findViewById(R.id.shortcut_name_edittext);
         assert shortcutNameEditText != null;  // Remove the warning below that shortcutNameEditText might be null.
         shortcutNameEditText.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.
-                    createHomeScreenShortcutListener.onCreateHomeScreenShortcutCreate(CreateHomeScreenShortcut.this);
+                    createHomeScreenShortcutListener.onCreateHomeScreenShortcut(CreateHomeScreenShortcut.this);
 
-                    // Manually dismiss the AlertDialog.
-                    createHomeScreenShortcutAlertDialog.dismiss();
+                    // Manually dismiss `alertDialog`.
+                    alertDialog.dismiss();
 
                     // Consume the event.
                     return true;
@@ -120,7 +115,7 @@ public class CreateHomeScreenShortcut extends DialogFragment {
             }
         });
 
-        // onCreateDialog requires the return of an AlertDialog.
-        return createHomeScreenShortcutAlertDialog;
+        // `onCreateDialog` requires the return of an `AlertDialog`.
+        return alertDialog;
     }
 }
\ No newline at end of file