Merge pull request #93

Allow to unset color (closes #92)
eltos · Feb 10, 2024 · 3d9fd3f · 3d9fd3f
2 parents c16808a + 97d7430
commit 3d9fd3f
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 2 deletions.
diff --git 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<ColorField> 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
@@ -13,13 +13,30 @@
 
     <TextView
         android:id="@+id/label"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_margin="4dp"
-        android:layout_weight="1"
         android:textAppearance="?android:attr/textAppearanceSmall"
         tools:text="Favourite color" />
 
 
+    <Space
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:layout_height="wrap_content" />
+
+    <ImageView
+        style="?actionButtonStyle"
+        android:id="@+id/clear_color"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_margin="6dp"
+        android:layout_gravity="center"
+        android:scaleType="fitCenter"
+        android:visibility="gone"
+        android:src="@drawable/ic_clear_search" />
+
+
+
 </LinearLayout>