app/DetailedColorPicker: fix bugs, refine ui

Signed-off-by: BlackMesa123 <giangrecosalvo9@gmail.com>

Author: salvogiangri

yanndroid/oneui/src/main/java/de/dlyt/yanndroid/oneui/preference/ColorPickerPreference.java

@@ -28,7 +28,6 @@ public class ColorPickerPreference extends Preference implements Preference.OnPr
     Dialog mDialog;
     SeslPreferenceImageView mPreview;
     private int mValue = Color.BLACK;
-    private boolean mFirstColor = true;
     private ArrayList<Integer> mUsedColors = new ArrayList();
 
     private boolean mAlphaSliderEnabled = false;
@@ -111,11 +110,7 @@ public void onColorSet(int color) {
         mValue = color;
 
         callChangeListener(color);
-
-        if (!mFirstColor)
-            addRecentColor(color);
-        else
-            mFirstColor = false;
+        addRecentColor(color);
         setPreviewColor();
     }
 
@@ -135,7 +130,7 @@ private void showDialog(Bundle state) {
             dialog.show();
 
             mDialog = dialog;
-        } else {
+        } else if (mPickerType == DETAILED) {
             DetailedColorPickerDialog dialog = new DetailedColorPickerDialog(getContext(), this, mValue, getRecentColors(), mAlphaSliderEnabled);
             dialog.setNewColor(mValue);
             dialog.setTransparencyControlEnabled(mAlphaSliderEnabled);
@@ -151,6 +146,10 @@ public void setAlphaSliderEnabled(boolean enable) {
         mAlphaSliderEnabled = enable;
     }
 
+    public void setPickerType(int type) {
+        mPickerType = type;
+    }
+
     private void addRecentColor(int color) {
         for (int i = 0; i < mUsedColors.size(); i++) {
             if (mUsedColors.get(i) == color)

yanndroid/oneui/src/main/java/de/dlyt/yanndroid/oneui/sesl/colorpicker/detailed/SeslColorPicker.java

@@ -244,17 +244,6 @@ public void onFocusChange(View v, boolean hasFocus) {
                 }
             }
         });
-        mColorPickerOpacityEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
-            @Override
-            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_NEXT) {
-                    mColorPickerHexEditText.requestFocus();
-                    return true;
-                } else {
-                    return false;
-                }
-            }
-        });
     }
 
     @Override
@@ -716,7 +705,7 @@ private void updateCurrentColor() {
             if (mOpacitySeekBar != null) {
                 mOpacitySeekBar.changeColorBase(color, mPickedColor.getAlpha());
                 mColorPickerOpacityEditText.setText("" + String.format(Locale.getDefault(), "%d", Integer.valueOf(mOpacitySeekBar.getProgress())));
-                mColorPickerOpacityEditText.setSelection(String.valueOf(mOpacitySeekBar.getProgress()).length());
+                mColorPickerOpacityEditText.setSelection(mColorPickerOpacityEditText.getText().length());
             }
 
             if (mSelectedColorBackground != null) {

yanndroid/oneui/src/main/res/drawable/oui_color_picker_preference_preview.xml

@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
     <stroke
-        android:width="1.0dip"
+        android:width="3.0px"
         android:color="?colorControlNormal" />
     <solid android:color="#00000000" />
 </shape>

yanndroid/oneui/src/main/res/drawable/sesl_color_picker_tab_selector_bg.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape android:padding="10.0dip" android:shape="rectangle"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <stroke android:width="1.0dip" android:color="@color/sesl_dialog_body_text_color" />
+    <stroke android:width="1.0dip" android:color="@color/sesl_tablayout_subtab_background_stroke_color" />
     <corners android:radius="20.0dip" />
 </shape>

yanndroid/oneui/src/main/res/layout-iw/sesl_color_picker_opacity_edittext_layout.xml

@@ -4,7 +4,7 @@
     <LinearLayout
         android:layout_width="wrap_content" android:layout_height="wrap_content" android:layoutDirection="ltr">
         <EditText
-            android:id="@+id/sesl_color_seek_bar_opacity_value_edit_view" android:layout_width="@dimen/sesl_color_picker_perecent_edit_text_width" android:layout_height="wrap_content" android:gravity="end" android:background="@null" android:maxLength="3" android:inputType="number" style="@style/SeekbarProgressText" />
+            android:id="@+id/sesl_color_seek_bar_opacity_value_edit_view" android:layout_width="@dimen/sesl_color_picker_perecent_edit_text_width" android:layout_height="wrap_content" android:gravity="end" android:background="@null" android:maxLength="3" android:inputType="number" android:imeOptions="actionDone" android:selectAllOnFocus="true" style="@style/SeekbarProgressText" />
         <TextView
             android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="start" android:text="%" style="@style/SeekbarProgressText" />
     </LinearLayout>

yanndroid/oneui/src/main/res/layout-iw/sesl_color_picker_saturation_edittext_layout.xml

@@ -4,7 +4,7 @@
     <LinearLayout
         android:layout_width="wrap_content" android:layout_height="wrap_content" android:layoutDirection="ltr">
         <EditText
-            android:id="@+id/sesl_color_seek_bar_saturation_value_edit_view" android:layout_width="@dimen/sesl_color_picker_perecent_edit_text_width" android:layout_height="wrap_content" android:gravity="end" android:background="@null" android:maxLength="3" android:inputType="number" style="@style/SeekbarProgressText" />
+            android:id="@+id/sesl_color_seek_bar_saturation_value_edit_view" android:layout_width="@dimen/sesl_color_picker_perecent_edit_text_width" android:layout_height="wrap_content" android:gravity="end" android:background="@null" android:maxLength="3" android:inputType="number" android:imeOptions="actionDone" android:selectAllOnFocus="true" style="@style/SeekbarProgressText" />
         <TextView
             android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="start" android:text="%" style="@style/SeekbarProgressText" />
     </LinearLayout>

yanndroid/oneui/src/main/res/layout-tr/sesl_color_picker_opacity_edittext_layout.xml

@@ -4,7 +4,7 @@
     <LinearLayout
         android:layout_width="wrap_content" android:layout_height="wrap_content" android:layoutDirection="rtl">
         <EditText
-            android:id="@+id/sesl_color_seek_bar_opacity_value_edit_view" android:layout_width="@dimen/sesl_color_picker_perecent_edit_text_width" android:layout_height="wrap_content" android:gravity="end" android:background="@null" android:maxLength="3" android:inputType="number" style="@style/SeekbarProgressText" />
+            android:id="@+id/sesl_color_seek_bar_opacity_value_edit_view" android:layout_width="@dimen/sesl_color_picker_perecent_edit_text_width" android:layout_height="wrap_content" android:gravity="end" android:background="@null" android:maxLength="3" android:inputType="number" android:imeOptions="actionDone" android:selectAllOnFocus="true" style="@style/SeekbarProgressText" />
         <TextView
             android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="start" android:text="%" style="@style/SeekbarProgressText" />
     </LinearLayout>

yanndroid/oneui/src/main/res/layout-tr/sesl_color_picker_saturation_edittext_layout.xml

@@ -4,7 +4,7 @@
     <LinearLayout
         android:layout_width="wrap_content" android:layout_height="wrap_content" android:layoutDirection="rtl">
         <EditText
-            android:id="@+id/sesl_color_seek_bar_saturation_value_edit_view" android:layout_width="@dimen/sesl_color_picker_perecent_edit_text_width" android:layout_height="wrap_content" android:gravity="end" android:background="@null" android:maxLength="3" android:inputType="number" style="@style/SeekbarProgressText" />
+            android:id="@+id/sesl_color_seek_bar_saturation_value_edit_view" android:layout_width="@dimen/sesl_color_picker_perecent_edit_text_width" android:layout_height="wrap_content" android:gravity="end" android:background="@null" android:maxLength="3" android:inputType="number" android:imeOptions="actionDone" android:selectAllOnFocus="true" style="@style/SeekbarProgressText" />
         <TextView
             android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="start" android:text="%" style="@style/SeekbarProgressText" />
     </LinearLayout>

yanndroid/oneui/src/main/res/layout/sesl_color_picker_oneui_3_selected_color_layout.xml

@@ -14,30 +14,30 @@
         <TextView
             android:id="@+id/sesl_color_hex_text" android:layout_width="wrap_content" android:layout_height="@dimen/sesl_color_picker_selected_color_title_text_height" android:gravity="center" android:text="@string/sesl_color_hex_text" style="@style/HexRGBTitleText" />
         <EditText
-            android:id="@+id/sesl_color_hex_edit_text" android:layout_width="wrap_content" android:layout_height="@dimen/sesl_color_picker_selected_color_value_text_height" android:minWidth="50.0dip" android:gravity="center" android:background="@null" android:singleLine="true" android:maxLength="6" android:digits="ABCDEFabcdef0123456789" android:privateImeOptions="disableSticker=true;disableGifKeyboard=true;disableEmoticonInput=true;disableDirectWriting=true;" android:imeOptions="actionNext" style="@style/SeekbarProgressText" />
+            android:id="@+id/sesl_color_hex_edit_text" android:layout_width="wrap_content" android:layout_height="@dimen/sesl_color_picker_selected_color_value_text_height" android:minWidth="50.0dip" android:gravity="center" android:background="@null" android:singleLine="true" android:maxLength="6" android:digits="ABCDEFabcdef0123456789" android:privateImeOptions="disableSticker=true;disableGifKeyboard=true;disableEmoticonInput=true;disableDirectWriting=true;" android:selectAllOnFocus="true" style="@style/SeekbarProgressText" />
     </LinearLayout>
 
     <LinearLayout
         android:layout_width="@dimen/sesl_color_picker_selected_color_rgb_width" android:layout_height="wrap_content" android:layout_marginStart="@dimen/sesl_color_picker_selected_color_item_margin" android:layout_gravity="center_vertical" android:gravity="center" android:orientation="vertical">
         <TextView
             android:id="@+id/sesl_color_red_text" android:layout_width="wrap_content" android:layout_height="@dimen/sesl_color_picker_selected_color_title_text_height" android:gravity="center" android:text="@string/sesl_color_red_text" style="@style/HexRGBTitleText" />
         <EditText
-            android:id="@+id/sesl_color_red_edit_text" android:layout_width="wrap_content" android:layout_height="@dimen/sesl_color_picker_selected_color_value_text_height" android:minWidth="30.0dip" android:gravity="center" android:background="@null" android:maxLength="3" android:inputType="number" android:imeOptions="actionNext" style="@style/SeekbarProgressText" />
+            android:id="@+id/sesl_color_red_edit_text" android:layout_width="wrap_content" android:layout_height="@dimen/sesl_color_picker_selected_color_value_text_height" android:minWidth="30.0dip" android:gravity="center" android:background="@null" android:maxLength="3" android:inputType="number" android:selectAllOnFocus="true" style="@style/SeekbarProgressText" />
     </LinearLayout>
 
     <LinearLayout
         android:layout_width="@dimen/sesl_color_picker_selected_color_rgb_width" android:layout_height="wrap_content" android:layout_marginStart="@dimen/sesl_color_picker_selected_color_item_margin" android:layout_gravity="center_vertical" android:gravity="center" android:orientation="vertical">
         <TextView
             android:id="@+id/sesl_color_green_text" android:layout_width="wrap_content" android:layout_height="@dimen/sesl_color_picker_selected_color_title_text_height" android:gravity="center" android:text="@string/sesl_color_green_text" style="@style/HexRGBTitleText" />
         <EditText
-            android:id="@+id/sesl_color_green_edit_text" android:layout_width="wrap_content" android:layout_height="@dimen/sesl_color_picker_selected_color_value_text_height" android:minWidth="30.0dip" android:gravity="center" android:background="@null" android:maxLength="3" android:inputType="number" android:imeOptions="actionNext" style="@style/SeekbarProgressText" />
+            android:id="@+id/sesl_color_green_edit_text" android:layout_width="wrap_content" android:layout_height="@dimen/sesl_color_picker_selected_color_value_text_height" android:minWidth="30.0dip" android:gravity="center" android:background="@null" android:maxLength="3" android:inputType="number" android:selectAllOnFocus="true" style="@style/SeekbarProgressText" />
     </LinearLayout>
 
     <LinearLayout
         android:layout_width="@dimen/sesl_color_picker_selected_color_rgb_width" android:layout_height="wrap_content" android:layout_marginStart="@dimen/sesl_color_picker_selected_color_item_margin" android:layout_gravity="center_vertical" android:gravity="center" android:orientation="vertical">
         <TextView
             android:id="@+id/sesl_color_blue_text" android:layout_width="wrap_content" android:layout_height="@dimen/sesl_color_picker_selected_color_title_text_height" android:gravity="center" android:text="@string/sesl_color_blue_text" style="@style/HexRGBTitleText" />
         <EditText
-            android:id="@+id/sesl_color_blue_edit_text" android:layout_width="wrap_content" android:layout_height="@dimen/sesl_color_picker_selected_color_value_text_height" android:minWidth="30.0dip" android:gravity="center" android:background="@null" android:maxLength="3" android:inputType="number" android:imeOptions="actionNext" style="@style/SeekbarProgressText" />
+            android:id="@+id/sesl_color_blue_edit_text" android:layout_width="wrap_content" android:layout_height="@dimen/sesl_color_picker_selected_color_value_text_height" android:minWidth="30.0dip" android:gravity="center" android:background="@null" android:maxLength="3" android:inputType="number" android:selectAllOnFocus="true" style="@style/SeekbarProgressText" />
     </LinearLayout>
 </LinearLayout>

yanndroid/oneui/src/main/res/layout/sesl_color_picker_opacity_edittext_layout.xml

@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical">
     <EditText
-        android:id="@+id/sesl_color_seek_bar_opacity_value_edit_view" android:layout_width="@dimen/sesl_color_picker_perecent_edit_text_width" android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:gravity="end" android:background="@null" android:maxLength="3" android:inputType="number" android:layout_marginStart="@dimen/sesl_color_picker_seekbar_edittext_margin_left" style="@style/SeekbarProgressText" />
+        android:id="@+id/sesl_color_seek_bar_opacity_value_edit_view" android:layout_width="@dimen/sesl_color_picker_perecent_edit_text_width" android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:gravity="end" android:background="@null" android:maxLength="3" android:inputType="number" android:imeOptions="actionDone" android:layout_marginStart="@dimen/sesl_color_picker_seekbar_edittext_margin_left" android:selectAllOnFocus="true" style="@style/SeekbarProgressText" />
     <TextView
         android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:gravity="start" android:text="%" style="@style/SeekbarProgressText" />
 </LinearLayout>