refactor(BarcodeInput): remove business logic from behavior

ZeroGachis · Nov 14, 2024 · 2165e70 · 2165e70
1 parent 6a9d681
commit 2165e70
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 119 deletions.
diff --git a/Smartway.UiComponent.UnitTests/Inputs/Barcode/BarcodeInputBehaviorTest.cs b/Smartway.UiComponent.UnitTests/Inputs/Barcode/BarcodeInputBehaviorTest.cs
diff --git a/Smartway.UiComponent/Inputs/Barcode/BarcodeInputBehavior.cs b/Smartway.UiComponent/Inputs/Barcode/BarcodeInputBehavior.cs
@@ -1,4 +1,5 @@
-using System.Linq;
+using System;
+using System.Linq;
 using System.Windows.Input;
 using Smartway.Barcode.Ean13;
 using Smartway.UiComponent.Behaviors;
@@ -21,51 +22,26 @@ protected override void OnAttachedTo(BindableObject bindable)
             base.OnAttachedTo(bindable);
 
             AssociatedObject.Focused += OnAssociatedObjectOnFocused;
-            AssociatedObject.TextChanged += OnTextChanged;
+            AssociatedObject.Completed += Completed;
         }
 
         protected override void OnDetachingFrom(BindableObject bindable)
         {
             base.OnDetachingFrom(bindable);
 
             AssociatedObject.Focused -= OnAssociatedObjectOnFocused;
-            AssociatedObject.TextChanged -= OnTextChanged;
+            AssociatedObject.Completed -= Completed;
         }
 
         private void OnAssociatedObjectOnFocused(object sender, FocusEventArgs e)
         {
             AssociatedObject.Keyboard = Keyboard.Numeric;
         }
 
-        private void OnTextChanged(object sender, TextChangedEventArgs e)
+        private void Completed(object sender, EventArgs e)
         {
-            if (string.IsNullOrEmpty(e.NewTextValue))
-                return;
-
-            if (InputIsInvalid(e.NewTextValue))
-            {
-                AssociatedObject.Text = e.OldTextValue;
-                return;
-            }
-
-            if (e.NewTextValue.Length != Ean13.CheckedLength)
-                return;
-
-            if (Command == null || !Command.CanExecute(null))
-                return;
-
-            Command.Execute(e.NewTextValue);
-        }
-
-        private bool InputIsInvalid(string input)
-        {
-            if (input.Length > Ean13.CheckedLength)
-                return true;
-
-            if (input.Length == Ean13.CheckedLength && !Ean13.Check(input))
-                return true;
-
-            return input.ToCharArray().Any(_ => !char.IsDigit(_));
+            var entry = (Entry)sender;
+            Command.Execute(entry.Text);
         }
     }
 }