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 927a58a5..c23aa157 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/LiveViewManager.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/LiveViewManager.java @@ -3,166 +3,126 @@ package com.moez.QKSMS.common; import android.content.Context; import android.content.SharedPreferences; import android.preference.PreferenceManager; -import android.util.Log; +import com.moez.QKSMS.common.preferences.QKPreference; import com.moez.QKSMS.interfaces.LiveView; import java.util.Collections; -import java.util.HashSet; +import java.util.HashMap; import java.util.Set; import java.util.WeakHashMap; /** - * Allows LiveViews to register for updates on relevant preferences. + * Allows views to register for updates on preferences + * + * Example: A button may need to know when the theme changes, so it that + * it can change colors accordingly + * + * In order to do this, you can use this class as following: + * LiveViewManager.registerView(QKPreference.THEME, key -> { + * // Change button color + * } + * + * You won't need to initialize the button color in addition to registering it + * in the LiveViewManager, because registering it will trigger a refresh automatically, + * which will initialize it */ public class LiveViewManager implements SharedPreferences.OnSharedPreferenceChangeListener { - - private static final String TAG = "LiveViewManager"; - private static final boolean LOCAL_LOGV = false; + private static final String TAG = "ThemedViewManager"; private static LiveViewManager sInstance; - - private static final Set sSet = Collections.newSetFromMap(new WeakHashMap()); - private static final WeakHashMap> sPrefsMap = new WeakHashMap<>(); + private static final HashMap> sViews = new HashMap<>(); /** - * Private constructor. + * Private constructor */ - private LiveViewManager() {} + private LiveViewManager() { + } - /** - * Initialize a static instance so that we can listen for views. - */ static { sInstance = new LiveViewManager(); } + /** + * Initialize preferences and register a listener for changes + * + * @param context Context + */ public static void init(Context context) { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); prefs.registerOnSharedPreferenceChangeListener(sInstance); } + /** + * Listen for preference changes from the SharedPreferences + * + * @param prefs SharedPreferences instance + * @param key Key of preference that was changed + */ @Override public void onSharedPreferenceChanged(SharedPreferences prefs, String key) { LiveViewManager.refreshViews(key); } /** - * Registers a LiveView for global updates. To get updates for specific preferences, use - * registerPreference. - * @param v - */ - public static void registerView(LiveView v) { - synchronized (sSet) { - sSet.add(v); - } - - synchronized(sPrefsMap) { - // Don't add the view to the prefs map more than once, in case the LiveView has already - // been initalized. - if (!sPrefsMap.containsKey(v)) { - sPrefsMap.put(v, new HashSet()); - } - } - } - - /** - * Unregisters a LiveView for any updates: global, or preference-specific. - * @param v - */ - public static void unregisterView(LiveView v) { - synchronized (sSet) { - sSet.remove(v); - } - - synchronized (sPrefsMap) { - sPrefsMap.remove(v); - } - } - - /** - * Register a LiveView to be notified when this preference is updated. - * Note that you must first register the view, otherwise #refresh() will - * not be called on it + * Convenience method for #registerView(QKPreference, ThemedView) to allow registering a single + * ThemedView to listen for multiple preferences * - * @param v - * @param pref + * @param view The ThemedView + * @param preferences The preferences to listen for */ - public static void registerPreference(LiveView v, String pref) { - synchronized (sPrefsMap) { - Set prefs = sPrefsMap.get(v); - // WeakHashSet: the value might have been removed. - if (prefs != null) { - prefs.add(pref); - } + public static void registerView(LiveView view, QKPreference... preferences) { + for (QKPreference preference : preferences) { + registerView(preference, view); } } /** - * Register a LiveView to be notified when this preference is updated. + * Register a view to be updated when a QKPreference is changed + * We don't need to manually unregister the views because we're using weak sets * - * @param v - * @param pref + * @param preference The preference to listen for + * @param view The view */ - public static void unregisterPreference(LiveView v, String pref) { - synchronized (sPrefsMap) { - Set prefs = sPrefsMap.get(v); - // WeakHashSet: the value might have been removed. - if (prefs != null) { - prefs.remove(pref); + public static void registerView(QKPreference preference, LiveView view) { + synchronized (sViews) { + if (sViews.containsKey(preference.getKey())) { + Set views = sViews.get(preference.getKey()); + views.add(view); + } else { + Set set = Collections.newSetFromMap(new WeakHashMap<>()); + set.add(view); + sViews.put(preference.getKey(), set); } } + + // Fire it off once registered + view.refresh(preference.getKey()); } /** - * Refresh all views. + * Refresh all views that are registered to listen for updates to the given preference + * Convenience method for #refreshViews(String key) + * + * @param preference The preference */ - public static void refreshViews() { - synchronized (sSet) { - for (LiveView view : sSet) { - view.refresh(); - } - } + public static void refreshViews(QKPreference preference) { + refreshViews(preference.getKey()); } /** - * Refreshes only the views that are listening for any of the given preferences. - * @param query + * Refresh all views that are registered to listen for updates to the given preference + * Convenience method for #refreshViews(String key) + * + * @param key The preference key */ - public static void refreshViews(String... query) { - Set toRefresh = getViews(query); + private static void refreshViews(String key) { + Set toRefresh = sViews.get(key); // Refresh those views. - for (LiveView view : toRefresh) { - view.refresh(); - } - } - - /** - * Returns the set of LiveViews which subscribe to at least one of the given preferences. Can - * be used to build a quick cache of LiveViews for rapid refreshing, i.e. animations. - * - * @param query - * @return - */ - public static Set getViews(String... query) { - // Build a set of the given preferences. - Set querySet = new HashSet<>(); - for (String string : query) { - querySet.add(string); - } - - // Get all the views that have at least one of the changed preferences. - Set result = new HashSet<>(); - synchronized (sPrefsMap) { - for (LiveView view : sPrefsMap.keySet()) { - Set viewPrefs = sPrefsMap.get(view); - if (viewPrefs != null && !Collections.disjoint(querySet, viewPrefs)) { - result.add(view); - } + if (toRefresh != null) { + for (LiveView view : toRefresh) { + view.refresh(key); } } - - if (LOCAL_LOGV) Log.v(TAG, "getViews returned:" + result.size() + " for preferences:" + querySet); - return result; } } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/interfaces/LiveView.java b/QKSMS/src/main/java/com/moez/QKSMS/interfaces/LiveView.java index 8755ec25..e9f85de2 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/interfaces/LiveView.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/interfaces/LiveView.java @@ -1,8 +1,5 @@ package com.moez.QKSMS.interfaces; -/** - * A simple interface for views that refresh statically for certain actions. - */ public interface LiveView { - public void refresh(); + void refresh(String 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 2612051a..e75f9749 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java @@ -29,14 +29,14 @@ import com.moez.QKSMS.R; import com.moez.QKSMS.common.ConversationPrefsHelper; import com.moez.QKSMS.common.DialogHelper; import com.moez.QKSMS.common.DonationManager; -import com.moez.QKSMS.common.LiveViewManager; import com.moez.QKSMS.common.QKRateSnack; +import com.moez.QKSMS.common.LiveViewManager; import com.moez.QKSMS.common.google.DraftCache; +import com.moez.QKSMS.common.preferences.QKPreference; import com.moez.QKSMS.common.utils.KeyboardUtils; import com.moez.QKSMS.common.utils.MessageUtils; import com.moez.QKSMS.common.utils.Units; import com.moez.QKSMS.data.Conversation; -import com.moez.QKSMS.interfaces.LiveView; import com.moez.QKSMS.mmssms.Utils; import com.moez.QKSMS.receiver.IconColorReceiver; import com.moez.QKSMS.transaction.NotificationManager; @@ -61,7 +61,7 @@ import java.net.URLDecoder; import java.util.Collection; -public class MainActivity extends QKActivity implements LiveView, SlidingMenu.SlidingMenuListener { +public class MainActivity extends QKActivity implements SlidingMenu.SlidingMenuListener { private final String TAG = "MainActivity"; @@ -122,8 +122,13 @@ public class MainActivity extends QKActivity implements LiveView, SlidingMenu.Sl showDialogIfNeeded(savedInstanceState); - LiveViewManager.registerView(this); - LiveViewManager.registerPreference(this, SettingsFragment.BACKGROUND); + LiveViewManager.registerView(QKPreference.BACKGROUND, 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()); + findViewById(R.id.menu_frame).setBackgroundColor(ThemeManager.getBackgroundColor()); + findViewById(R.id.content_frame).setBackgroundColor(ThemeManager.getBackgroundColor()); + }); //Adds a small/non intrusive snackbar that asks the user to rate the app SnackEngage.from(this).withSnack(new QKRateSnack().withDuration(BaseSnack.DURATION_LONG)) @@ -644,15 +649,6 @@ public class MainActivity extends QKActivity implements LiveView, SlidingMenu.Sl .show(); } - @Override - public void refresh() { - // 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()); - findViewById(R.id.menu_frame).setBackgroundColor(ThemeManager.getBackgroundColor()); - findViewById(R.id.content_frame).setBackgroundColor(ThemeManager.getBackgroundColor()); - } - public static class DeleteThreadListener implements DialogInterface.OnClickListener { private final Collection mThreadIds; private final Conversation.ConversationQueryHandler mHandler; 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 8636328b..5747341d 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java @@ -26,7 +26,6 @@ import com.moez.QKSMS.common.AnalyticsManager; import com.moez.QKSMS.common.LiveViewManager; import com.moez.QKSMS.common.preferences.QKPreference; import com.moez.QKSMS.common.utils.ColorUtils; -import com.moez.QKSMS.interfaces.LiveView; import com.moez.QKSMS.receiver.IconColorReceiver; import com.moez.QKSMS.ui.base.QKActivity; import com.moez.QKSMS.ui.dialog.QKDialog; @@ -35,8 +34,6 @@ import com.moez.QKSMS.ui.view.QKTextView; import com.moez.QKSMS.ui.view.colorpicker.ColorPickerPalette; import com.moez.QKSMS.ui.widget.WidgetProvider; -import java.util.Set; - public class ThemeManager { private final static String TAG = "ThemeManager"; @@ -306,14 +303,14 @@ public class ThemeManager { @Override public void onAnimationEnd(Animator animation) { // This updates the colors and fonts of all the views. - LiveViewManager.refreshViews(SettingsFragment.BACKGROUND); + LiveViewManager.refreshViews(QKPreference.BACKGROUND); WidgetProvider.notifyThemeChanged(mContext); } }); backgroundAnimation.start(); } else { // This updates the colors and fonts of all the views. - LiveViewManager.refreshViews(SettingsFragment.BACKGROUND); + LiveViewManager.refreshViews(QKPreference.BACKGROUND); background.setBackgroundColor(endColor); menu.setBackgroundColor(endColor); content.setBackgroundColor(endColor); @@ -321,7 +318,7 @@ public class ThemeManager { } } else { // This updates the colors and fonts of all the views. - LiveViewManager.refreshViews(SettingsFragment.BACKGROUND); + LiveViewManager.refreshViews(QKPreference.BACKGROUND); WidgetProvider.notifyThemeChanged(mContext); } } @@ -639,12 +636,7 @@ public class ThemeManager { // Some views are updated every frame of the animation; get these views here. We // build this list once beforehand since it's a slightly expensive operation. - final Set views = LiveViewManager.getViews(SettingsFragment.THEME); - - // Refresh all the views with the new color. - for (LiveView view : views) { - view.refresh(); - } + LiveViewManager.refreshViews(QKPreference.THEME); ValueAnimator colorAnimation = ValueAnimator.ofObject(new ArgbEvaluator(), colourFrom, color); colorAnimation.setDuration(TRANSITION_LENGTH); @@ -705,9 +697,7 @@ public class ThemeManager { mWindow.setNavigationBarColor(ColorUtils.darken(color)); } - for (LiveView view : LiveViewManager.getViews(QKPreference.ACTIVE_THEME.getKey())) { - view.refresh(); - } + LiveViewManager.refreshViews(QKPreference.ACTIVE_THEME); } private static boolean isColorDarkEnough(int color) { diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKContentFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKContentFragment.java index 2e45c808..b1135369 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKContentFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKContentFragment.java @@ -1,12 +1,7 @@ package com.moez.QKSMS.ui.base; import android.os.Bundle; -import android.view.View; -import com.moez.QKSMS.common.LiveViewManager; -import com.moez.QKSMS.interfaces.LiveView; import com.moez.QKSMS.ui.ContentFragment; -import com.moez.QKSMS.ui.ThemeManager; -import com.moez.QKSMS.ui.settings.SettingsFragment; /** * Base class for Fragments. QKSMS uses the recycle pattern as an optimization, and our fragment @@ -22,7 +17,7 @@ import com.moez.QKSMS.ui.settings.SettingsFragment; * - Manages the current state of the fragment in terms of the animation, i.e. opening, fully * opened, etc. */ -public abstract class QKContentFragment extends QKFragment implements LiveView, ContentFragment { +public abstract class QKContentFragment extends QKFragment implements ContentFragment { /** * It's not strictly necessary, but subclasses should call through to super() in their @@ -60,18 +55,6 @@ public abstract class QKContentFragment extends QKFragment implements LiveView, onNewArguments(); } - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - LiveViewManager.registerPreference(this, SettingsFragment.BACKGROUND); - } - - @Override - public void onViewCreated(View view, Bundle savedInstanceState) { - super.onViewCreated(view, savedInstanceState); - refresh(); - } - /** * Called when the content is being opened with an animation. */ @@ -97,12 +80,4 @@ public abstract class QKContentFragment extends QKFragment implements LiveView, */ public void onContentClosed() { } - - @Override - public void refresh() { - View view = getView(); - if (view != null) { - view.setBackgroundColor(ThemeManager.getBackgroundColor()); - } - } } 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 e071a742..8320ab45 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 @@ -3,14 +3,14 @@ package com.moez.QKSMS.ui.base; import android.app.Activity; import android.app.Fragment; import android.os.Bundle; +import android.view.View; import com.moez.QKSMS.QKSMSApp; import com.moez.QKSMS.common.LiveViewManager; -import com.moez.QKSMS.interfaces.LiveView; +import com.moez.QKSMS.common.preferences.QKPreference; import com.moez.QKSMS.ui.ThemeManager; -import com.moez.QKSMS.ui.settings.SettingsFragment; import com.squareup.leakcanary.RefWatcher; -public class QKFragment extends Fragment implements LiveView { +public class QKFragment extends Fragment { protected QKActivity mContext; @@ -21,10 +21,14 @@ public class QKFragment extends Fragment implements LiveView { } @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - LiveViewManager.registerView(this); - LiveViewManager.registerPreference(this, SettingsFragment.BACKGROUND); + public void onViewCreated(View view, Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + + LiveViewManager.registerView(QKPreference.BACKGROUND, key -> { + if (getView() != null) { + getView().setBackgroundColor(ThemeManager.getBackgroundColor()); + } + }); } @Override @@ -33,11 +37,4 @@ public class QKFragment extends Fragment implements LiveView { RefWatcher refWatcher = QKSMSApp.getRefWatcher(getActivity()); refWatcher.watch(this); } - - @Override - public void refresh() { - 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 a35bc960..5986c563 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 @@ -11,17 +11,16 @@ import com.moez.QKSMS.R; import com.moez.QKSMS.common.ConversationPrefsHelper; import com.moez.QKSMS.common.LiveViewManager; import com.moez.QKSMS.common.emoji.EmojiRegistry; +import com.moez.QKSMS.common.preferences.QKPreference; import com.moez.QKSMS.common.utils.DateFormatter; import com.moez.QKSMS.data.Contact; import com.moez.QKSMS.data.Conversation; -import com.moez.QKSMS.interfaces.LiveView; import com.moez.QKSMS.ui.ThemeManager; import com.moez.QKSMS.ui.base.QKActivity; import com.moez.QKSMS.ui.base.RecyclerCursorAdapter; import com.moez.QKSMS.ui.settings.SettingsFragment; -public class ConversationListAdapter extends RecyclerCursorAdapter - implements LiveView { +public class ConversationListAdapter extends RecyclerCursorAdapter { private final SharedPreferences mPrefs; @@ -38,9 +37,12 @@ public class ConversationListAdapter extends RecyclerCursorAdapter { + mMuted.setColorFilter(ThemeManager.getColor(), PorterDuff.Mode.SRC_ATOP); + mUnread.setColorFilter(ThemeManager.getColor(), PorterDuff.Mode.SRC_ATOP); + mError.setColorFilter(ThemeManager.getColor(), PorterDuff.Mode.SRC_ATOP); + notifyDataSetChanged(); + }); } protected Conversation getItem(int position) { @@ -124,12 +126,4 @@ public class ConversationListAdapter extends RecyclerCursorAdapter, LiveView, +public class ConversationListFragment extends QKFragment implements LoaderManager.LoaderCallbacks, RecyclerCursorAdapter.ItemClickListener, RecyclerCursorAdapter.MultiSelectListener, Observer { private final String TAG = "ConversationList"; @@ -79,8 +79,17 @@ public class ConversationListFragment extends QKFragment implements LoaderManage mLayoutManager = new LinearLayoutManager(mContext); mConversationDetailsDialog = new ConversationDetailsDialog(mContext, getFragmentManager()); - LiveViewManager.registerView(this); - LiveViewManager.registerPreference(this, SettingsFragment.THEME); + LiveViewManager.registerView(QKPreference.THEME, key -> { + if (!mViewHasLoaded) { + return; + } + + mFab.setColorNormal(ThemeManager.getColor()); + mFab.setColorPressed(ColorUtils.lighten(ThemeManager.getColor())); + mFab.getDrawable().setColorFilter(ThemeManager.getTextOnColorPrimary(), PorterDuff.Mode.SRC_ATOP); + + mEmptyStateIcon.setColorFilter(ThemeManager.getTextOnBackgroundPrimary()); + }); } @Override @@ -272,7 +281,6 @@ public class ConversationListFragment extends QKFragment implements LoaderManage @Override public void onDestroy() { super.onDestroy(); - LiveViewManager.unregisterView(this); BlockedConversationHelper.FutureBlockedConversationObservable.getInstance().deleteObserver(this); } @@ -301,19 +309,6 @@ public class ConversationListFragment extends QKFragment implements LoaderManage } } - @Override - public void refresh() { - if (!mViewHasLoaded) { - return; - } - - mFab.setColorNormal(ThemeManager.getColor()); - mFab.setColorPressed(ColorUtils.lighten(ThemeManager.getColor())); - mFab.getDrawable().setColorFilter(ThemeManager.getTextOnColorPrimary(), PorterDuff.Mode.SRC_ATOP); - - mEmptyStateIcon.setColorFilter(ThemeManager.getTextOnBackgroundPrimary()); - } - @Override public void onMultiSelectStateChanged(boolean enabled) { mContext.invalidateOptionsMenu(); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/ConversationNotificationSettingsDialog.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/ConversationNotificationSettingsDialog.java index 7617a635..531476b1 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/ConversationNotificationSettingsDialog.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/ConversationNotificationSettingsDialog.java @@ -68,7 +68,6 @@ public class ConversationNotificationSettingsDialog extends QKDialog implements int padding = Units.dpToPx(getActivity(), 16); QKTextView premiumWarning = new QKTextView(getActivity()); premiumWarning.setLayoutParams(mLayoutParams); - premiumWarning.setType(FontManager.TEXT_TYPE_PRIMARY); premiumWarning.setPadding(padding, padding, padding, padding); LinearLayout list = new LinearLayout(getActivity()); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListAdapter.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListAdapter.java index 0a8bd56a..a59df7ad 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListAdapter.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListAdapter.java @@ -14,16 +14,12 @@ import android.telephony.TelephonyManager; import android.text.SpannableString; import android.text.SpannableStringBuilder; import android.text.TextUtils; -import android.text.style.ClickableSpan; import android.text.style.StyleSpan; -import android.text.style.URLSpan; import android.text.style.UnderlineSpan; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.RelativeLayout; - import com.android.mms.transaction.Transaction; import com.android.mms.transaction.TransactionBundle; import com.android.mms.transaction.TransactionService; @@ -44,7 +40,6 @@ import com.moez.QKSMS.ui.base.RecyclerCursorAdapter; import com.moez.QKSMS.ui.mms.MmsThumbnailPresenter; import com.moez.QKSMS.ui.settings.SettingsFragment; import com.moez.QKSMS.ui.view.AvatarView; - import ezvcard.Ezvcard; import ezvcard.VCard; @@ -312,14 +307,13 @@ public class MessageListAdapter extends RecyclerCursorAdapter { + holder.setLiveViewCallback(key -> { if (messageItem.isMe()) { holder.mBodyTextView.getBackground().setColorFilter(ThemeManager.getSentBubbleColor(), PorterDuff.Mode.SRC_ATOP); } else { holder.mBodyTextView.getBackground().setColorFilter(ThemeManager.getReceivedBubbleColor(), PorterDuff.Mode.SRC_ATOP); } }); - holder.refresh(); if (messageItem.isMe() && !mPrefs.getBoolean(SettingsFragment.HIDE_AVATAR_SENT, true)) { holder.mAvatarView.setVisibility(showAvatar ? View.VISIBLE : View.GONE); 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 bacaf5ed..c032d56d 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 @@ -13,8 +13,8 @@ import com.moez.QKSMS.common.LiveViewManager; import com.moez.QKSMS.common.google.ItemLoadedCallback; import com.moez.QKSMS.common.google.ThumbnailManager; import com.moez.QKSMS.common.preferences.QKPreference; -import com.moez.QKSMS.interfaces.LiveView; import com.moez.QKSMS.interfaces.SlideViewInterface; +import com.moez.QKSMS.interfaces.LiveView; import com.moez.QKSMS.ui.base.ClickyViewHolder; import com.moez.QKSMS.ui.base.QKActivity; import com.moez.QKSMS.ui.mms.Presenter; @@ -23,13 +23,9 @@ import com.moez.QKSMS.ui.view.QKTextView; import java.util.Map; -public class MessageListViewHolder extends ClickyViewHolder implements SlideViewInterface, LiveView { +public class MessageListViewHolder extends ClickyViewHolder implements SlideViewInterface { private final String TAG = "MessageListViewHolder"; - protected interface LiveViewCallback { - void onRefresh(); - } - // Views protected View mRoot; protected QKTextView mBodyTextView; @@ -51,8 +47,6 @@ public class MessageListViewHolder extends ClickyViewHolder impleme protected ImageLoadedCallback mImageLoadedCallback; protected Presenter mPresenter; - protected LiveViewCallback mLiveViewCallback; - public MessageListViewHolder(QKActivity context, View view) { super(context, view); @@ -65,9 +59,6 @@ public class MessageListViewHolder extends ClickyViewHolder impleme mAvatarView = (AvatarView) view.findViewById(R.id.avatar); mMessageBlock = (LinearLayout) view.findViewById(R.id.message_block); mSpace = view.findViewById(R.id.space); - - LiveViewManager.registerView(this); - LiveViewManager.registerPreference(this, QKPreference.ACTIVE_THEME.getKey()); } protected void showMmsView(boolean visible) { @@ -102,8 +93,8 @@ public class MessageListViewHolder extends ClickyViewHolder impleme } } - protected void setLiveViewCallback(LiveViewCallback liveViewCallback) { - mLiveViewCallback = liveViewCallback; + protected void setLiveViewCallback(LiveView liveViewCallback) { + LiveViewManager.registerView(QKPreference.ACTIVE_THEME, liveViewCallback); } @Override @@ -225,13 +216,6 @@ public class MessageListViewHolder extends ClickyViewHolder impleme } - @Override - public void refresh() { - if (mLiveViewCallback != null) { - mLiveViewCallback.onRefresh(); - } - } - static protected class ImageLoadedCallback implements ItemLoadedCallback { private long mMessageId; private final MessageListViewHolder mListItem; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/popup/QKReplyActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/popup/QKReplyActivity.java index b081a96d..55987d2d 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/popup/QKReplyActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/popup/QKReplyActivity.java @@ -72,7 +72,6 @@ public class QKReplyActivity extends QKPopupActivity implements DialogInterface. mComposeView.setActivityLauncher(this); mComposeView.setOnSendListener(this); mComposeView.setLabel("QKReply"); - mComposeView.refresh(); mAdapter = new QKReplyAdapter(this); 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 ea1fc0eb..37b2c710 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 @@ -36,10 +36,10 @@ import com.moez.QKSMS.common.DialogHelper; import com.moez.QKSMS.common.DonationManager; import com.moez.QKSMS.common.ListviewHelper; import com.moez.QKSMS.common.LiveViewManager; +import com.moez.QKSMS.common.preferences.QKPreference; import com.moez.QKSMS.common.utils.DateFormatter; import com.moez.QKSMS.common.utils.KeyboardUtils; import com.moez.QKSMS.common.utils.PackageUtils; -import com.moez.QKSMS.interfaces.LiveView; import com.moez.QKSMS.receiver.NightModeAutoReceiver; import com.moez.QKSMS.transaction.EndlessJabber; import com.moez.QKSMS.transaction.NotificationManager; @@ -66,7 +66,7 @@ import java.util.Set; import java.util.Stack; public class SettingsFragment extends PreferenceFragment implements Preference.OnPreferenceChangeListener, - Preference.OnPreferenceClickListener, LiveView, ContentFragment { + Preference.OnPreferenceClickListener, ContentFragment { private final String TAG = "PreferenceFragment"; public static final String CATEGORY_APPEARANCE = "pref_key_category_appearance"; @@ -368,9 +368,14 @@ public class SettingsFragment extends PreferenceFragment implements Preference.O KeyboardUtils.hide(mContext, view); mListView = (ListView) view.findViewById(android.R.id.list); - LiveViewManager.registerView(this); - LiveViewManager.registerPreference(this, SettingsFragment.BACKGROUND); - refresh(); + LiveViewManager.registerView(QKPreference.BACKGROUND, key -> { + ListviewHelper.applyCustomScrollbar(mContext, mListView); + + View view1 = getView(); + if (view1 != null) { + view1.setBackgroundColor(ThemeManager.getBackgroundColor()); + } + }); } @Override @@ -688,23 +693,6 @@ public class SettingsFragment extends PreferenceFragment implements Preference.O } } - @Override - public void onDestroy() { - super.onDestroy(); - - LiveViewManager.unregisterView(this); - } - - @Override - public void refresh() { - ListviewHelper.applyCustomScrollbar(mContext, mListView); - - View view = getView(); - if (view != null) { - view.setBackgroundColor(ThemeManager.getBackgroundColor()); - } - } - @Override public void onContentOpening() { 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 3ddb31a1..2a4e74f0 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 @@ -10,12 +10,12 @@ import com.android.ex.chips.RecipientEditTextView; import com.moez.QKSMS.common.FontManager; import com.moez.QKSMS.common.LiveViewManager; import com.moez.QKSMS.common.TypefaceManager; -import com.moez.QKSMS.interfaces.LiveView; +import com.moez.QKSMS.common.preferences.QKPreference; import com.moez.QKSMS.ui.ThemeManager; import com.moez.QKSMS.ui.base.QKActivity; import com.moez.QKSMS.ui.settings.SettingsFragment; -public class AutoCompleteContactView extends RecipientEditTextView implements LiveView { +public class AutoCompleteContactView extends RecipientEditTextView { public static final String TAG = "AutoCompleteContactView"; private QKActivity mContext; @@ -33,40 +33,34 @@ public class AutoCompleteContactView extends RecipientEditTextView implements Li private void init(Context context) { mContext = (QKActivity) context; - SharedPreferences prefs = mContext.getPrefs(); - - // Setup text size, typeface, etc. - refresh(); mAdapter = new BaseRecipientAdapter(BaseRecipientAdapter.QUERY_TYPE_PHONE, getContext()); - mAdapter.setShowMobileOnly(prefs.getBoolean(SettingsFragment.MOBILE_ONLY, false)); setThreshold(1); setTokenizer(new MultiAutoCompleteTextView.CommaTokenizer()); setAdapter(mAdapter); setOnItemClickListener(this); - // Register this view for live updates. - LiveViewManager.registerView(this); - LiveViewManager.registerPreference(this, SettingsFragment.FONT_FAMILY); - LiveViewManager.registerPreference(this, SettingsFragment.FONT_SIZE); - LiveViewManager.registerPreference(this, SettingsFragment.FONT_WEIGHT); - LiveViewManager.registerPreference(this, SettingsFragment.MOBILE_ONLY); - LiveViewManager.registerPreference(this, SettingsFragment.BACKGROUND); - } + LiveViewManager.registerView(key -> { + int fontFamily = FontManager.getFontFamily(mContext); + int fontWeight = FontManager.getFontWeight(mContext, false); + setTypeface(TypefaceManager.obtainTypeface(mContext, fontFamily, fontWeight)); + }, QKPreference.FONT_FAMILY, QKPreference.FONT_WEIGHT); - @Override - public void refresh() { - setTypeface(TypefaceManager.obtainTypeface(mContext, FontManager.getFontFamily(mContext), - FontManager.getFontWeight(mContext, false))); - setTextSize(TypedValue.COMPLEX_UNIT_SP, FontManager.getTextSize(mContext, FontManager.TEXT_TYPE_PRIMARY)); + LiveViewManager.registerView(QKPreference.FONT_SIZE, key -> { + setTextSize(TypedValue.COMPLEX_UNIT_SP, FontManager.getTextSize(mContext, FontManager.TEXT_TYPE_PRIMARY)); + }); - setTextColor(ThemeManager.getTextOnBackgroundPrimary()); - setHintTextColor(ThemeManager.getTextOnBackgroundSecondary()); + LiveViewManager.registerView(QKPreference.BACKGROUND, key -> { + setTextColor(ThemeManager.getTextOnBackgroundPrimary()); + setHintTextColor(ThemeManager.getTextOnBackgroundSecondary()); + }); - if (mAdapter != null) { - SharedPreferences prefs = mContext.getPrefs(); - mAdapter.setShowMobileOnly(prefs.getBoolean(SettingsFragment.MOBILE_ONLY, false)); - } + LiveViewManager.registerView(QKPreference.MOBILE_ONLY, 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 7e5486bb..8c877d9a 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 @@ -28,10 +28,9 @@ 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; -public class AvatarView extends ImageView implements View.OnClickListener, LiveView { +public class AvatarView extends ImageView implements View.OnClickListener { private final String TAG = "AvatarView"; static final String[] PHONE_LOOKUP_PROJECTION = new String[]{ @@ -90,12 +89,17 @@ public class AvatarView extends ImageView implements View.OnClickListener, LiveV } a.recycle(); - refresh(); setOnClickListener(this); - // Register this view for live updates. - LiveViewManager.registerView(this); - LiveViewManager.registerPreference(this, QKPreference.ACTIVE_THEME.getKey()); + LiveViewManager.registerView(QKPreference.ACTIVE_THEME, key -> { + mPaint.setColor(ThemeManager.getTextOnColorPrimary()); + mDefaultDrawable.setColorFilter(ThemeManager.getTextOnColorPrimary(), PorterDuff.Mode.SRC_ATOP); + + if (getBackground() == null) { + setBackgroundResource(R.drawable.circle); + } + getBackground().setColorFilter(ThemeManager.getColor(), PorterDuff.Mode.SRC_ATOP); + }); } } @@ -277,17 +281,6 @@ public class AvatarView extends ImageView implements View.OnClickListener, LiveV } } - @Override - public void refresh() { - mPaint.setColor(ThemeManager.getTextOnColorPrimary()); - mDefaultDrawable.setColorFilter(ThemeManager.getTextOnColorPrimary(), PorterDuff.Mode.SRC_ATOP); - - if (getBackground() == null) { - setBackgroundResource(R.drawable.circle); - } - getBackground().setColorFilter(ThemeManager.getColor(), PorterDuff.Mode.SRC_ATOP); - } - private class QueryHandler extends AsyncQueryHandler { public QueryHandler(ContentResolver cr) { 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 2e1ee640..99ef0612 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 @@ -36,6 +36,7 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.Toast; import com.github.lzyzsd.circleprogress.DonutProgress; +import com.moez.QKSMS.common.LiveViewManager; import com.moez.QKSMS.common.preferences.QKPreference; import com.moez.QKSMS.mmssms.Transaction; import com.moez.QKSMS.mmssms.Utils; @@ -44,9 +45,7 @@ import com.moez.QKSMS.common.AnalyticsManager; import com.moez.QKSMS.data.Conversation; import com.moez.QKSMS.data.ConversationLegacy; import com.moez.QKSMS.interfaces.ActivityLauncher; -import com.moez.QKSMS.interfaces.LiveView; import com.moez.QKSMS.interfaces.RecipientProvider; -import com.moez.QKSMS.common.LiveViewManager; import com.moez.QKSMS.common.utils.ImageUtils; import com.moez.QKSMS.common.utils.PhoneNumberUtils; import com.moez.QKSMS.common.utils.Units; @@ -66,7 +65,7 @@ import java.io.InputStream; import java.text.SimpleDateFormat; import java.util.Date; -public class ComposeView extends LinearLayout implements View.OnClickListener, LiveView { +public class ComposeView extends LinearLayout implements View.OnClickListener { public final static String TAG = "ComposeView"; private final String KEY_DELAYED_INFO_DIALOG_SHOWN = "delayed_info_dialog_shown"; @@ -182,11 +181,23 @@ public class ComposeView extends LinearLayout implements View.OnClickListener, L mCancel.setOnClickListener(this); mDelay.setOnClickListener(this); - LiveViewManager.registerView(this); - LiveViewManager.registerPreference(this, QKPreference.ACTIVE_THEME.getKey()); - LiveViewManager.registerPreference(this, SettingsFragment.BACKGROUND); + LiveViewManager.registerView(QKPreference.ACTIVE_THEME, 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); + mAttachmentPanel.setBackgroundColor(ThemeManager.getColor()); + mAttach.setColorFilter(ThemeManager.getTextOnColorPrimary(), PorterDuff.Mode.SRC_ATOP); + mCamera.setColorFilter(ThemeManager.getTextOnColorPrimary(), PorterDuff.Mode.SRC_ATOP); + updateDelayButton(); + mProgress.setUnfinishedStrokeColor(ThemeManager.getTextOnColorSecondary()); + mProgress.setFinishedStrokeColor(ThemeManager.getTextOnColorPrimary()); + if (ThemeManager.getSentBubbleRes() != 0) mReplyText.setBackgroundResource(ThemeManager.getSentBubbleRes()); + }); - refresh(); + LiveViewManager.registerView(QKPreference.BACKGROUND, key -> { + mReplyText.getBackground().setColorFilter(ThemeManager.getNeutralBubbleColor(), PorterDuff.Mode.SRC_ATOP); + getBackground().setColorFilter(ThemeManager.getBackgroundColor(), PorterDuff.Mode.SRC_ATOP); + }); // There is an option for using the return button instead of the emoticon button in the // keyboard; set that up here. @@ -949,23 +960,6 @@ public class ComposeView extends LinearLayout implements View.OnClickListener, L } } - @Override - public void refresh() { - mButtonBackground.setColorFilter(ThemeManager.getColor(), PorterDuff.Mode.SRC_ATOP); - mButtonBar1.setColorFilter(ThemeManager.getTextOnColorPrimary(), PorterDuff.Mode.SRC_ATOP); - mButtonBar2.setColorFilter(ThemeManager.getTextOnColorPrimary(), PorterDuff.Mode.SRC_ATOP); - mAttachmentPanel.setBackgroundColor(ThemeManager.getColor()); - mAttach.setColorFilter(ThemeManager.getTextOnColorPrimary(), PorterDuff.Mode.SRC_ATOP); - mCamera.setColorFilter(ThemeManager.getTextOnColorPrimary(), PorterDuff.Mode.SRC_ATOP); - updateDelayButton(); - mProgress.setUnfinishedStrokeColor(ThemeManager.getTextOnColorSecondary()); - mProgress.setFinishedStrokeColor(ThemeManager.getTextOnColorPrimary()); - if (ThemeManager.getSentBubbleRes() != 0) mReplyText.setBackgroundResource(ThemeManager.getSentBubbleRes()); - mReplyText.getBackground().setColorFilter(ThemeManager.getNeutralBubbleColor(), PorterDuff.Mode.SRC_ATOP); - mReplyText.refresh(); - getBackground().setColorFilter(ThemeManager.getBackgroundColor(), PorterDuff.Mode.SRC_ATOP); - } - private void updateDelayButton() { mDelay.setColorFilter(mDelayedMessagingEnabled ? ThemeManager.getTextOnColorPrimary() : ThemeManager.getTextOnColorSecondary(), 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 5b2ff0cc..6d519700 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 @@ -8,14 +8,13 @@ import android.text.TextUtils; import android.text.TextWatcher; import android.util.AttributeSet; import android.util.TypedValue; -import com.moez.QKSMS.interfaces.LiveView; import com.moez.QKSMS.common.FontManager; import com.moez.QKSMS.common.LiveViewManager; import com.moez.QKSMS.common.TypefaceManager; +import com.moez.QKSMS.common.preferences.QKPreference; import com.moez.QKSMS.ui.ThemeManager; -import com.moez.QKSMS.ui.settings.SettingsFragment; -public class QKEditText extends android.widget.EditText implements LiveView { +public class QKEditText extends android.widget.EditText { public static final String TAG = "QKEditText"; public interface TextChangedListener { @@ -28,7 +27,7 @@ public class QKEditText extends android.widget.EditText implements LiveView { super(context); if (!isInEditMode()) { - init(context, null); + init(context); } } @@ -36,7 +35,7 @@ public class QKEditText extends android.widget.EditText implements LiveView { super(context, attrs); if (!isInEditMode()) { - init(context, attrs); + init(context); } } @@ -44,24 +43,29 @@ public class QKEditText extends android.widget.EditText implements LiveView { super(context, attrs, defStyle); if (!isInEditMode()) { - init(context, attrs); + init(context); } } - private void init(Context context, AttributeSet attrs) { + private void init(Context context) { mContext = context; - // Load the properties - refresh(); + LiveViewManager.registerView(key -> { + int fontFamily = FontManager.getFontFamily(mContext); + int fontWeight = FontManager.getFontWeight(mContext, false); + setTypeface(TypefaceManager.obtainTypeface(mContext, fontFamily, fontWeight)); + }, QKPreference.FONT_FAMILY, QKPreference.FONT_WEIGHT); + + LiveViewManager.registerView(QKPreference.FONT_SIZE, key -> { + setTextSize(TypedValue.COMPLEX_UNIT_SP, FontManager.getTextSize(mContext, FontManager.TEXT_TYPE_PRIMARY)); + }); + + LiveViewManager.registerView(QKPreference.BACKGROUND, key -> { + setTextColor(ThemeManager.getTextOnBackgroundPrimary()); + setHintTextColor(ThemeManager.getTextOnBackgroundSecondary()); + }); setText(getText()); - - // Register this view for live updates. - LiveViewManager.registerView(this); - LiveViewManager.registerPreference(this, SettingsFragment.FONT_FAMILY); - LiveViewManager.registerPreference(this, SettingsFragment.FONT_SIZE); - LiveViewManager.registerPreference(this, SettingsFragment.FONT_WEIGHT); - LiveViewManager.registerPreference(this, SettingsFragment.BACKGROUND); } @Override @@ -91,19 +95,4 @@ public class QKEditText extends android.widget.EditText implements LiveView { }); } } - - @Override - public void refresh() { - // Typeface and colors - int fontFamily = FontManager.getFontFamily(mContext); - int fontWeight = FontManager.getFontWeight(mContext, false); - setTypeface(TypefaceManager.obtainTypeface(mContext, fontFamily, fontWeight - )); - setTextColor(ThemeManager.getTextOnBackgroundPrimary()); - setHintTextColor(ThemeManager.getTextOnBackgroundSecondary()); - - // Text size - int sp = FontManager.getTextSize(mContext, FontManager.TEXT_TYPE_PRIMARY); - setTextSize(TypedValue.COMPLEX_UNIT_SP, sp); - } } 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 911b8d25..8941fba9 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 @@ -5,13 +5,11 @@ import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.util.AttributeSet; import android.widget.ImageView; - import com.moez.QKSMS.common.LiveViewManager; -import com.moez.QKSMS.interfaces.LiveView; +import com.moez.QKSMS.common.preferences.QKPreference; import com.moez.QKSMS.ui.ThemeManager; -import com.moez.QKSMS.ui.settings.SettingsFragment; -public class QKImageView extends ImageView implements LiveView { +public class QKImageView extends ImageView { private static final String TAG = "QKImageView"; private Drawable mDrawable; @@ -32,9 +30,9 @@ public class QKImageView extends ImageView implements LiveView { } public void init() { - // Register this view for live updates. - LiveViewManager.registerView(this); - LiveViewManager.registerPreference(this, SettingsFragment.THEME); + LiveViewManager.registerView(QKPreference.THEME, key -> { + setImageDrawable(mDrawable); + }); } @Override @@ -49,11 +47,6 @@ public class QKImageView extends ImageView implements LiveView { } } - @Override - public void refresh() { - setImageDrawable(mDrawable); - } - @Override public void onAttachedToWindow() { super.onAttachedToWindow(); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKSwitch.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKSwitch.java index 134629b0..c4ca616f 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKSwitch.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKSwitch.java @@ -9,11 +9,10 @@ import android.support.v7.widget.SwitchCompat; import android.util.AttributeSet; import com.moez.QKSMS.R; import com.moez.QKSMS.common.LiveViewManager; -import com.moez.QKSMS.interfaces.LiveView; +import com.moez.QKSMS.common.preferences.QKPreference; import com.moez.QKSMS.ui.ThemeManager; -import com.moez.QKSMS.ui.settings.SettingsFragment; -public class QKSwitch extends SwitchCompat implements LiveView { +public class QKSwitch extends SwitchCompat { private Resources mRes; @@ -30,18 +29,10 @@ public class QKSwitch extends SwitchCompat implements LiveView { private void init(Context context) { mRes = context.getResources(); - // Register this view for live updates. - LiveViewManager.registerView(this); - LiveViewManager.registerPreference(this, SettingsFragment.THEME); - LiveViewManager.registerPreference(this, SettingsFragment.BACKGROUND); - - refresh(); - } - - @Override - public void refresh() { - DrawableCompat.setTintList(getThumbDrawable(), getSwitchThumbColorStateList()); - DrawableCompat.setTintList(getTrackDrawable(), getSwitchTrackColorStateList()); + LiveViewManager.registerView(key -> { + DrawableCompat.setTintList(getThumbDrawable(), getSwitchThumbColorStateList()); + DrawableCompat.setTintList(getTrackDrawable(), getSwitchTrackColorStateList()); + }, QKPreference.THEME, QKPreference.BACKGROUND); } private ColorStateList getSwitchThumbColorStateList() { 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 43956443..39664144 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 @@ -14,12 +14,12 @@ import com.moez.QKSMS.R; import com.moez.QKSMS.common.FontManager; 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.MessageUtils; -import com.moez.QKSMS.interfaces.LiveView; import com.moez.QKSMS.ui.ThemeManager; import com.moez.QKSMS.ui.settings.SettingsFragment; -public class QKTextView extends TextView implements LiveView { +public class QKTextView extends TextView { private final String TAG = "QKTextView"; private Context mContext; @@ -60,21 +60,32 @@ public class QKTextView extends TextView implements LiveView { array.recycle(); } - refresh(); + setTextColor(FontManager.getTextColor(mContext, mType)); setText(getText()); - // Register this view for live updates. - LiveViewManager.registerView(this); - LiveViewManager.registerPreference(this, SettingsFragment.FONT_FAMILY); - LiveViewManager.registerPreference(this, SettingsFragment.FONT_SIZE); - LiveViewManager.registerPreference(this, SettingsFragment.FONT_WEIGHT); - LiveViewManager.registerPreference(this, SettingsFragment.MARKDOWN_ENABLED); - LiveViewManager.registerPreference(this, SettingsFragment.BACKGROUND); - // Register for theme updates if we're text that changes color dynamically. if (mType == FontManager.TEXT_TYPE_CATEGORY) { - LiveViewManager.registerPreference(this, SettingsFragment.THEME); + LiveViewManager.registerView(QKPreference.THEME, key -> + setTextColor(FontManager.getTextColor(mContext, mType))); } + + LiveViewManager.registerView(key -> { + int fontFamily = FontManager.getFontFamily(mContext); + int fontWeight = FontManager.getFontWeight(mContext, FontManager.getIsFontHeavy(mType)); + setTypeface(TypefaceManager.obtainTypeface(mContext, fontFamily, fontWeight)); + }, QKPreference.FONT_FAMILY, QKPreference.FONT_WEIGHT); + + LiveViewManager.registerView(QKPreference.FONT_SIZE, key -> { + setTextSize(TypedValue.COMPLEX_UNIT_SP, FontManager.getTextSize(mContext, mType)); + }); + + LiveViewManager.registerView(QKPreference.BACKGROUND, key -> { + setTextColor(FontManager.getTextColor(mContext, mType)); + }); + + LiveViewManager.registerView(QKPreference.TEXT_FORMATTING, key -> { + setText(getText(), BufferType.NORMAL); + }); } @Override @@ -124,11 +135,6 @@ public class QKTextView extends TextView implements LiveView { } } - public void setType(int type) { - mType = type; - refresh(); - } - @Override public void setText(CharSequence text, BufferType type) { @@ -152,24 +158,4 @@ public class QKTextView extends TextView implements LiveView { } } - - /** - * refresh() is called whenever a user preference around text size, font family, etc. has been - * updated and the view needs to refresh its properties. - */ - @Override - public void refresh() { - // Typeface - int fontFamily = FontManager.getFontFamily(mContext); - int fontWeight = FontManager.getFontWeight(mContext, FontManager.getIsFontHeavy(mType)); - setTypeface(TypefaceManager.obtainTypeface(mContext, fontFamily, fontWeight - )); - - // Text size and color - setTextSize(TypedValue.COMPLEX_UNIT_SP, FontManager.getTextSize(mContext, mType)); - setTextColor(FontManager.getTextColor(mContext, mType)); - - // Markdown support enabled - 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 140653a9..dd28c2e2 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 @@ -16,14 +16,14 @@ import android.widget.ImageView; import android.widget.LinearLayout; import com.moez.QKSMS.R; import com.moez.QKSMS.common.LiveViewManager; +import com.moez.QKSMS.common.preferences.QKPreference; import com.moez.QKSMS.data.Contact; import com.moez.QKSMS.data.ContactHelper; -import com.moez.QKSMS.interfaces.LiveView; import com.moez.QKSMS.ui.ThemeManager; import com.moez.QKSMS.ui.base.QKActivity; import com.moez.QKSMS.ui.settings.SettingsFragment; -public class StarredContactsView extends LinearLayout implements LoaderManager.LoaderCallbacks, View.OnClickListener, LiveView { +public class StarredContactsView extends LinearLayout implements LoaderManager.LoaderCallbacks, View.OnClickListener { private final String TAG = "StarredContactsView"; private QKActivity mContext; @@ -75,15 +75,16 @@ public class StarredContactsView extends LinearLayout implements LoaderManager.L collapse(); } - LiveViewManager.registerView(this); - LiveViewManager.registerPreference(this, SettingsFragment.BACKGROUND); - refresh(); + LiveViewManager.registerView(QKPreference.BACKGROUND, key -> { + mIndicator.setColorFilter(ThemeManager.getTextOnBackgroundSecondary(), PorterDuff.Mode.SRC_ATOP); + mFavoritesBackground.setBackgroundColor(ThemeManager.getBackgroundColor()); + }); } public void setComposeScreenViews(AutoCompleteContactView recipients, ComposeView composeView) { mRecipients = recipients; mComposeView = composeView; - ((QKActivity) mContext).getLoaderManager().initLoader(0, null, this); + mContext.getLoaderManager().initLoader(0, null, this); } @Override @@ -173,10 +174,4 @@ public class StarredContactsView extends LinearLayout implements LoaderManager.L break; } } - - @Override - public void refresh() { - mIndicator.setColorFilter(ThemeManager.getTextOnBackgroundSecondary(), PorterDuff.Mode.SRC_ATOP); - mFavoritesBackground.setBackgroundColor(ThemeManager.getBackgroundColor()); - } } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/welcome/WelcomeNightFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/welcome/WelcomeNightFragment.java index 870bf6cd..648a83dc 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/welcome/WelcomeNightFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/welcome/WelcomeNightFragment.java @@ -10,7 +10,6 @@ import android.view.View; import android.view.ViewGroup; import android.view.animation.DecelerateInterpolator; import com.moez.QKSMS.R; -import com.moez.QKSMS.common.LiveViewManager; import com.moez.QKSMS.ui.ThemeManager; import com.moez.QKSMS.ui.settings.SettingsFragment; import com.moez.QKSMS.ui.view.QKTextView; @@ -36,8 +35,6 @@ public class WelcomeNightFragment extends BaseWelcomeFragment implements BaseWel mContext.setFinished(); - LiveViewManager.unregisterView(mNightHint); - return view; } @@ -92,9 +89,4 @@ public class WelcomeNightFragment extends BaseWelcomeFragment implements BaseWel .commit(); } } - - @Override - public void refresh() { - // Don't let the super class change the background, since we'll handle animations here - } }