cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use darker colors

Browse Source
This commit is contained in:
Dominik Schürmann
2014-08-01 00:18:29 +02:00
parent afe56e08fe
commit a86b1d92f8
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
View File

@@ -486,13 +486,13 @@ public class KeyListFragment extends LoaderFragment
if (isRevoked) { if (isRevoked) {
h.mStatus.setImageDrawable( h.mStatus.setImageDrawable(
getResources().getDrawable(R.drawable.status_signature_revoked_cutout)); getResources().getDrawable(R.drawable.status_signature_revoked_cutout));
h.mStatus.setColorFilter(getResources().getColor(R.color.android_red_light), h.mStatus.setColorFilter(getResources().getColor(R.color.android_red_dark),
PorterDuff.Mode.SRC_ATOP); PorterDuff.Mode.SRC_ATOP);
h.mStatus.setVisibility(View.VISIBLE); h.mStatus.setVisibility(View.VISIBLE);
} else if (isExpired) { } else if (isExpired) {
h.mStatus.setImageDrawable( h.mStatus.setImageDrawable(
getResources().getDrawable(R.drawable.status_signature_expired_cutout)); getResources().getDrawable(R.drawable.status_signature_expired_cutout));
h.mStatus.setColorFilter(getResources().getColor(R.color.android_orange_light), h.mStatus.setColorFilter(getResources().getColor(R.color.android_orange_dark),
PorterDuff.Mode.SRC_ATOP); PorterDuff.Mode.SRC_ATOP);
h.mStatus.setVisibility(View.VISIBLE); h.mStatus.setVisibility(View.VISIBLE);
} else if (isVerified) { } else if (isVerified) {
@@ -503,7 +503,7 @@ public class KeyListFragment extends LoaderFragment
// this is a public key - show if it's verified // this is a public key - show if it's verified
h.mStatus.setImageDrawable( h.mStatus.setImageDrawable(
getResources().getDrawable(R.drawable.status_signature_verified_cutout)); getResources().getDrawable(R.drawable.status_signature_verified_cutout));
h.mStatus.setColorFilter(getResources().getColor(R.color.android_green_light), h.mStatus.setColorFilter(getResources().getColor(R.color.android_green_dark),
PorterDuff.Mode.SRC_ATOP); PorterDuff.Mode.SRC_ATOP);
h.mStatus.setVisibility(View.VISIBLE); h.mStatus.setVisibility(View.VISIBLE);
} }

8
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
View File

@@ -475,19 +475,19 @@ public class ViewKeyActivity extends ActionBarActivity implements
// Note: order is important // Note: order is important
if (isRevoked) { if (isRevoked) {
mStatusText.setText(R.string.view_key_revoked); mStatusText.setText(R.string.view_key_revoked);
mStatusText.setTextColor(getResources().getColor(R.color.android_red_light)); mStatusText.setTextColor(getResources().getColor(R.color.android_red_dark));
mStatusImage.setImageDrawable( mStatusImage.setImageDrawable(
getResources().getDrawable(R.drawable.status_signature_revoked_cutout)); getResources().getDrawable(R.drawable.status_signature_revoked_cutout));
mStatusImage.setColorFilter(getResources().getColor(R.color.android_red_light), mStatusImage.setColorFilter(getResources().getColor(R.color.android_red_dark),
PorterDuff.Mode.SRC_ATOP); PorterDuff.Mode.SRC_ATOP);
mStatusDivider.setVisibility(View.VISIBLE); mStatusDivider.setVisibility(View.VISIBLE);
mStatusLayout.setVisibility(View.VISIBLE); mStatusLayout.setVisibility(View.VISIBLE);
} else if (isExpired) { } else if (isExpired) {
mStatusText.setText(R.string.view_key_expired); mStatusText.setText(R.string.view_key_expired);
mStatusText.setTextColor(getResources().getColor(R.color.android_orange_light)); mStatusText.setTextColor(getResources().getColor(R.color.android_orange_dark));
mStatusImage.setImageDrawable( mStatusImage.setImageDrawable(
getResources().getDrawable(R.drawable.status_signature_expired_cutout)); getResources().getDrawable(R.drawable.status_signature_expired_cutout));
mStatusImage.setColorFilter(getResources().getColor(R.color.android_orange_light), mStatusImage.setColorFilter(getResources().getColor(R.color.android_orange_dark),
PorterDuff.Mode.SRC_ATOP); PorterDuff.Mode.SRC_ATOP);
mStatusDivider.setVisibility(View.VISIBLE); mStatusDivider.setVisibility(View.VISIBLE);
mStatusLayout.setVisibility(View.VISIBLE); mStatusLayout.setVisibility(View.VISIBLE);

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java
View File

@@ -188,7 +188,7 @@ public class UserIdsAdapter extends CursorAdapter implements AdapterView.OnItemC
case Certs.VERIFIED_SECRET: case Certs.VERIFIED_SECRET:
vVerified.setImageResource(R.drawable.status_signature_verified_cutout); vVerified.setImageResource(R.drawable.status_signature_verified_cutout);
vVerified.setColorFilter( vVerified.setColorFilter(
mContext.getResources().getColor(R.color.android_green_light), mContext.getResources().getColor(R.color.android_green_dark),
PorterDuff.Mode.SRC_IN); PorterDuff.Mode.SRC_IN);
break; break;
case Certs.VERIFIED_SELF: case Certs.VERIFIED_SELF:
@@ -200,7 +200,7 @@ public class UserIdsAdapter extends CursorAdapter implements AdapterView.OnItemC
default: default:
vVerified.setImageResource(R.drawable.status_signature_invalid_cutout); vVerified.setImageResource(R.drawable.status_signature_invalid_cutout);
vVerified.setColorFilter( vVerified.setColorFilter(
mContext.getResources().getColor(R.color.android_red_light), mContext.getResources().getColor(R.color.android_red_dark),
PorterDuff.Mode.SRC_IN); PorterDuff.Mode.SRC_IN);
break; break;
} }