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

Fix drawer background color for ViewKeyActivity

Browse Source
This commit is contained in:
Thialfihar
2015-07-04 18:27:13 +02:00
parent 31eece0e27
commit 680799caa7
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
View File

@@ -37,6 +37,7 @@ import org.sufficientlysecure.keychain.provider.KeychainDatabase;
import org.sufficientlysecure.keychain.provider.TemporaryStorageProvider; import org.sufficientlysecure.keychain.provider.TemporaryStorageProvider;
import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.ui.ConsolidateDialogActivity; import org.sufficientlysecure.keychain.ui.ConsolidateDialogActivity;
import org.sufficientlysecure.keychain.ui.util.FormattingUtils;
import org.sufficientlysecure.keychain.util.Log; import org.sufficientlysecure.keychain.util.Log;
import org.sufficientlysecure.keychain.util.PRNGFixes; import org.sufficientlysecure.keychain.util.PRNGFixes;
import org.sufficientlysecure.keychain.util.Preferences; import org.sufficientlysecure.keychain.util.Preferences;
@@ -91,7 +92,7 @@ public class KeychainApplication extends Application {
} }
brandGlowEffect(getApplicationContext(), brandGlowEffect(getApplicationContext(),
getApplicationContext().getResources().getColor(R.color.primary)); FormattingUtils.getColorFromAttr(getApplicationContext(), R.attr.colorPrimary));
setupAccountAsNeeded(this); setupAccountAsNeeded(this);

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

@@ -786,7 +786,7 @@ public class ViewKeyActivity extends BaseNfcActivity implements
} else if (mIsSecret) { } else if (mIsSecret) {
mStatusText.setText(R.string.view_key_my_key); mStatusText.setText(R.string.view_key_my_key);
mStatusImage.setVisibility(View.GONE); mStatusImage.setVisibility(View.GONE);
color = getResources().getColor(R.color.primary); color = FormattingUtils.getColorFromAttr(this, R.attr.colorPrimary);
// reload qr code only if the fingerprint changed // reload qr code only if the fingerprint changed
if (!mFingerprint.equals(mQrCodeLoaded)) { if (!mFingerprint.equals(mQrCodeLoaded)) {
loadQrCode(mFingerprint); loadQrCode(mFingerprint);
@@ -837,7 +837,7 @@ public class ViewKeyActivity extends BaseNfcActivity implements
mStatusImage.setVisibility(View.VISIBLE); mStatusImage.setVisibility(View.VISIBLE);
KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText, KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText,
State.VERIFIED, R.color.icons, true); State.VERIFIED, R.color.icons, true);
color = getResources().getColor(R.color.primary); color = FormattingUtils.getColorFromAttr(this, R.attr.colorPrimary);
photoTask.execute(mMasterKeyId); photoTask.execute(mMasterKeyId);
mFab.setVisibility(View.GONE); mFab.setVisibility(View.GONE);

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

@@ -213,10 +213,10 @@ public class ViewKeyAdvActivity extends BaseActivity implements
if (isRevoked || isExpired) { if (isRevoked || isExpired) {
color = getResources().getColor(R.color.key_flag_red); color = getResources().getColor(R.color.key_flag_red);
} else if (isSecret) { } else if (isSecret) {
color = getResources().getColor(R.color.primary); color = getResources().getColor(R.color.android_green_light);
} else { } else {
if (isVerified) { if (isVerified) {
color = getResources().getColor(R.color.primary); color = getResources().getColor(R.color.android_green_light);
} else { } else {
color = getResources().getColor(R.color.key_flag_orange); color = getResources().getColor(R.color.key_flag_orange);
} }