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 15bd05c2..427a8faa 100644
--- a/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java
+++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java
@@ -499,7 +499,7 @@ public class ThemeManager {
private static void showColorPicker(QKActivity context, View.OnClickListener saveListener) {
final QKDialog dialog = new QKDialog();
- View view = LayoutInflater.from(mContext).inflate(R.layout.dialog_color_picker_pager, null, false);
+ View view = LayoutInflater.from(mContext).inflate(R.layout.dialog_color_picker, null, false);
ColorPickerViewHolder holder = new ColorPickerViewHolder(view);
holder.mTab1.setBackgroundDrawable(getRippleBackground());
@@ -724,7 +724,7 @@ public class ThemeManager {
@Bind(R.id.tab_1) QKTextView mTab1;
@Bind(R.id.tab_2) QKTextView mTab2;
@Bind(R.id.pager) ViewPager mPager;
- @Bind(R.id.palette_view) ColorPickerPalette mPalette;
+ @Bind(R.id.palette) ColorPickerPalette mPalette;
@Bind(R.id.preview) View mPreview;
@Bind(R.id.red) SeekBar mRed;
@Bind(R.id.red_value) QKTextView mRedValue;
diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/colorpicker/ColorPickerDialog.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/colorpicker/ColorPickerDialog.java
index 038024ac..1dd77778 100644
--- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/colorpicker/ColorPickerDialog.java
+++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/colorpicker/ColorPickerDialog.java
@@ -63,7 +63,7 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerSwat
}
public Dialog onCreateDialog(Bundle bundle) {
- View view = LayoutInflater.from(getActivity()).inflate(R.layout.dialog_color_picker, null);
+ View view = LayoutInflater.from(getActivity()).inflate(R.layout.dialog_color_picker_led, null);
mProgress = ((ProgressBar) view.findViewById(android.R.id.progress));
mPalette = ((ColorPickerPalette) view.findViewById(R.id.color_picker));
mPalette.init(mSize, mColumns, this);
diff --git a/QKSMS/src/main/res/layout/dialog_color_picker.xml b/QKSMS/src/main/res/layout/dialog_color_picker.xml
index a4cb534a..35f25662 100644
--- a/QKSMS/src/main/res/layout/dialog_color_picker.xml
+++ b/QKSMS/src/main/res/layout/dialog_color_picker.xml
@@ -1,31 +1,168 @@
-
+
-
+
-
+ android:layout_height="match_parent"
+ android:gravity="center"
+ android:paddingLeft="16dp"
+ android:paddingRight="16dp"
+ android:text="@string/title_palette"
+ app:type="primary_bold" />
+
+
+
+
+
+
-
-
\ No newline at end of file
+ android:id="@+id/palette"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/QKSMS/src/main/res/layout/dialog_color_picker_led.xml b/QKSMS/src/main/res/layout/dialog_color_picker_led.xml
new file mode 100644
index 00000000..a4cb534a
--- /dev/null
+++ b/QKSMS/src/main/res/layout/dialog_color_picker_led.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/QKSMS/src/main/res/layout/dialog_color_picker_pager.xml b/QKSMS/src/main/res/layout/dialog_color_picker_pager.xml
deleted file mode 100644
index d5938c0a..00000000
--- a/QKSMS/src/main/res/layout/dialog_color_picker_pager.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/QKSMS/src/main/res/layout/dialog_color_picker_rgb.xml b/QKSMS/src/main/res/layout/dialog_color_picker_rgb.xml
deleted file mode 100644
index ee6c59d7..00000000
--- a/QKSMS/src/main/res/layout/dialog_color_picker_rgb.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file