From db32577d9aab76c9097c0390c76a78a03ed18e76 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 4 Jan 2016 13:10:09 -0500 Subject: [PATCH] Allow color picker inside conversation --- .../QKSMS/common/ConversationPrefsHelper.java | 4 +-- .../common/preferences/QKPreference.java | 3 ++- .../java/com/moez/QKSMS/ui/MainActivity.java | 4 +-- .../java/com/moez/QKSMS/ui/ThemeManager.java | 27 +++++++++++++++++++ ...g.java => ConversationSettingsDialog.java} | 12 ++++----- .../ui/messagelist/MessageListFragment.java | 10 ++++--- 6 files changed, 46 insertions(+), 14 deletions(-) rename QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/{ConversationNotificationSettingsDialog.java => ConversationSettingsDialog.java} (92%) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/ConversationPrefsHelper.java b/QKSMS/src/main/java/com/moez/QKSMS/common/ConversationPrefsHelper.java index 733e63fe..03b2c0ec 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/ConversationPrefsHelper.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/ConversationPrefsHelper.java @@ -5,6 +5,7 @@ import android.content.SharedPreferences; import android.net.Uri; import android.preference.PreferenceManager; import com.moez.QKSMS.R; +import com.moez.QKSMS.ui.ThemeManager; import com.moez.QKSMS.ui.settings.SettingsFragment; public class ConversationPrefsHelper { @@ -22,8 +23,7 @@ public class ConversationPrefsHelper { } public int getColor() { - //return getInt(SettingsFragment.THEME, 0xFF009688); - return 0xff26a69a; + return Integer.parseInt(mConversationPrefs.getString(SettingsFragment.THEME, "" + ThemeManager.DEFAULT_COLOR)); } public boolean getNotificationsEnabled() { diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/preferences/QKPreference.java b/QKSMS/src/main/java/com/moez/QKSMS/common/preferences/QKPreference.java index ef2e847e..d0978392 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/preferences/QKPreference.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/preferences/QKPreference.java @@ -89,9 +89,10 @@ public enum QKPreference { TAP_DISMISS("pref_key_quickreply_dismiss", true), // QK Compose - QK_COMPOSE("pref_key_quickcompose", false); + QK_COMPOSE("pref_key_quickcompose", false), // LiveViews + CONVERSATION_THEME("conversation_theme"); private String mKey; private Object mDefaultValue; 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 4b38ede5..50edaf36 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java @@ -44,7 +44,7 @@ import com.moez.QKSMS.transaction.SmsHelper; import com.moez.QKSMS.ui.base.QKActivity; import com.moez.QKSMS.ui.compose.ComposeFragment; import com.moez.QKSMS.ui.conversationlist.ConversationListFragment; -import com.moez.QKSMS.ui.dialog.ConversationNotificationSettingsDialog; +import com.moez.QKSMS.ui.dialog.ConversationSettingsDialog; import com.moez.QKSMS.ui.dialog.DefaultSmsHelper; import com.moez.QKSMS.ui.dialog.QKDialog; import com.moez.QKSMS.ui.dialog.mms.MMSSetupFragment; @@ -302,7 +302,7 @@ public class MainActivity extends QKActivity implements SlidingMenu.SlidingMenuL */ @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { - if (requestCode == ConversationNotificationSettingsDialog.RINGTONE_REQUEST_CODE) { + if (requestCode == ConversationSettingsDialog.RINGTONE_REQUEST_CODE) { if (data != null) { if (mWaitingForThreadId > 0) { ConversationPrefsHelper conversationPrefs = new ConversationPrefsHelper(this, mWaitingForThreadId); 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 06c326b3..32068d8f 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java @@ -22,6 +22,7 @@ import android.widget.LinearLayout; import com.moez.QKSMS.R; import com.moez.QKSMS.common.AnalyticsManager; import com.moez.QKSMS.common.CIELChEvaluator; +import com.moez.QKSMS.common.ConversationPrefsHelper; import com.moez.QKSMS.common.LiveViewManager; import com.moez.QKSMS.common.preferences.QKPreference; import com.moez.QKSMS.common.utils.ColorUtils; @@ -507,6 +508,32 @@ public class ThemeManager { dialog.show(); } + public static void showColorPickerDialogForConversation(final QKActivity context, ConversationPrefsHelper prefs) { + final QKDialog dialog = new QKDialog(); + + ColorPickerPalette palette = new ColorPickerPalette(context); + palette.setGravity(Gravity.CENTER); + palette.init(19, 4, color -> { + palette.init(getSwatch(color).length, 4, color2 -> { + prefs.putString(QKPreference.THEME.getKey(), "" + color2); + setActiveColor(color2); + LiveViewManager.refreshViews(QKPreference.CONVERSATION_THEME); + dialog.dismiss(); + }); + + palette.drawPalette(getSwatch(color), prefs.getColor()); + }); + + palette.drawPalette(PALETTE, getSwatchColor(prefs.getColor())); + + dialog.setContext(context) + .setTitle(R.string.pref_theme) + .setCustomView(palette) + .setNegativeButton(R.string.cancel, null); + + dialog.show(); + } + @TargetApi(Build.VERSION_CODES.LOLLIPOP) public static void setStatusBarTintEnabled(QKActivity activity, boolean enabled) { int colorFrom = enabled ? mResources.getColor(R.color.black) : mColor; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/ConversationNotificationSettingsDialog.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/ConversationSettingsDialog.java similarity index 92% rename from QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/ConversationNotificationSettingsDialog.java rename to QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/ConversationSettingsDialog.java index 531476b1..e660ab46 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/ConversationNotificationSettingsDialog.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/ConversationSettingsDialog.java @@ -11,9 +11,9 @@ import android.view.ViewGroup; import android.widget.LinearLayout; import com.moez.QKSMS.R; import com.moez.QKSMS.common.ConversationPrefsHelper; -import com.moez.QKSMS.common.FontManager; import com.moez.QKSMS.common.utils.Units; import com.moez.QKSMS.ui.MainActivity; +import com.moez.QKSMS.ui.ThemeManager; import com.moez.QKSMS.ui.settings.SettingsFragment; import com.moez.QKSMS.ui.view.QKPreference; import com.moez.QKSMS.ui.view.QKRingtonePreference; @@ -21,8 +21,8 @@ import com.moez.QKSMS.ui.view.QKSwitchPreference; import com.moez.QKSMS.ui.view.QKTextView; import com.moez.QKSMS.ui.view.colorpicker.ColorPickerDialog; -public class ConversationNotificationSettingsDialog extends QKDialog implements Preference.OnPreferenceClickListener { - private final String TAG = "ConversationNotificationSettingsDialog"; +public class ConversationSettingsDialog extends QKDialog implements Preference.OnPreferenceClickListener { + private final String TAG = "ConversationSettingsDialog"; public static final int RINGTONE_REQUEST_CODE = 716; public static final String ARG_THREAD_ID = "thread_id"; @@ -38,8 +38,8 @@ public class ConversationNotificationSettingsDialog extends QKDialog implements ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); - public static ConversationNotificationSettingsDialog newInstance(long threadId, String name) { - ConversationNotificationSettingsDialog dialog = new ConversationNotificationSettingsDialog(); + public static ConversationSettingsDialog newInstance(long threadId, String name) { + ConversationSettingsDialog dialog = new ConversationSettingsDialog(); Bundle bundle = new Bundle(); bundle.putLong(ARG_THREAD_ID, threadId); @@ -105,7 +105,7 @@ public class ConversationNotificationSettingsDialog extends QKDialog implements public boolean onPreferenceClick(Preference preference) { switch (preference.getKey()) { case SettingsFragment.THEME: - mContext.makeToast(R.string.test); + ThemeManager.showColorPickerDialogForConversation(mContext, mConversationPrefs); break; case SettingsFragment.NOTIFICATION_LED_COLOR: diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java index e7c7a852..58e4283f 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java @@ -67,6 +67,7 @@ import com.moez.QKSMS.data.Conversation; import com.moez.QKSMS.data.ConversationLegacy; import com.moez.QKSMS.data.Message; import com.moez.QKSMS.interfaces.ActivityLauncher; +import com.moez.QKSMS.interfaces.LiveView; import com.moez.QKSMS.model.SlideshowModel; import com.moez.QKSMS.transaction.NotificationManager; import com.moez.QKSMS.transaction.SmsHelper; @@ -77,7 +78,7 @@ import com.moez.QKSMS.ui.base.RecyclerCursorAdapter; import com.moez.QKSMS.ui.delivery.DeliveryReportHelper; import com.moez.QKSMS.ui.delivery.DeliveryReportItem; import com.moez.QKSMS.ui.dialog.AsyncDialog; -import com.moez.QKSMS.ui.dialog.ConversationNotificationSettingsDialog; +import com.moez.QKSMS.ui.dialog.ConversationSettingsDialog; import com.moez.QKSMS.ui.dialog.QKDialog; import com.moez.QKSMS.ui.popup.QKComposeActivity; import com.moez.QKSMS.ui.settings.SettingsFragment; @@ -221,11 +222,14 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa } mConversationPrefs = new ConversationPrefsHelper(mContext, mThreadId); - mCIELChEvaluator = new CIELChEvaluator(mConversationPrefs.getColor(), ThemeManager.getColor()); mIsSmsEnabled = MmsConfig.isSmsEnabled(mContext); mConversationDetailsDialog = new ConversationDetailsDialog(mContext, getFragmentManager()); setHasOptionsMenu(true); + LiveViewManager.registerView(QKPreference.CONVERSATION_THEME, this, key -> { + mCIELChEvaluator = new CIELChEvaluator(mConversationPrefs.getColor(), ThemeManager.getThemeColor()); + }); + mSensorManager = (SensorManager) mContext.getSystemService(Context.SENSOR_SERVICE); mProxSensor = mSensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY); @@ -645,7 +649,7 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa return true; case R.id.menu_notification_settings: - ConversationNotificationSettingsDialog.newInstance(mThreadId, mConversation.getRecipients().formatNames(", ")) + ConversationSettingsDialog.newInstance(mThreadId, mConversation.getRecipients().formatNames(", ")) .setContext(mContext) .show(); return true;