mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-19 12:28:53 +01:00
Simplify color picker dialog showing
This commit is contained in:
@@ -526,14 +526,18 @@ public class ThemeManager {
|
|||||||
return mTheme == Theme.GREY || mTheme == Theme.BLACK;
|
return mTheme == Theme.GREY || mTheme == Theme.BLACK;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void showColourSwatchesDialog(final QKActivity context) {
|
public static void showColorPickerDialog(final QKActivity context) {
|
||||||
final QKDialog dialog = new QKDialog();
|
final QKDialog dialog = new QKDialog();
|
||||||
|
|
||||||
ColorPickerPalette palette = new ColorPickerPalette(context);
|
ColorPickerPalette palette = new ColorPickerPalette(context);
|
||||||
palette.setGravity(Gravity.CENTER);
|
palette.setGravity(Gravity.CENTER);
|
||||||
palette.init(19, 4, color -> {
|
palette.init(19, 4, color -> {
|
||||||
showColourPickerDialog(context, color);
|
palette.init(getSwatch(color).length, 4, color2 -> {
|
||||||
dialog.dismiss();
|
setColour(context, color2);
|
||||||
|
dialog.dismiss();
|
||||||
|
});
|
||||||
|
|
||||||
|
palette.drawPalette(getSwatch(color), mColor);
|
||||||
});
|
});
|
||||||
|
|
||||||
palette.drawPalette(PALETTE, getSwatchColour(mColor));
|
palette.drawPalette(PALETTE, getSwatchColour(mColor));
|
||||||
@@ -546,25 +550,6 @@ public class ThemeManager {
|
|||||||
dialog.show();
|
dialog.show();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void showColourPickerDialog(final QKActivity context, int swatchColour) {
|
|
||||||
final QKDialog dialog = new QKDialog();
|
|
||||||
|
|
||||||
ColorPickerPalette palette = new ColorPickerPalette(context);
|
|
||||||
palette.setGravity(Gravity.CENTER);
|
|
||||||
palette.init(getSwatch(swatchColour).length, 4, color -> {
|
|
||||||
setColour(context, color);
|
|
||||||
dialog.dismiss();
|
|
||||||
});
|
|
||||||
|
|
||||||
palette.drawPalette(getSwatch(swatchColour), mColor);
|
|
||||||
|
|
||||||
dialog.setContext(context)
|
|
||||||
.setTitle(R.string.pref_theme)
|
|
||||||
.setCustomView(palette)
|
|
||||||
.setNegativeButton(R.string.cancel, null)
|
|
||||||
.show();
|
|
||||||
}
|
|
||||||
|
|
||||||
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
|
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
|
||||||
public static void setStatusBarTintEnabled(boolean enabled) {
|
public static void setStatusBarTintEnabled(boolean enabled) {
|
||||||
if (mStatusTintEnabled != enabled) {
|
if (mStatusTintEnabled != enabled) {
|
||||||
|
|||||||
@@ -524,7 +524,7 @@ public class SettingsFragment extends PreferenceFragment implements Preference.O
|
|||||||
|
|
||||||
switch (key) {
|
switch (key) {
|
||||||
case THEME:
|
case THEME:
|
||||||
ThemeManager.showColourSwatchesDialog(mContext);
|
ThemeManager.showColorPickerDialog(mContext);
|
||||||
break;
|
break;
|
||||||
case BUBBLES:
|
case BUBBLES:
|
||||||
new BubblePreferenceDialog().setContext(mContext).show();
|
new BubblePreferenceDialog().setContext(mContext).show();
|
||||||
|
|||||||
Reference in New Issue
Block a user