/**
- * Copyright 2015 Soren Stoutner
+ * Copyright 2015-2016 Soren Stoutner <soren@stoutner.com>.
*
- * This file is part of Privacy Browser <https://privacybrowser.stoutner.com/>.
+ * This file is part of Privacy Browser <https://www.stoutner.com/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
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 onCancelCreateHomeScreenShortcut(DialogFragment dialogFragment);
- void onCreateHomeScreenShortcutCreate(DialogFragment dialog);
+ void onCreateHomeScreenShortcut(DialogFragment dialogFragment);
}
- 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.");
}
}
- // onCreateDialog requires @NonNull.
@Override
- @NonNull
public Dialog onCreateDialog(Bundle savedInstanceState) {
// Create a drawable version of the favorite icon.
- Drawable favoriteIconDrawable = new BitmapDrawable(getResources(), Webview.favoriteIcon);
+ 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 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(customDialogInflater.inflate(R.layout.create_home_screen_shortcut_dialog, null));
+
+ // Set an onClick listener on the negative button.
+ dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
- buttonListener.onCreateHomeScreenShortcutCancel(CreateHomeScreenShortcut.this);
+ createHomeScreenShortcutListener.onCancelCreateHomeScreenShortcut(CreateHomeScreenShortcut.this);
}
});
- alertDialogBuilder.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) {
- buttonListener.onCreateHomeScreenShortcutCreate(CreateHomeScreenShortcut.this);
+ createHomeScreenShortcutListener.onCreateHomeScreenShortcut(CreateHomeScreenShortcut.this);
}
});
- // Assign the alertDialogBuilder to an AlertDialog.
- final AlertDialog alertDialog = alertDialogBuilder.create();
- // Show the keyboard when the dialog is displayed on the screen.
+ // Create an AlertDialog from the AlertDialogBuilder.
+ final AlertDialog alertDialog = dialogBuilder.create();
+
+ // 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 alertDialog before we can setOnKeyListener below.
+ // We need to show the AlertDialog before we can call setOnKeyListener() below.
alertDialog.show();
- EditText shortcutNameEditText = (EditText) alertDialog.findViewById(R.id.shortcutNameEditText);
-
// Allow the "enter" key on the keyboard to create the shortcut.
+ 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 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.onCreateHomeScreenShortcut(CreateHomeScreenShortcut.this);
- // Manually dismiss alertDialog.
+ // Manually dismiss `alertDialog`.
alertDialog.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;
}
}
projects / PrivacyBrowserAndroid.git / blobdiff