From eedc7064b9eca0e94c9fe9aadaee98aa1317a0c5 Mon Sep 17 00:00:00 2001 From: Ishan Khanna Date: Wed, 4 Mar 2015 02:36:33 +0530 Subject: [PATCH] Fixes Issue#1088 --- .../ui/CertifyFingerprintActivity.java | 21 +++++++++++++++++++ .../keychain/ui/CertifyKeyActivity.java | 21 +++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyFingerprintActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyFingerprintActivity.java index b7c80c1ed..fcfcc9cb2 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyFingerprintActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyFingerprintActivity.java @@ -19,7 +19,10 @@ package org.sufficientlysecure.keychain.ui; import android.net.Uri; import android.os.Bundle; +import android.support.v7.widget.Toolbar; import android.view.View; +import android.widget.ImageView; +import android.widget.RelativeLayout; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; @@ -55,6 +58,7 @@ public class CertifyFingerprintActivity extends BaseActivity { @Override protected void initLayout() { setContentView(R.layout.certify_fingerprint_activity); + changeToolbarColor(); } private void startFragment(Bundle savedInstanceState, Uri dataUri) { @@ -77,4 +81,21 @@ public class CertifyFingerprintActivity extends BaseActivity { getSupportFragmentManager().executePendingTransactions(); } + /** + * Changes the color of our ToolBar. + * + * Currently Set to ORANGE + */ + private void changeToolbarColor() { + RelativeLayout mToolBarInclude = (RelativeLayout) findViewById(R.id.toolbar_include); + + // Changes the color of the Status Bar strip + ImageView mStatusBar = (ImageView) mToolBarInclude.findViewById(R.id.status_bar); + mStatusBar.setBackgroundResource(getResources().getColor(R.color.android_orange_dark)); + + // Changes the color of our Tool Bar + Toolbar toolbar = (Toolbar) mToolBarInclude.findViewById(R.id.toolbar); + toolbar.setBackgroundResource(getResources().getColor(R.color.android_orange_light)); + } + } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java index 1fb88b182..a2e717ed2 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java @@ -18,6 +18,10 @@ package org.sufficientlysecure.keychain.ui; +import android.support.v7.widget.Toolbar; +import android.widget.ImageView; +import android.widget.RelativeLayout; + import org.sufficientlysecure.keychain.R; /** @@ -32,6 +36,23 @@ public class CertifyKeyActivity extends BaseActivity { @Override protected void initLayout() { setContentView(R.layout.certify_key_activity); + changeToolbarColor(); } + /** + * Changes the color of our ToolBar. + * + * Currently Set to ORANGE + */ + private void changeToolbarColor() { + RelativeLayout mToolBarInclude = (RelativeLayout) findViewById(R.id.toolbar_include); + + // Changes the color of the Status Bar strip + ImageView mStatusBar = (ImageView) mToolBarInclude.findViewById(R.id.status_bar); + mStatusBar.setBackgroundResource(getResources().getColor(R.color.android_orange_dark)); + + // Changes the color of our Tool Bar + Toolbar toolbar = (Toolbar) mToolBarInclude.findViewById(R.id.toolbar); + toolbar.setBackgroundResource(getResources().getColor(R.color.android_orange_light)); + } }