use project icons for certification status

Closes #573

34 files changed, 8 insertions, 8 deletions

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
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_certify_error.png b/OpenKeychain/src/main/res/drawable-hdpi/key_certify_error.png
new file mode 100644
index 000000000..391d1c988
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/key_certify_error.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_certify_ok_depth0.png b/OpenKeychain/src/main/res/drawable-hdpi/key_certify_ok_depth0.png
new file mode 100644
index 000000000..76944469c
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/key_certify_ok_depth0.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_certify_ok_self.png b/OpenKeychain/src/main/res/drawable-hdpi/key_certify_ok_self.png
new file mode 100644
index 000000000..815701015
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/key_certify_ok_self.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_certify_revoke.png b/OpenKeychain/src/main/res/drawable-hdpi/key_certify_revoke.png
new file mode 100644
index 000000000..c39d3a87c
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/key_certify_revoke.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/uid_mail_bad.png b/OpenKeychain/src/main/res/drawable-hdpi/uid_mail_bad.png
new file mode 100644
index 000000000..dc20b0f03
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/uid_mail_bad.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/uid_mail_ok.png b/OpenKeychain/src/main/res/drawable-hdpi/uid_mail_ok.png
new file mode 100644
index 000000000..76944469c
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/uid_mail_ok.png
diff --git a/OpenKeychain/src/main/res/drawable-ldpi/key_certify_error.png b/OpenKeychain/src/main/res/drawable-ldpi/key_certify_error.png
new file mode 100644
index 000000000..79fddf78a
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-ldpi/key_certify_error.png
diff --git a/OpenKeychain/src/main/res/drawable-ldpi/key_certify_ok_depth0.png b/OpenKeychain/src/main/res/drawable-ldpi/key_certify_ok_depth0.png
new file mode 100644
index 000000000..c400a1820
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-ldpi/key_certify_ok_depth0.png
diff --git a/OpenKeychain/src/main/res/drawable-ldpi/key_certify_ok_self.png b/OpenKeychain/src/main/res/drawable-ldpi/key_certify_ok_self.png
new file mode 100644
index 000000000..fb1654b53
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-ldpi/key_certify_ok_self.png
diff --git a/OpenKeychain/src/main/res/drawable-ldpi/key_certify_revoke.png b/OpenKeychain/src/main/res/drawable-ldpi/key_certify_revoke.png
new file mode 100644
index 000000000..5228a4b6b
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-ldpi/key_certify_revoke.png
diff --git a/OpenKeychain/src/main/res/drawable-ldpi/uid_mail_bad.png b/OpenKeychain/src/main/res/drawable-ldpi/uid_mail_bad.png
new file mode 100644
index 000000000..45467992f
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-ldpi/uid_mail_bad.png
diff --git a/OpenKeychain/src/main/res/drawable-ldpi/uid_mail_ok.png b/OpenKeychain/src/main/res/drawable-ldpi/uid_mail_ok.png
new file mode 100644
index 000000000..c400a1820
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-ldpi/uid_mail_ok.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_certify_error.png b/OpenKeychain/src/main/res/drawable-mdpi/key_certify_error.png
new file mode 100644
index 000000000..6def8769f
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/key_certify_error.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_certify_ok_depth0.png b/OpenKeychain/src/main/res/drawable-mdpi/key_certify_ok_depth0.png
new file mode 100644
index 000000000..e16ec810a
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/key_certify_ok_depth0.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_certify_ok_self.png b/OpenKeychain/src/main/res/drawable-mdpi/key_certify_ok_self.png
new file mode 100644
index 000000000..715a16487
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/key_certify_ok_self.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_certify_revoke.png b/OpenKeychain/src/main/res/drawable-mdpi/key_certify_revoke.png
new file mode 100644
index 000000000..62ee0ca42
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/key_certify_revoke.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/uid_mail_bad.png b/OpenKeychain/src/main/res/drawable-mdpi/uid_mail_bad.png
new file mode 100644
index 000000000..262d53027
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/uid_mail_bad.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/uid_mail_ok.png b/OpenKeychain/src/main/res/drawable-mdpi/uid_mail_ok.png
new file mode 100644
index 000000000..e16ec810a
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/uid_mail_ok.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_error.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_error.png
new file mode 100644
index 000000000..8278ce2b6
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_error.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_ok_depth0.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_ok_depth0.png
new file mode 100644
index 000000000..e2aef1177
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_ok_depth0.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_ok_self.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_ok_self.png
new file mode 100644
index 000000000..9bb6ceffa
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_ok_self.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_revoke.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_revoke.png
new file mode 100644
index 000000000..1478e726b
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_revoke.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_bad.png b/OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_bad.png
new file mode 100644
index 000000000..fc7ba24a3
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_bad.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_ok.png b/OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_ok.png
new file mode 100644
index 000000000..e2aef1177
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/uid_mail_ok.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_error.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_error.png
new file mode 100644
index 000000000..9416720eb
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_error.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_ok_depth0.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_ok_depth0.png
new file mode 100644
index 000000000..501a75d63
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_ok_depth0.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_ok_self.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_ok_self.png
new file mode 100644
index 000000000..72ada9c1f
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_ok_self.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_revoke.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_revoke.png
new file mode 100644
index 000000000..217f4e914
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_revoke.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_bad.png b/OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_bad.png
new file mode 100644
index 000000000..bc71d3a65
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_bad.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_ok.png b/OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_ok.png
new file mode 100644
index 000000000..501a75d63
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/uid_mail_ok.png
diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml
index 940181306..4676a624d 100644
--- a/OpenKeychain/src/main/res/layout/key_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_item.xml
@@ -79,7 +79,7 @@
             android:layout_height="wrap_content"
             android:id="@+id/verified"
             android:layout_gravity="center"
-            android:src="@android:drawable/presence_online"
+            android:src="@drawable/key_certify_ok_depth0"
             android:paddingLeft="25dp" />
     </FrameLayout>
 
diff --git a/OpenKeychain/src/main/res/layout/view_key_userids_item.xml b/OpenKeychain/src/main/res/layout/view_key_userids_item.xml
index 1db15e482..e56355ff3 100644
--- a/OpenKeychain/src/main/res/layout/view_key_userids_item.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_userids_item.xml
@@ -50,7 +50,7 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:id="@+id/certified"
-        android:src="@android:drawable/presence_invisible"
+        android:src="@drawable/key_certify_ok_self"
         android:layout_marginLeft="5dp"
         android:layout_marginRight="5dp" />