Update sample apps again

angularsen · angularsen · commit d87690876a40 · 2019-01-28T00:31:57.000+01:00
diff --git a/Samples/UnitConverter.Wpf/UnitConverter.Wpf/MainWindowDesignVM.cs b/Samples/UnitConverter.Wpf/UnitConverter.Wpf/MainWindowDesignVM.cs
@@ -14,7 +14,7 @@ public sealed class MainWindowDesignVm : IMainWindowVm
     {
         public MainWindowDesignVm()
         {
-            Quantities = ToReadOnly(UnitsHelper.QuantityTypes);
+            Quantities = ToReadOnly(Quantity.Types);
             Units = ToReadOnly(Length.Units.Select(u => new UnitListItem(u)));
             SelectedQuantity = QuantityType.Length;
             SelectedFromUnit = Units[1];
diff --git a/Samples/UnitConverter.Wpf/UnitConverter.Wpf/MainWindowVM.cs b/Samples/UnitConverter.Wpf/UnitConverter.Wpf/MainWindowVM.cs
@@ -29,7 +29,7 @@ public sealed class MainWindowVm : IMainWindowVm
 
         public MainWindowVm()
         {
-            Quantities = ToReadOnly(UnitsHelper.QuantityTypes);
+            Quantities = ToReadOnly(Quantity.Types);
 
             _units = new ObservableCollection<UnitListItem>();
             Units = new ReadOnlyObservableCollection<UnitListItem>(_units);
diff --git a/Samples/WpfMVVMSample/WpfMVVMSample/Converters/UnitToStringConverter.cs b/Samples/WpfMVVMSample/WpfMVVMSample/Converters/UnitToStringConverter.cs
@@ -57,7 +57,7 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu
                 // If input is just a number, use the configured default unit
                 if (double.TryParse((string) value, out double number))
                 {
-                    Type unitEnumType = UnitsHelper.QuantityInfos.First(qi => qi.ValueType == targetType).UnitType;
+                    Type unitEnumType = Quantity.Infos.First(qi => qi.ValueType == targetType).UnitType;
                     Enum defaultUnit = _settings.GetDefaultUnit(unitEnumType);
                     return Quantity.From(number, defaultUnit);
                 }

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public sealed class MainWindowDesignVm : IMainWindowVm`
`14`	`14`	`{`
`15`	`15`	`public MainWindowDesignVm()`
`16`	`16`	`{`
`17`		`- Quantities = ToReadOnly(UnitsHelper.QuantityTypes);`
	`17`	`+ Quantities = ToReadOnly(Quantity.Types);`
`18`	`18`	`Units = ToReadOnly(Length.Units.Select(u => new UnitListItem(u)));`
`19`	`19`	`SelectedQuantity = QuantityType.Length;`
`20`	`20`	`SelectedFromUnit = Units[1];`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public sealed class MainWindowVm : IMainWindowVm`
`29`	`29`
`30`	`30`	`public MainWindowVm()`
`31`	`31`	`{`
`32`		`- Quantities = ToReadOnly(UnitsHelper.QuantityTypes);`
	`32`	`+ Quantities = ToReadOnly(Quantity.Types);`
`33`	`33`
`34`	`34`	`_units = new ObservableCollection<UnitListItem>();`
`35`	`35`	`Units = new ReadOnlyObservableCollection<UnitListItem>(_units);`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu`
`57`	`57`	`// If input is just a number, use the configured default unit`
`58`	`58`	`if (double.TryParse((string) value, out double number))`
`59`	`59`	`{`
`60`		`- Type unitEnumType = UnitsHelper.QuantityInfos.First(qi => qi.ValueType == targetType).UnitType;`
	`60`	`+ Type unitEnumType = Quantity.Infos.First(qi => qi.ValueType == targetType).UnitType;`
`61`	`61`	`Enum defaultUnit = _settings.GetDefaultUnit(unitEnumType);`
`62`	`62`	`return Quantity.From(number, defaultUnit);`
`63`	`63`	`}`