diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/XmppActivity.java | 8 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/adapter/AccountAdapter.java | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java | 2 | ||||
-rw-r--r-- | src/main/res/values/attrs.xml | 3 | ||||
-rw-r--r-- | src/main/res/values/colors.xml | 1 | ||||
-rw-r--r-- | src/main/res/values/styles.xml | 2 | ||||
-rw-r--r-- | src/main/res/values/themes.xml | 4 |
7 files changed, 12 insertions, 12 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/XmppActivity.java b/src/main/java/de/pixart/messenger/ui/XmppActivity.java index 702f9a5c6..d580b05db 100644 --- a/src/main/java/de/pixart/messenger/ui/XmppActivity.java +++ b/src/main/java/de/pixart/messenger/ui/XmppActivity.java @@ -99,8 +99,6 @@ public abstract class XmppActivity extends ActionBarActivity { protected int mColorRed; protected int mColorWarningButton; protected int mColorWhite; - protected int mColorOrange; - protected int mColorGreen; protected static final String FRAGMENT_TAG_DIALOG = "dialog"; @@ -410,8 +408,6 @@ public abstract class XmppActivity extends ActionBarActivity { mColorWarningButton = ContextCompat.getColor(this, R.color.warning_button); } mColorWhite = ContextCompat.getColor(this, R.color.white70); - mColorOrange = ContextCompat.getColor(this, R.color.orange500); - mColorGreen = ContextCompat.getColor(this, R.color.realgreen); this.mUsingEnterKey = usingEnterKey(); mUseSubject = getPreferences().getBoolean("use_subject", getResources().getBoolean(R.bool.use_subject)); } @@ -912,10 +908,6 @@ public abstract class XmppActivity extends ActionBarActivity { return this.mColorWarningButton; } - public int getOnlineColor() { - return this.mColorGreen; - } - public int getPixel(int dp) { DisplayMetrics metrics = getResources().getDisplayMetrics(); return ((int) (dp * metrics.density)); diff --git a/src/main/java/de/pixart/messenger/ui/adapter/AccountAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/AccountAdapter.java index a7c20eb0e..4ed6a5492 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/AccountAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/AccountAdapter.java @@ -53,14 +53,14 @@ public class AccountAdapter extends ArrayAdapter<Account> { statusView.setText(getContext().getString(account.getStatus().getReadableId())); switch (account.getStatus()) { case ONLINE: - statusView.setTextColor(activity.getOnlineColor()); + statusView.setTextColor(Color.get(activity, R.attr.TextColorOnline)); break; case DISABLED: case CONNECTING: statusView.setTextColor(Color.get(activity, android.R.attr.textColorSecondary)); break; default: - statusView.setTextColor(activity.getWarningTextColor()); + statusView.setTextColor(Color.get(activity, R.attr.TextColorError)); break; } return view; diff --git a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java index 1b0553bed..512fe989e 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java @@ -319,7 +319,7 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie break; } if (error && type == SENT) { - viewHolder.time.setTextAppearance(getContext(), R.style.TextAppearance_Conversations_Caption_Waring); + viewHolder.time.setTextAppearance(getContext(), R.style.TextAppearance_Conversations_Caption_Warning); DownloadableFile file = activity.xmppConnectionService.getFileBackend().getFile(message); if (file.exists()) { if (activity.xmppConnectionService.mHttpConnectionManager.getAutoAcceptFileSize() >= message.getFileParams().size) { diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index 919e14b8f..264af344f 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -25,6 +25,9 @@ <attr name="activity_background_search" format="reference" /> <attr name="activity_background_no_results" format="reference" /> + <attr name="TextColorOnline" format="reference|color" /> + <attr name="TextColorError" format="reference|color" /> + <attr name="ic_send_cancel_offline" format="reference" /> <attr name="ic_send_location_offline" format="reference" /> <attr name="ic_send_photo_offline" format="reference" /> diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index c573107f1..f5d7d69ec 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -13,6 +13,7 @@ <color name="white12">#1fffffff</color> <color name="white70">#b2e2e7f1</color> <color name="white87">#deffffff</color> + <color name="green500">#ff4CAF50</color> <color name="grey50">#fafafa</color> <color name="grey200">#ffeeeeee</color> <color name="grey300">#ffe0e0e0</color> diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index 11430e064..6346dfcc0 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -90,7 +90,7 @@ <item name="android:textStyle">bold</item> </style> - <style name="TextAppearance.Conversations.Caption.Waring" parent="TextAppearance.Conversations.Caption"> + <style name="TextAppearance.Conversations.Caption.Warning" parent="TextAppearance.Conversations.Caption"> <item name="android:textColor">@color/red800</item> </style> diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index aef7c7daa..031e775a3 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -13,6 +13,8 @@ <item name="color_background_primary">@color/grey50</item> <item name="color_background_secondary">@color/grey200</item> <item name="color_warning">@color/red_a700</item> + <item name="TextColorOnline">@color/green500</item> + <item name="TextColorError">@color/red800</item> <item name="activity_background_search">@drawable/search_background_light</item> <item name="activity_background_no_results">@drawable/no_results_background_light</item> @@ -132,6 +134,8 @@ <item name="color_background_primary">@color/grey900</item> <item name="color_background_secondary">@color/realblack</item> <item name="color_warning">@color/red_a700</item> + <item name="TextColorOnline">@color/green500</item> + <item name="TextColorError">@color/red500</item> <item name="activity_background_search">@drawable/search_background_dark</item> <item name="activity_background_no_results">@drawable/no_results_background_dark</item> |