From 0bb11be749cd2af71fc905d930ac1d9e3b9b22be Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 7 May 2014 02:15:09 +0200
Subject: [PATCH] ui: slight edit icon cosmetics in keylist

---
 .../keychain/ui/ViewKeyActivity.java                  |  4 ++++
 OpenKeychain/src/main/res/layout/key_list_item.xml    | 11 ++++++-----
 .../src/main/res/layout/view_key_activity.xml         |  4 +++-
 3 files changed, 13 insertions(+), 6 deletions(-)

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 a7ac2587a..957a2db07 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
@@ -77,6 +77,7 @@ public class ViewKeyActivity extends ActionBarActivity implements
     private ViewPager mViewPager;
     private SlidingTabLayout mSlidingTabLayout;
     private PagerTabStripAdapter mTabsAdapter;
+    private View mStatusDivider;
     private View mStatusRevoked;
     private View mStatusExpired;
 
@@ -421,6 +422,7 @@ public class ViewKeyActivity extends ActionBarActivity implements
 
                     // If this key is revoked, it cannot be used for anything!
                     if (data.getInt(INDEX_UNIFIED_IS_REVOKED) != 0) {
+                        mStatusDivider.setVisibility(View.VISIBLE);
                         mStatusRevoked.setVisibility(View.VISIBLE);
                         mStatusExpired.setVisibility(View.GONE);
                     } else {
@@ -428,8 +430,10 @@ public class ViewKeyActivity extends ActionBarActivity implements
 
                         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);
                         }
                     }
diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml
index 85d9afdd3..73a20bd2e 100644
--- a/OpenKeychain/src/main/res/layout/key_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_item.xml
@@ -48,7 +48,7 @@
 
     <FrameLayout
         android:id="@+id/status_layout"
-        android:layout_width="80dp"
+        android:layout_width="wrap_content"
         android:layout_height="match_parent">
 
         <ImageButton
@@ -61,19 +61,20 @@
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="@color/black"
             android:src="@drawable/ic_action_edit"
-            android:text="@string/edit" />
+            android:text="@string/edit"
+            android:padding="12dp" />
 
         <TextView
             android:id="@+id/revoked"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingLeft="8dp"
             android:singleLine="true"
             android:ellipsize="end"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:text="@string/revoked"
             android:textColor="#e00"
-            android:layout_gravity="center" />
+            android:layout_gravity="center"
+            android:padding="12dp" />
 
         <ImageView
             android:layout_width="wrap_content"
@@ -81,7 +82,7 @@
             android:id="@+id/verified"
             android:layout_gravity="center"
             android:src="@drawable/key_certify_ok_depth0"
-            android:paddingLeft="25dp" />
+            android:padding="16dp" />
     </FrameLayout>
 
 </LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index aa6089aa2..f43aade25 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -31,7 +31,9 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="1dip"
-        android:background="?android:attr/listDivider" />
+        android:background="?android:attr/listDivider"
+        android:visibility="gone"
+        android:id="@+id/status_divider" />
 
     <org.sufficientlysecure.keychain.util.SlidingTabLayout
         android:id="@+id/view_key_sliding_tab_layout"