diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/LiveViewManager.java b/QKSMS/src/main/java/com/moez/QKSMS/common/LiveViewManager.java index 19be390b..13a7d8d3 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/LiveViewManager.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/LiveViewManager.java @@ -6,8 +6,8 @@ import android.preference.PreferenceManager; import com.moez.QKSMS.common.preferences.QKPreference; import com.moez.QKSMS.interfaces.LiveView; -import java.util.Collections; import java.util.HashMap; +import java.util.HashSet; import java.util.Set; import java.util.WeakHashMap; @@ -27,9 +27,9 @@ import java.util.WeakHashMap; * which will initialize it */ public abstract class LiveViewManager { - private static final String TAG = "ThemedViewManager"; + private static final String TAG = "LiveViewManager"; - private static final HashMap> sViews = new HashMap<>(); + private static final HashMap>> sViews = new HashMap<>(); /** * Initialize preferences and register a listener for changes @@ -45,12 +45,17 @@ public abstract class LiveViewManager { * Convenience method for #registerView(QKPreference, ThemedView) to allow registering a single * ThemedView to listen for multiple preferences * - * @param view The ThemedView + * @param view The LiveView + * @param parent The object to tie the lifecycle of the LiveView to. If we only reference + * a LiveView anonymous inner class, then it'll be quickly garbage collected + * and removed from the WeakHashMap. Instead, we should reference the parent + * object (ie. The Activity, Fragment, View, etc...) that this LiveView is + * concerned with. In most cases, it's acceptable to just pass in `this` * @param preferences The preferences to listen for */ - public static void registerView(LiveView view, QKPreference... preferences) { + public static void registerView(LiveView view, Object parent, QKPreference... preferences) { for (QKPreference preference : preferences) { - registerView(preference, view); + registerView(preference, parent, view); } } @@ -59,16 +64,25 @@ public abstract class LiveViewManager { * We don't need to manually unregister the views because we're using weak sets * * @param preference The preference to listen for - * @param view The view + * @param parent The object to tie the lifecycle of the LiveView to. If we only reference + * a LiveView anonymous inner class, then it'll be quickly garbage collected + * and removed from the WeakHashMap. Instead, we should reference the parent + * object (ie. The Activity, Fragment, View, etc...) that this LiveView is + * concerned with. In most cases, it's acceptable to just pass in `this` + * @param view The LiveView */ - public static void registerView(QKPreference preference, LiveView view) { + public static void registerView(QKPreference preference, Object parent, LiveView view) { synchronized (sViews) { if (sViews.containsKey(preference.getKey())) { - Set views = sViews.get(preference.getKey()); - views.add(view); + WeakHashMap> parents = sViews.get(preference.getKey()); + if (!parents.containsKey(parent)) { + parents.put(parent, new HashSet<>()); + } + parents.get(parent).add(view); } else { - Set set = Collections.newSetFromMap(new WeakHashMap<>()); - set.add(view); + WeakHashMap> set = new WeakHashMap<>(); + set.put(parent, new HashSet<>()); + set.get(parent).add(view); sViews.put(preference.getKey(), set); } } @@ -94,12 +108,13 @@ public abstract class LiveViewManager { * @param key The preference key */ private static void refreshViews(String key) { - Set toRefresh = sViews.get(key); - - // Refresh those views. - if (toRefresh != null) { - for (LiveView view : toRefresh) { - view.refresh(key); + synchronized (sViews) { + if (sViews.get(key) != null) { + for (Set views : sViews.get(key).values()) { + for (LiveView view : views) { + view.refresh(key); + } + } } } } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java index e75f9749..2d0acf0d 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java @@ -122,7 +122,7 @@ public class MainActivity extends QKActivity implements SlidingMenu.SlidingMenuL showDialogIfNeeded(savedInstanceState); - LiveViewManager.registerView(QKPreference.BACKGROUND, key -> { + LiveViewManager.registerView(QKPreference.BACKGROUND, this, key -> { // Update the background color. This code is important during the welcome screen setup, when the activity // in the ThemeManager isn't the MainActivity findViewById(R.id.menu_frame).getRootView().setBackgroundColor(ThemeManager.getBackgroundColor()); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKActivity.java index ba94c9d9..783e87be 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKActivity.java @@ -25,6 +25,7 @@ import com.moez.QKSMS.QKSMSApp; import com.moez.QKSMS.R; import com.moez.QKSMS.common.LiveViewManager; import com.moez.QKSMS.common.preferences.QKPreference; +import com.moez.QKSMS.interfaces.LiveView; import com.moez.QKSMS.ui.ThemeManager; import com.moez.QKSMS.ui.view.QKTextView; @@ -73,7 +74,7 @@ public abstract class QKActivity extends ActionBarActivity { setSupportActionBar(mToolbar); } - LiveViewManager.registerView(QKPreference.ACTIVE_THEME, key -> { + LiveViewManager.registerView(QKPreference.ACTIVE_THEME, this, key -> { mToolbar.setBackgroundColor(ThemeManager.getColor()); }); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKFragment.java index 8320ab45..cf8a2456 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKFragment.java @@ -24,7 +24,7 @@ public class QKFragment extends Fragment { public void onViewCreated(View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); - LiveViewManager.registerView(QKPreference.BACKGROUND, key -> { + LiveViewManager.registerView(QKPreference.BACKGROUND, this, key -> { if (getView() != null) { getView().setBackgroundColor(ThemeManager.getBackgroundColor()); } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListAdapter.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListAdapter.java index 5986c563..906ef0f8 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListAdapter.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListAdapter.java @@ -37,7 +37,7 @@ public class ConversationListAdapter extends RecyclerCursorAdapter { + LiveViewManager.registerView(QKPreference.THEME, this, key -> { mMuted.setColorFilter(ThemeManager.getColor(), PorterDuff.Mode.SRC_ATOP); mUnread.setColorFilter(ThemeManager.getColor(), PorterDuff.Mode.SRC_ATOP); mError.setColorFilter(ThemeManager.getColor(), PorterDuff.Mode.SRC_ATOP); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListFragment.java index c7f2a6dc..04327aa6 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListFragment.java @@ -79,7 +79,7 @@ public class ConversationListFragment extends QKFragment implements LoaderManage mLayoutManager = new LinearLayoutManager(mContext); mConversationDetailsDialog = new ConversationDetailsDialog(mContext, getFragmentManager()); - LiveViewManager.registerView(QKPreference.THEME, key -> { + LiveViewManager.registerView(QKPreference.THEME, this, key -> { if (!mViewHasLoaded) { return; } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListViewHolder.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListViewHolder.java index c032d56d..2de9dd22 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListViewHolder.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListViewHolder.java @@ -94,7 +94,7 @@ public class MessageListViewHolder extends ClickyViewHolder impleme } protected void setLiveViewCallback(LiveView liveViewCallback) { - LiveViewManager.registerView(QKPreference.ACTIVE_THEME, liveViewCallback); + LiveViewManager.registerView(QKPreference.ACTIVE_THEME, this, liveViewCallback); } @Override diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java index 37b2c710..5f2adcd5 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java @@ -368,7 +368,7 @@ public class SettingsFragment extends PreferenceFragment implements Preference.O KeyboardUtils.hide(mContext, view); mListView = (ListView) view.findViewById(android.R.id.list); - LiveViewManager.registerView(QKPreference.BACKGROUND, key -> { + LiveViewManager.registerView(QKPreference.BACKGROUND, this, key -> { ListviewHelper.applyCustomScrollbar(mContext, mListView); View view1 = getView(); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AutoCompleteContactView.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AutoCompleteContactView.java index 2a4e74f0..730f53cf 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AutoCompleteContactView.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AutoCompleteContactView.java @@ -47,16 +47,16 @@ public class AutoCompleteContactView extends RecipientEditTextView { setTypeface(TypefaceManager.obtainTypeface(mContext, fontFamily, fontWeight)); }, QKPreference.FONT_FAMILY, QKPreference.FONT_WEIGHT); - LiveViewManager.registerView(QKPreference.FONT_SIZE, key -> { + LiveViewManager.registerView(QKPreference.FONT_SIZE, this, key -> { setTextSize(TypedValue.COMPLEX_UNIT_SP, FontManager.getTextSize(mContext, FontManager.TEXT_TYPE_PRIMARY)); }); - LiveViewManager.registerView(QKPreference.BACKGROUND, key -> { + LiveViewManager.registerView(QKPreference.BACKGROUND, this, key -> { setTextColor(ThemeManager.getTextOnBackgroundPrimary()); setHintTextColor(ThemeManager.getTextOnBackgroundSecondary()); }); - LiveViewManager.registerView(QKPreference.MOBILE_ONLY, key -> { + LiveViewManager.registerView(QKPreference.MOBILE_ONLY, this, key -> { if (mAdapter != null) { SharedPreferences prefs1 = mContext.getPrefs(); mAdapter.setShowMobileOnly(prefs1.getBoolean(SettingsFragment.MOBILE_ONLY, false)); 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 8c877d9a..8b79b5c0 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 @@ -91,7 +91,7 @@ public class AvatarView extends ImageView implements View.OnClickListener { setOnClickListener(this); - LiveViewManager.registerView(QKPreference.ACTIVE_THEME, key -> { + LiveViewManager.registerView(QKPreference.ACTIVE_THEME, this, key -> { mPaint.setColor(ThemeManager.getTextOnColorPrimary()); mDefaultDrawable.setColorFilter(ThemeManager.getTextOnColorPrimary(), PorterDuff.Mode.SRC_ATOP); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/ComposeView.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/ComposeView.java index 99ef0612..36e621c2 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/ComposeView.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/ComposeView.java @@ -181,7 +181,7 @@ public class ComposeView extends LinearLayout implements View.OnClickListener { mCancel.setOnClickListener(this); mDelay.setOnClickListener(this); - LiveViewManager.registerView(QKPreference.ACTIVE_THEME, key -> { + LiveViewManager.registerView(QKPreference.ACTIVE_THEME, this, key -> { mButtonBackground.setColorFilter(ThemeManager.getColor(), PorterDuff.Mode.SRC_ATOP); mButtonBar1.setColorFilter(ThemeManager.getTextOnColorPrimary(), PorterDuff.Mode.SRC_ATOP); mButtonBar2.setColorFilter(ThemeManager.getTextOnColorPrimary(), PorterDuff.Mode.SRC_ATOP); @@ -194,7 +194,7 @@ public class ComposeView extends LinearLayout implements View.OnClickListener { if (ThemeManager.getSentBubbleRes() != 0) mReplyText.setBackgroundResource(ThemeManager.getSentBubbleRes()); }); - LiveViewManager.registerView(QKPreference.BACKGROUND, key -> { + LiveViewManager.registerView(QKPreference.BACKGROUND, this, key -> { mReplyText.getBackground().setColorFilter(ThemeManager.getNeutralBubbleColor(), PorterDuff.Mode.SRC_ATOP); getBackground().setColorFilter(ThemeManager.getBackgroundColor(), PorterDuff.Mode.SRC_ATOP); }); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKEditText.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKEditText.java index 6d519700..cce50c5b 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKEditText.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKEditText.java @@ -56,11 +56,11 @@ public class QKEditText extends android.widget.EditText { setTypeface(TypefaceManager.obtainTypeface(mContext, fontFamily, fontWeight)); }, QKPreference.FONT_FAMILY, QKPreference.FONT_WEIGHT); - LiveViewManager.registerView(QKPreference.FONT_SIZE, key -> { + LiveViewManager.registerView(QKPreference.FONT_SIZE, this, key -> { setTextSize(TypedValue.COMPLEX_UNIT_SP, FontManager.getTextSize(mContext, FontManager.TEXT_TYPE_PRIMARY)); }); - LiveViewManager.registerView(QKPreference.BACKGROUND, key -> { + LiveViewManager.registerView(QKPreference.BACKGROUND, this, key -> { setTextColor(ThemeManager.getTextOnBackgroundPrimary()); setHintTextColor(ThemeManager.getTextOnBackgroundSecondary()); }); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKImageView.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKImageView.java index 8941fba9..bc1da43e 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKImageView.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKImageView.java @@ -30,7 +30,7 @@ public class QKImageView extends ImageView { } public void init() { - LiveViewManager.registerView(QKPreference.THEME, key -> { + LiveViewManager.registerView(QKPreference.THEME, this, key -> { setImageDrawable(mDrawable); }); } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKTextView.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKTextView.java index 39664144..e41f0a72 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKTextView.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKTextView.java @@ -65,7 +65,7 @@ public class QKTextView extends TextView { // Register for theme updates if we're text that changes color dynamically. if (mType == FontManager.TEXT_TYPE_CATEGORY) { - LiveViewManager.registerView(QKPreference.THEME, key -> + LiveViewManager.registerView(QKPreference.THEME, this, key -> setTextColor(FontManager.getTextColor(mContext, mType))); } @@ -75,15 +75,15 @@ public class QKTextView extends TextView { setTypeface(TypefaceManager.obtainTypeface(mContext, fontFamily, fontWeight)); }, QKPreference.FONT_FAMILY, QKPreference.FONT_WEIGHT); - LiveViewManager.registerView(QKPreference.FONT_SIZE, key -> { + LiveViewManager.registerView(QKPreference.FONT_SIZE, this, key -> { setTextSize(TypedValue.COMPLEX_UNIT_SP, FontManager.getTextSize(mContext, mType)); }); - LiveViewManager.registerView(QKPreference.BACKGROUND, key -> { + LiveViewManager.registerView(QKPreference.BACKGROUND, this, key -> { setTextColor(FontManager.getTextColor(mContext, mType)); }); - LiveViewManager.registerView(QKPreference.TEXT_FORMATTING, key -> { + LiveViewManager.registerView(QKPreference.TEXT_FORMATTING, this, key -> { setText(getText(), BufferType.NORMAL); }); } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/StarredContactsView.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/StarredContactsView.java index dd28c2e2..91a11ee8 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/StarredContactsView.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/StarredContactsView.java @@ -75,7 +75,7 @@ public class StarredContactsView extends LinearLayout implements LoaderManager.L collapse(); } - LiveViewManager.registerView(QKPreference.BACKGROUND, key -> { + LiveViewManager.registerView(QKPreference.BACKGROUND, this, key -> { mIndicator.setColorFilter(ThemeManager.getTextOnBackgroundSecondary(), PorterDuff.Mode.SRC_ATOP); mFavoritesBackground.setBackgroundColor(ThemeManager.getBackgroundColor()); });