From 3f705117080def34b7793f6935e6ec7b6109d741 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Tue, 29 Dec 2015 21:21:11 +0100 Subject: Add edit action to user id card, left align card actions per material design guidelines --- .../keychain/ui/ViewKeyActivity.java | 7 +-- .../keychain/ui/ViewKeyAdvSubkeysFragment.java | 2 +- .../keychain/ui/ViewKeyFragment.java | 11 +++- .../keychain/ui/util/ContentDescriptionHint.java | 9 ++- .../main/res/layout/linked_id_view_fragment.xml | 10 +-- .../src/main/res/layout/view_key_fragment.xml | 72 +++++++++++++++------- .../src/main/res/layout/view_key_yubikey.xml | 2 +- OpenKeychain/src/main/res/values/colors.xml | 2 +- 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">