From d3d336a4535a9424853fd5a50104d2e7fb2f945a Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 24 Dec 2015 17:45:22 -0500 Subject: [PATCH] Update avatars with active theme --- QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java | 4 ++++ .../src/main/java/com/moez/QKSMS/ui/view/AvatarView.java | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java index e44a3763..f55850fc 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java @@ -535,6 +535,10 @@ public class ThemeManager { return sColor; } + public static int getActiveColor() { + return sActiveColor; + } + public static Theme getTheme() { return sTheme; } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AvatarView.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AvatarView.java index b4974998..9523e475 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AvatarView.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AvatarView.java @@ -25,11 +25,11 @@ import android.widget.ImageView; import com.moez.QKSMS.R; import com.moez.QKSMS.common.LiveViewManager; import com.moez.QKSMS.common.TypefaceManager; +import com.moez.QKSMS.common.preferences.QKPreference; import com.moez.QKSMS.common.utils.ImageUtils; import com.moez.QKSMS.common.utils.Units; import com.moez.QKSMS.interfaces.LiveView; import com.moez.QKSMS.ui.ThemeManager; -import com.moez.QKSMS.ui.settings.SettingsFragment; public class AvatarView extends ImageView implements View.OnClickListener, LiveView { private final String TAG = "AvatarView"; @@ -95,7 +95,7 @@ public class AvatarView extends ImageView implements View.OnClickListener, LiveV // Register this view for live updates. LiveViewManager.registerView(this); - LiveViewManager.registerPreference(this, SettingsFragment.THEME); + LiveViewManager.registerPreference(this, QKPreference.ACTIVE_THEME.getKey()); } } @@ -261,7 +261,7 @@ public class AvatarView extends ImageView implements View.OnClickListener, LiveV getBackground().setColorFilter(0x00000000, PorterDuff.Mode.SRC_ATOP); } else { super.setImageDrawable(TextUtils.isEmpty(mInitial) ? mDefaultDrawable : null); - getBackground().setColorFilter(ThemeManager.getColor(), PorterDuff.Mode.SRC_ATOP); + getBackground().setColorFilter(ThemeManager.getActiveColor(), PorterDuff.Mode.SRC_ATOP); } } } @@ -285,7 +285,7 @@ public class AvatarView extends ImageView implements View.OnClickListener, LiveV if (getBackground() == null) { setBackgroundResource(R.drawable.circle); } - getBackground().setColorFilter(ThemeManager.getColor(), PorterDuff.Mode.SRC_ATOP); + getBackground().setColorFilter(ThemeManager.getActiveColor(), PorterDuff.Mode.SRC_ATOP); } private class QueryHandler extends AsyncQueryHandler {