From fda9bd13866ff5561725151d0fe25b5a3c9d6342 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Thu, 17 Apr 2014 14:41:53 +0200 Subject: use project icons for certification status Closes #573 --- .../keychain/ui/adapter/ViewKeyUserIdsAdapter.java | 8 ++++---- .../org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'OpenKeychain/src/main/java/org') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java index 6e90be994..29883d750 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java @@ -124,7 +124,7 @@ public class ViewKeyUserIdsAdapter extends CursorAdapter implements AdapterView. if (cursor.getInt(mIsRevoked) > 0) { vRank.setText(" "); - vVerified.setImageResource(android.R.drawable.presence_away); + vVerified.setImageResource(R.drawable.key_certify_revoke); // disable and strike through text for revoked user ids vUserId.setEnabled(false); @@ -138,11 +138,11 @@ public class ViewKeyUserIdsAdapter extends CursorAdapter implements AdapterView. int verified = cursor.getInt(mVerifiedId); // TODO introduce own resources for this :) if (verified == Certs.VERIFIED_SECRET) { - vVerified.setImageResource(android.R.drawable.presence_online); + vVerified.setImageResource(R.drawable.key_certify_ok_depth0); } else if (verified == Certs.VERIFIED_SELF) { - vVerified.setImageResource(android.R.drawable.presence_invisible); + vVerified.setImageResource(R.drawable.key_certify_ok_self); } else { - vVerified.setImageResource(android.R.drawable.presence_busy); + vVerified.setImageResource(R.drawable.key_certify_error); } } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java index 75d5181c5..ea80317eb 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java @@ -135,10 +135,10 @@ public class UserIdEditor extends LinearLayout implements Editor, OnClickListene Matcher emailMatcher = Patterns.EMAIL_ADDRESS.matcher(email); if (emailMatcher.matches()) { mEmail.setCompoundDrawablesWithIntrinsicBounds(0, 0, - android.R.drawable.presence_online, 0); + R.drawable.uid_mail_ok, 0); } else { mEmail.setCompoundDrawablesWithIntrinsicBounds(0, 0, - android.R.drawable.presence_offline, 0); + R.drawable.uid_mail_bad, 0); } } else { // remove drawable if email is empty -- cgit v1.2.3