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

Set visibility at last

Browse Source
This commit is contained in:
Dominik Schürmann
2014-07-28 11:17:12 +02:00
parent 3d6edd1190
commit 730f820c8c
2 changed files with 6 additions and 6 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

@@ -492,23 +492,23 @@ public class KeyListFragment extends LoaderFragment
// Note: order is important! // Note: order is important!
if (isRevoked) { if (isRevoked) {
h.mStatus.setVisibility(View.VISIBLE);
h.mStatus.setImageDrawable( h.mStatus.setImageDrawable(
getResources().getDrawable(R.drawable.status_signature_revoked)); getResources().getDrawable(R.drawable.status_signature_revoked));
h.mStatus.setColorFilter(getResources().getColor(R.color.result_red), h.mStatus.setColorFilter(getResources().getColor(R.color.result_red),
PorterDuff.Mode.SRC_ATOP); PorterDuff.Mode.SRC_ATOP);
} else if (isExpired) {
h.mStatus.setVisibility(View.VISIBLE); h.mStatus.setVisibility(View.VISIBLE);
} else if (isExpired) {
h.mStatus.setImageDrawable( h.mStatus.setImageDrawable(
getResources().getDrawable(R.drawable.status_signature_expired)); getResources().getDrawable(R.drawable.status_signature_expired));
h.mStatus.setColorFilter(getResources().getColor(R.color.result_orange), h.mStatus.setColorFilter(getResources().getColor(R.color.result_orange),
PorterDuff.Mode.SRC_ATOP); PorterDuff.Mode.SRC_ATOP);
} else if (isVerified) {
h.mStatus.setVisibility(View.VISIBLE); h.mStatus.setVisibility(View.VISIBLE);
} else if (isVerified) {
h.mStatus.setImageDrawable( h.mStatus.setImageDrawable(
getResources().getDrawable(R.drawable.status_signature_verified)); getResources().getDrawable(R.drawable.status_signature_verified));
h.mStatus.setColorFilter(getResources().getColor(R.color.result_green), h.mStatus.setColorFilter(getResources().getColor(R.color.result_green),
PorterDuff.Mode.SRC_ATOP); PorterDuff.Mode.SRC_ATOP);
h.mStatus.setVisibility(View.VISIBLE);
} else { } else {
h.mStatus.setVisibility(View.GONE); h.mStatus.setVisibility(View.GONE);
} }

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

@@ -528,23 +528,23 @@ public class ViewKeyActivity extends ActionBarActivity implements
// Note: order is important // Note: order is important
if (isRevoked) { if (isRevoked) {
mStatusDivider.setVisibility(View.VISIBLE);
mStatusLayout.setVisibility(View.VISIBLE);
mStatusText.setText(R.string.view_key_revoked); mStatusText.setText(R.string.view_key_revoked);
mStatusText.setTextColor(getResources().getColor(R.color.result_red)); mStatusText.setTextColor(getResources().getColor(R.color.result_red));
mStatusImage.setImageDrawable( mStatusImage.setImageDrawable(
getResources().getDrawable(R.drawable.status_signature_revoked)); getResources().getDrawable(R.drawable.status_signature_revoked));
mStatusImage.setColorFilter(getResources().getColor(R.color.result_red), mStatusImage.setColorFilter(getResources().getColor(R.color.result_red),
PorterDuff.Mode.SRC_ATOP); PorterDuff.Mode.SRC_ATOP);
} else if (isExpired) {
mStatusDivider.setVisibility(View.VISIBLE); mStatusDivider.setVisibility(View.VISIBLE);
mStatusLayout.setVisibility(View.VISIBLE); mStatusLayout.setVisibility(View.VISIBLE);
} else if (isExpired) {
mStatusText.setText(R.string.view_key_expired); mStatusText.setText(R.string.view_key_expired);
mStatusText.setTextColor(getResources().getColor(R.color.result_orange)); mStatusText.setTextColor(getResources().getColor(R.color.result_orange));
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.result_orange), mStatusImage.setColorFilter(getResources().getColor(R.color.result_orange),
PorterDuff.Mode.SRC_ATOP); PorterDuff.Mode.SRC_ATOP);
mStatusDivider.setVisibility(View.VISIBLE);
mStatusLayout.setVisibility(View.VISIBLE);
} else { } else {
mStatusDivider.setVisibility(View.GONE); mStatusDivider.setVisibility(View.GONE);
mStatusLayout.setVisibility(View.GONE); mStatusLayout.setVisibility(View.GONE);