diff --git a/simpledialogfragments/src/main/java/eltos/simpledialogfragment/form/ColorViewHolder.java b/simpledialogfragments/src/main/java/eltos/simpledialogfragment/form/ColorViewHolder.java index 37b9375..a6e0535 100644 --- a/simpledialogfragments/src/main/java/eltos/simpledialogfragment/form/ColorViewHolder.java +++ b/simpledialogfragments/src/main/java/eltos/simpledialogfragment/form/ColorViewHolder.java @@ -22,6 +22,7 @@ import android.util.TypedValue; import android.view.View; +import android.widget.ImageView; import android.widget.TextView; import eltos.simpledialogfragment.R; @@ -44,6 +45,8 @@ class ColorViewHolder extends FormElementViewHolder implements Simpl private TextView label; private ColorView colorView; + private ImageView clearButton; + public ColorViewHolder(ColorField field) { super(field); } @@ -59,6 +62,7 @@ protected void setUpView(View view, final Context context, Bundle savedInstanceS label = (TextView) view.findViewById(R.id.label); colorView = (ColorView) view.findViewById(R.id.color); + clearButton = (ImageView) view.findViewById(R.id.clear_color); // Label String text = field.getText(context); @@ -97,6 +101,15 @@ public void onClick(View v) { } }); + if (!field.required) { + clearButton.setVisibility(View.VISIBLE); + clearButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + colorView.setColor(ColorView.NONE); + } + }); + } } diff --git a/simpledialogfragments/src/main/res/layout/simpledialogfragment_form_item_color.xml b/simpledialogfragments/src/main/res/layout/simpledialogfragment_form_item_color.xml index c066238..3d6ff27 100644 --- a/simpledialogfragments/src/main/res/layout/simpledialogfragment_form_item_color.xml +++ b/simpledialogfragments/src/main/res/layout/simpledialogfragment_form_item_color.xml @@ -13,13 +13,30 @@ + + + + + +