From 2177e575bc02be5c233fbc50e55850f640c6bcdd Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Thu, 26 Apr 2018 21:50:24 +0200 Subject: [PATCH] use styled colors for online/offline text --- .../eu/siacs/conversations/ui/XmppActivity.java | 9 --------- .../conversations/ui/adapter/AccountAdapter.java | 13 +++++++------ .../conversations/ui/adapter/MessageAdapter.java | 2 +- src/main/res/values/attrs.xml | 3 +++ src/main/res/values/styles.xml | 2 +- src/main/res/values/themes.xml | 5 +++++ 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java index f6be8d480..89c6d58ab 100644 --- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java @@ -43,7 +43,6 @@ import android.util.Log; import android.view.Menu; import android.view.MenuItem; import android.view.View; -import android.view.inputmethod.InputMethodManager; import android.widget.EditText; import android.widget.ImageView; import android.widget.Toast; @@ -86,8 +85,6 @@ public abstract class XmppActivity extends ActionBarActivity { protected boolean registeredListeners = false; protected int mColorRed; - protected int mColorOrange; - protected int mColorGreen; protected static final String FRAGMENT_TAG_DIALOG = "dialog"; @@ -407,8 +404,6 @@ public abstract class XmppActivity extends ActionBarActivity { this.isCameraFeatureAvailable = getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA); mColorRed = ContextCompat.getColor(this, R.color.red800); - mColorOrange = ContextCompat.getColor(this, R.color.orange500); - mColorGreen = ContextCompat.getColor(this, R.color.green500); this.mTheme = findTheme(); setTheme(this.mTheme); @@ -769,10 +764,6 @@ public abstract class XmppActivity extends ActionBarActivity { return this.mColorRed; } - 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/eu/siacs/conversations/ui/adapter/AccountAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java index 71d7f5dd4..77334955e 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java @@ -6,6 +6,7 @@ import android.graphics.Bitmap; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.os.AsyncTask; +import android.support.v4.content.ContextCompat; import android.support.v7.widget.SwitchCompat; import android.util.Log; import android.view.LayoutInflater; @@ -60,18 +61,18 @@ public class AccountAdapter extends ArrayAdapter { } TextView statusView = view.findViewById(R.id.account_status); ImageView imageView = view.findViewById(R.id.account_image); - loadAvatar(account,imageView); + loadAvatar(account, imageView); 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)); + statusView.setTextColor(Color.get(activity, android.R.attr.textColorSecondary)); break; default: - statusView.setTextColor(activity.getWarningTextColor()); + statusView.setTextColor(Color.get(activity, R.attr.TextColorError)); break; } final SwitchCompat tglAccountState = view.findViewById(R.id.tgl_account_status); @@ -85,7 +86,7 @@ public class AccountAdapter extends ArrayAdapter { } tglAccountState.setOnCheckedChangeListener((compoundButton, b) -> { if (b == isDisabled && activity instanceof ManageAccountActivity) { - ((ManageAccountActivity) activity).onClickTglAccountState(account,b); + ((ManageAccountActivity) activity).onClickTglAccountState(account, b); } }); return view; @@ -119,7 +120,7 @@ public class AccountAdapter extends ArrayAdapter { public void loadAvatar(Account account, ImageView imageView) { if (cancelPotentialWork(account, imageView)) { - final Bitmap bm = activity.avatarService().get(account,activity.getPixel(48),true); + final Bitmap bm = activity.avatarService().get(account, activity.getPixel(48), true); if (bm != null) { cancelPotentialWork(account, imageView); imageView.setImageBitmap(bm); diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java index 65e05cf7d..e6f486a30 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -302,7 +302,7 @@ public class MessageAdapter extends ArrayAdapter 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); } else { if (darkBackground) { viewHolder.time.setTextAppearance(getContext(), R.style.TextAppearance_Conversations_Caption_OnDark); diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index 625ab3c68..f1eeeaddf 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -20,6 +20,9 @@ + + + diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index da37f6a3f..073d3af80 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -91,7 +91,7 @@ bold - diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index 26f1bc214..d032bcaa8 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -10,6 +10,8 @@ @color/grey50 @color/grey200 @color/red_a700 + @color/green500 + @color/red800 @drawable/search_background_light @drawable/no_results_background_light @@ -106,6 +108,9 @@ @drawable/no_results_background_dark @color/red_a100 + @color/green500 + @color/red500 + @color/white true