Merge pull request #23 from timothyjc/hex-tweaks

Hex picker tweaks

Author: attenzione

res/layout-land/dialog_color_picker.xml

@@ -39,7 +39,10 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:hint="HEX"
+            android:imeOptions="actionDone"
             android:maxLength="7"
+            android:singleLine="true"
+            android:inputType="textCapCharacters"
             android:visibility="gone" >
         </EditText>
 

res/layout/dialog_color_picker.xml

@@ -49,7 +49,10 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:hint="HEX"
+            android:imeOptions="actionDone"
             android:maxLength="7"
+            android:singleLine="true"
+            android:inputType="textCapCharacters"
             android:visibility="gone" >
         </EditText>
     </LinearLayout>

src/net/margaritov/preference/colorpicker/ColorPickerDialog.java

@@ -16,19 +16,24 @@
 
 package net.margaritov.preference.colorpicker;
 
+import java.util.Locale;
+
 import android.app.Dialog;
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.graphics.Color;
 import android.graphics.PixelFormat;
 import android.os.Bundle;
-import android.text.Editable;
 import android.text.InputFilter;
-import android.text.TextWatcher;
+import android.text.InputType;
+import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.LinearLayout;
+import android.widget.TextView;
 
 public class ColorPickerDialog 
 	extends 
@@ -43,7 +48,6 @@ public class ColorPickerDialog
 	private ColorPickerPanelView mNewColor;
 
 	private EditText mHexVal;
-	private boolean mHexInternalTextChange;
 	private boolean mHexValueEnabled = false;
 	private ColorStateList mHexDefaultTextColor;
 
@@ -82,28 +86,31 @@ private void setUp(int color) {
 		mNewColor = (ColorPickerPanelView) layout.findViewById(R.id.new_color_panel);
 
 		mHexVal = (EditText) layout.findViewById(R.id.hex_val);
+		mHexVal.setInputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
 		mHexDefaultTextColor = mHexVal.getTextColors();
-		mHexVal.addTextChangedListener(new TextWatcher() {
-			@Override
-			public void onTextChanged(CharSequence s, int start, int before, int count) {}
-			@Override
-			public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+		
+		mHexVal.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+
 			@Override
-			public void afterTextChanged(Editable s) {
-				if (mHexValueEnabled) {
-					if (mHexInternalTextChange) return;
-					
+			public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+				if (actionId == EditorInfo.IME_ACTION_DONE) {
+					InputMethodManager imm = (InputMethodManager) v.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+					imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
+					String s = mHexVal.getText().toString();
 					if (s.length() > 5 || s.length() < 10) {
 						try {
 							int c = ColorPickerPreference.convertToColorInt(s.toString());
 							mColorPicker.setColor(c, true);
 							mHexVal.setTextColor(mHexDefaultTextColor);
-						} catch (NumberFormatException e) {
+						} catch (IllegalArgumentException e) {
 							mHexVal.setTextColor(Color.RED);
 						}
-					} else
+					} else {
 						mHexVal.setTextColor(Color.RED);
+					}
+					return true;
 				}
+				return false;
 			}
 		});
 
@@ -161,12 +168,12 @@ private void updateHexLengthFilter() {
 	}
 
 	private void updateHexValue(int color) {
-		mHexInternalTextChange = true;
-		if (getAlphaSliderVisible())
-			mHexVal.setText(ColorPickerPreference.convertToARGB(color));
-		else
-			mHexVal.setText(ColorPickerPreference.convertToRGB(color));
-		mHexInternalTextChange = false;
+		if (getAlphaSliderVisible()) {
+			mHexVal.setText(ColorPickerPreference.convertToARGB(color).toUpperCase(Locale.getDefault()));
+		} else {
+			mHexVal.setText(ColorPickerPreference.convertToRGB(color).toUpperCase(Locale.getDefault()));
+		}
+		mHexVal.setTextColor(mHexDefaultTextColor);
 	}
 
 	public void setAlphaSliderVisible(boolean visible) {

src/net/margaritov/preference/colorpicker/ColorPickerPreference.java

@@ -245,31 +245,14 @@ public static String convertToRGB(int color) {
      * @throws NumberFormatException
      * @author Unknown
      */
-    public static int convertToColorInt(String argb) throws NumberFormatException {
+	public static int convertToColorInt(String argb) throws IllegalArgumentException {
 
-    	if (argb.startsWith("#")) {
-    		argb = argb.replace("#", "");
-    	}
-
-        int alpha = -1, red = -1, green = -1, blue = -1;
-
-        if (argb.length() == 8) {
-            alpha = Integer.parseInt(argb.substring(0, 2), 16);
-            red = Integer.parseInt(argb.substring(2, 4), 16);
-            green = Integer.parseInt(argb.substring(4, 6), 16);
-            blue = Integer.parseInt(argb.substring(6, 8), 16);
-        }
-        else if (argb.length() == 6) {
-            alpha = 255;
-            red = Integer.parseInt(argb.substring(0, 2), 16);
-            green = Integer.parseInt(argb.substring(2, 4), 16);
-            blue = Integer.parseInt(argb.substring(4, 6), 16);
-        }
-        else
-        	throw new NumberFormatException("string " + argb + "did not meet length requirements");
+		if (!argb.startsWith("#")) {
+			argb = "#" + argb;
+		}
 
-        return Color.argb(alpha, red, green, blue);
-    }
+		return Color.parseColor(argb);
+	}
 
     @Override
     protected Parcelable onSaveInstanceState() {

src/net/margaritov/preference/colorpicker/ColorPickerView.java

@@ -848,24 +848,21 @@ public void setColor(int color){
 	 * @param callback If you want to get a callback to
 	 * your OnColorChangedListener.
 	 */
-	public void setColor(int color, boolean callback){
+	public void setColor(int color, boolean callback) {
 
 		int alpha = Color.alpha(color);
-		int red = Color.red(color);
-		int blue = Color.blue(color);
-		int green = Color.green(color);
 
 		float[] hsv = new float[3];
 
-		Color.RGBToHSV(red, green, blue, hsv);
+		Color.colorToHSV(color, hsv);
 
 		mAlpha = alpha;
 		mHue = hsv[0];
 		mSat = hsv[1];
 		mVal = hsv[2];
 
-		if(callback && mListener != null){
-			mListener.onColorChanged(Color.HSVToColor(mAlpha, new float[]{mHue, mSat, mVal}));
+		if (callback && mListener != null) {
+			mListener.onColorChanged(Color.HSVToColor(mAlpha, new float[] { mHue, mSat, mVal }));
 		}
 
 		invalidate();