X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FAddDomainDialog.java;h=292ef453abe7f295041915e579287cb0b2f3d093;hp=4d99a20655258ab012af57574b76725efb2d2d8e;hb=6fa2fbb5a767bbe036daae06b0da883c4bafb798;hpb=f82135d919d64d4909c37c79a18e14ceba802579 diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.java b/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.java index 4d99a206..292ef453 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.java +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/AddDomainDialog.java @@ -1,5 +1,5 @@ /* - * Copyright © 2017 Soren Stoutner . + * Copyright © 2017-2018 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -29,13 +29,18 @@ import android.os.Bundle; // We have to use `AppCompatDialogFragment` instead of `DialogFragment` or an error is produced on API <= 22. import android.support.annotation.NonNull; import android.support.v7.app.AppCompatDialogFragment; +import android.text.Editable; +import android.text.TextWatcher; import android.view.KeyEvent; import android.view.View; import android.view.WindowManager; +import android.widget.Button; import android.widget.EditText; +import android.widget.TextView; import com.stoutner.privacybrowser.R; import com.stoutner.privacybrowser.activities.MainWebViewActivity; +import com.stoutner.privacybrowser.helpers.DomainsDatabaseHelper; public class AddDomainDialog extends AppCompatDialogFragment { // The public interface is used to send information back to the parent activity. @@ -63,62 +68,102 @@ public class AddDomainDialog extends AppCompatDialogFragment { @Override @NonNull public Dialog onCreateDialog(Bundle savedInstanceState) { - // 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); + // Use `AlertDialog.Builder` to create the `AlertDialog`. + AlertDialog.Builder dialogBuilder; + + // Set the style according to the theme. + if (MainWebViewActivity.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.add_domain); - // The parent view is `null` because it will be assigned by the `AlertDialog`. + + // Remove the incorrect lint warning below that `getActivity()` might be null. + assert getActivity() != null; + + // Set the view. The parent view is `null` because it will be assigned by the alert dialog. dialogBuilder.setView(getActivity().getLayoutInflater().inflate(R.layout.add_domain_dialog, null)); - // Set an `onClick()` listener for the negative button. - dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - // Do nothing. The `AlertDialog` will close automatically. - } + // Set a listener for the negative button. + dialogBuilder.setNegativeButton(R.string.cancel, (DialogInterface dialog, int which) -> { + // Do nothing. The `AlertDialog` will close automatically. }); - // Set an `onClick()` listener for the positive button. - dialogBuilder.setPositiveButton(R.string.add, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - // Return the `DialogFragment` to the parent activity on add. - addDomainListener.onAddDomain(AddDomainDialog.this); - } + // Set a listener for the positive button. + dialogBuilder.setPositiveButton(R.string.add, (DialogInterface dialog, int which) -> { + // Return the `DialogFragment` to the parent activity on add. + addDomainListener.onAddDomain(AddDomainDialog.this); }); - // Create an `AlertDialog` from the `AlertDialog.Builder`. + // Create an alert dialog from the builder. final AlertDialog alertDialog = dialogBuilder.create(); - // Remove the warning below the `setSoftInputMode` might produce `java.lang.NullPointerException`. + // Remove the warning below that `setSoftInputMode` might be null. assert alertDialog.getWindow() != null; - // Show the keyboard when the `AlertDialog` is displayed on the screen. + // Show the keyboard when the alert 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 edit the contents. + // The alert dialog must be shown before the contents can be edited. alertDialog.show(); - // Get a handle for `domain_name_edittext`. - EditText addDomainEditText = (EditText) alertDialog.findViewById(R.id.domain_name_edittext); + // Initialize `domainsDatabaseHelper`. The `0` specifies the database version, but that is ignored and set instead using a constant in `DomainsDatabaseHelper`. + final DomainsDatabaseHelper domainsDatabaseHelper = new DomainsDatabaseHelper(getContext(), null, null, 0); + + // Get handles for the views in the alert dialog. + final EditText addDomainEditText = alertDialog.findViewById(R.id.domain_name_edittext); + final TextView domainNameAlreadyExistsTextView = alertDialog.findViewById(R.id.domain_name_already_exists_textview); + final Button addButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE); + + // Update the status of the warning text and the add button. + addDomainEditText.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) { + if (domainsDatabaseHelper.getCursorForDomainName(addDomainEditText.getText().toString()).getCount() >0) { // The domain already exists. + // Show the warning text. + domainNameAlreadyExistsTextView.setVisibility(View.VISIBLE); + + // Disable the add button. + addButton.setEnabled(false); + } else { // The domain do not yet exist. + // Hide the warning text. + domainNameAlreadyExistsTextView.setVisibility(View.GONE); + + // Enable the add button. + addButton.setEnabled(true); + } + } + }); // Get the current domain from `formattedUrlString`. Uri currentUri = Uri.parse(MainWebViewActivity.formattedUrlString); addDomainEditText.setText(currentUri.getHost()); // Allow the `enter` key on the keyboard to create the domain from `add_domain_edittext`. - addDomainEditText.setOnKeyListener(new View.OnKeyListener() { - public boolean onKey(View view, int keyCode, KeyEvent event) { - // If the event is a key-down on the `enter` key, select the `PositiveButton` `Add`. - if ((keyCode == KeyEvent.KEYCODE_ENTER) && (event.getAction() == KeyEvent.ACTION_DOWN)) { - // Trigger `addDomainListener` and return the `DialogFragment` to the parent activity. - addDomainListener.onAddDomain(AddDomainDialog.this); - // Manually dismiss the `AlertDialog`. - alertDialog.dismiss(); - // Consume the event. - return true; - } else { // If any other key was pressed, do not consume the event. - return false; - } + addDomainEditText.setOnKeyListener((View view, int keyCode, KeyEvent event) -> { + // If the event is a key-down on the `enter` key, select the `PositiveButton` `Add`. + if ((keyCode == KeyEvent.KEYCODE_ENTER) && (event.getAction() == KeyEvent.ACTION_DOWN)) { + // Trigger `addDomainListener` and return the `DialogFragment` to the parent activity. + addDomainListener.onAddDomain(AddDomainDialog.this); + // Manually dismiss the `AlertDialog`. + alertDialog.dismiss(); + // Consume the event. + return true; + } else { // If any other key was pressed, do not consume the event. + return false; } });