Improved selected states

Author: saulmm

app/src/main/java/com/saulmm/cui/OrderDialogFragment.java

@@ -42,7 +42,6 @@
 import de.hdodenhof.circleimageview.CircleImageView;
 
 
-
 public class OrderDialogFragment extends BottomSheetDialogFragment {
     public static final String ID_SIZE_SUFFIX = "txt_size";
     public static final String ID_COLOR_SUFFIX = "img_color";
@@ -58,10 +57,10 @@ public class OrderDialogFragment extends BottomSheetDialogFragment {
     private OrderSelection orderSelection;
 
     public static class OrderSelection {
-        public int size;
-        public int color;
-        public String date;
-        public String time;
+        public int size = 0;
+        public int color = 0;
+        public String date = "";
+        public String time = "";
     }
 
     public interface Step1Listener {
@@ -102,7 +101,6 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
         orderSelection = new OrderSelection();
-        orderSelection.color = ContextCompat.getColor(getContext(), getProduct().color);
 
         selectedViewTransition = TransitionInflater.from(getContext())
             .inflateTransition(R.transition.transition_fake_view);
@@ -139,8 +137,6 @@ private void showDeliveryForm() {
     }
 
     private void transitionSelectedView(View v) {
-        v.setSelected(true);
-
         // Create the cloned view from the selected view at the same position
         final View clonedView = createSelectionView(v);
 
@@ -190,10 +186,26 @@ private View getTargetView(View v) {
         throw new IllegalStateException();
     }
 
+    @BindingAdapter("app:spanOffset")
+    public static void setItemSpan(View v, int spanOffset) {
+        final String itemText = ((TextView) v).getText().toString();
+        final SpannableString sString = new SpannableString(itemText);
+
+        sString.setSpan(new RelativeSizeSpan(1.5f), itemText.length() - spanOffset, itemText.length(),
+            Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+        ((TextView) v).setText(sString);
+    }
+
     private void initOrderStepOneView(LayoutFormOrderStep1Binding layoutStep1) {
         binding.btnGo.setOnClickListener(v -> {
             binding.txtAction.setText(R.string.action_book);
 
+            if (orderSelection.color == 0) {
+                orderSelection.color = ContextCompat.getColor(
+                    getContext(), getProduct().color);
+            }
+
             for (View clonedView : clonedViews)
                 binding.mainContainer.removeView(clonedView);
 
@@ -205,42 +217,45 @@ private void initOrderStepOneView(LayoutFormOrderStep1Binding layoutStep1) {
         layoutStep1.setListener(new Step1Listener() {
             @Override
             public void onSizeSelected(View v) {
-                orderSelection.size = Integer.parseInt(((TextView) v).getText().toString());
-                transitionSelectedView(v);
+                if (orderSelection.size == 0) {
+                    orderSelection.size = Integer.parseInt(((TextView) v).getText().toString());
+                    v.setSelected(true);
+                    transitionSelectedView(v);
+                }
             }
 
             @Override
             public void onColorSelected(View v) {
-                orderSelection.color = ((ColorDrawable) ((ImageView) v).getDrawable()).getColor();
-                transitionSelectedView(v);
+                if (orderSelection.color == 0) {
+                    orderSelection.color = ((ColorDrawable) ((ImageView) v).getDrawable()).getColor();
+                    v.setSelected(true);
+                    transitionSelectedView(v);
+                }
             }
         });
     }
 
-    @BindingAdapter("app:spanOffset")
-    public static void setItemSpan(View v, int spanOffset) {
-        final String itemText = ((TextView) v).getText().toString();
-        final SpannableString sString = new SpannableString(itemText);
-
-        sString.setSpan(new RelativeSizeSpan(1.5f), itemText.length() - spanOffset, itemText.length(),
-            Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-
-        ((TextView) v).setText(sString);
-    }
-
     private void initOrderStepTwoView(LayoutFormOrderStep2Binding step2Binding) {
         binding.btnGo.setBackground(new ColorDrawable(orderSelection.color));
         binding.btnGo.setOnClickListener(v -> changeToConfirmScene());
 
         step2Binding.setListener(new Step2Listener() {
             @Override
             public void onDateSelected(View v) {
-                transitionSelectedView(v);
+                if (orderSelection.date.isEmpty()) {
+                    orderSelection.date = ((TextView) v).getText().toString();
+                    v.setSelected(true);
+                    transitionSelectedView(v);
+                }
             }
 
             @Override
             public void onTimeSelected(View v) {
-                transitionSelectedView(v);
+                if (orderSelection.time.isEmpty()) {
+                    orderSelection.time = ((TextView) v).getText().toString();
+                    v.setSelected(true);
+                    transitionSelectedView(v);
+                }
             }
         });
     }

app/src/main/res/color/csl_date.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    >
+
+    <item android:color="@android:color/white" android:state_selected="true"/>
+
+    <item android:color="@color/blue_grey_400"/>
+</selector>

app/src/main/res/values/styles.xml

@@ -1,4 +1,5 @@
 <resources>
+
     <style name="Widget"/>
 
     <style name="ConfirmationTextAppearance" parent="Base.TextAppearance.AppCompat">
@@ -21,8 +22,6 @@
         <item name="android:textStyle">italic</item>
     </style>
 
-
-
     <style name="Widget.Size">
         <item name="android:layout_width">@dimen/product_color_size</item>
         <item name="android:layout_height">@dimen/product_color_size</item>
@@ -55,7 +54,7 @@
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:background">@drawable/bg_square_date</item>
-        <item name="android:textColor">@color/blue_grey_400</item>
+        <item name="android:textColor">@color/csl_date</item>
         <item name="android:gravity">center</item>
         <item name="android:padding">@dimen/spacing_medium</item>
     </style>