From 4e1053c6fa23181ee7a1018e56fa4cc63618f387 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Wed, 15 Oct 2014 23:05:29 +0200 Subject: [PATCH] More color/icon consistency --- .../keychain/ui/KeyListFragment.java | 19 +++++++++++-------- .../keychain/ui/ViewKeyShareFragment.java | 9 +++++++-- .../ui/adapter/SelectKeyCursorAdapter.java | 2 +- .../keychain/ui/adapter/SubkeysAdapter.java | 6 +----- .../keychain/ui/adapter/UserIdsAdapter.java | 5 +---- .../main/res/layout/decrypt_text_fragment.xml | 4 ++-- .../src/main/res/layout/key_list_item.xml | 10 +++++----- 7 files changed, 28 insertions(+), 27 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 0e848a068..1138c9e9c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java @@ -24,6 +24,7 @@ import android.content.Context; import android.content.Intent; import android.database.Cursor; import android.graphics.Color; +import android.graphics.PorterDuff; import android.net.Uri; import android.os.Build; import android.os.Bundle; @@ -51,11 +52,10 @@ import android.view.View.OnClickListener; import android.view.ViewGroup; import android.widget.AbsListView.MultiChoiceModeListener; import android.widget.AdapterView; -import android.widget.ArrayAdapter; import android.widget.Button; +import android.widget.ImageButton; import android.widget.ImageView; import android.widget.ListView; -import android.widget.Spinner; import android.widget.TextView; import org.sufficientlysecure.keychain.Constants; @@ -84,7 +84,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; -import java.util.List; import edu.cmu.cylab.starslinger.exchange.ExchangeActivity; import edu.cmu.cylab.starslinger.exchange.ExchangeConfig; @@ -585,18 +584,22 @@ public class KeyListFragment extends LoaderFragment TextView mMainUserIdRest; ImageView mStatus; View mSlinger; + ImageButton mSlingerButton; } @Override public View newView(Context context, Cursor cursor, ViewGroup parent) { View view = mInflater.inflate(R.layout.key_list_item, parent, false); final ItemViewHolder holder = new ItemViewHolder(); - holder.mMainUserId = (TextView) view.findViewById(R.id.mainUserId); - holder.mMainUserIdRest = (TextView) view.findViewById(R.id.mainUserIdRest); - holder.mStatus = (ImageView) view.findViewById(R.id.status_icon); - holder.mSlinger = view.findViewById(R.id.slinger_view); + holder.mMainUserId = (TextView) view.findViewById(R.id.key_list_item_name); + holder.mMainUserIdRest = (TextView) view.findViewById(R.id.key_list_item_email); + holder.mStatus = (ImageView) view.findViewById(R.id.key_list_item_status_icon); + holder.mSlinger = view.findViewById(R.id.key_list_item_slinger_view); + holder.mSlingerButton = (ImageButton) view.findViewById(R.id.key_list_item_slinger_button); + holder.mSlingerButton.setColorFilter(context.getResources().getColor(R.color.tertiary_text_light), + PorterDuff.Mode.SRC_IN); view.setTag(holder); - view.findViewById(R.id.slinger_button).setOnClickListener(new OnClickListener() { + view.findViewById(R.id.key_list_item_slinger_button).setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { if (holder.mMasterKeyId != null) { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyShareFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyShareFragment.java index 1efd2c935..e7f1be3f2 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyShareFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyShareFragment.java @@ -21,6 +21,7 @@ import android.annotation.TargetApi; import android.content.Intent; import android.database.Cursor; import android.graphics.Bitmap; +import android.graphics.PorterDuff; import android.net.Uri; import android.os.AsyncTask; import android.os.Build; @@ -33,6 +34,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.view.animation.AlphaAnimation; +import android.widget.ImageButton; import android.widget.ImageView; import android.widget.TextView; @@ -68,7 +70,7 @@ public class ViewKeyShareFragment extends LoaderFragment implements private View mFingerprintClipboardButton; private View mKeyShareButton; private View mKeyClipboardButton; - private View mKeySafeSlingerButton; + private ImageButton mKeySafeSlingerButton; private View mNfcHelpButton; private View mNfcPrefsButton; private View mKeyUploadButton; @@ -96,11 +98,14 @@ public class ViewKeyShareFragment extends LoaderFragment implements mFingerprintClipboardButton = view.findViewById(R.id.view_key_action_fingerprint_clipboard); mKeyShareButton = view.findViewById(R.id.view_key_action_key_share); mKeyClipboardButton = view.findViewById(R.id.view_key_action_key_clipboard); - mKeySafeSlingerButton = view.findViewById(R.id.view_key_action_key_safeslinger); + mKeySafeSlingerButton = (ImageButton) view.findViewById(R.id.view_key_action_key_safeslinger); mNfcHelpButton = view.findViewById(R.id.view_key_action_nfc_help); mNfcPrefsButton = view.findViewById(R.id.view_key_action_nfc_prefs); mKeyUploadButton = view.findViewById(R.id.view_key_action_upload); + mKeySafeSlingerButton.setColorFilter(getResources().getColor(R.color.tertiary_text_light), + PorterDuff.Mode.SRC_IN); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { mNfcPrefsButton.setVisibility(View.VISIBLE); } else { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java index c864c7138..8b6a04b99 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java @@ -152,7 +152,7 @@ abstract public class SelectKeyCursorAdapter extends CursorAdapter { View view = mInflater.inflate(R.layout.select_key_item, null); ViewHolderItem holder = new ViewHolderItem(); holder.view = view; - holder.mainUserId = (TextView) view.findViewById(R.id.mainUserId); + holder.mainUserId = (TextView) view.findViewById(R.id.key_list_item_name); holder.mainUserIdRest = (TextView) view.findViewById(R.id.mainUserIdRest); holder.keyId = (TextView) view.findViewById(R.id.subkey_item_key_id); holder.statusIcon = (ImageView) view.findViewById(R.id.status_icon); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java index 7bbd3eee3..a032e96fc 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java @@ -249,15 +249,11 @@ public class SubkeysAdapter extends CursorAdapter { vKeyExpiry.setText(context.getString(R.string.label_expiry) + ": " + context.getString(R.string.none)); } - // if key is expired or revoked, strike through text + // if key is expired or revoked... boolean isInvalid = isRevoked || isExpired; if (isInvalid) { vStatus.setVisibility(View.VISIBLE); - vKeyId.setText(FormattingUtils.strikeOutText(vKeyId.getText())); - vKeyDetails.setText(FormattingUtils.strikeOutText(vKeyDetails.getText())); - vKeyExpiry.setText(FormattingUtils.strikeOutText(vKeyExpiry.getText())); - vCertifyIcon.setColorFilter( mContext.getResources().getColor(R.color.bg_gray), PorterDuff.Mode.SRC_IN); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java index 55ed7c65b..a2e1930d3 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java @@ -166,13 +166,10 @@ public class UserIdsAdapter extends CursorAdapter implements AdapterView.OnItemC // set revocation icon (can this even be primary?) KeyFormattingUtils.setStatusImage(mContext, vVerified, null, KeyFormattingUtils.STATE_REVOKED, true); - // disable and strike through text for revoked user ids + // disable revoked user ids vName.setEnabled(false); vAddress.setEnabled(false); vComment.setEnabled(false); - vName.setText(FormattingUtils.strikeOutText(vName.getText())); - vAddress.setText(FormattingUtils.strikeOutText(vAddress.getText())); - vComment.setText(FormattingUtils.strikeOutText(vComment.getText())); } else { vName.setEnabled(true); vAddress.setEnabled(true); diff --git a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml index c58e2d7e6..59e401f31 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml @@ -100,14 +100,14 @@ android:text="@string/decrypt_invalid_text" android:padding="8dp" android:layout_gravity="center" - android:textColor="@color/android_red_dark" /> + android:textColor="@color/android_red_light" />