Update ColorPicker to 696bb05

app/build.gradle

@@ -78,6 +78,7 @@ android {
 dependencies {
 // Android support
     implementation 'androidx.appcompat:appcompat:1.1.0'
+	implementation 'androidx.preference:preference:1.1.1'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0'
     implementation 'com.google.android.material:material:1.1.0'
 

app/src/main/java/net/margaritov/preference/colorpicker/AlphaPatternDrawable.java

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+// Taken from https://github.com/attenzione/android-ColorPickerPreference/tree/696bb050527d6a7ae14e47b7472a0640a7ff08e6
+
 package net.margaritov.preference.colorpicker;
 
 import android.graphics.Bitmap;
@@ -28,101 +30,102 @@ import android.graphics.drawable.Drawable;
  * This drawable that draws a simple white and gray chessboard pattern.
  * It's pattern you will often see as a background behind a
  * partly transparent image in many applications.
+ *
  * @author Daniel Nilsson
  */
 public class AlphaPatternDrawable extends Drawable {
 
-	private int mRectangleSize = 10;
+    private int mRectangleSize = 10;
 
-	private Paint mPaint = new Paint();
-	private Paint mPaintWhite = new Paint();
-	private Paint mPaintGray = new Paint();
+    private Paint mPaint = new Paint();
+    private Paint mPaintWhite = new Paint();
+    private Paint mPaintGray = new Paint();
 
-	private int numRectanglesHorizontal;
-	private int numRectanglesVertical;
+    private int numRectanglesHorizontal;
+    private int numRectanglesVertical;
 
-	/**
-	 * Bitmap in which the pattern will be cahched.
-	 */
-	private Bitmap mBitmap;
+    /**
+     * Bitmap in which the pattern will be cahched.
+     */
+    private Bitmap mBitmap;
 
-	public AlphaPatternDrawable(int rectangleSize) {
-		mRectangleSize = rectangleSize;
-		mPaintWhite.setColor(0xffffffff);
-		mPaintGray.setColor(0xffcbcbcb);
-	}
+    public AlphaPatternDrawable(int rectangleSize) {
+        mRectangleSize = rectangleSize;
+        mPaintWhite.setColor(0xffffffff);
+        mPaintGray.setColor(0xffcbcbcb);
+    }
 
-	@Override
-	public void draw(Canvas canvas) {
-		canvas.drawBitmap(mBitmap, null, getBounds(), mPaint);
-	}
+    @Override
+    public void draw(Canvas canvas) {
+        canvas.drawBitmap(mBitmap, null, getBounds(), mPaint);
+    }
 
-	@Override
-	public int getOpacity() {
-		return 0;
-	}
+    @Override
+    public int getOpacity() {
+        return 0;
+    }
 
-	@Override
-	public void setAlpha(int alpha) {
-		throw new UnsupportedOperationException("Alpha is not supported by this drawwable.");
-	}
+    @Override
+    public void setAlpha(int alpha) {
+        throw new UnsupportedOperationException("Alpha is not supported by this drawwable.");
+    }
 
-	@Override
-	public void setColorFilter(ColorFilter cf) {
-		throw new UnsupportedOperationException("ColorFilter is not supported by this drawwable.");
-	}
+    @Override
+    public void setColorFilter(ColorFilter cf) {
+        throw new UnsupportedOperationException("ColorFilter is not supported by this drawwable.");
+    }
 
-	@Override
-	protected void onBoundsChange(Rect bounds) {
-		super.onBoundsChange(bounds);
+    @Override
+    protected void onBoundsChange(Rect bounds) {
+        super.onBoundsChange(bounds);
 
-		int height = bounds.height();
-		int width = bounds.width();
+        int height = bounds.height();
+        int width = bounds.width();
 
-		numRectanglesHorizontal = (int) Math.ceil((width / mRectangleSize));
-		numRectanglesVertical = (int) Math.ceil(height / mRectangleSize);
+        numRectanglesHorizontal = (int) Math.ceil((width / mRectangleSize));
+        numRectanglesVertical = (int) Math.ceil(height / mRectangleSize);
 
-		generatePatternBitmap();
+        generatePatternBitmap();
 
-	}
+    }
 
-	/**
-	 * This will generate a bitmap with the pattern
-	 * as big as the rectangle we were allow to draw on.
-	 * We do this to chache the bitmap so we don't need to
-	 * recreate it each time draw() is called since it
-	 * takes a few milliseconds.
-	 */
-	private void generatePatternBitmap() {
+    /**
+     * This will generate a bitmap with the pattern
+     * as big as the rectangle we were allow to draw on.
+     * We do this to chache the bitmap so we don't need to
+     * recreate it each time draw() is called since it
+     * takes a few milliseconds.
+     */
+    private void generatePatternBitmap() {
 
-		if (getBounds().width() <= 0 || getBounds().height() <= 0) {
-			return;
-		}
+        if (getBounds().width() <= 0 || getBounds().height() <= 0) {
+            return;
+        }
 
-		mBitmap = Bitmap.createBitmap(getBounds().width(), getBounds().height(), Config.ARGB_8888);
-		Canvas canvas = new Canvas(mBitmap);
+        mBitmap = Bitmap.createBitmap(getBounds().width(), getBounds().height(), Config.ARGB_8888);
+        Canvas canvas = new Canvas(mBitmap);
 
-		Rect r = new Rect();
-		boolean verticalStartWhite = true;
-		for (int i = 0; i <= numRectanglesVertical; i++) {
+        Rect r = new Rect();
+        boolean verticalStartWhite = true;
+        for (int i = 0; i <= numRectanglesVertical; i++) {
 
-			boolean isWhite = verticalStartWhite;
-			for (int j = 0; j <= numRectanglesHorizontal; j++) {
+            boolean isWhite = verticalStartWhite;
+            for (int j = 0; j <= numRectanglesHorizontal; j++) {
 
-				r.top = i * mRectangleSize;
-				r.left = j * mRectangleSize;
-				r.bottom = r.top + mRectangleSize;
-				r.right = r.left + mRectangleSize;
+                r.top = i * mRectangleSize;
+                r.left = j * mRectangleSize;
+                r.bottom = r.top + mRectangleSize;
+                r.right = r.left + mRectangleSize;
 
-				canvas.drawRect(r, isWhite ? mPaintWhite : mPaintGray);
+                canvas.drawRect(r, isWhite ? mPaintWhite : mPaintGray);
 
-				isWhite = !isWhite;
-			}
+                isWhite = !isWhite;
+            }
 
-			verticalStartWhite = !verticalStartWhite;
+            verticalStartWhite = !verticalStartWhite;
 
-		}
+        }
 
-	}
+    }
 
 }

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

@@ -14,123 +14,240 @@
  * limitations under the License.
  */
 
+// Taken from https://github.com/attenzione/android-ColorPickerPreference/tree/696bb050527d6a7ae14e47b7472a0640a7ff08e6
+
 package net.margaritov.preference.colorpicker;
 
-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.InputFilter;
+import android.text.InputType;
+import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewTreeObserver;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
 import android.widget.LinearLayout;
+import android.widget.TextView;
 
-import org.transdroid.R;
-
-public class ColorPickerDialog extends Dialog implements ColorPickerView.OnColorChangedListener, View.OnClickListener {
-
-	private ColorPickerView mColorPicker;
-
-	private ColorPickerPanelView mOldColor;
-	private ColorPickerPanelView mNewColor;
-
-	private OnColorChangedListener mListener;
-
-	public interface OnColorChangedListener {
-		public void onColorChanged(int color);
-	}
-
-	public ColorPickerDialog(Context context, int initialColor) {
-		super(context);
-
-		init(initialColor);
-	}
-
-	private void init(int color) {
-		// To fight color banding.
-		getWindow().setFormat(PixelFormat.RGBA_8888);
-
-		setUp(color);
-
-	}
+import androidx.appcompat.app.AppCompatDialog;
 
-	private void setUp(int color) {
-
-		LayoutInflater inflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-
-		View layout = inflater.inflate(R.layout.dialog_color_picker, null);
-
-		setContentView(layout);
-
-		setTitle(R.string.dialog_color_picker);
-
-		mColorPicker = (ColorPickerView) layout.findViewById(R.id.color_picker_view);
-		mOldColor = (ColorPickerPanelView) layout.findViewById(R.id.old_color_panel);
-		mNewColor = (ColorPickerPanelView) layout.findViewById(R.id.new_color_panel);
-
-		((LinearLayout) mOldColor.getParent())
-				.setPadding(Math.round(mColorPicker.getDrawingOffset()), 0, Math.round(mColorPicker.getDrawingOffset()),
-						0);
-
-		mOldColor.setOnClickListener(this);
-		mNewColor.setOnClickListener(this);
-		mColorPicker.setOnColorChangedListener(this);
-		mOldColor.setColor(color);
-		mColorPicker.setColor(color, true);
-
-	}
-
-	@Override
-	public void onColorChanged(int color) {
+import org.transdroid.R;
 
-		mNewColor.setColor(color);
+import java.util.Locale;
+
+public class ColorPickerDialog
+        extends
+        AppCompatDialog
+        implements
+        ColorPickerView.OnColorChangedListener,
+        View.OnClickListener, ViewTreeObserver.OnGlobalLayoutListener {
+
+    private ColorPickerView mColorPicker;
+
+    private ColorPickerPanelView mOldColor;
+    private ColorPickerPanelView mNewColor;
+
+    private EditText mHexVal;
+    private boolean mHexValueEnabled = false;
+    private ColorStateList mHexDefaultTextColor;
+
+    private OnColorChangedListener mListener;
+    private int mOrientation;
+    private View mLayout;
+
+    private String mTitle;
+
+    @Override
+    public void onGlobalLayout() {
+        if (getContext().getResources().getConfiguration().orientation != mOrientation) {
+            final int oldcolor = mOldColor.getColor();
+            final int newcolor = mNewColor.getColor();
+            mLayout.getViewTreeObserver().removeGlobalOnLayoutListener(this);
+            setUp(oldcolor);
+            mNewColor.setColor(newcolor);
+            mColorPicker.setColor(newcolor);
+        }
+    }
+
+    public interface OnColorChangedListener {
+        public void onColorChanged(int color);
+    }
+
+    public ColorPickerDialog(Context context, int initialColor, String title) {
+        super(context);
+
+        mTitle = title;
+        init(initialColor);
+    }
+
+    private void init(int color) {
+        // To fight color banding.
+        getWindow().setFormat(PixelFormat.RGBA_8888);
+
+        setUp(color);
+
+    }
+
+    private void setUp(int color) {
+
+        LayoutInflater inflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+
+        mLayout = inflater.inflate(R.layout.dialog_color_picker, null);
+        mLayout.getViewTreeObserver().addOnGlobalLayoutListener(this);
+
+        mOrientation = getContext().getResources().getConfiguration().orientation;
+        setContentView(mLayout);
+
+        setTitle(mTitle);
+
+        mColorPicker = (ColorPickerView) mLayout.findViewById(R.id.color_picker_view);
+        mOldColor = (ColorPickerPanelView) mLayout.findViewById(R.id.old_color_panel);
+        mNewColor = (ColorPickerPanelView) mLayout.findViewById(R.id.new_color_panel);
+
+        mHexVal = (EditText) mLayout.findViewById(R.id.hex_val);
+        mHexVal.setInputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
+        mHexDefaultTextColor = mHexVal.getTextColors();
+
+        mHexVal.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+
+            @Override
+            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 (IllegalArgumentException e) {
+                            mHexVal.setTextColor(Color.RED);
+                        }
+                    } else {
+                        mHexVal.setTextColor(Color.RED);
+                    }
+                    return true;
+                }
+                return false;
+            }
+        });
+
+        ((LinearLayout) mOldColor.getParent()).setPadding(
+                Math.round(mColorPicker.getDrawingOffset()),
+                0,
+                Math.round(mColorPicker.getDrawingOffset()),
+                0
+        );
+
+        mOldColor.setOnClickListener(this);
+        mNewColor.setOnClickListener(this);
+        mColorPicker.setOnColorChangedListener(this);
+        mOldColor.setColor(color);
+        mColorPicker.setColor(color, true);
+
+    }
+
+    @Override
+    public void onColorChanged(int color) {
+
+        mNewColor.setColor(color);
+
+        if (mHexValueEnabled)
+            updateHexValue(color);
 
 		/*
-		if (mListener != null) {
+        if (mListener != null) {
 			mListener.onColorChanged(color);
 		}
 		*/
 
-	}
-
-	public void setAlphaSliderVisible(boolean visible) {
-		mColorPicker.setAlphaSliderVisible(visible);
-	}
-
-	/**
-	 * Set a OnColorChangedListener to get notified when the color
-	 * selected by the user has changed.
-	 * @param listener
-	 */
-	public void setOnColorChangedListener(OnColorChangedListener listener) {
-		mListener = listener;
-	}
-
-	public int getColor() {
-		return mColorPicker.getColor();
-	}
-
-	@Override
-	public void onClick(View v) {
-		if (v.getId() == R.id.new_color_panel) {
-			if (mListener != null) {
-				mListener.onColorChanged(mNewColor.getColor());
-			}
-		}
-		dismiss();
-	}
-
-	@Override
-	public Bundle onSaveInstanceState() {
-		Bundle state = super.onSaveInstanceState();
-		state.putInt("old_color", mOldColor.getColor());
-		state.putInt("new_color", mNewColor.getColor());
-		return state;
-	}
-
-	@Override
-	public void onRestoreInstanceState(Bundle savedInstanceState) {
-		super.onRestoreInstanceState(savedInstanceState);
-		mOldColor.setColor(savedInstanceState.getInt("old_color"));
-		mColorPicker.setColor(savedInstanceState.getInt("new_color"), true);
-	}
+    }
+
+    public void setHexValueEnabled(boolean enable) {
+        mHexValueEnabled = enable;
+        if (enable) {
+            mHexVal.setVisibility(View.VISIBLE);
+            updateHexLengthFilter();
+            updateHexValue(getColor());
+        } else
+            mHexVal.setVisibility(View.GONE);
+    }
+
+    public boolean getHexValueEnabled() {
+        return mHexValueEnabled;
+    }
+
+    private void updateHexLengthFilter() {
+        if (getAlphaSliderVisible())
+            mHexVal.setFilters(new InputFilter[]{new InputFilter.LengthFilter(9)});
+        else
+            mHexVal.setFilters(new InputFilter[]{new InputFilter.LengthFilter(7)});
+    }
+
+    private void updateHexValue(int color) {
+        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) {
+        mColorPicker.setAlphaSliderVisible(visible);
+        if (mHexValueEnabled) {
+            updateHexLengthFilter();
+            updateHexValue(getColor());
+        }
+    }
+
+    public boolean getAlphaSliderVisible() {
+        return mColorPicker.getAlphaSliderVisible();
+    }
+
+    /**
+     * Set a OnColorChangedListener to get notified when the color
+     * selected by the user has changed.
+     *
+     * @param listener
+     */
+    public void setOnColorChangedListener(OnColorChangedListener listener) {
+        mListener = listener;
+    }
+
+    public int getColor() {
+        return mColorPicker.getColor();
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (v.getId() == R.id.new_color_panel) {
+            if (mListener != null) {
+                mListener.onColorChanged(mNewColor.getColor());
+            }
+        }
+        dismiss();
+    }
+
+    @Override
+    public Bundle onSaveInstanceState() {
+        Bundle state = super.onSaveInstanceState();
+        state.putInt("old_color", mOldColor.getColor());
+        state.putInt("new_color", mNewColor.getColor());
+        return state;
+    }
+
+    @Override
+    public void onRestoreInstanceState(Bundle savedInstanceState) {
+        super.onRestoreInstanceState(savedInstanceState);
+        mOldColor.setColor(savedInstanceState.getInt("old_color"));
+        mColorPicker.setColor(savedInstanceState.getInt("new_color"), true);
+    }
 }

app/src/main/java/net/margaritov/preference/colorpicker/ColorPickerPanelView.java

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+// Taken from https://github.com/attenzione/android-ColorPickerPreference/tree/696bb050527d6a7ae14e47b7472a0640a7ff08e6
+
 package net.margaritov.preference.colorpicker;
 
 import android.content.Context;
@@ -27,140 +29,148 @@ import android.view.View;
  * This class draws a panel which which will be filled with a color which can be set.
  * It can be used to show the currently selected color which you will get from
  * the {@link ColorPickerView}.
+ *
  * @author Daniel Nilsson
  */
 public class ColorPickerPanelView extends View {
 
-	/**
-	 * The width in pixels of the border
-	 * surrounding the color panel.
-	 */
-	private final static float BORDER_WIDTH_PX = 1;
-
-	private float mDensity = 1f;
-
-	private int mBorderColor = 0xff6E6E6E;
-	private int mColor = 0xff000000;
+    /**
+     * The width in pixels of the border
+     * surrounding the color panel.
+     */
+    private final static float BORDER_WIDTH_PX = 1;
 
-	private Paint mBorderPaint;
-	private Paint mColorPaint;
+    private float mDensity = 1f;
 
-	private RectF mDrawingRect;
-	private RectF mColorRect;
+    private int mBorderColor = 0xff6E6E6E;
+    private int mColor = 0xff000000;
 
-	private AlphaPatternDrawable mAlphaPattern;
+    private Paint mBorderPaint;
+    private Paint mColorPaint;
 
+    private RectF mDrawingRect;
+    private RectF mColorRect;
 
-	public ColorPickerPanelView(Context context) {
-		this(context, null);
-	}
+    private AlphaPatternDrawable mAlphaPattern;
 
-	public ColorPickerPanelView(Context context, AttributeSet attrs) {
-		this(context, attrs, 0);
-	}
 
-	public ColorPickerPanelView(Context context, AttributeSet attrs, int defStyle) {
-		super(context, attrs, defStyle);
-		init();
-	}
+    public ColorPickerPanelView(Context context) {
+        this(context, null);
+    }
 
-	private void init() {
-		mBorderPaint = new Paint();
-		mColorPaint = new Paint();
-		mDensity = getContext().getResources().getDisplayMetrics().density;
-	}
+    public ColorPickerPanelView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
 
+    public ColorPickerPanelView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        init();
+    }
 
-	@Override
-	protected void onDraw(Canvas canvas) {
+    private void init() {
+        mBorderPaint = new Paint();
+        mColorPaint = new Paint();
+        mDensity = getContext().getResources().getDisplayMetrics().density;
+    }
 
-		final RectF rect = mColorRect;
 
-		if (BORDER_WIDTH_PX > 0) {
-			mBorderPaint.setColor(mBorderColor);
-			canvas.drawRect(mDrawingRect, mBorderPaint);
-		}
+    @Override
+    protected void onDraw(Canvas canvas) {
 
-		if (mAlphaPattern != null) {
-			mAlphaPattern.draw(canvas);
-		}
+        final RectF rect = mColorRect;
 
-		mColorPaint.setColor(mColor);
+        if (BORDER_WIDTH_PX > 0) {
+            mBorderPaint.setColor(mBorderColor);
+            canvas.drawRect(mDrawingRect, mBorderPaint);
+        }
 
-		canvas.drawRect(rect, mColorPaint);
-	}
+        if (mAlphaPattern != null) {
+            mAlphaPattern.draw(canvas);
+        }
 
-	@Override
-	protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        mColorPaint.setColor(mColor);
 
-		int width = MeasureSpec.getSize(widthMeasureSpec);
-		int height = MeasureSpec.getSize(heightMeasureSpec);
+        canvas.drawRect(rect, mColorPaint);
+    }
 
-		setMeasuredDimension(width, height);
-	}
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
 
-	@Override
-	protected void onSizeChanged(int w, int h, int oldw, int oldh) {
-		super.onSizeChanged(w, h, oldw, oldh);
+        int width = MeasureSpec.getSize(widthMeasureSpec);
+        int height = MeasureSpec.getSize(heightMeasureSpec);
 
-		mDrawingRect = new RectF();
-		mDrawingRect.left = getPaddingLeft();
-		mDrawingRect.right = w - getPaddingRight();
-		mDrawingRect.top = getPaddingTop();
-		mDrawingRect.bottom = h - getPaddingBottom();
+        setMeasuredDimension(width, height);
+    }
 
-		setUpColorRect();
+    @Override
+    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+        super.onSizeChanged(w, h, oldw, oldh);
 
-	}
+        mDrawingRect = new RectF();
+        mDrawingRect.left = getPaddingLeft();
+        mDrawingRect.right = w - getPaddingRight();
+        mDrawingRect.top = getPaddingTop();
+        mDrawingRect.bottom = h - getPaddingBottom();
 
-	private void setUpColorRect() {
-		final RectF dRect = mDrawingRect;
+        setUpColorRect();
 
-		float left = dRect.left + BORDER_WIDTH_PX;
-		float top = dRect.top + BORDER_WIDTH_PX;
-		float bottom = dRect.bottom - BORDER_WIDTH_PX;
-		float right = dRect.right - BORDER_WIDTH_PX;
+    }
 
-		mColorRect = new RectF(left, top, right, bottom);
+    private void setUpColorRect() {
+        final RectF dRect = mDrawingRect;
 
-		mAlphaPattern = new AlphaPatternDrawable((int) (5 * mDensity));
+        float left = dRect.left + BORDER_WIDTH_PX;
+        float top = dRect.top + BORDER_WIDTH_PX;
+        float bottom = dRect.bottom - BORDER_WIDTH_PX;
+        float right = dRect.right - BORDER_WIDTH_PX;
 
-		mAlphaPattern.setBounds(Math.round(mColorRect.left), Math.round(mColorRect.top), Math.round(mColorRect.right),
-				Math.round(mColorRect.bottom));
+        mColorRect = new RectF(left, top, right, bottom);
 
-	}
+        mAlphaPattern = new AlphaPatternDrawable((int) (5 * mDensity));
 
-	/**
-	 * Set the color that should be shown by this view.
-	 * @param color
-	 */
-	public void setColor(int color) {
-		mColor = color;
-		invalidate();
-	}
+        mAlphaPattern.setBounds(
+                Math.round(mColorRect.left),
+                Math.round(mColorRect.top),
+                Math.round(mColorRect.right),
+                Math.round(mColorRect.bottom)
+        );
 
-	/**
-	 * Get the color currently show by this view.
-	 * @return
-	 */
-	public int getColor() {
-		return mColor;
-	}
+    }
 
-	/**
-	 * Set the color of the border surrounding the panel.
-	 * @param color
-	 */
-	public void setBorderColor(int color) {
-		mBorderColor = color;
-		invalidate();
-	}
+    /**
+     * Set the color that should be shown by this view.
+     *
+     * @param color
+     */
+    public void setColor(int color) {
+        mColor = color;
+        invalidate();
+    }
 
-	/**
-	 * Get the color of the border surrounding the panel.
-	 */
-	public int getBorderColor() {
-		return mBorderColor;
-	}
+    /**
+     * Get the color currently show by this view.
+     *
+     * @return
+     */
+    public int getColor() {
+        return mColor;
+    }
+
+    /**
+     * Set the color of the border surrounding the panel.
+     *
+     * @param color
+     */
+    public void setBorderColor(int color) {
+        mBorderColor = color;
+        invalidate();
+    }
+
+    /**
+     * Get the color of the border surrounding the panel.
+     */
+    public int getBorderColor() {
+        return mBorderColor;
+    }
 
 }

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

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+// Taken from https://github.com/attenzione/android-ColorPickerPreference/tree/696bb050527d6a7ae14e47b7472a0640a7ff08e6
+
 package net.margaritov.preference.colorpicker;
 
 import android.content.Context;
@@ -24,259 +26,312 @@ import android.graphics.Color;
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.preference.Preference;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+
 /**
- * A preference type that allows a user to choose a time
+ * A preference type that allows a user to choose a color
+ *
  * @author Sergey Margaritov
  */
-public class ColorPickerPreference extends Preference
-		implements Preference.OnPreferenceClickListener, ColorPickerDialog.OnColorChangedListener {
-
-	View mView;
-	ColorPickerDialog mDialog;
-	private int mValue = Color.BLACK;
-	private float mDensity = 0;
-	private boolean mAlphaSliderEnabled = false;
-
-	public ColorPickerPreference(Context context) {
-		super(context);
-		init(context, null);
-	}
-
-	public ColorPickerPreference(Context context, AttributeSet attrs) {
-		super(context, attrs);
-		init(context, attrs);
-	}
-
-	public ColorPickerPreference(Context context, AttributeSet attrs, int defStyle) {
-		super(context, attrs, defStyle);
-		init(context, attrs);
-	}
-
-	@Override
-	protected Object onGetDefaultValue(TypedArray a, int index) {
-		return a.getColor(index, Color.BLACK);
-	}
-
-	@Override
-	protected void onSetInitialValue(boolean restoreValue, Object defaultValue) {
-		onColorChanged(restoreValue ? getPersistedInt(mValue) : (Integer) defaultValue);
-	}
-
-	private void init(Context context, AttributeSet attrs) {
-		mDensity = getContext().getResources().getDisplayMetrics().density;
-		setOnPreferenceClickListener(this);
-		if (attrs != null) {
-			mAlphaSliderEnabled = attrs.getAttributeBooleanValue(null, "alphaSlider", false);
-		}
-	}
-
-	@Override
-	protected void onBindView(View view) {
-		super.onBindView(view);
-		mView = view;
-		setPreviewColor();
-	}
-
-	private void setPreviewColor() {
-		if (mView == null) {
-			return;
-		}
-		ImageView iView = new ImageView(getContext());
-		LinearLayout widgetFrameView = ((LinearLayout) mView.findViewById(android.R.id.widget_frame));
-		if (widgetFrameView == null) {
-			return;
-		}
-		widgetFrameView.setVisibility(View.VISIBLE);
-		widgetFrameView
-				.setPadding(widgetFrameView.getPaddingLeft(), widgetFrameView.getPaddingTop(), (int) (mDensity * 8),
-						widgetFrameView.getPaddingBottom());
-		// remove already create preview image
-		int count = widgetFrameView.getChildCount();
-		if (count > 0) {
-			widgetFrameView.removeViews(0, count);
-		}
-		widgetFrameView.addView(iView);
-		widgetFrameView.setMinimumWidth(0);
-		iView.setBackgroundDrawable(new AlphaPatternDrawable((int) (5 * mDensity)));
-		iView.setImageBitmap(getPreviewBitmap());
-	}
-
-	private Bitmap getPreviewBitmap() {
-		int d = (int) (mDensity * 31); //30dip
-		int color = mValue;
-		Bitmap bm = Bitmap.createBitmap(d, d, Config.ARGB_8888);
-		int w = bm.getWidth();
-		int h = bm.getHeight();
-		int c = color;
-		for (int i = 0; i < w; i++) {
-			for (int j = i; j < h; j++) {
-				c = (i <= 1 || j <= 1 || i >= w - 2 || j >= h - 2) ? Color.GRAY : color;
-				bm.setPixel(i, j, c);
-				if (i != j) {
-					bm.setPixel(j, i, c);
-				}
-			}
-		}
-
-		return bm;
-	}
-
-	@Override
-	public void onColorChanged(int color) {
-		if (isPersistent()) {
-			persistInt(color);
-		}
-		mValue = color;
-		setPreviewColor();
-		try {
-			getOnPreferenceChangeListener().onPreferenceChange(this, color);
-		} catch (NullPointerException e) {
-
-		}
-	}
-
-	public boolean onPreferenceClick(Preference preference) {
-		showDialog(null);
-		return false;
-	}
-
-	protected void showDialog(Bundle state) {
-		mDialog = new ColorPickerDialog(getContext(), mValue);
-		mDialog.setOnColorChangedListener(this);
-		if (mAlphaSliderEnabled) {
-			mDialog.setAlphaSliderVisible(true);
-		}
-		if (state != null) {
-			mDialog.onRestoreInstanceState(state);
-		}
-		mDialog.show();
-	}
-
-	/**
-	 * Toggle Alpha Slider visibility (by default it's disabled)
-	 * @param enable
-	 */
-	public void setAlphaSliderEnabled(boolean enable) {
-		mAlphaSliderEnabled = enable;
-	}
-
-	/**
-	 * For custom purposes. Not used by ColorPickerPreferrence
-	 * @param color
-	 * @author Unknown
-	 */
-	public static String convertToARGB(int color) {
-		String alpha = Integer.toHexString(Color.alpha(color));
-		String red = Integer.toHexString(Color.red(color));
-		String green = Integer.toHexString(Color.green(color));
-		String blue = Integer.toHexString(Color.blue(color));
-
-		if (alpha.length() == 1) {
-			alpha = "0" + alpha;
-		}
-
-		if (red.length() == 1) {
-			red = "0" + red;
-		}
-
-		if (green.length() == 1) {
-			green = "0" + green;
-		}
-
-		if (blue.length() == 1) {
-			blue = "0" + blue;
-		}
-
-		return "#" + alpha + red + green + blue;
-	}
-
-	/**
-	 * For custom purposes. Not used by ColorPickerPreferrence
-	 * @param argb
-	 * @throws NumberFormatException
-	 * @author Unknown
-	 */
-	public static int convertToColorInt(String argb) throws NumberFormatException {
-
-		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);
-		}
-
-		return Color.argb(alpha, red, green, blue);
-	}
-
-	@Override
-	protected Parcelable onSaveInstanceState() {
-		final Parcelable superState = super.onSaveInstanceState();
-		if (mDialog == null || !mDialog.isShowing()) {
-			return superState;
-		}
-
-		final SavedState myState = new SavedState(superState);
-		myState.dialogBundle = mDialog.onSaveInstanceState();
-		return myState;
-	}
-
-	@Override
-	protected void onRestoreInstanceState(Parcelable state) {
-		if (state == null || !(state instanceof SavedState)) {
-			// Didn't save state for us in onSaveInstanceState
-			super.onRestoreInstanceState(state);
-			return;
-		}
-
-		SavedState myState = (SavedState) state;
-		super.onRestoreInstanceState(myState.getSuperState());
-		showDialog(myState.dialogBundle);
-	}
-
-	private static class SavedState extends BaseSavedState {
-		Bundle dialogBundle;
-
-		public SavedState(Parcel source) {
-			super(source);
-			dialogBundle = source.readBundle();
-		}
-
-		@Override
-		public void writeToParcel(Parcel dest, int flags) {
-			super.writeToParcel(dest, flags);
-			dest.writeBundle(dialogBundle);
-		}
-
-		public SavedState(Parcelable superState) {
-			super(superState);
-		}
-
-		@SuppressWarnings("unused")
-		public static final Parcelable.Creator<SavedState> CREATOR = new Parcelable.Creator<SavedState>() {
-			public SavedState createFromParcel(Parcel in) {
-				return new SavedState(in);
-			}
-
-			public SavedState[] newArray(int size) {
-				return new SavedState[size];
-			}
-		};
-	}
+public class ColorPickerPreference
+        extends
+        Preference
+        implements
+        Preference.OnPreferenceClickListener,
+        ColorPickerDialog.OnColorChangedListener {
+
+    View mView;
+    ColorPickerDialog mDialog;
+    private int mValue = Color.BLACK;
+    private float mDensity = 0;
+    private boolean mAlphaSliderEnabled = false;
+    private boolean mHexValueEnabled = false;
+
+    public ColorPickerPreference(Context context) {
+        super(context);
+        init(context, null);
+    }
+
+    public ColorPickerPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init(context, attrs);
+    }
+
+    public ColorPickerPreference(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        init(context, attrs);
+    }
+
+    /**Method edited by
+     * @author Anna Berkovitch
+     * added functionality to accept hex string as defaultValue
+     * and to properly persist resources reference string, such as @color/someColor
+     * previously persisted 0*/
+    @Override
+    protected Object onGetDefaultValue(TypedArray a, int index) {
+        int colorInt;
+        String mHexDefaultValue = a.getString(index);
+        if (mHexDefaultValue != null && mHexDefaultValue.startsWith("#")) {
+            colorInt = convertToColorInt(mHexDefaultValue);
+            return colorInt;
+
+        } else {
+            return a.getColor(index, Color.BLACK);
+        }
+    }
+
+    @Override
+    protected void onSetInitialValue(boolean restoreValue, Object defaultValue) {
+        onColorChanged(restoreValue ? getPersistedInt(mValue) : (Integer) defaultValue);
+    }
+
+    private void init(Context context, AttributeSet attrs) {
+        mDensity = getContext().getResources().getDisplayMetrics().density;
+        setOnPreferenceClickListener(this);
+        if (attrs != null) {
+            mAlphaSliderEnabled = attrs.getAttributeBooleanValue(null, "alphaSlider", false);
+            mHexValueEnabled = attrs.getAttributeBooleanValue(null, "hexValue", false);
+        }
+    }
+
+    @Override
+    public void onBindViewHolder(PreferenceViewHolder holder) {
+        super.onBindViewHolder(holder);
+
+        mView = holder.itemView;
+        setPreviewColor();
+    }
+
+    private void setPreviewColor() {
+        if (mView == null) return;
+        ImageView iView = new ImageView(getContext());
+        LinearLayout widgetFrameView = ((LinearLayout) mView.findViewById(android.R.id.widget_frame));
+        if (widgetFrameView == null) return;
+        widgetFrameView.setVisibility(View.VISIBLE);
+        widgetFrameView.setPadding(
+                widgetFrameView.getPaddingLeft(),
+                widgetFrameView.getPaddingTop(),
+                (int) (mDensity * 8),
+                widgetFrameView.getPaddingBottom()
+        );
+        // remove already create preview image
+        int count = widgetFrameView.getChildCount();
+        if (count > 0) {
+            widgetFrameView.removeViews(0, count);
+        }
+        widgetFrameView.addView(iView);
+        widgetFrameView.setMinimumWidth(0);
+        iView.setBackgroundDrawable(new AlphaPatternDrawable((int) (5 * mDensity)));
+        iView.setImageBitmap(getPreviewBitmap());
+    }
+
+    private Bitmap getPreviewBitmap() {
+        int d = (int) (mDensity * 31); //30dip
+        int color = mValue;
+        Bitmap bm = Bitmap.createBitmap(d, d, Config.ARGB_8888);
+        int w = bm.getWidth();
+        int h = bm.getHeight();
+        int c = color;
+        for (int i = 0; i < w; i++) {
+            for (int j = i; j < h; j++) {
+                c = (i <= 1 || j <= 1 || i >= w - 2 || j >= h - 2) ? Color.GRAY : color;
+                bm.setPixel(i, j, c);
+                if (i != j) {
+                    bm.setPixel(j, i, c);
+                }
+            }
+        }
+
+        return bm;
+    }
+
+    @Override
+    public void onColorChanged(int color) {
+        if (isPersistent()) {
+            persistInt(color);
+        }
+        mValue = color;
+        setPreviewColor();
+        try {
+            getOnPreferenceChangeListener().onPreferenceChange(this, color);
+        } catch (NullPointerException e) {
+
+        }
+    }
+
+    public boolean onPreferenceClick(Preference preference) {
+        showDialog(null);
+        return false;
+    }
+
+    protected void showDialog(Bundle state) {
+        mDialog = new ColorPickerDialog(getContext(), mValue, getTitle().toString());
+        mDialog.setOnColorChangedListener(this);
+        if (mAlphaSliderEnabled) {
+            mDialog.setAlphaSliderVisible(true);
+        }
+        if (mHexValueEnabled) {
+            mDialog.setHexValueEnabled(true);
+        }
+        if (state != null) {
+            mDialog.onRestoreInstanceState(state);
+        }
+        mDialog.show();
+    }
+
+    /**
+     * Toggle Alpha Slider visibility (by default it's disabled)
+     *
+     * @param enable
+     */
+    public void setAlphaSliderEnabled(boolean enable) {
+        mAlphaSliderEnabled = enable;
+    }
+
+    /**
+     * Toggle Hex Value visibility (by default it's disabled)
+     *
+     * @param enable
+     */
+    public void setHexValueEnabled(boolean enable) {
+        mHexValueEnabled = enable;
+    }
+
+    /**
+     * For custom purposes. Not used by ColorPickerPreferrence
+     *
+     * @param color
+     * @author Unknown
+     */
+    public static String convertToARGB(int color) {
+        String alpha = Integer.toHexString(Color.alpha(color));
+        String red = Integer.toHexString(Color.red(color));
+        String green = Integer.toHexString(Color.green(color));
+        String blue = Integer.toHexString(Color.blue(color));
+
+        if (alpha.length() == 1) {
+            alpha = "0" + alpha;
+        }
+
+        if (red.length() == 1) {
+            red = "0" + red;
+        }
+
+        if (green.length() == 1) {
+            green = "0" + green;
+        }
+
+        if (blue.length() == 1) {
+            blue = "0" + blue;
+        }
+
+        return "#" + alpha + red + green + blue;
+    }
+
+    /**
+     * Method currently used by onGetDefaultValue method to
+     * convert hex string provided in android:defaultValue to color integer.
+     *
+     * @param color
+     * @return A string representing the hex value of color,
+     * without the alpha value
+     * @author Charles Rosaaen
+     */
+    public static String convertToRGB(int color) {
+        String red = Integer.toHexString(Color.red(color));
+        String green = Integer.toHexString(Color.green(color));
+        String blue = Integer.toHexString(Color.blue(color));
+
+        if (red.length() == 1) {
+            red = "0" + red;
+        }
+
+        if (green.length() == 1) {
+            green = "0" + green;
+        }
+
+        if (blue.length() == 1) {
+            blue = "0" + blue;
+        }
+
+        return "#" + red + green + blue;
+    }
+
+    /**
+     * For custom purposes. Not used by ColorPickerPreferrence
+     *
+     * @param argb
+     * @throws NumberFormatException
+     * @author Unknown
+     */
+    public static int convertToColorInt(String argb) throws IllegalArgumentException {
+
+        if (!argb.startsWith("#")) {
+            argb = "#" + argb;
+        }
+
+        return Color.parseColor(argb);
+    }
+
+    @Override
+    protected Parcelable onSaveInstanceState() {
+        final Parcelable superState = super.onSaveInstanceState();
+        if (mDialog == null || !mDialog.isShowing()) {
+            return superState;
+        }
+
+        final SavedState myState = new SavedState(superState);
+        myState.dialogBundle = mDialog.onSaveInstanceState();
+        return myState;
+    }
+
+    @Override
+    protected void onRestoreInstanceState(Parcelable state) {
+        if (state == null || !(state instanceof SavedState)) {
+            // Didn't save state for us in onSaveInstanceState
+            super.onRestoreInstanceState(state);
+            return;
+        }
+
+        SavedState myState = (SavedState) state;
+        super.onRestoreInstanceState(myState.getSuperState());
+        showDialog(myState.dialogBundle);
+    }
+
+    private static class SavedState extends BaseSavedState {
+        Bundle dialogBundle;
+
+        public SavedState(Parcel source) {
+            super(source);
+            dialogBundle = source.readBundle();
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            super.writeToParcel(dest, flags);
+            dest.writeBundle(dialogBundle);
+        }
+
+        public SavedState(Parcelable superState) {
+            super(superState);
+        }
+
+        @SuppressWarnings("unused")
+        public static final Parcelable.Creator<SavedState> CREATOR =
+                new Parcelable.Creator<SavedState>() {
+                    public SavedState createFromParcel(Parcel in) {
+                        return new SavedState(in);
+                    }
+
+                    public SavedState[] newArray(int size) {
+                        return new SavedState[size];
+                    }
+                };
+    }
 }

app/src/main/res/layout-land/dialog_color_picker.xml

@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 Daniel Nilsson
+<?xml version="1.0" encoding="utf-8"?><!--
+     Copyright (C) 2010 Daniel Nilsson
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -10,68 +10,73 @@
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
+     See the License for the specific language governing permissions and limitations under the License.
+
+// Taken from https://github.com/attenzione/android-ColorPickerPreference/tree/696bb050527d6a7ae14e47b7472a0640a7ff08e6
 -->
 
-<LinearLayout 
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    android:orientation="horizontal"
     android:paddingLeft="5dp"
-    android:paddingRight="5dp"
-    android:orientation="horizontal">
+    android:paddingRight="5dp">
 
-	<net.margaritov.preference.colorpicker.ColorPickerView
-		android:id="@+id/color_picker_view"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:tag="landscape"
-		android:layerType="software"
-	/>
+    <net.margaritov.preference.colorpicker.ColorPickerView
+        android:id="@+id/color_picker_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layerType="software"
+        android:tag="landscape" />
 
-	<LinearLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:orientation="vertical"
-		android:layout_marginBottom="10dp">
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="10dp"
+        android:orientation="vertical">
 
-		<TextView
-			android:layout_width="wrap_content" 
-			android:layout_height="wrap_content"	
-			android:text="@string/press_color_to_apply"
-			android:gravity="center"
-			android:layout_marginTop="6dp"
-			android:layout_marginLeft="6dp"
-			android:layout_marginRight="6dp"
-			android:layout_marginBottom="5dp"
-			android:textAppearance="?android:attr/textAppearanceSmall"
-		/>
+        <EditText
+            android:id="@+id/hex_val"
+            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>
 
-		<net.margaritov.preference.colorpicker.ColorPickerPanelView
-			android:id="@+id/old_color_panel"
-			android:layout_width="fill_parent"
-			android:layout_height="40dp"
-			android:layout_weight="0.5"
-		/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="5dp"
+            android:layout_marginLeft="6dp"
+            android:layout_marginRight="6dp"
+            android:layout_marginTop="6dp"
+            android:gravity="center"
+            android:text="@string/press_color_to_apply"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
 
-		<TextView
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"	
-			android:text="↓"
-			android:textSize="20sp"
-			android:gravity="center"
-			android:layout_marginTop="10dp"
-			android:layout_marginBottom="10dp"
-		/>
+        <net.margaritov.preference.colorpicker.ColorPickerPanelView
+            android:id="@+id/old_color_panel"
+            android:layout_width="fill_parent"
+            android:layout_height="40dp"
+            android:layout_weight="0.5" />
 
-		<net.margaritov.preference.colorpicker.ColorPickerPanelView
-			android:id="@+id/new_color_panel"
-			android:layout_width="fill_parent"
-			android:layout_height="40dp"
-			android:layout_weight="0.5"
-		/>
+        <TextView
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:layout_marginTop="10dp"
+            android:gravity="center"
+            android:text="↓"
+            android:textSize="20sp" />
 
-	</LinearLayout>
+        <net.margaritov.preference.colorpicker.ColorPickerPanelView
+            android:id="@+id/new_color_panel"
+            android:layout_width="fill_parent"
+            android:layout_height="40dp"
+            android:layout_weight="0.5" />
+    </LinearLayout>
 
 </LinearLayout>

app/src/main/res/layout/dialog_color_picker.xml

@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 Daniel Nilsson
+<?xml version="1.0" encoding="utf-8"?><!--
+     Copyright (C) 2010 Daniel Nilsson
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -10,68 +10,79 @@
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
+     See the License for the specific language governing permissions and limitations under the License.
+
+// Taken from https://github.com/attenzione/android-ColorPickerPreference/tree/696bb050527d6a7ae14e47b7472a0640a7ff08e6
 -->
 
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android" 
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    android:orientation="vertical"
     android:paddingLeft="5dp"
-    android:paddingRight="5dp"
-    android:orientation="vertical">
+    android:paddingRight="5dp">
+
+    <net.margaritov.preference.colorpicker.ColorPickerView
+        android:id="@+id/color_picker_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layerType="software"
+        android:tag="portrait" />
 
-	<net.margaritov.preference.colorpicker.ColorPickerView
-		android:id="@+id/color_picker_view"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_gravity="center_horizontal"
-		android:tag="portrait"
-		android:layerType="software"
-	/>
+    <LinearLayout
+        android:id="@+id/text_hex_wrapper"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
+        android:layout_marginLeft="6dp"
+        android:layout_marginRight="6dp">
 
-	<TextView
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"	
-		android:text="@string/press_color_to_apply"
-		android:gravity="left"
-		android:layout_marginLeft="6dp"
-		android:layout_marginRight="6dp"
-		android:layout_marginBottom="5dp"
-		android:textAppearance="?android:attr/textAppearanceSmall"
-	/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="left"
+            android:text="@string/press_color_to_apply"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
 
-	<LinearLayout
-		android:layout_width="wrap_content"
-		android:layout_height="40dp"
-		android:orientation="horizontal"
-		android:layout_marginBottom="10dp">
+        <EditText
+            android:id="@+id/hex_val"
+            android:layout_width="0dp"
+            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>
 
-		<net.margaritov.preference.colorpicker.ColorPickerPanelView
-			android:id="@+id/old_color_panel"
-			android:layout_width="0px"
-			android:layout_height="fill_parent"
-			android:layout_weight="0.5"
-		/>
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="40dp"
+        android:layout_marginBottom="10dp"
+        android:orientation="horizontal">
 
-		<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="fill_parent"	
-			android:text="→"
-			android:textSize="20sp"
-			android:gravity="center"
-			android:layout_marginLeft="10dp"
-			android:layout_marginRight="10dp"
-		/>
+        <net.margaritov.preference.colorpicker.ColorPickerPanelView
+            android:id="@+id/old_color_panel"
+            android:layout_width="0px"
+            android:layout_height="fill_parent"
+            android:layout_weight="0.5" />
 
-		<net.margaritov.preference.colorpicker.ColorPickerPanelView
-			android:id="@+id/new_color_panel"
-			android:layout_width="0px"
-			android:layout_height="wrap_content"
-			android:layout_weight="0.5"
-		/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:gravity="center"
+            android:text="→"
+            android:textSize="20sp" />
 
-	</LinearLayout>
+        <net.margaritov.preference.colorpicker.ColorPickerPanelView
+            android:id="@+id/new_color_panel"
+            android:layout_width="0px"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.5" />
+    </LinearLayout>
 
 </LinearLayout>