Use icons in key view

5 files changed, 64 insertions, 43 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
index ef3c0a1c1..ee05a5fe4 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
@@ -494,19 +494,19 @@ public class KeyListFragment extends LoaderFragment
                     if (isRevoked) {
                         h.mStatus.setVisibility(View.VISIBLE);
                         h.mStatus.setImageDrawable(
-                                getResources().getDrawable(R.drawable.status_signature_revoked_cutout));
+                                getResources().getDrawable(R.drawable.status_signature_revoked));
                         h.mStatus.setColorFilter(getResources().getColor(R.color.result_red),
                                 PorterDuff.Mode.SRC_ATOP);
                     } else if (isExpired) {
                         h.mStatus.setVisibility(View.VISIBLE);
                         h.mStatus.setImageDrawable(
-                                getResources().getDrawable(R.drawable.status_signature_expired_cutout));
+                                getResources().getDrawable(R.drawable.status_signature_expired));
                         h.mStatus.setColorFilter(getResources().getColor(R.color.result_orange),
                                 PorterDuff.Mode.SRC_ATOP);
                     } else if (isVerified) {
                         h.mStatus.setVisibility(View.VISIBLE);
                         h.mStatus.setImageDrawable(
-                                getResources().getDrawable(R.drawable.status_signature_verified_cutout));
+                                getResources().getDrawable(R.drawable.status_signature_verified));
                         h.mStatus.setColorFilter(getResources().getColor(R.color.result_green),
                                 PorterDuff.Mode.SRC_ATOP);
                     } else {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
index a9cd0976b..8407ab66d 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
@@ -22,6 +22,7 @@ import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.Intent;
 import android.database.Cursor;
+import android.graphics.PorterDuff;
 import android.net.Uri;
 import android.nfc.NdefMessage;
 import android.nfc.NdefRecord;
@@ -43,6 +44,9 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.Window;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 
 import com.devspark.appmsg.AppMsg;
 
@@ -81,9 +85,11 @@ public class ViewKeyActivity extends ActionBarActivity implements
     private ViewPager mViewPager;
     private SlidingTabLayout mSlidingTabLayout;
     private PagerTabStripAdapter mTabsAdapter;
+
+    private LinearLayout mStatusLayout;
+    private TextView mStatusText;
+    private ImageView mStatusImage;
     private View mStatusDivider;
-    private View mStatusRevoked;
-    private View mStatusExpired;
 
     public static final int REQUEST_CODE_LOOKUP_KEY = 0x00007006;
 
@@ -115,9 +121,10 @@ public class ViewKeyActivity extends ActionBarActivity implements
 
         setContentView(R.layout.view_key_activity);
 
-        mStatusDivider = findViewById(R.id.status_divider);
-        mStatusRevoked = findViewById(R.id.view_key_revoked);
-        mStatusExpired = findViewById(R.id.view_key_expired);
+        mStatusLayout = (LinearLayout) findViewById(R.id.view_key_status_layout);
+        mStatusText = (TextView) findViewById(R.id.view_key_status_text);
+        mStatusImage = (ImageView) findViewById(R.id.view_key_status_image);
+        mStatusDivider = findViewById(R.id.view_key_status_divider);
 
         mViewPager = (ViewPager) findViewById(R.id.view_key_pager);
         mSlidingTabLayout = (SlidingTabLayout) findViewById(R.id.view_key_sliding_tab_layout);
@@ -515,22 +522,32 @@ public class ViewKeyActivity extends ActionBarActivity implements
                     String keyIdStr = PgpKeyHelper.convertKeyIdToHex(masterKeyId);
                     getSupportActionBar().setSubtitle(keyIdStr);
 
-                    // If this key is revoked, it cannot be used for anything!
-                    if (data.getInt(INDEX_UNIFIED_IS_REVOKED) != 0) {
+                    boolean isRevoked = data.getInt(INDEX_UNIFIED_IS_REVOKED) > 0;
+                    boolean isExpired = !data.isNull(INDEX_UNIFIED_EXPIRY)
+                            && new Date(data.getLong(INDEX_UNIFIED_EXPIRY) * 1000).before(new Date());
+
+                    // Note: order is important
+                    if (isRevoked) {
+                        mStatusDivider.setVisibility(View.VISIBLE);
+                        mStatusLayout.setVisibility(View.VISIBLE);
+                        mStatusText.setText(R.string.view_key_revoked);
+                        mStatusText.setTextColor(getResources().getColor(R.color.result_red));
+                        mStatusImage.setImageDrawable(
+                                getResources().getDrawable(R.drawable.status_signature_revoked));
+                        mStatusImage.setColorFilter(getResources().getColor(R.color.result_red),
+                                PorterDuff.Mode.SRC_ATOP);
+                    } else if (isExpired) {
                         mStatusDivider.setVisibility(View.VISIBLE);
-                        mStatusRevoked.setVisibility(View.VISIBLE);
-                        mStatusExpired.setVisibility(View.GONE);
+                        mStatusLayout.setVisibility(View.VISIBLE);
+                        mStatusText.setText(R.string.view_key_expired);
+                        mStatusText.setTextColor(getResources().getColor(R.color.result_orange));
+                        mStatusImage.setImageDrawable(
+                                getResources().getDrawable(R.drawable.status_signature_expired_cutout));
+                        mStatusImage.setColorFilter(getResources().getColor(R.color.result_orange),
+                                PorterDuff.Mode.SRC_ATOP);
                     } else {
-                        mStatusRevoked.setVisibility(View.GONE);
-
-                        Date expiryDate = new Date(data.getLong(INDEX_UNIFIED_EXPIRY) * 1000);
-                        if (!data.isNull(INDEX_UNIFIED_EXPIRY) && expiryDate.before(new Date())) {
-                            mStatusDivider.setVisibility(View.VISIBLE);
-                            mStatusExpired.setVisibility(View.VISIBLE);
-                        } else {
-                            mStatusDivider.setVisibility(View.GONE);
-                            mStatusExpired.setVisibility(View.GONE);
-                        }
+                        mStatusDivider.setVisibility(View.GONE);
+                        mStatusLayout.setVisibility(View.GONE);
                     }
 
                     break;
diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml
index 057902505..8d600464c 100644
--- a/OpenKeychain/src/main/res/layout/key_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_item.xml
@@ -43,7 +43,7 @@
         android:layout_height="wrap_content"
         android:id="@+id/status_image"
         android:layout_gravity="center"
-        android:src="@drawable/status_signature_verified_cutout"
+        android:src="@drawable/status_signature_revoked_cutout"
         android:padding="16dp" />
 
 </LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index 481b1ddf5..27078c9e4 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -10,36 +10,36 @@
         android:layout_height="wrap_content"
         android:orientation="vertical" />
 
-    <TextView
-        android:layout_width="match_parent"
+    <LinearLayout
+        android:id="@+id/view_key_status_layout"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="This key is expired!"
-        android:id="@+id/view_key_expired"
-        android:textColor="@color/alert"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:gravity="center_vertical|center_horizontal"
+        android:layout_gravity="center"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
-        android:visibility="gone" />
+        android:orientation="horizontal">
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="This key has been revoked!"
-        android:id="@+id/view_key_revoked"
-        android:textColor="@color/alert"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:gravity="center_vertical|center_horizontal"
-        android:visibility="gone"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp" />
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/view_key_status_image" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/view_key_status_text"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="8dp"/>
+
+    </LinearLayout>
 
     <View
         android:layout_width="match_parent"
         android:layout_height="1dip"
         android:background="?android:attr/listDivider"
         android:visibility="gone"
-        android:id="@+id/status_divider" />
+        android:id="@+id/view_key_status_divider" />
 
     <org.sufficientlysecure.keychain.ui.widget.SlidingTabLayout
         android:id="@+id/view_key_sliding_tab_layout"
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index dd8ae0ac1..f6648ca3d 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -492,6 +492,10 @@
     <string name="create_key_upload">Upload key to keyserver</string>
     <string name="create_key_empty">This field is required</string>
 
+    <!-- View key -->
+    <string name="view_key_revoked">This key has been revoked!</string>
+    <string name="view_key_expired">This key is expired!</string>
+
     <!-- Navigation Drawer -->
     <string name="nav_keys">Keys</string>
     <string name="nav_encrypt">Sign and Encrypt</string>