Skip to content

Commit 4d12ac4

Browse files
duffhandy-weiswilliambohrmann3ZackAllendotMorten
authored
Merge v.next into main (#1225)
Co-authored-by: Andy Weis <[email protected]> Co-authored-by: William Bohrmann <[email protected]> Co-authored-by: Zack Allen <[email protected]> Co-authored-by: Morten Nielsen <[email protected]> Co-authored-by: William Bohrmann <[email protected]> Co-authored-by: Preeti <[email protected]>
1 parent 85adf66 commit 4d12ac4

File tree

801 files changed

+2838
-908
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

801 files changed

+2838
-908
lines changed

‎src/MAUI/Maui.Samples/ApiKeyPage.xaml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<ContentPage
3+
x:Class="ArcGIS.ApiKeyPage"
4+
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
5+
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
6+
xmlns:arcgisruntime="clr-namespace:ArcGIS"
7+
Title="API Key">
8+
<Grid>
9+
<arcgisruntime:ApiKeyView />
10+
</Grid>
11+
</ContentPage>

‎src/MAUI/Maui.Samples/ApiKeyPage.xaml.cs

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
namespace ArcGIS;
2+
3+
public partial class ApiKeyPage : ContentPage
4+
{
5+
public ApiKeyPage()
6+
{
7+
InitializeComponent();
8+
}
9+
}

‎src/MAUI/Maui.Samples/ApiKeyPrompt.xaml ‎src/MAUI/Maui.Samples/ApiKeyView.xaml

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<?xml version="1.0" encoding="utf-8" ?>
2-
<ContentPage
3-
x:Class="ArcGIS.ApiKeyPrompt"
2+
<ContentView
3+
x:Class="ArcGIS.ApiKeyView"
44
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
5-
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
6-
Title="Manage API key">
7-
<ContentPage.Content>
5+
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
6+
<ContentView.Content>
87
<StackLayout Orientation="Vertical">
98
<Label x:Name="Instructions" Margin="5">
109
<Label.FormattedText>
@@ -44,5 +43,5 @@
4443
</StackLayout>
4544
<Label x:Name="Status" Margin="5,0,0,0" />
4645
</StackLayout>
47-
</ContentPage.Content>
48-
</ContentPage>
46+
</ContentView.Content>
47+
</ContentView>

‎src/MAUI/Maui.Samples/ApiKeyPrompt.xaml.cs ‎src/MAUI/Maui.Samples/ApiKeyView.xaml.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
namespace ArcGIS
1313
{
1414
[XamlCompilation(XamlCompilationOptions.Compile)]
15-
public partial class ApiKeyPrompt : ContentPage
15+
public partial class ApiKeyView : ContentView
1616
{
17-
public ApiKeyPrompt()
17+
public ApiKeyView()
1818
{
1919
InitializeComponent();
2020
Initialize();

‎src/MAUI/Maui.Samples/App.xaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<?xml version = "1.0" encoding = "UTF-8" ?>
2-
<Application xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
3-
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
4-
xmlns:local="clr-namespace:ArcGISRuntime.Samples.Maui"
5-
x:Class="ArcGIS.Samples.Maui.App">
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<Application
3+
x:Class="ArcGIS.Samples.Maui.App"
4+
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
5+
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
66
<Application.Resources>
77
<ResourceDictionary>
88
<ResourceDictionary.MergedDictionaries>

‎src/MAUI/Maui.Samples/App.xaml.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public App()
88
{
99
InitializeComponent();
1010

11-
MainPage = new NavigationPage(new CategoryListPage() { });
11+
MainPage = new AppShell();
1212
Current = this;
1313
}
1414
}

‎src/MAUI/Maui.Samples/AppShell.xaml

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<Shell
3+
x:Class="ArcGIS.AppShell"
4+
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
5+
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
6+
Shell.TabBarIsVisible="False">
7+
<Shell.FlyoutHeader>
8+
<Label
9+
Margin="0,5"
10+
FontAttributes="Bold"
11+
HorizontalTextAlignment="Center"
12+
Text="Categories"
13+
VerticalTextAlignment="Center" />
14+
</Shell.FlyoutHeader>
15+
</Shell>

‎src/MAUI/Maui.Samples/AppShell.xaml.cs

+64
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
using ArcGIS.Samples.Managers;
2+
using ArcGIS.Samples.Shared.Managers;
3+
using ArcGIS.Samples.Shared.Models;
4+
5+
namespace ArcGIS;
6+
7+
public partial class AppShell : Shell
8+
{
9+
public AppShell()
10+
{
11+
InitializeComponent();
12+
13+
Initialize();
14+
}
15+
16+
private void Initialize()
17+
{
18+
this.Appearing += FirstLoaded;
19+
20+
SampleManager.Current.Initialize();
21+
22+
var samplesCategories = SampleManager.Current.FullTree.Items.OfType<SearchableTreeNode>().ToList();
23+
var allSamples = SampleManager.Current.AllSamples.ToList();
24+
25+
List<FlyoutItem> flyoutItems = new List<FlyoutItem>();
26+
27+
foreach (var category in samplesCategories)
28+
{
29+
FlyoutItem flyoutItem = new FlyoutItem();
30+
flyoutItem.Title = category.Name;
31+
32+
ShellContent shellContent = new ShellContent();
33+
//shellContent.Title = category.Name;
34+
shellContent.Content = new CategoryPage(category);
35+
shellContent.Route = $"{nameof(CategoryPage)}_{category.Name}";
36+
37+
flyoutItem.Items.Add(shellContent);
38+
39+
this.Items.Add(flyoutItem);
40+
}
41+
}
42+
43+
#region Check API Key
44+
private void FirstLoaded(object sender, EventArgs e)
45+
{
46+
this.Appearing -= FirstLoaded;
47+
48+
_ = CheckApiKey();
49+
}
50+
51+
private async Task CheckApiKey()
52+
{
53+
// Attempt to load a locally stored API key.
54+
await ApiKeyManager.TrySetLocalKey();
55+
56+
// Check that the current API key is valid.
57+
ApiKeyStatus status = await ApiKeyManager.CheckKeyValidity();
58+
if (status != ApiKeyStatus.Valid)
59+
{
60+
await Navigation.PushAsync(new ApiKeyPage(), true);
61+
}
62+
}
63+
#endregion
64+
}

‎src/MAUI/Maui.Samples/ArcGIS.Samples.Maui.csproj

+52-12
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
<None Remove="Samples\MapView\FilterByTimeExtent\**" />
6262
</ItemGroup>
6363

64-
<!-- Exclude some samples on mac catalyst -->
65-
<ItemGroup Condition="$(TargetFramework.StartsWith('net7.0-maccatalyst')) == true">
64+
<!-- Exclude Indoor Positioning on desktop platforms -->
65+
<ItemGroup Condition="$(TargetFramework.StartsWith('net7.0-maccatalyst')) or $(TargetFramework.StartsWith('net7.0-windows'))">
6666
<AndroidResource Remove="Samples\Location\IndoorPositioning\**" />
6767
<Compile Remove="Samples\Location\IndoorPositioning\**" />
6868
<EmbeddedResource Remove="Samples\Location\IndoorPositioning\**" />
@@ -82,35 +82,40 @@
8282
<ItemGroup>
8383
<None Remove="Resources\SettingsPage\*.md" />
8484
<EmbeddedResource Include="Resources\SettingsPage\*.md" />
85-
<Content Include="Samples\**\*.md" Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'" />
8685
<Content Include="Samples\**\*.jpg" Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'" />
87-
<BundleResource Include="Samples\**\*.md" Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'iOS'" />
88-
<AndroidAsset Include="Samples\**\*.jpg" Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'" />
89-
<AndroidAsset Include="Samples\**\*.md" Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'" />
9086
</ItemGroup>
9187

9288
<!-- Resource outputs for description and source code viewing -->
9389
<ItemGroup>
94-
<EmbeddedResource Include="Samples\**\*.md" />
95-
<EmbeddedResource Include="Samples\**\*.jpg" />
90+
<None Remove="Samples\**\*.md" />
91+
<MauiAsset Include="Samples\**\*.md" />
92+
<MauiImage Include="Samples\**\*.jpg" />
9693
<EmbeddedResource Include="Samples\**\*.cs" />
9794
<EmbeddedResource Include="Helpers\**\*.cs" />
9895
<EmbeddedResource Include="SyntaxHighlighting\highlight.js" />
9996
</ItemGroup>
100-
10197
<ItemGroup>
98+
<MauiImage Include="Resources\Thumbnails\placeholder_android.jpg" />
10299
<None Remove="Resources\Icons\*.svg" />
103100
<MauiImage Include="Resources\Icons\*.svg" />
104101
</ItemGroup>
105102

106103
<ItemGroup>
107104
<None Remove="Resources\Fonts\calcite-ui-icons-24.ttf" />
108105
</ItemGroup>
106+
<ItemGroup>
107+
<Compile Remove="Helpers\SampleTreeViewBuilder.cs" />
108+
</ItemGroup>
109+
<ItemGroup>
110+
<MauiImage Include="Resources\Thumbnails\placeholder_ios.jpg" />
111+
<MauiImage Include="Resources\Thumbnails\placeholder_maccatalyst.jpg" />
112+
</ItemGroup>
109113
<ItemGroup>
110114
<EmbeddedResource Include="Resources\PictureMarkerSymbols\pin_blue.png" />
111115
<EmbeddedResource Include="Resources\PictureMarkerSymbols\pin_star_blue.png" />
112116
</ItemGroup>
113117
<ItemGroup>
118+
<MauiAsset Include="Resources\Thumbnails\placeholder_windows.jpg" />
114119
<MauiAsset Include="SyntaxHighlighting\github-markdown.css">
115120
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
116121
</MauiAsset>
@@ -128,10 +133,13 @@
128133
</MauiAsset>
129134
</ItemGroup>
130135
<ItemGroup>
131-
<PackageReference Include="Esri.ArcGISRuntime.Hydrography" Version="200.0.0" />
132-
<PackageReference Include="Esri.ArcGISRuntime.Maui" Version="200.0.0" />
133-
<PackageReference Include="Esri.ArcGISRuntime.Toolkit.Maui" Version="200.0.0" />
136+
<PackageReference Include="CommunityToolkit.Maui" Version="5.0.0" />
137+
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.1.0" />
138+
<PackageReference Include="Esri.ArcGISRuntime.Hydrography" Version="200.1.0" />
139+
<PackageReference Include="Esri.ArcGISRuntime.Maui" Version="200.1.0" />
140+
<PackageReference Include="Esri.ArcGISRuntime.Toolkit.Maui" Version="200.1.0" />
134141
<PackageReference Include="Markdig" Version="0.30.4" />
142+
<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
135143
</ItemGroup>
136144

137145
<!-- WinUIEx is used to workaround the lack of a WebAuthenticationBroker for WinUI. https://github.com/microsoft/WindowsAppSDK/issues/441 -->
@@ -145,6 +153,38 @@
145153
</PackageReference>
146154
</ItemGroup>
147155
<ItemGroup>
156+
<Compile Update="ApiKeyView.xaml.cs">
157+
<DependentUpon>ApiKeyView.xaml</DependentUpon>
158+
</Compile>
159+
<Compile Update="AppShell.xaml.cs">
160+
<DependentUpon>AppShell.xaml</DependentUpon>
161+
</Compile>
162+
<Compile Update="ScreenshotView.xaml.cs">
163+
<DependentUpon>ScreenshotView.xaml</DependentUpon>
164+
</Compile>
165+
<Compile Update="SettingsPage.xaml.cs">
166+
<DependentUpon>SettingsPage.xaml</DependentUpon>
167+
</Compile>
168+
</ItemGroup>
169+
<ItemGroup>
170+
<MauiXaml Update="ApiKeyPage.xaml">
171+
<Generator>MSBuild:Compile</Generator>
172+
</MauiXaml>
173+
<MauiXaml Update="AppShell.xaml">
174+
<Generator>MSBuild:Compile</Generator>
175+
</MauiXaml>
176+
<MauiXaml Update="CategoryPage.xaml">
177+
<Generator>MSBuild:Compile</Generator>
178+
</MauiXaml>
179+
<MauiXaml Update="ScreenshotView.xaml">
180+
<Generator>MSBuild:Compile</Generator>
181+
</MauiXaml>
182+
<MauiXaml Update="SearchPopup.xaml">
183+
<Generator>MSBuild:Compile</Generator>
184+
</MauiXaml>
185+
<MauiXaml Update="SettingsPage.xaml">
186+
<Generator>MSBuild:Compile</Generator>
187+
</MauiXaml>
148188
<MauiFont Update="Resources\Fonts\calcite-ui-icons-24.ttf">
149189
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
150190
</MauiFont>

‎src/MAUI/Maui.Samples/CategoryListPage.xaml

-44
This file was deleted.

0 commit comments

Comments
 (0)