Simplify color picker dialog showing

This commit is contained in:
Moez Bhatti
2016-01-03 19:24:31 -05:00
parent 16119792c7
commit 4e54a2a4c2
2 changed files with 8 additions and 23 deletions
@@ -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();