feat: Changing ViewModel to Model in template

unoplatform · Nov 2, 2022 · 10d2a4f · 10d2a4f
1 parent 58298c9
commit 10d2a4f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.UI/App.xaml.host.cs b/src/Uno.Extensions.Templates/content/unoapp-extensions/MyExtensionsApp.UI/App.xaml.host.cs
@@ -62,18 +62,18 @@ private static IHost BuildAppHost()
 	private static void RegisterRoutes(IViewRegistry views, IRouteRegistry routes)
 	{
 		views.Register(
-			new ViewMap(ViewModel: typeof(ShellViewModel)),
-			new ViewMap<MainPage, MainViewModel>(),
-			new DataViewMap<SecondPage, SecondViewModel, Entity>()
+			new ViewMap(ViewModel: typeof(ShellModel)),
+			new ViewMap<MainPage, MainModel>(),
+			new DataViewMap<SecondPage, SecondModel, Entity>()
 			);
 
 		routes
 			.Register(
-				new RouteMap("", View: views.FindByViewModel<ShellViewModel>(),
+				new RouteMap("", View: views.FindByViewModel<ShellModel>(),
 						Nested: new RouteMap[]
 						{
-										new RouteMap("Main", View: views.FindByViewModel<MainViewModel>()),
-										new RouteMap("Second", View: views.FindByViewModel<SecondViewModel>()),
+										new RouteMap("Main", View: views.FindByViewModel<MainModel>()),
+										new RouteMap("Second", View: views.FindByViewModel<SecondModel>()),
 						}));
 	}
 }
diff --git a/...tensionsApp/Presentation/MainViewModel.cs → ...MyExtensionsApp/Presentation/MainModel.cs b/...tensionsApp/Presentation/MainViewModel.cs → ...MyExtensionsApp/Presentation/MainModel.cs
@@ -9,14 +9,14 @@
 
 namespace MyExtensionsApp.Presentation;
 
-#if(reactive)
-public partial class MainViewModel 
+#if (reactive)
+public partial class MainModel 
 {
 	public string? Title { get; }
 
 	public IState<string> Name { get; }
 
-	public MainViewModel(
+	public MainModel(
 		INavigator navigator,
 		IOptions<AppConfig> appInfo)
 	{
@@ -30,13 +30,13 @@ public MainViewModel(
 	public async Task GoToSecond()
 	{
 		var name = await Name;
-		await _navigator.NavigateViewModelAsync<SecondViewModel>(this, data: new Entity(name!));
+		await _navigator.NavigateViewModelAsync<SecondModel>(this, data: new Entity(name!));
 	}
 
 	private INavigator _navigator;
 }
 #else
-public partial class MainViewModel:ObservableObject
+public partial class MainModel:ObservableObject
 {
 	public string? Title { get; }
 
@@ -45,7 +45,7 @@ public partial class MainViewModel:ObservableObject
 
 	public ICommand GoToSecond { get; }
 
-	public MainViewModel(
+	public MainModel(
 		INavigator navigator,
 		IOptions<AppConfig> appInfo)
 	{ 
@@ -58,7 +58,7 @@ public MainViewModel(
 
 	public async Task GoToSecondView()
 	{
-		await _navigator.NavigateViewModelAsync<SecondViewModel>(this, data: new Entity(Name!));
+		await _navigator.NavigateViewModelAsync<SecondModel>(this, data: new Entity(Name!));
 	}
 
 	private INavigator _navigator;

diff --git a/...nsionsApp/Presentation/SecondViewModel.cs → ...ExtensionsApp/Presentation/SecondModel.cs b/...nsionsApp/Presentation/SecondViewModel.cs → ...ExtensionsApp/Presentation/SecondModel.cs
@@ -2,6 +2,6 @@
 
 namespace MyExtensionsApp.Presentation;
 
-public partial record SecondViewModel (Entity Entity)
+public partial record SecondModel (Entity Entity)
 {
 }
diff --git a/...ensionsApp/Presentation/ShellViewModel.cs → ...yExtensionsApp/Presentation/ShellModel.cs b/...ensionsApp/Presentation/ShellViewModel.cs → ...yExtensionsApp/Presentation/ShellModel.cs
@@ -2,12 +2,12 @@
 
 namespace MyExtensionsApp.Presentation;
 
-public class ShellViewModel
+public class ShellModel
 {
 	private INavigator Navigator { get; }
 
 
-	public ShellViewModel(
+	public ShellModel(
 		INavigator navigator)
 	{
 
@@ -18,6 +18,6 @@ public ShellViewModel(
 
 	public async Task Start()
 	{
-		await Navigator.NavigateViewModelAsync<MainViewModel>(this);
+		await Navigator.NavigateViewModelAsync<MainModel>(this);
 	}
 }