From ac6220eed31f1aab0f73403b3befe77c57f0c9a1 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Mon, 29 Jun 2020 12:50:05 +0530 Subject: Merge SshKeyGenFragment into its activity (#897) * Merge SshKeyGenFragment into its activity Signed-off-by: Harsh Shandilya * Drop neutral button discouraged by material specs Signed-off-by: Harsh Shandilya * Address review comments Signed-off-by: Harsh Shandilya --- .../main/java/com/zeapo/pwdstore/sshkeygen/ShowSshKeyFragment.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'app/src/main/java/com/zeapo/pwdstore/sshkeygen/ShowSshKeyFragment.kt') diff --git a/app/src/main/java/com/zeapo/pwdstore/sshkeygen/ShowSshKeyFragment.kt b/app/src/main/java/com/zeapo/pwdstore/sshkeygen/ShowSshKeyFragment.kt index 8f4fbf84..109ebd01 100644 --- a/app/src/main/java/com/zeapo/pwdstore/sshkeygen/ShowSshKeyFragment.kt +++ b/app/src/main/java/com/zeapo/pwdstore/sshkeygen/ShowSshKeyFragment.kt @@ -36,7 +36,7 @@ class ShowSshKeyFragment : DialogFragment() { createMaterialDialog(view) val ad = builder.create() ad.setOnShowListener { - val b = ad.getButton(AlertDialog.BUTTON_NEUTRAL) + val b = ad.getButton(AlertDialog.BUTTON_POSITIVE) b.setOnClickListener { val clipboard = activity.clipboard ?: return@setOnClickListener val clip = ClipData.newPlainText("public key", publicKey.text.toString()) @@ -49,9 +49,8 @@ class ShowSshKeyFragment : DialogFragment() { private fun createMaterialDialog(view: View) { builder.setView(view) builder.setTitle(getString(R.string.your_public_key)) - builder.setPositiveButton(getString(R.string.dialog_ok)) { _, _ -> requireActivity().finish() } - builder.setNegativeButton(getString(R.string.dialog_cancel), null) - builder.setNeutralButton(resources.getString(R.string.ssh_keygen_copy), null) + builder.setNegativeButton(R.string.dialog_ok) { _, _ -> requireActivity().finish() } + builder.setPositiveButton(R.string.ssh_keygen_copy, null) } private fun readKeyFromFile() { -- cgit v1.2.3