added map page

davidortinau · Sep 28, 2022 · 978a59e · 978a59e
1 parent a585e92
commit 978a59e
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 44 deletions.
diff --git a/src/ControlGallery/App.xaml.cs b/src/ControlGallery/App.xaml.cs
@@ -31,6 +31,7 @@ private void RegisterRoutes()
         Routing.RegisterRoute(nameof(EntryPage), typeof(EntryPage));
         Routing.RegisterRoute(nameof(ImagePage), typeof(ImagePage));
         Routing.RegisterRoute(nameof(LabelPage), typeof(LabelPage));
+        Routing.RegisterRoute(nameof(MapPage), typeof(MapPage));
         Routing.RegisterRoute(nameof(ProgressBarPage), typeof(ProgressBarPage));
         Routing.RegisterRoute(nameof(RadioButtonPage), typeof(RadioButtonPage));
         Routing.RegisterRoute(nameof(ShapesPage), typeof(ShapesPage));

diff --git a/src/ControlGallery/ControlGallery.csproj b/src/ControlGallery/ControlGallery.csproj
@@ -45,9 +45,11 @@
   <ItemGroup>
     <None Remove="CommunityToolkit.Maui" />
     <None Remove="CommunityToolkit.Mvvm" />
+    <None Remove="Microsoft.Maui.Controls.Maps" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="CommunityToolkit.Maui" Version="1.3.0" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Maui.Controls.Maps" Version="7.0.0-rc.1.6687" />
   </ItemGroup>
 </Project>
diff --git a/src/ControlGallery/MauiProgram.cs b/src/ControlGallery/MauiProgram.cs
@@ -7,6 +7,7 @@
 
 using Microsoft.Maui.Handlers;
 using static Microsoft.Maui.Controls.Button;
+using Microsoft.Maui.Controls.Maps;
 
 #if IOS || MACCATALYST
 using UIKit;
@@ -26,6 +27,7 @@ public static MauiApp CreateMauiApp()
 		builder
 			.UseMauiApp<App>()
             .UseMauiCommunityToolkit()
+            .UseMauiMaps()
 			.ConfigureFonts(fonts =>
 			{
 				fonts.AddFont("fa_solid.ttf", "FontAwesome");

diff --git a/src/ControlGallery/Pages/Controls/ActivityIndicatorPage (copy).xaml b/src/ControlGallery/Pages/Controls/ActivityIndicatorPage (copy).xaml
diff --git a/src/ControlGallery/Pages/Controls/ActivityIndicatorPage (copy).xaml.cs b/src/ControlGallery/Pages/Controls/ActivityIndicatorPage (copy).xaml.cs
diff --git a/src/ControlGallery/Pages/Controls/MapPage.xaml b/src/ControlGallery/Pages/Controls/MapPage.xaml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="ControlGallery.Pages.MapPage"
+             Title="Map">
+    <ContentPage.Content>
+        <Grid>
+            <Map x:Name="map"/>
+        </Grid>
+    </ContentPage.Content>
+</ContentPage>
diff --git a/src/ControlGallery/Pages/Controls/MapPage.xaml.cs b/src/ControlGallery/Pages/Controls/MapPage.xaml.cs
@@ -0,0 +1,26 @@
+namespace ControlGallery.Pages;
+
+public partial class MapPage : ContentPage
+{
+    public MapPage()
+    {
+        InitializeComponent();
+    }
+
+    protected override void OnNavigatedTo(NavigatedToEventArgs args)
+    {
+        base.OnNavigatedTo(args);
+
+        var hanaLoc = new Location(20.7557, -155.9880);
+
+        MapSpan mapSpan = MapSpan.FromCenterAndRadius(hanaLoc, Distance.FromKilometers(3));
+        map.MoveToRegion(mapSpan);
+
+        map.Pins.Add(new Pin
+        {
+            Label = "Welcome to .NET MAUI!",
+            Location = hanaLoc,
+        });
+    }
+
+}
diff --git a/src/ControlGallery/Pages/ControlsPage.xaml b/src/ControlGallery/Pages/ControlsPage.xaml
@@ -97,6 +97,9 @@
                 <m:NavItem Title="Labels"
                             Icon="view_label.png"
                             Destination="{x:Type p:LabelPage}"/>
+                <m:NavItem Title="Map"
+                            Icon="view_map.png"
+                            Destination="{x:Type p:MapPage}"/>
                     <m:NavItem Title="Picker"
                             Icon="view_picker.png"
                             Destination="{x:Type p:PickerPage}"/>

diff --git a/src/ControlGallery/Pages/Features/ContextMenuPage.xaml b/src/ControlGallery/Pages/Features/ContextMenuPage.xaml
@@ -5,7 +5,7 @@
              x:Class="ControlGallery.Pages.ContextMenuPage"
              Title="ContextMenu">
     <ScrollView>
-        <StackLayout Margin="15" Spacing="8">
+        <StackLayout Margin="15" Spacing="16">
             <Label Text="ContextMenu" Style="{StaticResource Headline}"/>
             <Label Text="Right-click the Button for additional actions"/>
             <Button
@@ -14,7 +14,7 @@
                 ToolTipProperties.Text="More than meets the eye"
                 SemanticProperties.Hint="Counts the number of times you click"
                 Clicked="OnCounterClicked"
-                HorizontalOptions="Center">
+                HorizontalOptions="Start">
                 <FlyoutBase.ContextFlyout>
                     <MenuFlyout>
                             <MenuFlyoutItem Text="Increment by 10" Clicked="OnIncrementMenuItemClicked" CommandParameter="10"></MenuFlyoutItem>

diff --git a/src/ControlGallery/_usings.cs b/src/ControlGallery/_usings.cs
@@ -1,3 +1,5 @@
 global using CommunityToolkit.Maui;
 global using CommunityToolkit.Mvvm.ComponentModel;
-global using CommunityToolkit.Mvvm.Input;
+global using CommunityToolkit.Mvvm.Input;
+global using Microsoft.Maui.Maps;
+global using Microsoft.Maui.Controls.Maps;