From ea22a9534860a726ff3273a3aaa4b50884cb304d Mon Sep 17 00:00:00 2001
From: Yik Teng Hie <thyik@mitech-ltd.com.sg>
Date: Mon, 6 Feb 2023 15:57:02 +0800
Subject: [PATCH] add MvvmAppUi class library

---
 MvvmAppCore/Models/MotorProfile.cs            | 12 ++++++
 .../ViewModels/MotorProfileViewModel.cs       | 15 ++++++++
 MvvmAppUi/MvvmAppUi.csproj                    | 17 +++++++++
 MvvmAppUi/Views/MotorProfileView.xaml         | 38 +++++++++++++++++++
 MvvmAppUi/Views/MotorProfileView.xaml.cs      | 19 ++++++++++
 MvvmCommunityApp.sln                          |  6 +++
 MvvmCommunityApp/App.xaml.cs                  |  1 +
 MvvmCommunityApp/MainWindow.xaml              |  2 +
 MvvmCommunityApp/MvvmCommunityApp.csproj      |  1 +
 9 files changed, 111 insertions(+)
 create mode 100644 MvvmAppCore/Models/MotorProfile.cs
 create mode 100644 MvvmAppCore/ViewModels/MotorProfileViewModel.cs
 create mode 100644 MvvmAppUi/MvvmAppUi.csproj
 create mode 100644 MvvmAppUi/Views/MotorProfileView.xaml
 create mode 100644 MvvmAppUi/Views/MotorProfileView.xaml.cs

diff --git a/MvvmAppCore/Models/MotorProfile.cs b/MvvmAppCore/Models/MotorProfile.cs
new file mode 100644
index 0000000..a156531
--- /dev/null
+++ b/MvvmAppCore/Models/MotorProfile.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MvvmAppCore.Models
+{
+    internal class MotorProfile
+    {
+    }
+}
diff --git a/MvvmAppCore/ViewModels/MotorProfileViewModel.cs b/MvvmAppCore/ViewModels/MotorProfileViewModel.cs
new file mode 100644
index 0000000..b16ab69
--- /dev/null
+++ b/MvvmAppCore/ViewModels/MotorProfileViewModel.cs
@@ -0,0 +1,15 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace MvvmAppCore.ViewModels
+{
+    public partial class MotorProfileViewModel : ObservableObject
+    {
+        [ObservableProperty]
+        private string _motorName;
+
+        public MotorProfileViewModel()
+        {
+            MotorName = "Elevator";
+        }
+    }
+}
diff --git a/MvvmAppUi/MvvmAppUi.csproj b/MvvmAppUi/MvvmAppUi.csproj
new file mode 100644
index 0000000..51c7aeb
--- /dev/null
+++ b/MvvmAppUi/MvvmAppUi.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.1.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\MvvmAppCore\MvvmAppCore.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/MvvmAppUi/Views/MotorProfileView.xaml b/MvvmAppUi/Views/MotorProfileView.xaml
new file mode 100644
index 0000000..c78c51d
--- /dev/null
+++ b/MvvmAppUi/Views/MotorProfileView.xaml
@@ -0,0 +1,38 @@
+<UserControl x:Class="MvvmAppUi.Views.MotorProfileView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:local="clr-namespace:MvvmAppUi.Views"
+             mc:Ignorable="d"
+             d:DesignHeight="450"
+             d:DesignWidth="800">
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition />
+            <ColumnDefinition />
+            <ColumnDefinition />
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+        <!-- Content -->
+        <Grid Grid.Column="1">
+            <TextBlock Text="{Binding MotorName}" />
+        </Grid>
+        <Grid Grid.Column="1"
+              Grid.Row="2"
+              Grid.ColumnSpan="2">
+            <StackPanel Orientation="Horizontal">
+                <Button Content="OK"
+                        Margin="5"
+                        HorizontalContentAlignment="Stretch" />
+                <Button Content="Cancel"
+                        Margin="5"
+                        HorizontalContentAlignment="Stretch" />
+            </StackPanel>
+        </Grid>
+    </Grid>
+</UserControl>
diff --git a/MvvmAppUi/Views/MotorProfileView.xaml.cs b/MvvmAppUi/Views/MotorProfileView.xaml.cs
new file mode 100644
index 0000000..1923867
--- /dev/null
+++ b/MvvmAppUi/Views/MotorProfileView.xaml.cs
@@ -0,0 +1,19 @@
+using CommunityToolkit.Mvvm.DependencyInjection;
+using MvvmAppCore.ViewModels;
+using System.Windows.Controls;
+
+namespace MvvmAppUi.Views
+{
+    /// <summary>
+    /// Interaction logic for MotorProfileView.xaml
+    /// </summary>
+    public partial class MotorProfileView : UserControl
+    {
+        public MotorProfileView()
+        {
+            InitializeComponent();
+
+            DataContext = Ioc.Default.GetRequiredService<MotorProfileViewModel>();
+        }
+    }
+}
diff --git a/MvvmCommunityApp.sln b/MvvmCommunityApp.sln
index 3fb52fa..577461d 100644
--- a/MvvmCommunityApp.sln
+++ b/MvvmCommunityApp.sln
@@ -7,6 +7,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmCommunityApp", "MvvmCom
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmAppCore", "MvvmAppCore\MvvmAppCore.csproj", "{8CFB1DAE-0565-4A86-B0CC-2D7E3C9ED053}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmAppUi", "MvvmAppUi\MvvmAppUi.csproj", "{E0548A3E-F7A4-4BEE-A5DC-A62AACA38C12}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -21,6 +23,10 @@ Global
 		{8CFB1DAE-0565-4A86-B0CC-2D7E3C9ED053}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8CFB1DAE-0565-4A86-B0CC-2D7E3C9ED053}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8CFB1DAE-0565-4A86-B0CC-2D7E3C9ED053}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E0548A3E-F7A4-4BEE-A5DC-A62AACA38C12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E0548A3E-F7A4-4BEE-A5DC-A62AACA38C12}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E0548A3E-F7A4-4BEE-A5DC-A62AACA38C12}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E0548A3E-F7A4-4BEE-A5DC-A62AACA38C12}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/MvvmCommunityApp/App.xaml.cs b/MvvmCommunityApp/App.xaml.cs
index 25fdcdf..801796c 100644
--- a/MvvmCommunityApp/App.xaml.cs
+++ b/MvvmCommunityApp/App.xaml.cs
@@ -29,6 +29,7 @@ namespace MvvmCommunityApp
                     .AddTransient<IocPageViewModel>()
                     .AddSingleton<IDemoService, DemoService>()
                     .AddSingleton<MainWindowViewModel>()
+                    .AddSingleton<MotorProfileViewModel>()
                     .BuildServiceProvider());
 
         protected override void OnStartup(StartupEventArgs e)
diff --git a/MvvmCommunityApp/MainWindow.xaml b/MvvmCommunityApp/MainWindow.xaml
index c58d23f..af8bf3c 100644
--- a/MvvmCommunityApp/MainWindow.xaml
+++ b/MvvmCommunityApp/MainWindow.xaml
@@ -4,6 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:MvvmCommunityApp"
+        xmlns:vm="clr-namespace:MvvmAppUi.Views;assembly=MvvmAppUi"
         mc:Ignorable="d"
         Title="MainWindow" Height="450" Width="800">
     <Grid>
@@ -14,6 +15,7 @@
             <Button Content="Update"
                     Command="{Binding UpdateCommand}" />
             <TextBlock Text="{Binding Customer}" />
+            <vm:MotorProfileView />
         </StackPanel>
     </Grid>
 </Window>
diff --git a/MvvmCommunityApp/MvvmCommunityApp.csproj b/MvvmCommunityApp/MvvmCommunityApp.csproj
index 2b799d2..de3d36f 100644
--- a/MvvmCommunityApp/MvvmCommunityApp.csproj
+++ b/MvvmCommunityApp/MvvmCommunityApp.csproj
@@ -18,6 +18,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\MvvmAppCore\MvvmAppCore.csproj" />
+    <ProjectReference Include="..\MvvmAppUi\MvvmAppUi.csproj" />
   </ItemGroup>
 
 </Project>