diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-09-11 14:24:10 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-09-11 14:24:10 +0200 |
| commit | dee46f34536577f6b395f7fe62d3503ecf5cf7fc (patch) | |
| tree | 9235c147564a3fe8f780d83420ec4d3301997dc7 /src/eu/siacs/conversations/ui/XmppActivity.java | |
| parent | ff41918cb757fdb68cfff936dca74a4c9d351b05 (diff) | |
match color in contact details to the colors in the send button. also migrated some other colors from hard coding to using resources
Diffstat (limited to 'src/eu/siacs/conversations/ui/XmppActivity.java')
| -rw-r--r-- | src/eu/siacs/conversations/ui/XmppActivity.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/eu/siacs/conversations/ui/XmppActivity.java b/src/eu/siacs/conversations/ui/XmppActivity.java index f13c112a..a3503048 100644 --- a/src/eu/siacs/conversations/ui/XmppActivity.java +++ b/src/eu/siacs/conversations/ui/XmppActivity.java @@ -55,7 +55,9 @@ public abstract class XmppActivity extends Activity { protected int mPrimaryTextColor; protected int mSecondaryTextColor; - protected int mWarningTextColor; + protected int mColorRed; + protected int mColorOrange; + protected int mColorGreen; protected int mPrimaryColor; private DisplayMetrics metrics; @@ -183,7 +185,9 @@ public abstract class XmppActivity extends Activity { ExceptionHelper.init(getApplicationContext()); mPrimaryTextColor = getResources().getColor(R.color.primarytext); mSecondaryTextColor = getResources().getColor(R.color.secondarytext); - mWarningTextColor = getResources().getColor(R.color.warningtext); + mColorRed = getResources().getColor(R.color.red); + mColorOrange = getResources().getColor(R.color.orange); + mColorGreen = getResources().getColor(R.color.green); mPrimaryColor = getResources().getColor(R.color.primary); if (getPreferences().getBoolean("use_larger_font", false)) { setTheme(R.style.ConversationsTheme_LargerText); @@ -475,7 +479,7 @@ public abstract class XmppActivity extends Activity { } public int getWarningTextColor() { - return this.mWarningTextColor; + return this.mColorRed; } public int getPrimaryColor() { |