mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-17 03:28:52 +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;
|
||||
}
|
||||
|
||||
public static void showColourSwatchesDialog(final QKActivity context) {
|
||||
public static void showColorPickerDialog(final QKActivity context) {
|
||||
final QKDialog dialog = new QKDialog();
|
||||
|
||||
ColorPickerPalette palette = new ColorPickerPalette(context);
|
||||
palette.setGravity(Gravity.CENTER);
|
||||
palette.init(19, 4, color -> {
|
||||
showColourPickerDialog(context, color);
|
||||
dialog.dismiss();
|
||||
palette.init(getSwatch(color).length, 4, color2 -> {
|
||||
setColour(context, color2);
|
||||
dialog.dismiss();
|
||||
});
|
||||
|
||||
palette.drawPalette(getSwatch(color), mColor);
|
||||
});
|
||||
|
||||
palette.drawPalette(PALETTE, getSwatchColour(mColor));
|
||||
@@ -546,25 +550,6 @@ public class ThemeManager {
|
||||
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)
|
||||
public static void setStatusBarTintEnabled(boolean enabled) {
|
||||
if (mStatusTintEnabled != enabled) {
|
||||
|
||||
@@ -524,7 +524,7 @@ public class SettingsFragment extends PreferenceFragment implements Preference.O
|
||||
|
||||
switch (key) {
|
||||
case THEME:
|
||||
ThemeManager.showColourSwatchesDialog(mContext);
|
||||
ThemeManager.showColorPickerDialog(mContext);
|
||||
break;
|
||||
case BUBBLES:
|
||||
new BubblePreferenceDialog().setContext(mContext).show();
|
||||
|
||||
Reference in New Issue
Block a user