aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-01-24 00:28:29 +0100
committerDaniel Gultsch <daniel@gultsch.de>2015-01-24 00:28:29 +0100
commit7769d305e6853442914b5c0a82b0e8184e90a6ca (patch)
tree7825d1ee7caee3c619cc526948c517b28bbeada2 /src/main
parentb9af38464e971e21a78f5c99d20d37fea73cc67e (diff)
parentcbebd14dbddcd4d09a929b9efa707d82661cea98 (diff)
Merge pull request #924 from andersruneson/changeonlinecolor
Changed online color to green instead of primary
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/XmppActivity.java4
-rw-r--r--src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
index 7fd1094c..6399bcef 100644
--- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
@@ -687,6 +687,10 @@ public abstract class XmppActivity extends Activity {
return this.mPrimaryColor;
}
+ public int getOnlineColor() {
+ return this.mColorGreen;
+ }
+
public int getSecondaryBackgroundColor() {
return this.mSecondaryBackgroundColor;
}
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
index 139f3657..29730914 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
@@ -39,7 +39,7 @@ public class AccountAdapter extends ArrayAdapter<Account> {
statusView.setText(getContext().getString(account.getStatus().getReadableId()));
switch (account.getStatus()) {
case ONLINE:
- statusView.setTextColor(activity.getPrimaryColor());
+ statusView.setTextColor(activity.getOnlineColor());
break;
case DISABLED:
case CONNECTING: