From 51ac309bcf537f944c75bdc2415b411944e46b0a Mon Sep 17 00:00:00 2001 From: Ishit Date: Thu, 2 Jul 2015 20:13:50 +0530 Subject: Change PassphraseEditAgain status icons. --- .../keychain/ui/CreateKeyPassphraseFragment.java | 4 ++-- .../keychain/ui/widget/EmailEditText.java | 4 ++-- .../src/main/res/drawable-hdpi/ic_stat_retyped_bad.png | Bin 0 -> 942 bytes .../src/main/res/drawable-hdpi/ic_stat_retyped_ok.png | Bin 0 -> 1252 bytes OpenKeychain/src/main/res/drawable-hdpi/uid_mail_bad.png | Bin 942 -> 0 bytes OpenKeychain/src/main/res/drawable-hdpi/uid_mail_ok.png | Bin 1252 -> 0 bytes .../src/main/res/drawable-mdpi/ic_stat_retyped_bad.png | Bin 0 -> 647 bytes .../src/main/res/drawable-mdpi/ic_stat_retyped_ok.png | Bin 0 -> 862 bytes OpenKeychain/src/main/res/drawable-mdpi/uid_mail_bad.png | Bin 647 -> 0 bytes OpenKeychain/src/main/res/drawable-mdpi/uid_mail_ok.png | Bin 862 -> 0 bytes .../src/main/res/drawable-xhdpi/ic_stat_retyped_bad.png | Bin 0 -> 1299 bytes .../src/main/res/drawable-xhdpi/ic_stat_retyped_ok.png | Bin 0 -> 1606 bytes .../src/main/res/drawable-xhdpi/uid_mail_bad.png | Bin 1299 -> 0 bytes OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_ok.png | Bin 1606 -> 0 bytes .../src/main/res/drawable-xxhdpi/ic_stat_retyped_bad.png | Bin 0 -> 2338 bytes .../src/main/res/drawable-xxhdpi/ic_stat_retyped_ok.png | Bin 0 -> 2364 bytes .../src/main/res/drawable-xxhdpi/uid_mail_bad.png | Bin 2338 -> 0 bytes .../src/main/res/drawable-xxhdpi/uid_mail_ok.png | Bin 2364 -> 0 bytes 18 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_stat_retyped_bad.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_stat_retyped_ok.png delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/uid_mail_bad.png delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/uid_mail_ok.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_stat_retyped_bad.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_stat_retyped_ok.png delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/uid_mail_bad.png delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/uid_mail_ok.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_retyped_bad.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_retyped_ok.png delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_bad.png delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_ok.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_retyped_bad.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_retyped_ok.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_bad.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_ok.png (limited to 'OpenKeychain/src') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyPassphraseFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyPassphraseFragment.java index 7bf1af393..b38d874d8 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyPassphraseFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyPassphraseFragment.java @@ -144,9 +144,9 @@ public class CreateKeyPassphraseFragment extends Fragment { } if (areEditTextsEqual(mPassphraseEdit, mPassphraseEditAgain)) { - mPassphraseEditAgain.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_done_grey_24dp, 0); + mPassphraseEditAgain.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_stat_retyped_ok, 0); } else { - mPassphraseEditAgain.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_close_grey_24dp, 0); + mPassphraseEditAgain.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_stat_retyped_bad, 0); } } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EmailEditText.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EmailEditText.java index e55f6b1ad..494ccb6d3 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EmailEditText.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EmailEditText.java @@ -75,10 +75,10 @@ public class EmailEditText extends AppCompatAutoCompleteTextView { Matcher emailMatcher = Patterns.EMAIL_ADDRESS.matcher(email); if (emailMatcher.matches()) { EmailEditText.this.setCompoundDrawablesWithIntrinsicBounds(0, 0, - R.drawable.uid_mail_ok, 0); + R.drawable.ic_stat_retyped_ok, 0); } else { EmailEditText.this.setCompoundDrawablesWithIntrinsicBounds(0, 0, - R.drawable.uid_mail_bad, 0); + R.drawable.ic_stat_retyped_bad, 0); } } else { // remove drawable if email is empty diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_retyped_bad.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_retyped_bad.png new file mode 100644 index 000000000..dc20b0f03 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_retyped_bad.png differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_retyped_ok.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_retyped_ok.png new file mode 100644 index 000000000..76944469c Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_retyped_ok.png differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/uid_mail_bad.png b/OpenKeychain/src/main/res/drawable-hdpi/uid_mail_bad.png deleted file mode 100644 index dc20b0f03..000000000 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/uid_mail_bad.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/uid_mail_ok.png b/OpenKeychain/src/main/res/drawable-hdpi/uid_mail_ok.png deleted file mode 100644 index 76944469c..000000000 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/uid_mail_ok.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_retyped_bad.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_retyped_bad.png new file mode 100644 index 000000000..262d53027 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_retyped_bad.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_retyped_ok.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_retyped_ok.png new file mode 100644 index 000000000..e16ec810a Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_retyped_ok.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/uid_mail_bad.png b/OpenKeychain/src/main/res/drawable-mdpi/uid_mail_bad.png deleted file mode 100644 index 262d53027..000000000 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/uid_mail_bad.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/uid_mail_ok.png b/OpenKeychain/src/main/res/drawable-mdpi/uid_mail_ok.png deleted file mode 100644 index e16ec810a..000000000 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/uid_mail_ok.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_retyped_bad.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_retyped_bad.png new file mode 100644 index 000000000..fc7ba24a3 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_retyped_bad.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_retyped_ok.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_retyped_ok.png new file mode 100644 index 000000000..e2aef1177 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_retyped_ok.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_bad.png b/OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_bad.png deleted file mode 100644 index fc7ba24a3..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_bad.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_ok.png b/OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_ok.png deleted file mode 100644 index e2aef1177..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_ok.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_retyped_bad.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_retyped_bad.png new file mode 100644 index 000000000..bc71d3a65 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_retyped_bad.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_retyped_ok.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_retyped_ok.png new file mode 100644 index 000000000..501a75d63 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_retyped_ok.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_bad.png b/OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_bad.png deleted file mode 100644 index bc71d3a65..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_bad.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_ok.png b/OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_ok.png deleted file mode 100644 index 501a75d63..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_ok.png and /dev/null differ -- cgit v1.2.3