Views fix

denis-tsv · denis-tsv · commit cd5f8d0983ca · 2022-03-11T18:38:03.000+07:00
diff --git a/samples/MvvmSampleUwp/Views/AsyncRelayCommandPage.xaml.cs b/samples/MvvmSampleUwp/Views/AsyncRelayCommandPage.xaml.cs
@@ -17,10 +17,8 @@ public AsyncRelayCommandPage()
     {
         this.InitializeComponent();
 
-        ViewModel = Ioc.Default.GetRequiredService<AsyncRelayCommandPageViewModel>();
-
-        DataContext = ViewModel;
+        DataContext = Ioc.Default.GetRequiredService<AsyncRelayCommandPageViewModel>();
     }
 
-    public AsyncRelayCommandPageViewModel ViewModel { get; }
+    public AsyncRelayCommandPageViewModel ViewModel => (AsyncRelayCommandPageViewModel)DataContext;
 }
diff --git a/samples/MvvmSampleUwp/Views/BuildingTheUIPage.xaml.cs b/samples/MvvmSampleUwp/Views/BuildingTheUIPage.xaml.cs
@@ -17,10 +17,8 @@ public BuildingTheUIPage()
     {
         this.InitializeComponent();
 
-        ViewModel = Ioc.Default.GetRequiredService<SamplePageViewModel>();
-
-        DataContext = ViewModel;
+        DataContext = Ioc.Default.GetRequiredService<SamplePageViewModel>();
     }
 
-    public SamplePageViewModel ViewModel { get; }
+    public SamplePageViewModel ViewModel => (SamplePageViewModel)DataContext;
 }
diff --git a/samples/MvvmSampleUwp/Views/IntroductionPage.xaml.cs b/samples/MvvmSampleUwp/Views/IntroductionPage.xaml.cs
@@ -17,10 +17,8 @@ public IntroductionPage()
     {
         this.InitializeComponent();
 
-        ViewModel = Ioc.Default.GetRequiredService<ObservableObjectPageViewModel>();
-
-        DataContext = ViewModel;
+        DataContext = Ioc.Default.GetRequiredService<ObservableObjectPageViewModel>();
     }
 
-    public ObservableObjectPageViewModel ViewModel { get; }
+    public ObservableObjectPageViewModel ViewModel => (ObservableObjectPageViewModel)DataContext;
 }
diff --git a/samples/MvvmSampleUwp/Views/IocPage.xaml.cs b/samples/MvvmSampleUwp/Views/IocPage.xaml.cs
@@ -17,10 +17,8 @@ public IocPage()
     {
         this.InitializeComponent();
 
-        ViewModel = Ioc.Default.GetRequiredService<IocPageViewModel>();
-
-        DataContext = ViewModel;
+        DataContext = Ioc.Default.GetRequiredService<IocPageViewModel>();
     }
 
-    public IocPageViewModel ViewModel { get; }
+    public IocPageViewModel ViewModel => (IocPageViewModel)DataContext;
 }
diff --git a/samples/MvvmSampleUwp/Views/MessengerPage.xaml.cs b/samples/MvvmSampleUwp/Views/MessengerPage.xaml.cs
@@ -17,10 +17,8 @@ public MessengerPage()
     {
         this.InitializeComponent();
 
-        ViewModel = Ioc.Default.GetRequiredService<MessengerPageViewModel>();
-
-        DataContext = ViewModel;
+        DataContext = Ioc.Default.GetRequiredService<MessengerPageViewModel>();
     }
 
-    public MessengerPageViewModel ViewModel { get; }
+    public MessengerPageViewModel ViewModel => (MessengerPageViewModel)DataContext;
 }
diff --git a/samples/MvvmSampleUwp/Views/MessengerRequestPage.xaml.cs b/samples/MvvmSampleUwp/Views/MessengerRequestPage.xaml.cs
@@ -18,12 +18,10 @@ public MessengerRequestPage()
     {
         this.InitializeComponent();
 
-        ViewModel = Ioc.Default.GetRequiredService<MessengerPageViewModel>();
-
-        DataContext = ViewModel;
+        DataContext = Ioc.Default.GetRequiredService<MessengerPageViewModel>();
     }
 
-    public MessengerPageViewModel ViewModel { get; }
+    public MessengerPageViewModel ViewModel => (MessengerPageViewModel)DataContext;
 
     /// <inheritdoc/>
     protected override void OnNavigatedTo(NavigationEventArgs e)
diff --git a/samples/MvvmSampleUwp/Views/MessengerSendPage.xaml.cs b/samples/MvvmSampleUwp/Views/MessengerSendPage.xaml.cs
@@ -18,12 +18,10 @@ public MessengerSendPage()
     {
         this.InitializeComponent();
 
-        ViewModel = Ioc.Default.GetRequiredService<MessengerPageViewModel>();
-
-        DataContext = ViewModel;
+        DataContext = Ioc.Default.GetRequiredService<MessengerPageViewModel>();
     }
 
-    public MessengerPageViewModel ViewModel { get; }
+    public MessengerPageViewModel ViewModel => (MessengerPageViewModel)DataContext;
 
     /// <inheritdoc/>
     protected override void OnNavigatedTo(NavigationEventArgs e)
diff --git a/samples/MvvmSampleUwp/Views/ObservableObjectPage.xaml.cs b/samples/MvvmSampleUwp/Views/ObservableObjectPage.xaml.cs
@@ -17,10 +17,8 @@ public ObservableObjectPage()
     {
         this.InitializeComponent();
 
-        ViewModel = Ioc.Default.GetRequiredService<ObservableObjectPageViewModel>();
-
-        DataContext = ViewModel;
+        DataContext = Ioc.Default.GetRequiredService<ObservableObjectPageViewModel>();
     }
 
-    public ObservableObjectPageViewModel ViewModel { get; }
+    public ObservableObjectPageViewModel ViewModel => (ObservableObjectPageViewModel)DataContext;
 }
diff --git a/samples/MvvmSampleUwp/Views/PuttingThingsTogetherPage.xaml.cs b/samples/MvvmSampleUwp/Views/PuttingThingsTogetherPage.xaml.cs
@@ -17,10 +17,8 @@ public PuttingThingsTogetherPage()
     {
         this.InitializeComponent();
 
-        ViewModel = Ioc.Default.GetRequiredService<SamplePageViewModel>();
-
-        DataContext = ViewModel;
+        DataContext = Ioc.Default.GetRequiredService<SamplePageViewModel>();
     }
 
-    public SamplePageViewModel ViewModel { get; }
+    public SamplePageViewModel ViewModel => (SamplePageViewModel)DataContext;
 }
diff --git a/samples/MvvmSampleUwp/Views/RedditServicePage.xaml.cs b/samples/MvvmSampleUwp/Views/RedditServicePage.xaml.cs
@@ -17,10 +17,8 @@ public RedditServicePage()
     {
         this.InitializeComponent();
 
-        ViewModel = Ioc.Default.GetRequiredService<SamplePageViewModel>();
-
-        DataContext = ViewModel;
+        DataContext = Ioc.Default.GetRequiredService<SamplePageViewModel>();
     }
 
-    public SamplePageViewModel ViewModel { get; }
+    public SamplePageViewModel ViewModel => (SamplePageViewModel)DataContext;
 }
diff --git a/samples/MvvmSampleUwp/Views/RelayCommandPage.xaml.cs b/samples/MvvmSampleUwp/Views/RelayCommandPage.xaml.cs
@@ -17,10 +17,8 @@ public RelayCommandPage()
     {
         this.InitializeComponent();
 
-        ViewModel = Ioc.Default.GetRequiredService<RelayCommandPageViewModel>();
-
-        DataContext = ViewModel;
+        DataContext = Ioc.Default.GetRequiredService<RelayCommandPageViewModel>();
     }
 
-    public RelayCommandPageViewModel ViewModel { get; }
+    public RelayCommandPageViewModel ViewModel => (RelayCommandPageViewModel)DataContext;
 }
diff --git a/samples/MvvmSampleUwp/Views/SettingUpTheViewModelsPage.xaml.cs b/samples/MvvmSampleUwp/Views/SettingUpTheViewModelsPage.xaml.cs
@@ -17,10 +17,8 @@ public SettingUpTheViewModelsPage()
     {
         this.InitializeComponent();
 
-        ViewModel = Ioc.Default.GetRequiredService<SamplePageViewModel>();
-
-        DataContext = ViewModel;
+        DataContext = Ioc.Default.GetRequiredService<SamplePageViewModel>();
     }
 
-    public SamplePageViewModel ViewModel { get; }
+    public SamplePageViewModel ViewModel => (SamplePageViewModel)DataContext;
 }
diff --git a/samples/MvvmSampleUwp/Views/SettingsServicePage.xaml.cs b/samples/MvvmSampleUwp/Views/SettingsServicePage.xaml.cs
@@ -17,10 +17,8 @@ public SettingsServicePage()
     {
         this.InitializeComponent();
 
-        ViewModel = Ioc.Default.GetRequiredService<SamplePageViewModel>();
-
-        DataContext = ViewModel;
+        DataContext = Ioc.Default.GetRequiredService<SamplePageViewModel>();
     }
 
-    public SamplePageViewModel ViewModel { get; }
+    public SamplePageViewModel ViewModel => (SamplePageViewModel)DataContext;
 }
diff --git a/samples/MvvmSampleUwp/Views/Widgets/PostWidget.xaml.cs b/samples/MvvmSampleUwp/Views/Widgets/PostWidget.xaml.cs
@@ -14,13 +14,11 @@ public PostWidget()
     {
         this.InitializeComponent();
 
-        ViewModel = Ioc.Default.GetRequiredService<PostWidgetViewModel>();
-
-        DataContext = ViewModel;
+        DataContext = Ioc.Default.GetRequiredService<PostWidgetViewModel>();
 
         this.Loaded += (s, e) => ViewModel.IsActive = true;
         this.Unloaded += (s, e) => ViewModel.IsActive = false;
     }
 
-    public PostWidgetViewModel ViewModel { get; }
+    public PostWidgetViewModel ViewModel => (PostWidgetViewModel)DataContext;
 }
diff --git a/samples/MvvmSampleUwp/Views/Widgets/SubredditWidget.xaml.cs b/samples/MvvmSampleUwp/Views/Widgets/SubredditWidget.xaml.cs
@@ -14,10 +14,8 @@ public SubredditWidget()
     {
         this.InitializeComponent();
 
-        ViewModel = Ioc.Default.GetRequiredService<SubredditWidgetViewModel>();
-
-        DataContext = ViewModel;
+        DataContext = Ioc.Default.GetRequiredService<SubredditWidgetViewModel>();
     }
 
-    public SubredditWidgetViewModel ViewModel { get; }
+    public SubredditWidgetViewModel ViewModel => (SubredditWidgetViewModel)DataContext;
 }
diff --git a/samples/MvvmSampleXF/MvvmSampleXF/Views/AsyncRelayCommandPage.xaml.cs b/samples/MvvmSampleXF/MvvmSampleXF/Views/AsyncRelayCommandPage.xaml.cs
@@ -1,9 +1,4 @@
-﻿using MvvmSample.Core.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+﻿using MvvmSample.Core.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
 
 using Xamarin.Forms;
@@ -18,12 +13,10 @@ public AsyncRelayCommandPage()
         {
             InitializeComponent();
 
-            ViewModel = Ioc.Default.GetRequiredService<AsyncRelayCommandPageViewModel>();
-
-            BindingContext = ViewModel;
+            BindingContext = Ioc.Default.GetRequiredService<AsyncRelayCommandPageViewModel>();
         }
 
-        public AsyncRelayCommandPageViewModel ViewModel { get; }
+        public AsyncRelayCommandPageViewModel ViewModel => (AsyncRelayCommandPageViewModel)BindingContext;
 
         protected override void OnAppearing()
         {
diff --git a/samples/MvvmSampleXF/MvvmSampleXF/Views/BuildingTheUIPage.xaml.cs b/samples/MvvmSampleXF/MvvmSampleXF/Views/BuildingTheUIPage.xaml.cs
@@ -1,9 +1,4 @@
-﻿using MvvmSample.Core.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+﻿using MvvmSample.Core.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
 
 using Xamarin.Forms;
@@ -16,14 +11,12 @@ public partial class BuildingTheUIPage : ContentPage
     {
         public BuildingTheUIPage()
         {
-            InitializeComponent();
-
-            ViewModel = Ioc.Default.GetRequiredService<SamplePageViewModel>();
+            InitializeComponent();
 
-            BindingContext = ViewModel;
+            BindingContext = Ioc.Default.GetRequiredService<SamplePageViewModel>();
         }
 
-        public SamplePageViewModel ViewModel { get; }
+        public SamplePageViewModel ViewModel => (SamplePageViewModel)BindingContext;
 
         protected override void OnAppearing()
         {
diff --git a/samples/MvvmSampleXF/MvvmSampleXF/Views/IntroductionPage.xaml.cs b/samples/MvvmSampleXF/MvvmSampleXF/Views/IntroductionPage.xaml.cs
@@ -1,9 +1,4 @@
-﻿using MvvmSample.Core.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+﻿using MvvmSample.Core.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
 
 using Xamarin.Forms;
@@ -18,12 +13,10 @@ public IntroductionPage()
         {
             InitializeComponent();
 
-            ViewModel = Ioc.Default.GetRequiredService<ObservableObjectPageViewModel>();
-
-            BindingContext = ViewModel;
+            BindingContext = Ioc.Default.GetRequiredService<ObservableObjectPageViewModel>();
         }
 
-        public ObservableObjectPageViewModel ViewModel { get; }
+        public ObservableObjectPageViewModel ViewModel => (ObservableObjectPageViewModel)BindingContext;
 
         protected override void OnAppearing()
         {
diff --git a/samples/MvvmSampleXF/MvvmSampleXF/Views/IoCPage.xaml.cs b/samples/MvvmSampleXF/MvvmSampleXF/Views/IoCPage.xaml.cs
@@ -1,9 +1,4 @@
-﻿using MvvmSample.Core.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+﻿using MvvmSample.Core.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
 
 using Xamarin.Forms;
@@ -18,12 +13,10 @@ public IoCPage()
         {
             InitializeComponent();
 
-            ViewModel = Ioc.Default.GetRequiredService<IocPageViewModel>();
-
-            BindingContext = ViewModel;
+            BindingContext = Ioc.Default.GetRequiredService<IocPageViewModel>();
         }
 
-        public IocPageViewModel ViewModel { get; }
+        public IocPageViewModel ViewModel => (IocPageViewModel)BindingContext;
 
         protected override void OnAppearing()
         {
diff --git a/samples/MvvmSampleXF/MvvmSampleXF/Views/MessengerPage.xaml.cs b/samples/MvvmSampleXF/MvvmSampleXF/Views/MessengerPage.xaml.cs
@@ -1,9 +1,4 @@
-﻿using MvvmSample.Core.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+﻿using MvvmSample.Core.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
 
 using Xamarin.Forms;
@@ -18,12 +13,10 @@ public MessengerPage()
         {
             InitializeComponent();
 
-            ViewModel = Ioc.Default.GetRequiredService<MessengerPageViewModel>();
-
-            BindingContext = ViewModel;
+            BindingContext = Ioc.Default.GetRequiredService<MessengerPageViewModel>();
         }
 
-        public MessengerPageViewModel ViewModel { get; }
+        public MessengerPageViewModel ViewModel => (MessengerPageViewModel)BindingContext;
 
         protected override void OnAppearing()
         {
diff --git a/samples/MvvmSampleXF/MvvmSampleXF/Views/MessengerRequestPage.xaml.cs b/samples/MvvmSampleXF/MvvmSampleXF/Views/MessengerRequestPage.xaml.cs
@@ -1,9 +1,4 @@
-﻿using MvvmSample.Core.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+﻿using MvvmSample.Core.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
 
 using Xamarin.Forms;
@@ -18,12 +13,10 @@ public MessengerRequestPage()
         {
             InitializeComponent();
 
-            ViewModel = Ioc.Default.GetRequiredService<MessengerPageViewModel>();
-
-            BindingContext = ViewModel;
+            BindingContext = Ioc.Default.GetRequiredService<MessengerPageViewModel>();
         }
 
-        public MessengerPageViewModel ViewModel { get; }
+        public MessengerPageViewModel ViewModel => (MessengerPageViewModel)BindingContext;
 
         protected override void OnAppearing()
         {
diff --git a/samples/MvvmSampleXF/MvvmSampleXF/Views/MessengerSendPage.xaml.cs b/samples/MvvmSampleXF/MvvmSampleXF/Views/MessengerSendPage.xaml.cs
@@ -1,9 +1,4 @@
-﻿using MvvmSample.Core.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+﻿using MvvmSample.Core.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
 
 using Xamarin.Forms;
@@ -18,12 +13,10 @@ public MessengerSendPage()
         {
             InitializeComponent();
 
-            ViewModel = Ioc.Default.GetRequiredService<MessengerPageViewModel>();
-
-            BindingContext = ViewModel;
+            BindingContext = Ioc.Default.GetRequiredService<MessengerPageViewModel>();
         }
 
-        public MessengerPageViewModel ViewModel { get; }
+        public MessengerPageViewModel ViewModel => (MessengerPageViewModel)BindingContext;
 
         protected override void OnAppearing()
         {
diff --git a/samples/MvvmSampleXF/MvvmSampleXF/Views/ObservableObjectPage.xaml.cs b/samples/MvvmSampleXF/MvvmSampleXF/Views/ObservableObjectPage.xaml.cs
diff --git a/samples/MvvmSampleXF/MvvmSampleXF/Views/PuttingThingsTogetherPage.xaml.cs b/samples/MvvmSampleXF/MvvmSampleXF/Views/PuttingThingsTogetherPage.xaml.cs
diff --git a/samples/MvvmSampleXF/MvvmSampleXF/Views/RedditBrowserPage.xaml.cs b/samples/MvvmSampleXF/MvvmSampleXF/Views/RedditBrowserPage.xaml.cs
diff --git a/samples/MvvmSampleXF/MvvmSampleXF/Views/RedditServicePage.xaml.cs b/samples/MvvmSampleXF/MvvmSampleXF/Views/RedditServicePage.xaml.cs
diff --git a/samples/MvvmSampleXF/MvvmSampleXF/Views/RelayCommandPage.xaml.cs b/samples/MvvmSampleXF/MvvmSampleXF/Views/RelayCommandPage.xaml.cs
diff --git a/samples/MvvmSampleXF/MvvmSampleXF/Views/SettingUpTheViewModelsPage.xaml.cs b/samples/MvvmSampleXF/MvvmSampleXF/Views/SettingUpTheViewModelsPage.xaml.cs
diff --git a/samples/MvvmSampleXF/MvvmSampleXF/Views/SettingsServicePage.xaml.cs b/samples/MvvmSampleXF/MvvmSampleXF/Views/SettingsServicePage.xaml.cs
diff --git a/samples/MvvmSampleXF/MvvmSampleXF/Views/Widgets/PostWidget.xaml.cs b/samples/MvvmSampleXF/MvvmSampleXF/Views/Widgets/PostWidget.xaml.cs
diff --git a/samples/MvvmSampleXF/MvvmSampleXF/Views/Widgets/SubredditWidget.xaml.cs b/samples/MvvmSampleXF/MvvmSampleXF/Views/Widgets/SubredditWidget.xaml.cs

Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,8 @@ public AsyncRelayCommandPage()`
`17`	`17`	`{`
`18`	`18`	`this.InitializeComponent();`
`19`	`19`
`20`		`- ViewModel = Ioc.Default.GetRequiredService<AsyncRelayCommandPageViewModel>();`
`21`		`-`
`22`		`- DataContext = ViewModel;`
	`20`	`+ DataContext = Ioc.Default.GetRequiredService<AsyncRelayCommandPageViewModel>();`
`23`	`21`	`}`
`24`	`22`
`25`		`- public AsyncRelayCommandPageViewModel ViewModel { get; }`
	`23`	`+ public AsyncRelayCommandPageViewModel ViewModel => (AsyncRelayCommandPageViewModel)DataContext;`
`26`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,8 @@ public BuildingTheUIPage()`
`17`	`17`	`{`
`18`	`18`	`this.InitializeComponent();`
`19`	`19`
`20`		`- ViewModel = Ioc.Default.GetRequiredService<SamplePageViewModel>();`
`21`		`-`
`22`		`- DataContext = ViewModel;`
	`20`	`+ DataContext = Ioc.Default.GetRequiredService<SamplePageViewModel>();`
`23`	`21`	`}`
`24`	`22`
`25`		`- public SamplePageViewModel ViewModel { get; }`
	`23`	`+ public SamplePageViewModel ViewModel => (SamplePageViewModel)DataContext;`
`26`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,8 @@ public IntroductionPage()`
`17`	`17`	`{`
`18`	`18`	`this.InitializeComponent();`
`19`	`19`
`20`		`- ViewModel = Ioc.Default.GetRequiredService<ObservableObjectPageViewModel>();`
`21`		`-`
`22`		`- DataContext = ViewModel;`
	`20`	`+ DataContext = Ioc.Default.GetRequiredService<ObservableObjectPageViewModel>();`
`23`	`21`	`}`
`24`	`22`
`25`		`- public ObservableObjectPageViewModel ViewModel { get; }`
	`23`	`+ public ObservableObjectPageViewModel ViewModel => (ObservableObjectPageViewModel)DataContext;`
`26`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,8 @@ public IocPage()`
`17`	`17`	`{`
`18`	`18`	`this.InitializeComponent();`
`19`	`19`
`20`		`- ViewModel = Ioc.Default.GetRequiredService<IocPageViewModel>();`
`21`		`-`
`22`		`- DataContext = ViewModel;`
	`20`	`+ DataContext = Ioc.Default.GetRequiredService<IocPageViewModel>();`
`23`	`21`	`}`
`24`	`22`
`25`		`- public IocPageViewModel ViewModel { get; }`
	`23`	`+ public IocPageViewModel ViewModel => (IocPageViewModel)DataContext;`
`26`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,8 @@ public MessengerPage()`
`17`	`17`	`{`
`18`	`18`	`this.InitializeComponent();`
`19`	`19`
`20`		`- ViewModel = Ioc.Default.GetRequiredService<MessengerPageViewModel>();`
`21`		`-`
`22`		`- DataContext = ViewModel;`
	`20`	`+ DataContext = Ioc.Default.GetRequiredService<MessengerPageViewModel>();`
`23`	`21`	`}`
`24`	`22`
`25`		`- public MessengerPageViewModel ViewModel { get; }`
	`23`	`+ public MessengerPageViewModel ViewModel => (MessengerPageViewModel)DataContext;`
`26`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,12 +18,10 @@ public MessengerRequestPage()`
`18`	`18`	`{`
`19`	`19`	`this.InitializeComponent();`
`20`	`20`
`21`		`- ViewModel = Ioc.Default.GetRequiredService<MessengerPageViewModel>();`
`22`		`-`
`23`		`- DataContext = ViewModel;`
	`21`	`+ DataContext = Ioc.Default.GetRequiredService<MessengerPageViewModel>();`
`24`	`22`	`}`
`25`	`23`
`26`		`- public MessengerPageViewModel ViewModel { get; }`
	`24`	`+ public MessengerPageViewModel ViewModel => (MessengerPageViewModel)DataContext;`
`27`	`25`
`28`	`26`	`/// <inheritdoc/>`
`29`	`27`	`protected override void OnNavigatedTo(NavigationEventArgs e)`
Original file line number	Diff line number	Diff line change
`@@ -18,12 +18,10 @@ public MessengerSendPage()`
`18`	`18`	`{`
`19`	`19`	`this.InitializeComponent();`
`20`	`20`
`21`		`- ViewModel = Ioc.Default.GetRequiredService<MessengerPageViewModel>();`
`22`		`-`
`23`		`- DataContext = ViewModel;`
	`21`	`+ DataContext = Ioc.Default.GetRequiredService<MessengerPageViewModel>();`
`24`	`22`	`}`
`25`	`23`
`26`		`- public MessengerPageViewModel ViewModel { get; }`
	`24`	`+ public MessengerPageViewModel ViewModel => (MessengerPageViewModel)DataContext;`
`27`	`25`
`28`	`26`	`/// <inheritdoc/>`
`29`	`27`	`protected override void OnNavigatedTo(NavigationEventArgs e)`
Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,8 @@ public ObservableObjectPage()`
`17`	`17`	`{`
`18`	`18`	`this.InitializeComponent();`
`19`	`19`
`20`		`- ViewModel = Ioc.Default.GetRequiredService<ObservableObjectPageViewModel>();`
`21`		`-`
`22`		`- DataContext = ViewModel;`
	`20`	`+ DataContext = Ioc.Default.GetRequiredService<ObservableObjectPageViewModel>();`
`23`	`21`	`}`
`24`	`22`
`25`		`- public ObservableObjectPageViewModel ViewModel { get; }`
	`23`	`+ public ObservableObjectPageViewModel ViewModel => (ObservableObjectPageViewModel)DataContext;`
`26`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,8 @@ public PuttingThingsTogetherPage()`
`17`	`17`	`{`
`18`	`18`	`this.InitializeComponent();`
`19`	`19`
`20`		`- ViewModel = Ioc.Default.GetRequiredService<SamplePageViewModel>();`
`21`		`-`
`22`		`- DataContext = ViewModel;`
	`20`	`+ DataContext = Ioc.Default.GetRequiredService<SamplePageViewModel>();`
`23`	`21`	`}`
`24`	`22`
`25`		`- public SamplePageViewModel ViewModel { get; }`
	`23`	`+ public SamplePageViewModel ViewModel => (SamplePageViewModel)DataContext;`
`26`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,8 @@ public RedditServicePage()`
`17`	`17`	`{`
`18`	`18`	`this.InitializeComponent();`
`19`	`19`
`20`		`- ViewModel = Ioc.Default.GetRequiredService<SamplePageViewModel>();`
`21`		`-`
`22`		`- DataContext = ViewModel;`
	`20`	`+ DataContext = Ioc.Default.GetRequiredService<SamplePageViewModel>();`
`23`	`21`	`}`
`24`	`22`
`25`		`- public SamplePageViewModel ViewModel { get; }`
	`23`	`+ public SamplePageViewModel ViewModel => (SamplePageViewModel)DataContext;`
`26`	`24`	`}`