Refactoring.

ChebanovDD · ChebanovDD · commit c85c1f222eac · 2022-08-31T00:27:10.000+07:00
diff --git a/samples/Unity.Mvvm.Counter/Assets/Scripts/BindableUIElementWrappers/BindableCounterSliderWrapper.cs b/samples/Unity.Mvvm.Counter/Assets/Scripts/BindableUIElementWrappers/BindableCounterSliderWrapper.cs
@@ -8,39 +8,39 @@ namespace BindableUIElementWrappers
     public class BindableCounterSliderWrapper : BindableCommandElement, IInitializable, IDisposable
     {
         private readonly BindableCounterSlider _counterSlider;
-        private readonly ICommand _increaseCommand;
-        private readonly ICommand _decreaseCommand;
+        private readonly ICommand _incrementCommand;
+        private readonly ICommand _decrementCommand;
 
         public BindableCounterSliderWrapper(BindableCounterSlider counterSlider, IObjectProvider objectProvider)
             : base(objectProvider)
         {
             _counterSlider = counterSlider;
-            _increaseCommand = GetCommand<ICommand>(counterSlider.IncreaseCommand);
-            _decreaseCommand = GetCommand<ICommand>(counterSlider.DecreaseCommand);
+            _incrementCommand = GetCommand<ICommand>(counterSlider.IncrementCommand);
+            _decrementCommand = GetCommand<ICommand>(counterSlider.DecrementCommand);
         }
 
-        public bool CanInitialize => _increaseCommand != null && _decreaseCommand != null;
+        public bool CanInitialize => _incrementCommand != null && _decrementCommand != null;
 
         public void Initialize()
         {
-            _counterSlider.Increase += OnIncrease;
-            _counterSlider.Decrease += OnDecrease;
+            _counterSlider.Increment += OnIncrement;
+            _counterSlider.Decrement += OnDecrement;
         }
 
         public void Dispose()
         {
-            _counterSlider.Increase -= OnIncrease;
-            _counterSlider.Decrease -= OnDecrease;
+            _counterSlider.Increment -= OnIncrement;
+            _counterSlider.Decrement -= OnDecrement;
         }
 
-        private void OnIncrease(object sender, EventArgs e)
+        private void OnIncrement(object sender, EventArgs e)
         {
-            _increaseCommand.Execute();
+            _incrementCommand.Execute();
         }
 
-        private void OnDecrease(object sender, EventArgs e)
+        private void OnDecrement(object sender, EventArgs e)
         {
-            _decreaseCommand.Execute();
+            _decrementCommand.Execute();
         }
     }
 }
diff --git a/samples/Unity.Mvvm.Counter/Assets/Scripts/BindableUIElements/BindableCounterSlider.cs b/samples/Unity.Mvvm.Counter/Assets/Scripts/BindableUIElements/BindableCounterSlider.cs
@@ -6,28 +6,28 @@ namespace BindableUIElements
 {
     public class BindableCounterSlider : CounterSlider, IBindableUIElement
     {
-        public string IncreaseCommand { get; set; }
-        public string DecreaseCommand { get; set; }
+        public string IncrementCommand { get; set; }
+        public string DecrementCommand { get; set; }
 
         public new class UxmlFactory : UxmlFactory<BindableCounterSlider, UxmlTraits>
         {
         }
 
         public new class UxmlTraits : CounterSlider.UxmlTraits
         {
-            private readonly UxmlStringAttributeDescription _increaseCommandAttribute = new()
-                { name = "increase-command", defaultValue = "" };
+            private readonly UxmlStringAttributeDescription _incrementCommandAttribute = new()
+                { name = "increment-command", defaultValue = "" };
 
-            private readonly UxmlStringAttributeDescription _decreaseCommandAttribute = new()
-                { name = "decrease-command", defaultValue = "" };
+            private readonly UxmlStringAttributeDescription _decrementCommandAttribute = new()
+                { name = "decrement-command", defaultValue = "" };
 
             public override void Init(VisualElement visualElement, IUxmlAttributes bag, CreationContext context)
             {
                 base.Init(visualElement, bag, context);
 
                 var bindableCounterSlider = (BindableCounterSlider) visualElement;
-                bindableCounterSlider.IncreaseCommand = _increaseCommandAttribute.GetValueFromBag(bag, context);
-                bindableCounterSlider.DecreaseCommand = _decreaseCommandAttribute.GetValueFromBag(bag, context);
+                bindableCounterSlider.IncrementCommand = _incrementCommandAttribute.GetValueFromBag(bag, context);
+                bindableCounterSlider.DecrementCommand = _decrementCommandAttribute.GetValueFromBag(bag, context);
             }
         }
     }
diff --git a/samples/Unity.Mvvm.Counter/Assets/Scripts/UIElements/CounterSlider.cs b/samples/Unity.Mvvm.Counter/Assets/Scripts/UIElements/CounterSlider.cs
@@ -26,16 +26,16 @@ public CounterSlider()
             RegisterCallback<GeometryChangedEvent>(OnLayoutCalculated);
         }
 
-        public event EventHandler Increase
+        public event EventHandler Increment
         {
-            add => _manipulator.Increase += value;
-            remove => _manipulator.Increase -= value;
+            add => _manipulator.Increment += value;
+            remove => _manipulator.Increment -= value;
         }
 
-        public event EventHandler Decrease
+        public event EventHandler Decrement
         {
-            add => _manipulator.Decrease += value;
-            remove => _manipulator.Decrease -= value;
+            add => _manipulator.Decrement += value;
+            remove => _manipulator.Decrement -= value;
         }
 
         private void CreateLabel(string labelName, string labelText)
diff --git a/samples/Unity.Mvvm.Counter/Assets/Scripts/UIElements/SliderManipulator.cs b/samples/Unity.Mvvm.Counter/Assets/Scripts/UIElements/SliderManipulator.cs
@@ -22,8 +22,8 @@ public SliderManipulator(VisualElement slider, VisualElement thumb)
             _thumb = thumb;
         }
 
-        public event EventHandler Increase;
-        public event EventHandler Decrease;
+        public event EventHandler Increment;
+        public event EventHandler Decrement;
 
         public void Initialize()
         {
@@ -77,11 +77,11 @@ private async UniTaskVoid EndThumbMove(Vector2 localPosition)
 
             if (localPosition.x >= _increasePositionX)
             {
-                Increase?.Invoke(this, EventArgs.Empty);
+                Increment?.Invoke(this, EventArgs.Empty);
             }
             else if (localPosition.x <= _decreasePositionX)
             {
-                Decrease?.Invoke(this, EventArgs.Empty);
+                Decrement?.Invoke(this, EventArgs.Empty);
             }
         }
 
diff --git a/samples/Unity.Mvvm.Counter/Assets/Scripts/ViewModels/CounterViewModel.cs b/samples/Unity.Mvvm.Counter/Assets/Scripts/ViewModels/CounterViewModel.cs
@@ -11,8 +11,8 @@ public class CounterViewModel : ViewModel
 
         public CounterViewModel()
         {
-            IncreaseCommand = new Command(IncreaseCount);
-            DecreaseCommand = new Command(DecreaseCount);
+            IncrementCommand = new Command(IncrementCount);
+            DecrementCommand = new Command(DecrementCount);
         }
 
         public int Count
@@ -27,17 +27,10 @@ public ThemeMode ThemeMode
             set => Set(ref _themeMode, value);
         }
 
-        public ICommand IncreaseCommand { get; }
-        public ICommand DecreaseCommand { get; }
+        public ICommand IncrementCommand { get; }
+        public ICommand DecrementCommand { get; }
 
-        private void IncreaseCount()
-        {
-            Count++;
-        }
-
-        private void DecreaseCount()
-        {
-            Count--;
-        }
+        private void IncrementCount() => Count++;
+        private void DecrementCount() => Count--;
     }
 }
diff --git a/samples/Unity.Mvvm.Counter/Assets/UI Toolkit/CounterView.uxml b/samples/Unity.Mvvm.Counter/Assets/UI Toolkit/CounterView.uxml
@@ -8,6 +8,6 @@
             <BindableUIElements.BindableCountLabel text="25" binding-text-path="Count" class="count-label count-label--animation" />
         </ui:VisualElement>
         <BindableUIElements.BindableThemeSwitcher binding-value-path="ThemeMode, Converter={ThemeModeToBoolConverter}" />
-        <BindableUIElements.BindableCounterSlider increase-command="IncreaseCommand" decrease-command="DecreaseCommand" style="margin-bottom: 15%;" />
+        <BindableUIElements.BindableCounterSlider increment-command="IncrementCommand" decrement-command="DecrementCommand" style="margin-bottom: 15%;" />
     </BindableUIElements.BindableContentPage>
 </ui:UXML>

Original file line number	Diff line number	Diff line change
`@@ -8,39 +8,39 @@ namespace BindableUIElementWrappers`
`8`	`8`	`public class BindableCounterSliderWrapper : BindableCommandElement, IInitializable, IDisposable`
`9`	`9`	`{`
`10`	`10`	`private readonly BindableCounterSlider _counterSlider;`
`11`		`- private readonly ICommand _increaseCommand;`
`12`		`- private readonly ICommand _decreaseCommand;`
	`11`	`+ private readonly ICommand _incrementCommand;`
	`12`	`+ private readonly ICommand _decrementCommand;`
`13`	`13`
`14`	`14`	`public BindableCounterSliderWrapper(BindableCounterSlider counterSlider, IObjectProvider objectProvider)`
`15`	`15`	`: base(objectProvider)`
`16`	`16`	`{`
`17`	`17`	`_counterSlider = counterSlider;`
`18`		`- _increaseCommand = GetCommand<ICommand>(counterSlider.IncreaseCommand);`
`19`		`- _decreaseCommand = GetCommand<ICommand>(counterSlider.DecreaseCommand);`
	`18`	`+ _incrementCommand = GetCommand<ICommand>(counterSlider.IncrementCommand);`
	`19`	`+ _decrementCommand = GetCommand<ICommand>(counterSlider.DecrementCommand);`
`20`	`20`	`}`
`21`	`21`
`22`		`- public bool CanInitialize => _increaseCommand != null && _decreaseCommand != null;`
	`22`	`+ public bool CanInitialize => _incrementCommand != null && _decrementCommand != null;`
`23`	`23`
`24`	`24`	`public void Initialize()`
`25`	`25`	`{`
`26`		`- _counterSlider.Increase += OnIncrease;`
`27`		`- _counterSlider.Decrease += OnDecrease;`
	`26`	`+ _counterSlider.Increment += OnIncrement;`
	`27`	`+ _counterSlider.Decrement += OnDecrement;`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`public void Dispose()`
`31`	`31`	`{`
`32`		`- _counterSlider.Increase -= OnIncrease;`
`33`		`- _counterSlider.Decrease -= OnDecrease;`
	`32`	`+ _counterSlider.Increment -= OnIncrement;`
	`33`	`+ _counterSlider.Decrement -= OnDecrement;`
`34`	`34`	`}`
`35`	`35`
`36`		`- private void OnIncrease(object sender, EventArgs e)`
	`36`	`+ private void OnIncrement(object sender, EventArgs e)`
`37`	`37`	`{`
`38`		`- _increaseCommand.Execute();`
	`38`	`+ _incrementCommand.Execute();`
`39`	`39`	`}`
`40`	`40`
`41`		`- private void OnDecrease(object sender, EventArgs e)`
	`41`	`+ private void OnDecrement(object sender, EventArgs e)`
`42`	`42`	`{`
`43`		`- _decreaseCommand.Execute();`
	`43`	`+ _decrementCommand.Execute();`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,28 +6,28 @@ namespace BindableUIElements`
`6`	`6`	`{`
`7`	`7`	`public class BindableCounterSlider : CounterSlider, IBindableUIElement`
`8`	`8`	`{`
`9`		`- public string IncreaseCommand { get; set; }`
`10`		`- public string DecreaseCommand { get; set; }`
	`9`	`+ public string IncrementCommand { get; set; }`
	`10`	`+ public string DecrementCommand { get; set; }`
`11`	`11`
`12`	`12`	`public new class UxmlFactory : UxmlFactory<BindableCounterSlider, UxmlTraits>`
`13`	`13`	`{`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`public new class UxmlTraits : CounterSlider.UxmlTraits`
`17`	`17`	`{`
`18`		`- private readonly UxmlStringAttributeDescription _increaseCommandAttribute = new()`
`19`		`- { name = "increase-command", defaultValue = "" };`
	`18`	`+ private readonly UxmlStringAttributeDescription _incrementCommandAttribute = new()`
	`19`	`+ { name = "increment-command", defaultValue = "" };`
`20`	`20`
`21`		`- private readonly UxmlStringAttributeDescription _decreaseCommandAttribute = new()`
`22`		`- { name = "decrease-command", defaultValue = "" };`
	`21`	`+ private readonly UxmlStringAttributeDescription _decrementCommandAttribute = new()`
	`22`	`+ { name = "decrement-command", defaultValue = "" };`
`23`	`23`
`24`	`24`	`public override void Init(VisualElement visualElement, IUxmlAttributes bag, CreationContext context)`
`25`	`25`	`{`
`26`	`26`	`base.Init(visualElement, bag, context);`
`27`	`27`
`28`	`28`	`var bindableCounterSlider = (BindableCounterSlider) visualElement;`
`29`		`- bindableCounterSlider.IncreaseCommand = _increaseCommandAttribute.GetValueFromBag(bag, context);`
`30`		`- bindableCounterSlider.DecreaseCommand = _decreaseCommandAttribute.GetValueFromBag(bag, context);`
	`29`	`+ bindableCounterSlider.IncrementCommand = _incrementCommandAttribute.GetValueFromBag(bag, context);`
	`30`	`+ bindableCounterSlider.DecrementCommand = _decrementCommandAttribute.GetValueFromBag(bag, context);`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,16 +26,16 @@ public CounterSlider()`
`26`	`26`	`RegisterCallback<GeometryChangedEvent>(OnLayoutCalculated);`
`27`	`27`	`}`
`28`	`28`
`29`		`- public event EventHandler Increase`
	`29`	`+ public event EventHandler Increment`
`30`	`30`	`{`
`31`		`- add => _manipulator.Increase += value;`
`32`		`- remove => _manipulator.Increase -= value;`
	`31`	`+ add => _manipulator.Increment += value;`
	`32`	`+ remove => _manipulator.Increment -= value;`
`33`	`33`	`}`
`34`	`34`
`35`		`- public event EventHandler Decrease`
	`35`	`+ public event EventHandler Decrement`
`36`	`36`	`{`
`37`		`- add => _manipulator.Decrease += value;`
`38`		`- remove => _manipulator.Decrease -= value;`
	`37`	`+ add => _manipulator.Decrement += value;`
	`38`	`+ remove => _manipulator.Decrement -= value;`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`private void CreateLabel(string labelName, string labelText)`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@ public SliderManipulator(VisualElement slider, VisualElement thumb)`
`22`	`22`	`_thumb = thumb;`
`23`	`23`	`}`
`24`	`24`
`25`		`- public event EventHandler Increase;`
`26`		`- public event EventHandler Decrease;`
	`25`	`+ public event EventHandler Increment;`
	`26`	`+ public event EventHandler Decrement;`
`27`	`27`
`28`	`28`	`public void Initialize()`
`29`	`29`	`{`
`@@ -77,11 +77,11 @@ private async UniTaskVoid EndThumbMove(Vector2 localPosition)`
`77`	`77`
`78`	`78`	`if (localPosition.x >= _increasePositionX)`
`79`	`79`	`{`
`80`		`- Increase?.Invoke(this, EventArgs.Empty);`
	`80`	`+ Increment?.Invoke(this, EventArgs.Empty);`
`81`	`81`	`}`
`82`	`82`	`else if (localPosition.x <= _decreasePositionX)`
`83`	`83`	`{`
`84`		`- Decrease?.Invoke(this, EventArgs.Empty);`
	`84`	`+ Decrement?.Invoke(this, EventArgs.Empty);`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ public class CounterViewModel : ViewModel`
`11`	`11`
`12`	`12`	`public CounterViewModel()`
`13`	`13`	`{`
`14`		`- IncreaseCommand = new Command(IncreaseCount);`
`15`		`- DecreaseCommand = new Command(DecreaseCount);`
	`14`	`+ IncrementCommand = new Command(IncrementCount);`
	`15`	`+ DecrementCommand = new Command(DecrementCount);`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`public int Count`
`@@ -27,17 +27,10 @@ public ThemeMode ThemeMode`
`27`	`27`	`set => Set(ref _themeMode, value);`
`28`	`28`	`}`
`29`	`29`
`30`		`- public ICommand IncreaseCommand { get; }`
`31`		`- public ICommand DecreaseCommand { get; }`
	`30`	`+ public ICommand IncrementCommand { get; }`
	`31`	`+ public ICommand DecrementCommand { get; }`
`32`	`32`
`33`		`- private void IncreaseCount()`
`34`		`- {`
`35`		`- Count++;`
`36`		`- }`
`37`		`-`
`38`		`- private void DecreaseCount()`
`39`		`- {`
`40`		`- Count--;`
`41`		`- }`
	`33`	`+ private void IncrementCount() => Count++;`
	`34`	`+ private void DecrementCount() => Count--;`
`42`	`35`	`}`
`43`	`36`	`}`