mirror of https://github.com/M66B/FairEmail.git
Reduce number of picker colors, save state
This commit is contained in:
parent
5873cd925f
commit
0d6cb493f7
|
@ -28,17 +28,28 @@ import androidx.annotation.NonNull;
|
||||||
import androidx.annotation.Nullable;
|
import androidx.annotation.Nullable;
|
||||||
|
|
||||||
import com.flask.colorpicker.ColorPickerView;
|
import com.flask.colorpicker.ColorPickerView;
|
||||||
|
import com.flask.colorpicker.OnColorChangedListener;
|
||||||
import com.flask.colorpicker.builder.ColorPickerClickListener;
|
import com.flask.colorpicker.builder.ColorPickerClickListener;
|
||||||
import com.flask.colorpicker.builder.ColorPickerDialogBuilder;
|
import com.flask.colorpicker.builder.ColorPickerDialogBuilder;
|
||||||
|
|
||||||
import static android.app.Activity.RESULT_OK;
|
import static android.app.Activity.RESULT_OK;
|
||||||
|
|
||||||
public class FragmentDialogColor extends FragmentDialogBase {
|
public class FragmentDialogColor extends FragmentDialogBase {
|
||||||
|
private int color;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onSaveInstanceState(@NonNull Bundle outState) {
|
||||||
|
outState.putInt("fair:color", color);
|
||||||
|
super.onSaveInstanceState(outState);
|
||||||
|
}
|
||||||
|
|
||||||
@NonNull
|
@NonNull
|
||||||
@Override
|
@Override
|
||||||
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
|
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
|
||||||
Bundle args = getArguments();
|
Bundle args = getArguments();
|
||||||
int color = args.getInt("color");
|
color = (savedInstanceState == null
|
||||||
|
? args.getInt("color")
|
||||||
|
: savedInstanceState.getInt("fair:color"));
|
||||||
String title = args.getString("title");
|
String title = args.getString("title");
|
||||||
boolean reset = args.getBoolean("reset", false);
|
boolean reset = args.getBoolean("reset", false);
|
||||||
|
|
||||||
|
@ -50,8 +61,14 @@ public class FragmentDialogColor extends FragmentDialogBase {
|
||||||
.setTitle(title)
|
.setTitle(title)
|
||||||
.initialColor(color)
|
.initialColor(color)
|
||||||
.wheelType(ColorPickerView.WHEEL_TYPE.FLOWER)
|
.wheelType(ColorPickerView.WHEEL_TYPE.FLOWER)
|
||||||
.density(12)
|
.density(6)
|
||||||
.lightnessSliderOnly()
|
.lightnessSliderOnly()
|
||||||
|
.setOnColorChangedListener(new OnColorChangedListener() {
|
||||||
|
@Override
|
||||||
|
public void onColorChanged(int selectedColor) {
|
||||||
|
color = selectedColor;
|
||||||
|
}
|
||||||
|
})
|
||||||
.setPositiveButton(android.R.string.ok, new ColorPickerClickListener() {
|
.setPositiveButton(android.R.string.ok, new ColorPickerClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(DialogInterface dialog, int selectedColor, Integer[] allColors) {
|
public void onClick(DialogInterface dialog, int selectedColor, Integer[] allColors) {
|
||||||
|
|
Loading…
Reference in New Issue