From fccefadd3205204cd766af66a391e2b18f52bd67 Mon Sep 17 00:00:00 2001 From: Matthew Wong Date: Fri, 10 Jul 2015 19:45:32 -0400 Subject: Create password generation dialog --- app/src/main/res/layout/fragment_pwgen.xml | 108 +++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 app/src/main/res/layout/fragment_pwgen.xml (limited to 'app/src/main/res/layout') diff --git a/app/src/main/res/layout/fragment_pwgen.xml b/app/src/main/res/layout/fragment_pwgen.xml new file mode 100644 index 00000000..3fd8bd51 --- /dev/null +++ b/app/src/main/res/layout/fragment_pwgen.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- cgit v1.2.3 From d63b16eb2671608cd9acc7e935f1ec3db1d0b396 Mon Sep 17 00:00:00 2001 From: Matthew Wong Date: Fri, 10 Jul 2015 19:46:18 -0400 Subject: Open password generation dialog when button pressed --- app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java | 5 +++++ app/src/main/res/layout/encrypt_layout.xml | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) (limited to 'app/src/main/res/layout') diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java index 28aea81e..9c0bc877 100644 --- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java +++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java @@ -1,6 +1,7 @@ package com.zeapo.pwdstore.crypto; import android.app.Activity; +import android.app.DialogFragment; import android.app.PendingIntent; import android.content.ClipData; import android.content.ClipboardManager; @@ -28,6 +29,7 @@ import android.widget.Toast; import com.google.common.primitives.Longs; import com.zeapo.pwdstore.R; import com.zeapo.pwdstore.UserPreference; +import com.zeapo.pwdstore.pwgenDialogFragment; import com.zeapo.pwdstore.utils.PasswordRepository; import org.apache.commons.io.FileUtils; @@ -174,6 +176,9 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne case R.id.crypto_get_key_ids: getKeyIds(new Intent()); break; + case R.id.generate_password: + DialogFragment df = new pwgenDialogFragment(); + df.show(getFragmentManager(), "generator"); default: // should not happen diff --git a/app/src/main/res/layout/encrypt_layout.xml b/app/src/main/res/layout/encrypt_layout.xml index 5fc93b3c..dcb6bf88 100644 --- a/app/src/main/res/layout/encrypt_layout.xml +++ b/app/src/main/res/layout/encrypt_layout.xml @@ -64,7 +64,15 @@ android:id="@+id/crypto_password_edit" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:typeface="monospace"/> + android:typeface="monospace" + android:layout_weight="1"/> + Date: Sat, 11 Jul 2015 12:22:56 -0400 Subject: Use string resources --- .../com/zeapo/pwdstore/pwgenDialogFragment.java | 43 ++++++++-------------- app/src/main/res/layout/fragment_pwgen.xml | 10 ++--- app/src/main/res/values/strings.xml | 8 ++++ 3 files changed, 29 insertions(+), 32 deletions(-) (limited to 'app/src/main/res/layout') diff --git a/app/src/main/java/com/zeapo/pwdstore/pwgenDialogFragment.java b/app/src/main/java/com/zeapo/pwdstore/pwgenDialogFragment.java index 12822b3f..38e7a7b9 100644 --- a/app/src/main/java/com/zeapo/pwdstore/pwgenDialogFragment.java +++ b/app/src/main/java/com/zeapo/pwdstore/pwgenDialogFragment.java @@ -50,46 +50,35 @@ public class pwgenDialogFragment extends DialogFragment { checkBox.setChecked(!prefs.getBoolean("B", false)); checkBox = (CheckBox) view.findViewById(R.id.pronounceable); - checkBox.setChecked(!prefs.getBoolean("s", false)); + checkBox.setChecked(!prefs.getBoolean("s", true)); TextView textView = (TextView) view.findViewById(R.id.lengthNumber); - textView.setText(Integer.toString(prefs.getInt("length", 8))); + textView.setText(Integer.toString(prefs.getInt("length", 20))); textView = (TextView) view.findViewById(R.id.passwordText); textView.setText(pwgen.generate(getActivity().getApplicationContext()).get(0)); - builder.setPositiveButton("OK", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - TextView edit = (TextView) getActivity().findViewById(R.id.crypto_password_edit); - TextView generate = (TextView) getDialog().findViewById(R.id.passwordText); - edit.append(generate.getText()); - } + builder.setPositiveButton(getResources().getString(R.string.dialog_ok), (dialog, which) -> { + setPreferences(); + TextView edit = (TextView) getActivity().findViewById(R.id.crypto_password_edit); + TextView generate = (TextView) getDialog().findViewById(R.id.passwordText); + edit.append(generate.getText()); }); - builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { + builder.setNegativeButton(getResources().getString(R.string.dialog_cancel), (dialog, which) -> { - } }); - builder.setNeutralButton("Generate", null); + builder.setNeutralButton(getResources().getString(R.string.pwgen_generate), null); final AlertDialog ad = builder.setTitle("Generate Password").create(); - ad.setOnShowListener(new DialogInterface.OnShowListener() { - @Override - public void onShow(DialogInterface dialog) { - Button b = ad.getButton(AlertDialog.BUTTON_NEUTRAL); - b.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - setPreferences(); - TextView textView = (TextView) getDialog().findViewById(R.id.passwordText); - textView.setText(pwgen.generate(getActivity().getApplicationContext()).get(0)); - } - }); - } + ad.setOnShowListener(dialog -> { + Button b = ad.getButton(AlertDialog.BUTTON_NEUTRAL); + b.setOnClickListener(v -> { + setPreferences(); + TextView textView1 = (TextView) getDialog().findViewById(R.id.passwordText); + textView1.setText(pwgen.generate(getActivity().getApplicationContext()).get(0)); + }); }); return ad; } diff --git a/app/src/main/res/layout/fragment_pwgen.xml b/app/src/main/res/layout/fragment_pwgen.xml index 3fd8bd51..072a78a9 100644 --- a/app/src/main/res/layout/fragment_pwgen.xml +++ b/app/src/main/res/layout/fragment_pwgen.xml @@ -39,7 +39,7 @@ android:id="@+id/include" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Include" + android:text="@string/pwgen_include" android:textAppearance="?android:attr/textAppearanceSmall" android:layout_marginBottom="8dp"/> @@ -47,26 +47,26 @@ android:id="@+id/numerals" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Numerals"/> + android:text="@string/pwgen_numerals"/> + android:text="@string/pwgen_symbols"/> + android:text="@string/pwgen_uppercase"/> + android:text="@string/pwgen_ambiguous"/> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a8db99ff..a9b03151 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -114,6 +114,14 @@ Recursive filtering Recursively find passwords of the current directory. + + Generate + Include + Numerals + Symbols + Uppercase + Ambiguous + OK Yes -- cgit v1.2.3