Add edit action to user id card, left align card actions per material design guidelines

8 files changed, 75 insertions, 40 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 35e00ff21..1eb16b3c3 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
@@ -391,11 +391,11 @@ public class ViewKeyActivity extends BaseNfcActivity implements
                 return true;
             }
             case R.id.menu_key_view_certify_fingerprint: {
-                certifyFingeprint(mDataUri, false);
+                certifyFingerprint(mDataUri, false);
                 return true;
             }
             case R.id.menu_key_view_certify_fingerprint_word: {
-                certifyFingeprint(mDataUri, true);
+                certifyFingerprint(mDataUri, true);
                 return true;
             }
         }
@@ -423,14 +423,13 @@ public class ViewKeyActivity extends BaseNfcActivity implements
         return true;
     }
 
-
     private void scanQrCode() {
         Intent scanQrCode = new Intent(this, ImportKeysProxyActivity.class);
         scanQrCode.setAction(ImportKeysProxyActivity.ACTION_SCAN_WITH_RESULT);
         startActivityForResult(scanQrCode, REQUEST_QR_FINGERPRINT);
     }
 
-    private void certifyFingeprint(Uri dataUri, boolean enableWordConfirm) {
+    private void certifyFingerprint(Uri dataUri, boolean enableWordConfirm) {
         Intent intent = new Intent(this, CertifyFingerprintActivity.class);
         intent.setData(dataUri);
         intent.putExtra(CertifyFingerprintActivity.EXTRA_ENABLE_WORD_CONFIRM, enableWordConfirm);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvSubkeysFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvSubkeysFragment.java
index 4308983ce..14477723e 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvSubkeysFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvSubkeysFragment.java
@@ -200,7 +200,7 @@ public class ViewKeyAdvSubkeysFragment extends LoaderFragment implements
         switch (loader.getId()) {
             case LOADER_ID_UNIFIED: {
                 data.moveToFirst();
-                
+
                 mMasterKeyId = data.getLong(INDEX_MASTER_KEY_ID);
                 mHasSecret = data.getInt(INDEX_HAS_ANY_SECRET) != 0;
                 mFingerprint = data.getBlob(INDEX_FINGERPRINT);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
index f75012731..b8edb9b1c 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
@@ -162,7 +162,7 @@ public class ViewKeyFragment extends LoaderFragment implements
         try {
             frag = mLinkedIdsAdapter.getLinkedIdFragment(mDataUri, position, mFingerprint);
         } catch (IOException e) {
-            e.printStackTrace();
+            Log.e(Constants.TAG, "IOException", e);
             return;
         }
 
@@ -429,8 +429,17 @@ public class ViewKeyFragment extends LoaderFragment implements
             }
 
             case LOADER_ID_USER_IDS: {
+                LinearLayout editButtonsLayout =
+                        (LinearLayout) getActivity().findViewById(R.id.view_key_card_user_ids_buttons);
+                if (mIsSecret) {
+                    editButtonsLayout.setVisibility(View.VISIBLE);
+                } else {
+                    editButtonsLayout.setVisibility(View.GONE);
+                }
+
                 setContentShown(true, false);
                 mUserIdsAdapter.swapCursor(data);
+
                 break;
             }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/ContentDescriptionHint.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/ContentDescriptionHint.java
index 8e45a20e9..758e63eb1 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/ContentDescriptionHint.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/ContentDescriptionHint.java
@@ -1,8 +1,3 @@
-package org.sufficientlysecure.keychain.ui.util;
-
-/**
- * Created by rohan on 20/9/15.
- */
 /*
  * Copyright 2012 Google Inc.
  *
@@ -19,14 +14,18 @@ package org.sufficientlysecure.keychain.ui.util;
  * limitations under the License.
  */
 
+package org.sufficientlysecure.keychain.ui.util;
+
 import android.content.Context;
 import android.graphics.Rect;
 import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.Toast;
+
 public class ContentDescriptionHint {
     private static final int ESTIMATED_TOAST_HEIGHT_DIPS = 48;
+
     public static void setup(View view) {
         view.setOnLongClickListener(new View.OnLongClickListener() {
             @Override
diff --git a/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml b/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml
index 8b275fcef..14db368bf 100644
--- a/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml
@@ -144,14 +144,14 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
-                android:gravity="right|end">
+                android:gravity="left|start">
 
                 <Button
                     android:id="@+id/button_view"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/linked_button_view"
-                    android:textColor="@color/link_text_material_light"
+                    android:textColor="@color/card_view_button"
                     style="?android:attr/borderlessButtonStyle"
                     />
 
@@ -166,21 +166,21 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/linked_button_verify"
-                        android:textColor="@color/link_text_material_light"
+                        android:textColor="@color/card_view_button"
                         style="?android:attr/borderlessButtonStyle" />
                     <Button
                         android:id="@+id/button_retry"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/linked_button_retry"
-                        android:textColor="@color/link_text_material_light"
+                        android:textColor="@color/card_view_button"
                         style="?android:attr/borderlessButtonStyle" />
                     <Button
                         android:id="@+id/button_confirm"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/linked_button_confirm"
-                        android:textColor="@color/link_text_material_light"
+                        android:textColor="@color/card_view_button"
                         style="?android:attr/borderlessButtonStyle" />
                 </ViewAnimator>
 
diff --git a/OpenKeychain/src/main/res/layout/view_key_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
index 8715945bf..64bfe08b5 100644
--- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
@@ -1,8 +1,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:paddingBottom="16dp"
     android:paddingLeft="16dp"
@@ -11,16 +11,16 @@
 
     <android.support.v7.widget.CardView
         android:id="@+id/card_linked_ids"
-        android:transitionName="card_linked_ids"
-        android:layout_gravity="center"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:transitionName="card_linked_ids"
         android:visibility="gone"
-        tools:visibility="visible"
         card_view:cardBackgroundColor="?attr/colorCardViewBackground"
+        card_view:cardCornerRadius="4dp"
         card_view:cardElevation="2dp"
         card_view:cardUseCompatPadding="true"
-        card_view:cardCornerRadius="4dp">
+        tools:visibility="visible">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -43,28 +43,27 @@
                 android:id="@+id/view_key_linked_ids_expander"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
                 android:layout_marginBottom="4dp"
-                android:gravity="center_vertical"
-                android:drawableTop="@drawable/divider"
-                android:drawableRight="@drawable/ic_expand_more_black_24dp"
+                android:layout_marginTop="4dp"
+                android:background="?android:selectableItemBackground"
+                android:clickable="true"
                 android:drawableEnd="@drawable/ic_expand_more_black_24dp"
                 android:drawablePadding="3dp"
-                android:clickable="true"
-                android:text="@string/linked_ids_more_unknown"
+                android:drawableRight="@drawable/ic_expand_more_black_24dp"
+                android:drawableTop="@drawable/divider"
+                android:gravity="center_vertical"
                 android:paddingLeft="8dp"
                 android:paddingRight="8dp"
-                android:background="?android:selectableItemBackground"
+                android:text="@string/linked_ids_more_unknown"
                 android:visibility="gone"
-                tools:visibility="visible"
-                />
+                tools:visibility="visible" />
 
         </LinearLayout>
 
     </android.support.v7.widget.CardView>
 
     <android.support.v7.widget.CardView
-        android:id="@+id/card_view"
+        android:id="@+id/view_key_card_user_ids"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -78,17 +77,46 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <TextView
-                style="@style/CardViewHeader"
-                android:layout_width="wrap_content"
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/section_user_ids" />
+                android:orientation="vertical">
 
-            <org.sufficientlysecure.keychain.ui.widget.FixedListView
-                android:id="@+id/view_key_user_ids"
+                <TextView
+                    style="@style/CardViewHeader"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/section_user_ids" />
+
+                <org.sufficientlysecure.keychain.ui.widget.FixedListView
+                    android:id="@+id/view_key_user_ids"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="4dp" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/view_key_card_user_ids_buttons"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp" />
+                android:gravity="left|start"
+                android:orientation="vertical">
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dip"
+                    android:background="?android:attr/listDivider" />
+
+                <Button
+                    android:id="@+id/view_key_card_user_ids_edit"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/key_view_action_edit"
+                    android:textColor="@color/card_view_button" />
+
+            </LinearLayout>
 
         </LinearLayout>
 
diff --git a/OpenKeychain/src/main/res/layout/view_key_yubikey.xml b/OpenKeychain/src/main/res/layout/view_key_yubikey.xml
index 57f93493d..5e2bfbfe6 100644
--- a/OpenKeychain/src/main/res/layout/view_key_yubikey.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_yubikey.xml
@@ -89,7 +89,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="right|end"
                     android:text="@string/button_bind_key"
-                    android:textColor="@color/link_text_material_light"
+                    android:textColor="@color/card_view_button"
                     style="?android:attr/borderlessButtonStyle"
                     android:visibility="gone"
                     />
diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml
index 4eb9e7d68..93cf126f7 100644
--- a/OpenKeychain/src/main/res/values/colors.xml
+++ b/OpenKeychain/src/main/res/values/colors.xml
@@ -34,6 +34,6 @@
     <color name="translucent_scrim_bottom_center">#2A000000</color>
 
     <!-- linked ID view -->
-    <color name="link_text_material_light">#ff009688</color>
+    <color name="card_view_button">#7bad45</color>
 
 </resources>