]> gitweb.stoutner.com Git - PrivacyBrowserAndroid.git/blobdiff - app/src/main/java/com/stoutner/privacybrowser/CreateHomeScreenShortcut.java
Initial bookmarks implementation. Fix for Custom User Agent not working. https...
[PrivacyBrowserAndroid.git] / app / src / main / java / com / stoutner / privacybrowser / CreateHomeScreenShortcut.java
index 9808d407a9e849f4c9e3003b5e2f234a787fa1e2..f4f4034eac9c8ce69d09008550c7078f470e3281 100644 (file)
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Soren Stoutner <soren@stoutner.com>.
+ * Copyright 2015-2016 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
@@ -21,37 +21,38 @@ package com.stoutner.privacybrowser;
 
 import android.app.Activity;
 import android.app.Dialog;
+import android.app.DialogFragment;
 import android.content.DialogInterface;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
+// 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.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 CreateHomeScreenShortcut extends AppCompatDialogFragment {
-    // The public interface is used to send information back to the activity that called CreateHomeScreenShortcut.
+public class CreateHomeScreenShortcut extends DialogFragment {
+    // The public interface is used to send information back to the parent activity.
     public interface CreateHomeScreenSchortcutListener {
-        void onCreateHomeScreenShortcutCancel(DialogFragment dialog);
+        void onCreateHomeScreenShortcutCancel(DialogFragment dialogFragment);
 
-        void onCreateHomeScreenShortcutCreate(DialogFragment dialog);
+        void onCreateHomeScreenShortcutCreate(DialogFragment dialogFragment);
     }
 
-    private CreateHomeScreenSchortcutListener buttonListener;
+    //createHomeScreenShortcutListener is used in onAttach and and onCreateDialog.
+    private CreateHomeScreenSchortcutListener createHomeScreenShortcutListener;
 
-    // Check to make sure that the activity that called CreateHomeScreenShortcut implements both listeners.
-    public void onAttach(Activity activity) {
-        super.onAttach(activity);
+    // Check to make sure that the parent activity implements the listener.
+    public void onAttach(Activity parentActivity) {
+        super.onAttach(parentActivity);
         try {
-            buttonListener = (CreateHomeScreenSchortcutListener) activity;
-        } catch (ClassCastException e) {
-            throw new ClassCastException(activity.toString() + " must implement CreateHomeScreenShortcutListener.");
+            createHomeScreenShortcutListener = (CreateHomeScreenSchortcutListener) parentActivity;
+        } catch(ClassCastException exception) {
+            throw new ClassCastException(parentActivity.toString() + " must implement CreateHomeScreenShortcutListener.");
         }
     }
 
@@ -62,57 +63,64 @@ public class CreateHomeScreenShortcut extends AppCompatDialogFragment {
         // Create a drawable version of the favorite icon.
         Drawable favoriteIconDrawable = new BitmapDrawable(getResources(), MainWebViewActivity.favoriteIcon);
 
-        // Use AlertDialog.Builder to create the AlertDialog
-        AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(getActivity());
+        // Get the activity's layout inflater.
         LayoutInflater customDialogInflater = getActivity().getLayoutInflater();
-        alertDialogBuilder.setTitle(R.string.shortcut_name);
-        alertDialogBuilder.setIcon(favoriteIconDrawable);
-        alertDialogBuilder.setView(customDialogInflater.inflate(R.layout.create_home_screen_shortcut_dialog, null));
-        alertDialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+
+        // 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));
+
+        // Set an onClick listener on the negative button.
+        createHomeScreenShorcutDialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
-                buttonListener.onCreateHomeScreenShortcutCancel(CreateHomeScreenShortcut.this);
+                createHomeScreenShortcutListener.onCreateHomeScreenShortcutCancel(CreateHomeScreenShortcut.this);
             }
         });
-        alertDialogBuilder.setPositiveButton(R.string.create, new DialogInterface.OnClickListener() {
+
+        // Set an onClick listener on the positive button.
+        createHomeScreenShorcutDialogBuilder.setPositiveButton(R.string.create, new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
-                buttonListener.onCreateHomeScreenShortcutCreate(CreateHomeScreenShortcut.this);
+                createHomeScreenShortcutListener.onCreateHomeScreenShortcutCreate(CreateHomeScreenShortcut.this);
             }
         });
 
-        // Assign the alertDialogBuilder to an AlertDialog.
-        final AlertDialog alertDialog = alertDialogBuilder.create();
 
-        // Show the keyboard when the dialog is displayed on the screen.
-        alertDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+        // Create an AlertDialog from the AlertDialogBuilder.
+        final AlertDialog createHomeScreenShortcutAlertDialog = createHomeScreenShorcutDialogBuilder.create();
 
-        // We need to show alertDialog before we can setOnKeyListener below.
-        alertDialog.show();
+        // Show the keyboard when the Dialog is displayed on the screen.
+        createHomeScreenShortcutAlertDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
 
-        EditText shortcutNameEditText = (EditText) alertDialog.findViewById(R.id.shortcutNameEditText);
+        // We need to show the AlertDialog before we can call setOnKeyListener() below.
+        createHomeScreenShortcutAlertDialog.show();
 
         // Allow the "enter" key on the keyboard to create the shortcut.
+        EditText shortcutNameEditText = (EditText) createHomeScreenShortcutAlertDialog.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 event 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 create listener.
-                    buttonListener.onCreateHomeScreenShortcutCreate(CreateHomeScreenShortcut.this);
+                    createHomeScreenShortcutListener.onCreateHomeScreenShortcutCreate(CreateHomeScreenShortcut.this);
 
-                    // Manually dismiss alertDialog.
-                    alertDialog.dismiss();
+                    // Manually dismiss the AlertDialog.
+                    createHomeScreenShortcutAlertDialog.dismiss();
 
                     // Consume the event.
                     return true;
-                } else {
-                    // If any other key was pressed, do not consume the event.
+                } else {  // If any other key was pressed, do not consume the event.
                     return false;
                 }
             }
         });
 
         // onCreateDialog requires the return of an AlertDialog.
-        return alertDialog;
+        return createHomeScreenShortcutAlertDialog;
     }
 }
\ No newline at end of file