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 b565ddfd..26485bfa 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java @@ -553,7 +553,10 @@ public class ThemeManager { setActiveColor(color); String colorString = Integer.toHexString(color); + holder.mHex.setTextChangedListenerEnabled(false); holder.mHex.setText(colorString.substring(colorString.length() > 6 ? colorString.length() - 6 : 0)); + holder.mHex.setTextChangedListenerEnabled(true); + holder.mError.setVisibility(View.INVISIBLE); } @Override @@ -606,7 +609,7 @@ public class ThemeManager { return false; }); holder.mHex.setTextChangedListener(s -> { - try { + if (s.length() == 6) { int color = Color.parseColor("#" + s.toString()); holder.mError.setVisibility(View.INVISIBLE); if (color != getColor()) { @@ -614,7 +617,7 @@ public class ThemeManager { holder.mGreen.setProgress(Color.green(color)); holder.mBlue.setProgress(Color.blue(color)); } - } catch (IllegalArgumentException e) { + } else { holder.mError.setVisibility(View.VISIBLE); } }); 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 aed937c4..3bc8c1c5 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 @@ -21,6 +21,7 @@ public class QKEditText extends android.widget.EditText { } private Context mContext; + private boolean mTextChangedListenerEnabled = true; public QKEditText(Context context) { super(context); @@ -77,6 +78,10 @@ public class QKEditText extends android.widget.EditText { super.setText(text, type); } + public void setTextChangedListenerEnabled(boolean textChangedListenerEnabled) { + mTextChangedListenerEnabled = textChangedListenerEnabled; + } + public void setTextChangedListener(final TextChangedListener listener) { if (listener != null) { addTextChangedListener(new TextWatcher() { @@ -91,7 +96,9 @@ public class QKEditText extends android.widget.EditText { @Override public void afterTextChanged(Editable s) { - listener.onTextChanged(s); + if (mTextChangedListenerEnabled) { + listener.onTextChanged(s); + } } }); }