diff --git a/.vscode/launch.json b/.vscode/launch.json index a1071ea..b2e5267 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -4,6 +4,7 @@ // Pour plus d'informations, visitez : https://go.microsoft.com/fwlink/?linkid=830387 "version": "0.2.0", "configurations": [ + { "name": ".NET MAUI", "type": "maui", diff --git a/Samples.sln b/Samples.sln index bc72ff4..ffedb54 100644 --- a/Samples.sln +++ b/Samples.sln @@ -25,6 +25,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ex_CustomContentView", "ch0 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ex_DataTemplateSelector", "ch03_DataBinding\ex_DataTemplateSelector\ex_DataTemplateSelector.csproj", "{CE13BDA5-D5E5-42A2-BF2B-17942919E7E6}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ch04_Navigation", "ch04_Navigation", "{0E6296E1-F020-4A0D-9F98-4284F38FD68B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ex_ShellRoutes", "ch04_Navigation\ex_ShellRoutes\ex_ShellRoutes.csproj", "{1559C59B-727D-402D-A140-30B111DBF224}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -73,6 +77,10 @@ Global {CE13BDA5-D5E5-42A2-BF2B-17942919E7E6}.Debug|Any CPU.Build.0 = Debug|Any CPU {CE13BDA5-D5E5-42A2-BF2B-17942919E7E6}.Release|Any CPU.ActiveCfg = Release|Any CPU {CE13BDA5-D5E5-42A2-BF2B-17942919E7E6}.Release|Any CPU.Build.0 = Release|Any CPU + {1559C59B-727D-402D-A140-30B111DBF224}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1559C59B-727D-402D-A140-30B111DBF224}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1559C59B-727D-402D-A140-30B111DBF224}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1559C59B-727D-402D-A140-30B111DBF224}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -87,5 +95,6 @@ Global {5E1D0DEE-CD68-4AAD-9597-9BFF30C8214C} = {1E07D063-F377-413B-B9A0-FB94AF14B1A9} {5F26E535-4541-4C99-BD92-2DDB4EB65705} = {E9273679-4D52-465F-8C23-8096DD8C2A7B} {CE13BDA5-D5E5-42A2-BF2B-17942919E7E6} = {E9273679-4D52-465F-8C23-8096DD8C2A7B} + {1559C59B-727D-402D-A140-30B111DBF224} = {0E6296E1-F020-4A0D-9F98-4284F38FD68B} EndGlobalSection EndGlobal diff --git a/ch03_DataBinding/ex_DataTemplateSelector/MainPage.xaml b/ch03_DataBinding/ex_DataTemplateSelector/MainPage.xaml index 07b75bf..2495676 100644 --- a/ch03_DataBinding/ex_DataTemplateSelector/MainPage.xaml +++ b/ch03_DataBinding/ex_DataTemplateSelector/MainPage.xaml @@ -131,7 +131,6 @@ - + RowHeight="76" BackgroundColor="White"/> diff --git a/ch04_Navigation/ex_ShellRoutes/App.xaml b/ch04_Navigation/ex_ShellRoutes/App.xaml new file mode 100644 index 0000000..52a40f8 --- /dev/null +++ b/ch04_Navigation/ex_ShellRoutes/App.xaml @@ -0,0 +1,14 @@ + + + + + + + + + + + diff --git a/ch04_Navigation/ex_ShellRoutes/App.xaml.cs b/ch04_Navigation/ex_ShellRoutes/App.xaml.cs new file mode 100644 index 0000000..9993ef0 --- /dev/null +++ b/ch04_Navigation/ex_ShellRoutes/App.xaml.cs @@ -0,0 +1,11 @@ +namespace ex_ShellRoutes; + +public partial class App : Application +{ + public App() + { + InitializeComponent(); + + MainPage = new AppShell(); + } +} diff --git a/ch04_Navigation/ex_ShellRoutes/AppShell.xaml b/ch04_Navigation/ex_ShellRoutes/AppShell.xaml new file mode 100644 index 0000000..b9adf92 --- /dev/null +++ b/ch04_Navigation/ex_ShellRoutes/AppShell.xaml @@ -0,0 +1,15 @@ + + + + + + diff --git a/ch04_Navigation/ex_ShellRoutes/AppShell.xaml.cs b/ch04_Navigation/ex_ShellRoutes/AppShell.xaml.cs new file mode 100644 index 0000000..72ac629 --- /dev/null +++ b/ch04_Navigation/ex_ShellRoutes/AppShell.xaml.cs @@ -0,0 +1,10 @@ +namespace ex_ShellRoutes; + +public partial class AppShell : Shell +{ + public AppShell() + { + InitializeComponent(); + Routing.RegisterRoute("//newpage1", typeof(NewPage1)); + } +} diff --git a/ch04_Navigation/ex_ShellRoutes/MainPage.xaml b/ch04_Navigation/ex_ShellRoutes/MainPage.xaml new file mode 100644 index 0000000..060c822 --- /dev/null +++ b/ch04_Navigation/ex_ShellRoutes/MainPage.xaml @@ -0,0 +1,39 @@ + + + + + + + +