Refactor samples.

Author: ChebanovDD

samples/Unity.Mvvm.Calc/Assets/Scripts/AppContext.cs

@@ -32,7 +32,7 @@ private void RegisterInstance<T>(T instance)
         _registeredTypes.Add(typeof(T), instance);
     }
 
-    private IReadOnlyDictionary<char, IMathOperation> GetMathOperations()
+    private static IReadOnlyDictionary<char, IMathOperation> GetMathOperations()
     {
         return new Dictionary<char, IMathOperation>
         {

samples/Unity.Mvvm.Calc/Assets/Scripts/ViewModels/CalcViewModel.cs

@@ -3,6 +3,9 @@
 using UnityMvvmToolkit.Core;
 using UnityMvvmToolkit.Core.Interfaces;
 
+// ReSharper disable UnusedMember.Global
+// ReSharper disable UnusedAutoPropertyAccessor.Global
+
 namespace ViewModels
 {
     public class CalcViewModel : IBindingContext

samples/Unity.Mvvm.Counter/Assets/Scripts/AppContext.cs

@@ -4,9 +4,7 @@
 using Interfaces.Services;
 using Services;
 using UnityEngine;
-using UnityMvvmToolkit.Core;
 using UnityMvvmToolkit.Core.Converters.PropertyValueConverters;
-using UnityMvvmToolkit.Core.Enums;
 using UnityMvvmToolkit.Core.Interfaces;
 using ValueConverters;
 using ViewModels;
@@ -24,7 +22,7 @@ public void Construct()
         RegisterInstance<IThemeService>(_themeService);
         RegisterInstance(new CounterViewModel());
         RegisterInstance<IDataStoreService>(new DataStoreService(this));
-        RegisterInstance(GetObjectProvider());
+        RegisterInstance(GetValueConverters());
     }
 
     public T Resolve<T>()
@@ -37,14 +35,6 @@ private void RegisterInstance<T>(T instance)
         _registeredTypes.Add(typeof(T), instance);
     }
 
-    private static IObjectProvider GetObjectProvider()
-    {
-        return new BindingContextObjectProvider(GetValueConverters())
-            .WarmupViewModel<CounterViewModel>()
-            .WarmupValueConverter<IntToStrConverter>(1)
-            .WarmupValueConverter<ThemeModeToBoolConverter>(1, WarmupType.OnlyByName);
-    }
-
     private static IValueConverter[] GetValueConverters()
     {
         return new IValueConverter[]

samples/Unity.Mvvm.Counter/Assets/Scripts/BindableUIElements/BindableContentPage.cs

@@ -28,9 +28,10 @@ public void ResetBindingContext(IObjectProvider objectProvider)
                 return;
             }
 
+            _themeModeProperty.ValueChanged -= OnPropertyValueChanged;
+
             objectProvider.ReturnReadOnlyProperty(_themeModeProperty);
 
-            _themeModeProperty.ValueChanged -= OnPropertyValueChanged;
             _themeModeProperty = null;
         }
 

samples/Unity.Mvvm.Counter/Assets/Scripts/BindableUIElements/BindableCountLabel.cs

@@ -19,6 +19,7 @@ public BindableCountLabel()
         protected override void UpdateControlText(string newText)
         {
             base.UpdateControlText(newText);
+
             _scaleAnimation?.PlayAsync().Forget();
         }
 

samples/Unity.Mvvm.Counter/Assets/Scripts/BindableUIElements/BindableCounterSlider.cs

@@ -20,11 +20,11 @@ public void SetBindingContext(IBindingContext context, IObjectProvider objectPro
 
         public void ResetBindingContext(IObjectProvider objectProvider)
         {
-            _incrementCommand = null;
-            _decrementCommand = null;
-
             Increment -= OnIncrement;
             Decrement -= OnDecrement;
+
+            _incrementCommand = null;
+            _decrementCommand = null;
         }
 
         private void OnIncrement(object sender, EventArgs e)

samples/Unity.Mvvm.Counter/Assets/Scripts/BindableUIElements/BindableThemeSwitcher.cs

@@ -18,6 +18,8 @@ public void SetBindingContext(IBindingContext context, IObjectProvider objectPro
             _valueProperty.ValueChanged += OnPropertyValueChanged;
 
             UpdateControlValue(_valueProperty.Value);
+
+            ValueChanged += OnControlValueChanged;
         }
 
         public void ResetBindingContext(IObjectProvider objectProvider)
@@ -27,13 +29,18 @@ public void ResetBindingContext(IObjectProvider objectProvider)
                 return;
             }
 
+            _valueProperty.ValueChanged -= OnPropertyValueChanged;
+
             objectProvider.ReturnProperty(_valueProperty);
 
-            _valueProperty.ValueChanged -= OnPropertyValueChanged;
             _valueProperty = null;
+
+            ValueChanged -= OnControlValueChanged;
+
+            UpdateControlValue(false);
         }
 
-        protected override void OnControlValueChanged(bool value)
+        private void OnControlValueChanged(object sender, bool value)
         {
             _valueProperty.Value = value;
         }

samples/Unity.Mvvm.Counter/Assets/Scripts/Services/ThemeService.cs

@@ -14,6 +14,7 @@ public class ThemeService : MonoBehaviour, IThemeService
         public void SetThemeMode(ThemeMode mode)
         {
             var theme = mode == ThemeMode.Light ? _lightTheme : _darkTheme;
+
             if (_panelSettings.themeStyleSheet != theme)
             {
                 _panelSettings.themeStyleSheet = theme;

samples/Unity.Mvvm.Counter/Assets/Scripts/UIElements/ThemeSwitcher.cs

@@ -38,16 +38,13 @@ public bool IsDarkMode
             set => SetValue(value);
         }
 
+        public event EventHandler<bool> ValueChanged;
+
         public void SetValueWithoutNotify(bool value)
         {
             SetValue(value, false);
         }
 
-        protected virtual void OnControlValueChanged(bool value)
-        {
-            throw new NotImplementedException();
-        }
-
         private void CreateLabelContainer(string containerName, string labelText, string labelClassNameModifier)
         {
             var labelContainer = new VisualElement();
@@ -108,7 +105,7 @@ private void SetValue(bool value, bool notify = true)
 
             if (notify)
             {
-                OnControlValueChanged(value);
+                ValueChanged?.Invoke(this, value);
             }
         }
 

samples/Unity.Mvvm.Counter/Assets/Scripts/ViewModels/CounterViewModel.cs

@@ -2,6 +2,8 @@
 using UnityMvvmToolkit.Core;
 using UnityMvvmToolkit.Core.Interfaces;
 
+// ReSharper disable UnusedAutoPropertyAccessor.Global
+
 namespace ViewModels
 {
     public class CounterViewModel : IBindingContext