UWP ViewModels ctor injection

denis-tsv · denis-tsv · commit f93b35b6765b · 2022-03-11T16:12:38.000+07:00
diff --git a/samples/MvvmSampleUwp/App.xaml.cs b/samples/MvvmSampleUwp/App.xaml.cs
@@ -11,6 +11,8 @@
 using Refit;
 using MvvmSampleUwp.Helpers;
 using MvvmSample.Core.Services;
+using MvvmSample.Core.ViewModels.Widgets;
+using MvvmSample.Core.ViewModels;
 
 namespace MvvmSampleUwp;
 
@@ -39,14 +41,24 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
             TitleBarHelper.StyleTitleBar();
             TitleBarHelper.ExpandViewIntoTitleBar();
 
-            // Register services
-            Ioc.Default.ConfigureServices(
-                new ServiceCollection()
-                .AddSingleton<IFilesService, FilesService>()
-                .AddSingleton<ISettingsService, SettingsService>()
-                .AddSingleton(RestService.For<IRedditService>("https://www.reddit.com/"))
-                .BuildServiceProvider());
-        }
+                // Register services
+                Ioc.Default.ConfigureServices(
+                    new ServiceCollection()
+                    //Services
+                    .AddSingleton<IFilesService, FilesService>()
+                    .AddSingleton<ISettingsService, SettingsService>()
+                    .AddSingleton(RestService.For<IRedditService>("https://www.reddit.com/"))
+                    //ViewModels
+                    .AddTransient<PostWidgetViewModel>()
+                    .AddTransient<SubredditWidgetViewModel>()
+                    .AddTransient<AsyncRelayCommandPageViewModel>()
+                    .AddTransient<IocPageViewModel>()
+                    .AddTransient<MessengerPageViewModel>()
+                    .AddTransient<ObservableObjectPageViewModel>()
+                    .AddTransient<RelayCommandPageViewModel>()
+                    .AddTransient<SamplePageViewModel>()
+                    .BuildServiceProvider());
+            }
 
         // Enable the prelaunch if needed, and activate the window
         if (e.PrelaunchActivated == false)
diff --git a/samples/MvvmSampleUwp/Views/AsyncRelayCommandPage.xaml b/samples/MvvmSampleUwp/Views/AsyncRelayCommandPage.xaml
@@ -12,9 +12,6 @@
     xmlns:viewModels="using:MvvmSample.Core.ViewModels"
     NavigationCacheMode="Enabled"
     mc:Ignorable="d">
-    <Page.DataContext>
-        <viewModels:AsyncRelayCommandPageViewModel x:Name="ViewModel" />
-    </Page.DataContext>
     <interactivity:Interaction.Behaviors>
         <core:EventTriggerBehavior EventName="Loaded">
             <core:InvokeCommandAction Command="{x:Bind ViewModel.LoadDocsCommand}" CommandParameter="AsyncRelayCommand" />
diff --git a/samples/MvvmSampleUwp/Views/AsyncRelayCommandPage.xaml.cs b/samples/MvvmSampleUwp/Views/AsyncRelayCommandPage.xaml.cs
@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using CommunityToolkit.Mvvm.DependencyInjection;
+using MvvmSample.Core.ViewModels;
 using Windows.UI.Xaml.Controls;
 
 namespace MvvmSampleUwp.Views;
@@ -14,5 +16,11 @@ public sealed partial class AsyncRelayCommandPage : Page
     public AsyncRelayCommandPage()
     {
         this.InitializeComponent();
+
+        ViewModel = Ioc.Default.GetRequiredService<AsyncRelayCommandPageViewModel>();
+
+        DataContext = ViewModel;
     }
+
+    public AsyncRelayCommandPageViewModel ViewModel { get; }
 }
diff --git a/samples/MvvmSampleUwp/Views/BuildingTheUIPage.xaml b/samples/MvvmSampleUwp/Views/BuildingTheUIPage.xaml
@@ -10,9 +10,6 @@
     xmlns:viewModels="using:MvvmSample.Core.ViewModels"
     NavigationCacheMode="Enabled"
     mc:Ignorable="d">
-    <Page.DataContext>
-        <viewModels:SamplePageViewModel x:Name="ViewModel" />
-    </Page.DataContext>
     <interactivity:Interaction.Behaviors>
         <core:EventTriggerBehavior EventName="Loaded">
             <core:InvokeCommandAction Command="{x:Bind ViewModel.LoadDocsCommand}" CommandParameter="PuttingThingsTogether" />
diff --git a/samples/MvvmSampleUwp/Views/BuildingTheUIPage.xaml.cs b/samples/MvvmSampleUwp/Views/BuildingTheUIPage.xaml.cs
@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using CommunityToolkit.Mvvm.DependencyInjection;
+using MvvmSample.Core.ViewModels;
 using Windows.UI.Xaml.Controls;
 
 namespace MvvmSampleUwp.Views;
@@ -14,5 +16,11 @@ public sealed partial class BuildingTheUIPage : Page
     public BuildingTheUIPage()
     {
         this.InitializeComponent();
+
+        ViewModel = Ioc.Default.GetRequiredService<SamplePageViewModel>();
+
+        DataContext = ViewModel;
     }
+
+    public SamplePageViewModel ViewModel { get; }
 }
diff --git a/samples/MvvmSampleUwp/Views/IntroductionPage.xaml b/samples/MvvmSampleUwp/Views/IntroductionPage.xaml
@@ -10,9 +10,6 @@
     xmlns:viewModels="using:MvvmSample.Core.ViewModels"
     NavigationCacheMode="Enabled"
     mc:Ignorable="d">
-    <Page.DataContext>
-        <viewModels:ObservableObjectPageViewModel x:Name="ViewModel" />
-    </Page.DataContext>
     <interactivity:Interaction.Behaviors>
         <core:EventTriggerBehavior EventName="Loaded">
             <core:InvokeCommandAction Command="{x:Bind ViewModel.LoadDocsCommand}" CommandParameter="Introduction" />
diff --git a/samples/MvvmSampleUwp/Views/IntroductionPage.xaml.cs b/samples/MvvmSampleUwp/Views/IntroductionPage.xaml.cs
@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using CommunityToolkit.Mvvm.DependencyInjection;
+using MvvmSample.Core.ViewModels;
 using Windows.UI.Xaml.Controls;
 
 namespace MvvmSampleUwp.Views;
@@ -14,5 +16,11 @@ public sealed partial class IntroductionPage : Page
     public IntroductionPage()
     {
         this.InitializeComponent();
+
+        ViewModel = Ioc.Default.GetRequiredService<ObservableObjectPageViewModel>();
+
+        DataContext = ViewModel;
     }
+
+    public ObservableObjectPageViewModel ViewModel { get; }
 }
diff --git a/samples/MvvmSampleUwp/Views/IocPage.xaml b/samples/MvvmSampleUwp/Views/IocPage.xaml
@@ -10,9 +10,6 @@
     xmlns:viewModels="using:MvvmSample.Core.ViewModels"
     NavigationCacheMode="Enabled"
     mc:Ignorable="d">
-    <Page.DataContext>
-        <viewModels:IocPageViewModel x:Name="ViewModel" />
-    </Page.DataContext>
     <interactivity:Interaction.Behaviors>
         <core:EventTriggerBehavior EventName="Loaded">
             <core:InvokeCommandAction Command="{x:Bind ViewModel.LoadDocsCommand}" CommandParameter="Ioc" />
diff --git a/samples/MvvmSampleUwp/Views/IocPage.xaml.cs b/samples/MvvmSampleUwp/Views/IocPage.xaml.cs
@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using CommunityToolkit.Mvvm.DependencyInjection;
+using MvvmSample.Core.ViewModels;
 using Windows.UI.Xaml.Controls;
 
 namespace MvvmSampleUwp.Views;
@@ -14,5 +16,11 @@ public sealed partial class IocPage : Page
     public IocPage()
     {
         this.InitializeComponent();
+
+        ViewModel = Ioc.Default.GetRequiredService<IocPageViewModel>();
+
+        DataContext = ViewModel;
     }
+
+    public IocPageViewModel ViewModel { get; }
 }
diff --git a/samples/MvvmSampleUwp/Views/MessengerPage.xaml b/samples/MvvmSampleUwp/Views/MessengerPage.xaml
@@ -10,9 +10,6 @@
     xmlns:viewModels="using:MvvmSample.Core.ViewModels"
     NavigationCacheMode="Enabled"
     mc:Ignorable="d">
-    <Page.DataContext>
-        <viewModels:MessengerPageViewModel x:Name="ViewModel" />
-    </Page.DataContext>
     <interactivity:Interaction.Behaviors>
         <core:EventTriggerBehavior EventName="Loaded">
             <core:InvokeCommandAction Command="{x:Bind ViewModel.LoadDocsCommand}" CommandParameter="Messenger" />
diff --git a/samples/MvvmSampleUwp/Views/MessengerPage.xaml.cs b/samples/MvvmSampleUwp/Views/MessengerPage.xaml.cs
@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using CommunityToolkit.Mvvm.DependencyInjection;
+using MvvmSample.Core.ViewModels;
 using Windows.UI.Xaml.Controls;
 
 namespace MvvmSampleUwp.Views;
@@ -14,5 +16,11 @@ public sealed partial class MessengerPage : Page
     public MessengerPage()
     {
         this.InitializeComponent();
+
+        ViewModel = Ioc.Default.GetRequiredService<MessengerPageViewModel>();
+
+        DataContext = ViewModel;
     }
+
+    public MessengerPageViewModel ViewModel { get; }
 }
diff --git a/samples/MvvmSampleUwp/Views/MessengerRequestPage.xaml b/samples/MvvmSampleUwp/Views/MessengerRequestPage.xaml
@@ -10,9 +10,6 @@
     xmlns:viewModels="using:MvvmSample.Core.ViewModels"
     NavigationCacheMode="Enabled"
     mc:Ignorable="d">
-    <Page.DataContext>
-        <viewModels:MessengerPageViewModel x:Name="ViewModel" />
-    </Page.DataContext>
     <interactivity:Interaction.Behaviors>
         <core:EventTriggerBehavior EventName="Loaded">
             <core:InvokeCommandAction Command="{x:Bind ViewModel.LoadDocsCommand}" CommandParameter="Messenger" />
diff --git a/samples/MvvmSampleUwp/Views/MessengerRequestPage.xaml.cs b/samples/MvvmSampleUwp/Views/MessengerRequestPage.xaml.cs
@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using CommunityToolkit.Mvvm.DependencyInjection;
+using MvvmSample.Core.ViewModels;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Navigation;
 
@@ -15,8 +17,14 @@ public sealed partial class MessengerRequestPage : Page
     public MessengerRequestPage()
     {
         this.InitializeComponent();
+
+        ViewModel = Ioc.Default.GetRequiredService<MessengerPageViewModel>();
+
+        DataContext = ViewModel;
     }
 
+    public MessengerPageViewModel ViewModel { get; }
+
     /// <inheritdoc/>
     protected override void OnNavigatedTo(NavigationEventArgs e)
     {
diff --git a/samples/MvvmSampleUwp/Views/MessengerSendPage.xaml b/samples/MvvmSampleUwp/Views/MessengerSendPage.xaml
@@ -10,9 +10,6 @@
     xmlns:viewModels="using:MvvmSample.Core.ViewModels"
     NavigationCacheMode="Enabled"
     mc:Ignorable="d">
-    <Page.DataContext>
-        <viewModels:MessengerPageViewModel x:Name="ViewModel" />
-    </Page.DataContext>
     <interactivity:Interaction.Behaviors>
         <core:EventTriggerBehavior EventName="Loaded">
             <core:InvokeCommandAction Command="{x:Bind ViewModel.LoadDocsCommand}" CommandParameter="Messenger" />
diff --git a/samples/MvvmSampleUwp/Views/MessengerSendPage.xaml.cs b/samples/MvvmSampleUwp/Views/MessengerSendPage.xaml.cs
@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using CommunityToolkit.Mvvm.DependencyInjection;
+using MvvmSample.Core.ViewModels;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Navigation;
 
@@ -15,8 +17,14 @@ public sealed partial class MessengerSendPage : Page
     public MessengerSendPage()
     {
         this.InitializeComponent();
+
+        ViewModel = Ioc.Default.GetRequiredService<MessengerPageViewModel>();
+
+        DataContext = ViewModel;
     }
 
+    public MessengerPageViewModel ViewModel { get; }
+
     /// <inheritdoc/>
     protected override void OnNavigatedTo(NavigationEventArgs e)
     {
diff --git a/samples/MvvmSampleUwp/Views/ObservableObjectPage.xaml b/samples/MvvmSampleUwp/Views/ObservableObjectPage.xaml
@@ -10,9 +10,6 @@
     xmlns:viewModels="using:MvvmSample.Core.ViewModels"
     NavigationCacheMode="Enabled"
     mc:Ignorable="d">
-    <Page.DataContext>
-        <viewModels:ObservableObjectPageViewModel x:Name="ViewModel" />
-    </Page.DataContext>
     <interactivity:Interaction.Behaviors>
         <core:EventTriggerBehavior EventName="Loaded">
             <core:InvokeCommandAction Command="{x:Bind ViewModel.LoadDocsCommand}" CommandParameter="ObservableObject" />
diff --git a/samples/MvvmSampleUwp/Views/ObservableObjectPage.xaml.cs b/samples/MvvmSampleUwp/Views/ObservableObjectPage.xaml.cs
@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using CommunityToolkit.Mvvm.DependencyInjection;
+using MvvmSample.Core.ViewModels;
 using Windows.UI.Xaml.Controls;
 
 namespace MvvmSampleUwp.Views;
@@ -14,5 +16,11 @@ public sealed partial class ObservableObjectPage : Page
     public ObservableObjectPage()
     {
         this.InitializeComponent();
+
+        ViewModel = Ioc.Default.GetRequiredService<ObservableObjectPageViewModel>();
+
+        DataContext = ViewModel;
     }
+
+    public ObservableObjectPageViewModel ViewModel { get; }
 }
diff --git a/samples/MvvmSampleUwp/Views/PuttingThingsTogetherPage.xaml b/samples/MvvmSampleUwp/Views/PuttingThingsTogetherPage.xaml
@@ -10,9 +10,6 @@
     xmlns:viewModels="using:MvvmSample.Core.ViewModels"
     NavigationCacheMode="Enabled"
     mc:Ignorable="d">
-    <Page.DataContext>
-        <viewModels:SamplePageViewModel x:Name="ViewModel" />
-    </Page.DataContext>
     <interactivity:Interaction.Behaviors>
         <core:EventTriggerBehavior EventName="Loaded">
             <core:InvokeCommandAction Command="{x:Bind ViewModel.LoadDocsCommand}" CommandParameter="PuttingThingsTogether" />
diff --git a/samples/MvvmSampleUwp/Views/PuttingThingsTogetherPage.xaml.cs b/samples/MvvmSampleUwp/Views/PuttingThingsTogetherPage.xaml.cs
@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using CommunityToolkit.Mvvm.DependencyInjection;
+using MvvmSample.Core.ViewModels;
 using Windows.UI.Xaml.Controls;
 
 namespace MvvmSampleUwp.Views;
@@ -14,5 +16,11 @@ public sealed partial class PuttingThingsTogetherPage : Page
     public PuttingThingsTogetherPage()
     {
         this.InitializeComponent();
+
+        ViewModel = Ioc.Default.GetRequiredService<SamplePageViewModel>();
+
+        DataContext = ViewModel;
     }
+
+    public SamplePageViewModel ViewModel { get; }
 }
diff --git a/samples/MvvmSampleUwp/Views/RedditServicePage.xaml b/samples/MvvmSampleUwp/Views/RedditServicePage.xaml
@@ -10,9 +10,6 @@
     xmlns:viewModels="using:MvvmSample.Core.ViewModels"
     NavigationCacheMode="Enabled"
     mc:Ignorable="d">
-    <Page.DataContext>
-        <viewModels:SamplePageViewModel x:Name="ViewModel" />
-    </Page.DataContext>
     <interactivity:Interaction.Behaviors>
         <core:EventTriggerBehavior EventName="Loaded">
             <core:InvokeCommandAction Command="{x:Bind ViewModel.LoadDocsCommand}" CommandParameter="PuttingThingsTogether" />
diff --git a/samples/MvvmSampleUwp/Views/RedditServicePage.xaml.cs b/samples/MvvmSampleUwp/Views/RedditServicePage.xaml.cs
@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using CommunityToolkit.Mvvm.DependencyInjection;
+using MvvmSample.Core.ViewModels;
 using Windows.UI.Xaml.Controls;
 
 namespace MvvmSampleUwp.Views;
@@ -14,5 +16,11 @@ public sealed partial class RedditServicePage : Page
     public RedditServicePage()
     {
         this.InitializeComponent();
+
+        ViewModel = Ioc.Default.GetRequiredService<SamplePageViewModel>();
+
+        DataContext = ViewModel;
     }
+
+    public SamplePageViewModel ViewModel { get; }
 }
diff --git a/samples/MvvmSampleUwp/Views/RelayCommandPage.xaml b/samples/MvvmSampleUwp/Views/RelayCommandPage.xaml
@@ -10,9 +10,6 @@
     xmlns:viewModels="using:MvvmSample.Core.ViewModels"
     NavigationCacheMode="Enabled"
     mc:Ignorable="d">
-    <Page.DataContext>
-        <viewModels:RelayCommandPageViewModel x:Name="ViewModel" />
-    </Page.DataContext>
     <interactivity:Interaction.Behaviors>
         <core:EventTriggerBehavior EventName="Loaded">
             <core:InvokeCommandAction Command="{x:Bind ViewModel.LoadDocsCommand}" CommandParameter="RelayCommand" />
diff --git a/samples/MvvmSampleUwp/Views/RelayCommandPage.xaml.cs b/samples/MvvmSampleUwp/Views/RelayCommandPage.xaml.cs
@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using CommunityToolkit.Mvvm.DependencyInjection;
+using MvvmSample.Core.ViewModels;
 using Windows.UI.Xaml.Controls;
 
 namespace MvvmSampleUwp.Views;
@@ -14,5 +16,11 @@ public sealed partial class RelayCommandPage : Page
     public RelayCommandPage()
     {
         this.InitializeComponent();
+
+        ViewModel = Ioc.Default.GetRequiredService<RelayCommandPageViewModel>();
+
+        DataContext = ViewModel;
     }
+
+    public RelayCommandPageViewModel ViewModel { get; }
 }
diff --git a/samples/MvvmSampleUwp/Views/SettingUpTheViewModelsPage.xaml b/samples/MvvmSampleUwp/Views/SettingUpTheViewModelsPage.xaml
@@ -10,9 +10,6 @@
     xmlns:viewModels="using:MvvmSample.Core.ViewModels"
     NavigationCacheMode="Enabled"
     mc:Ignorable="d">
-    <Page.DataContext>
-        <viewModels:SamplePageViewModel x:Name="ViewModel" />
-    </Page.DataContext>
     <interactivity:Interaction.Behaviors>
         <core:EventTriggerBehavior EventName="Loaded">
             <core:InvokeCommandAction Command="{x:Bind ViewModel.LoadDocsCommand}" CommandParameter="PuttingThingsTogether" />
diff --git a/samples/MvvmSampleUwp/Views/SettingUpTheViewModelsPage.xaml.cs b/samples/MvvmSampleUwp/Views/SettingUpTheViewModelsPage.xaml.cs
diff --git a/samples/MvvmSampleUwp/Views/SettingsServicePage.xaml b/samples/MvvmSampleUwp/Views/SettingsServicePage.xaml
diff --git a/samples/MvvmSampleUwp/Views/SettingsServicePage.xaml.cs b/samples/MvvmSampleUwp/Views/SettingsServicePage.xaml.cs
diff --git a/samples/MvvmSampleUwp/Views/Widgets/PostWidget.xaml b/samples/MvvmSampleUwp/Views/Widgets/PostWidget.xaml
diff --git a/samples/MvvmSampleUwp/Views/Widgets/PostWidget.xaml.cs b/samples/MvvmSampleUwp/Views/Widgets/PostWidget.xaml.cs
diff --git a/samples/MvvmSampleUwp/Views/Widgets/SubredditWidget.xaml b/samples/MvvmSampleUwp/Views/Widgets/SubredditWidget.xaml
diff --git a/samples/MvvmSampleUwp/Views/Widgets/SubredditWidget.xaml.cs b/samples/MvvmSampleUwp/Views/Widgets/SubredditWidget.xaml.cs

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@`
`2`	`2`	`// The .NET Foundation licenses this file to you under the MIT license.`
`3`	`3`	`// See the LICENSE file in the project root for more information.`
`4`	`4`
	`5`	`+using CommunityToolkit.Mvvm.DependencyInjection;`
	`6`	`+using MvvmSample.Core.ViewModels;`
`5`	`7`	`using Windows.UI.Xaml.Controls;`
`6`	`8`
`7`	`9`	`namespace MvvmSampleUwp.Views;`
`@@ -14,5 +16,11 @@ public sealed partial class AsyncRelayCommandPage : Page`
`14`	`16`	`public AsyncRelayCommandPage()`
`15`	`17`	`{`
`16`	`18`	`this.InitializeComponent();`
	`19`	`+`
	`20`	`+ ViewModel = Ioc.Default.GetRequiredService<AsyncRelayCommandPageViewModel>();`
	`21`	`+`
	`22`	`+ DataContext = ViewModel;`
`17`	`23`	`}`
	`24`	`+`
	`25`	`+ public AsyncRelayCommandPageViewModel ViewModel { get; }`
`18`	`26`	`}`