Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge v.next into main for 200.3.0 release #1331

Merged
merged 12 commits into from
Dec 6, 2023
Merged

Merge v.next into main for 200.3.0 release #1331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e400a0b
Merge `main` into `v.next` (#1318)
duffh Nov 9, 2023
223e4f9
New sample: Define clustering feature reduction (#1316)
duffh Nov 13, 2023
56b989f
MAUI packages and revert "strip exited 139" workaround (#1321)
williambohrmann3 Nov 15, 2023
e42e90d
Define rows/columns of sample container grid upon device orientation …
williambohrmann3 Nov 20, 2023
8143111
WindowsAppsSDK upgrade (#1323)
williambohrmann3 Nov 28, 2023
52adb52
Update `Web tiled layer` sample data (#1324)
duffh Nov 30, 2023
e87d862
`AddClusteringFeatureReductionToAPointFeatureLayer`: Unchecked event …
williambohrmann3 Dec 1, 2023
6ff3748
Merge branch 'main' into hduff/merge-conflicts
duffh Dec 6, 2023
9b2cf7a
Update ArcGIS.WPF.Viewer.Net.csproj
duffh Dec 6, 2023
df5909d
Update Directory.Packages.props
duffh Dec 6, 2023
d36a849
Update ArcGIS.WinUI.Viewer.csproj
duffh Dec 6, 2023
24f2402
Update csproj files
duffh Dec 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<ArcGISMapsSDKVersion>200.2.0</ArcGISMapsSDKVersion>
<ArcGISMapsSDKVersion>200.3.0</ArcGISMapsSDKVersion>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Esri.ArcGISRuntime" Version="$(ArcGISMapsSDKVersion)" />
Expand All @@ -25,12 +25,14 @@
<PackageVersion Include="CommunityToolkit.Maui" Version="5.0.0" />
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.1.0" />
<PackageVersion Include="WinUIEx" Version="1.8.0" />
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.2.221116.1" Condition="'$(UseMaui)'!='true'" />
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.4.231115000" Condition="'$(UseMaui)'!='true'" />
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" Condition="'$(UseMaui)'!='true'" />
<PackageVersion Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.13"/>
<PackageVersion Include="Microsoft.Toolkit.Uwp.UI.Controls" Version="6.1.1"/>
<PackageVersion Include="Microsoft.UI.Xaml" Version="2.5.0"/>
<PackageVersion Include="Monaco.Editor" Version="0.8.1-alpha"/>
<PackageVersion Include="Xamarin.AndroidX.AppCompat" Version="1.5.1.1"/>
<PackageVersion Include="Microsoft.Maui.Controls" Version="8.0.3" />
<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.3" />
<PackageVersion Include="Xamarin.AndroidX.AppCompat" Version="1.6.1.3"/>
</ItemGroup>
</Project>
10 changes: 5 additions & 5 deletions src/MAUI/Maui.Samples/ArcGIS.Samples.Maui.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
<OutputType>Exe</OutputType>
<RootNamespace>ArcGIS.Samples</RootNamespace>
<UseMaui>true</UseMaui>
Expand Down Expand Up @@ -61,7 +61,7 @@
</ItemGroup>

<!-- Exclude Indoor Positioning on desktop platforms -->
<ItemGroup Condition="$(TargetFramework.StartsWith('net7.0-maccatalyst')) or $(TargetFramework.StartsWith('net7.0-windows'))">
<ItemGroup Condition="$(TargetFramework.StartsWith('net8.0-maccatalyst')) or $(TargetFramework.StartsWith('net8.0-windows'))">
<AndroidResource Remove="Samples\Location\IndoorPositioning\**" />
<Compile Remove="Samples\Location\IndoorPositioning\**" />
<MauiCss Remove="Samples\Location\IndoorPositioning\**" />
Expand Down Expand Up @@ -138,11 +138,11 @@
</ItemGroup>

<!-- WinUIEx is used to workaround the lack of a WebAuthenticationBroker for WinUI. https://github.com/microsoft/WindowsAppSDK/issues/441 -->
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0-windows10.0.19041.0'">
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-windows10.0.19041.0'">
<PackageReference Include="WinUIEx" />
<PackageReference Include="System.Security.Cryptography.ProtectedData" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0-android'">
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-android'">
<PackageReference Include="Xamarin.AndroidX.AppCompat" />
</ItemGroup>
<ItemGroup>
Expand Down
56 changes: 40 additions & 16 deletions src/MAUI/Maui.Samples/Resources/Styles/Styles.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,44 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?xaml-comp compile="true" ?>
<ResourceDictionary
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:esri="http://schemas.esri.com/arcgis/runtime/2013">
<ResourceDictionary xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:esri="http://schemas.esri.com/arcgis/runtime/2013">

<!-- Esri samples helper styles -->
<Style x:Key="EsriSampleContainer" TargetType="Grid">
<Setter Property="Grid.RowDefinitions" Value="Auto,*" />
<Setter Property="Grid.ColumnDefinitions" Value="*,Auto" />
<Setter Property="VisualStateManager.VisualStateGroups">
<VisualStateGroupList>
<VisualStateGroup>
<VisualState x:Name="HorizontalFloat">
<VisualState.StateTriggers>
<AdaptiveTrigger MinWindowHeight="{OnPlatform Default=800, WinUI=0}" MinWindowWidth="{OnPlatform Default=800, WinUI=0}" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Property="RowDefinitions" Value="Auto,*" />
<Setter Property="ColumnDefinitions" Value="*,Auto" />
</VisualState.Setters>
</VisualState>
<VisualState x:Name="Vertical">
<VisualState.StateTriggers>
<OrientationStateTrigger Orientation="Portrait" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Property="RowDefinitions" Value="Auto,*" />
<Setter Property="ColumnDefinitions" Value="*" />
</VisualState.Setters>
</VisualState>
<VisualState x:Name="Horizontal">
<VisualState.StateTriggers>
<OrientationStateTrigger Orientation="Landscape" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Property="RowDefinitions" Value="*" />
<Setter Property="ColumnDefinitions" Value="2*,*" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
</VisualStateGroupList>
</Setter>
</Style>
<Style x:Key="EsriSampleControlPanel" TargetType="Border">
<Setter Property="BackgroundColor" Value="{AppThemeBinding Light=#dfdfdf, Dark=#303030}" />
Expand Down Expand Up @@ -36,8 +66,8 @@
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Property="Grid.Row" Value="0" />
<Setter Property="Grid.ColumnSpan" Value="2" />
<Setter Property="Grid.Column" Value="0" />
<Setter Property="MaximumHeightRequest" Value="{OnIdiom Phone=300, Tablet=500}" />
</VisualState.Setters>
</VisualState>
<VisualState x:Name="Horizontal">
Expand All @@ -46,9 +76,7 @@
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Property="Grid.Row" Value="0" />
<Setter Property="Grid.RowSpan" Value="2" />
<Setter Property="Grid.Column" Value="1" />
<Setter Property="Grid.ColumnSpan" Value="1" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
Expand Down Expand Up @@ -76,8 +104,6 @@
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Property="Grid.Row" Value="1" />
<Setter Property="Grid.RowSpan" Value="1" />
<Setter Property="Grid.ColumnSpan" Value="2" />
<Setter Property="Grid.Column" Value="0" />
</VisualState.Setters>
</VisualState>
Expand All @@ -87,7 +113,6 @@
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Property="Grid.Row" Value="0" />
<Setter Property="Grid.RowSpan" Value="2" />
<Setter Property="Grid.Column" Value="0" />
</VisualState.Setters>
</VisualState>
Expand Down Expand Up @@ -453,10 +478,9 @@
<Setter Property="Shell.TabBarUnselectedColor" Value="{AppThemeBinding Light={StaticResource LightGray}, Dark={StaticResource DarkGray}}" />
</Style>

<Style
ApplyToDerivedTypes="True"
BasedOn="{StaticResource BaseStyle}"
TargetType="ShellItem" />
<Style ApplyToDerivedTypes="True"
BasedOn="{StaticResource BaseStyle}"
TargetType="ShellItem" />

<Style TargetType="NavigationPage">
<Setter Property="BarBackgroundColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource Black}}" />
Expand Down
2 changes: 1 addition & 1 deletion src/MAUI/Maui.Samples/Samples/Analysis/DistanceMeasurement/DistanceMeasurement.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:esriUI="clr-namespace:Esri.ArcGISRuntime.Maui;assembly=Esri.ArcGISRuntime.Maui">
<Grid RowDefinitions="Auto, *" ColumnDefinitions="*, Auto">
<Grid Style="{DynamicResource EsriSampleContainer}">
<esriUI:SceneView x:Name="MySceneView" Style="{DynamicResource EsriSampleGeoView}" />
<Border Style="{DynamicResource EsriSampleControlPanel}">
<Grid Padding="5">
Expand Down
2 changes: 1 addition & 1 deletion src/MAUI/Maui.Samples/Samples/Analysis/LineOfSightGeoElement/LineOfSightGeoElement.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:esriUI="clr-namespace:Esri.ArcGISRuntime.Maui;assembly=Esri.ArcGISRuntime.Maui"
xmlns:sampleViewer="clr-namespace:ArcGIS.Resources">
<Grid RowDefinitions="Auto, *" ColumnDefinitions="*, Auto">
<Grid Style="{DynamicResource EsriSampleContainer}">
<esriUI:SceneView x:Name="MySceneView" Style="{DynamicResource EsriSampleGeoView}" />
<Border Style="{DynamicResource EsriSampleControlPanel}">
<VerticalStackLayout Padding="5" Spacing="5">
Expand Down
2 changes: 1 addition & 1 deletion .../Maui.Samples/Samples/Analysis/QueryFeatureCountAndExtent/QueryFeatureCountAndExtent.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:esriUI="clr-namespace:Esri.ArcGISRuntime.Maui;assembly=Esri.ArcGISRuntime.Maui"
xmlns:sampleViewer="clr-namespace:ArcGIS.Resources">
<Grid RowDefinitions="Auto, *" ColumnDefinitions="*, Auto">
<Grid Style="{DynamicResource EsriSampleContainer}">
<esriUI:MapView x:Name="MyMapView" Style="{DynamicResource EsriSampleGeoView}" />
<Border Style="{DynamicResource EsriSampleControlPanel}">
<Grid Padding="5"
Expand Down
2 changes: 1 addition & 1 deletion src/MAUI/Maui.Samples/Samples/Analysis/ViewshedLocation/ViewshedLocation.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:esriUI="clr-namespace:Esri.ArcGISRuntime.Maui;assembly=Esri.ArcGISRuntime.Maui">
<Grid RowDefinitions="Auto, *" ColumnDefinitions="*, Auto">
<Grid Style="{DynamicResource EsriSampleContainer}">
<esriUI:SceneView x:Name="MySceneView" Style="{DynamicResource EsriSampleGeoView}" />
<Border Style="{DynamicResource EsriSampleControlPanel}">
<Grid ColumnSpacing="5"
Expand Down
2 changes: 1 addition & 1 deletion src/MAUI/Maui.Samples/Samples/Data/CreateMobileGeodatabase/CreateMobileGeodatabase.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:esriUI="clr-namespace:Esri.ArcGISRuntime.Maui;assembly=Esri.ArcGISRuntime.Maui">
<Grid RowDefinitions="Auto, *" ColumnDefinitions="*, Auto">
<Grid Style="{DynamicResource EsriSampleContainer}">
<esriUI:MapView x:Name="MyMapView" Style="{DynamicResource EsriSampleGeoView}" />
<Border Style="{DynamicResource EsriSampleControlPanel}" WidthRequest="{OnIdiom Default=-1}">
<Grid RowDefinitions="auto,auto">
Expand Down
2 changes: 1 addition & 1 deletion src/MAUI/Maui.Samples/Samples/Data/EditAndSyncFeatures/EditAndSyncFeatures.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:esriUI="clr-namespace:Esri.ArcGISRuntime.Maui;assembly=Esri.ArcGISRuntime.Maui">
<Grid RowDefinitions="Auto, *" ColumnDefinitions="*, Auto">
<Grid Style="{DynamicResource EsriSampleContainer}">
<esriUI:MapView x:Name="MyMapView"
GeoViewTapped="GeoViewTapped"
Style="{DynamicResource EsriSampleGeoView}" />
Expand Down
2 changes: 1 addition & 1 deletion src/MAUI/Maui.Samples/Samples/Data/EditBranchVersioning/EditBranchVersioning.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:esriUI="clr-namespace:Esri.ArcGISRuntime.Maui;assembly=Esri.ArcGISRuntime.Maui">
<Grid RowDefinitions="Auto, *" ColumnDefinitions="*, Auto">
<Grid Style="{DynamicResource EsriSampleContainer}">
<esriUI:MapView x:Name="MyMapView" Style="{DynamicResource EsriSampleGeoView}" />
<Border Style="{DynamicResource EsriSampleControlPanel}">
<Grid>
Expand Down
2 changes: 1 addition & 1 deletion src/MAUI/Maui.Samples/Samples/Data/EditFeatureAttachments/EditFeatureAttachments.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:esriUI="clr-namespace:Esri.ArcGISRuntime.Maui;assembly=Esri.ArcGISRuntime.Maui">
<Grid RowDefinitions="Auto, *" ColumnDefinitions="*, Auto">
<Grid Style="{DynamicResource EsriSampleContainer}">
<esriUI:MapView x:Name="MyMapView"
GeoViewTapped="MapView_Tapped"
Style="{DynamicResource EsriSampleGeoView}" />
Expand Down
2 changes: 1 addition & 1 deletion ...UI/Maui.Samples/Samples/Data/EditFeatureLinkedAnnotation/EditFeatureLinkedAnnotation.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:esriUI="clr-namespace:Esri.ArcGISRuntime.Maui;assembly=Esri.ArcGISRuntime.Maui">
<Grid RowDefinitions="Auto, *" ColumnDefinitions="*, Auto">
<Grid Style="{DynamicResource EsriSampleContainer}">
<esriUI:MapView x:Name="MyMapView"
GeoViewTapped="MyMapView_GeoViewTapped"
Style="{DynamicResource EsriSampleGeoView}" />
Expand Down
2 changes: 1 addition & 1 deletion src/MAUI/Maui.Samples/Samples/Data/FeatureLayerQuery/FeatureLayerQuery.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:esriUI="clr-namespace:Esri.ArcGISRuntime.Maui;assembly=Esri.ArcGISRuntime.Maui">
<Grid RowDefinitions="Auto, *" ColumnDefinitions="*, Auto">
<Grid Style="{DynamicResource EsriSampleContainer}">
<esriUI:MapView x:Name="MyMapView" Style="{DynamicResource EsriSampleGeoView}" />
<Border Style="{DynamicResource EsriSampleControlPanel}">
<Grid RowSpacing="5">
Expand Down
2 changes: 1 addition & 1 deletion ...MAUI/Maui.Samples/Samples/Data/GenerateGeodatabaseReplica/GenerateGeodatabaseReplica.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:esriUI="clr-namespace:Esri.ArcGISRuntime.Maui;assembly=Esri.ArcGISRuntime.Maui">
<Grid RowDefinitions="Auto, *" ColumnDefinitions="*, Auto">
<Grid Style="{DynamicResource EsriSampleContainer}">
<esriUI:MapView x:Name="MyMapView" Style="{DynamicResource EsriSampleGeoView}" />
<Border Style="{DynamicResource EsriSampleControlPanel}">
<Grid RowSpacing="5">
Expand Down
2 changes: 1 addition & 1 deletion src/MAUI/Maui.Samples/Samples/Data/GeodatabaseTransactions/GeodatabaseTransactions.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:esriUI="clr-namespace:Esri.ArcGISRuntime.Maui;assembly=Esri.ArcGISRuntime.Maui">
<Grid RowDefinitions="Auto, *" ColumnDefinitions="*, Auto">
<Grid Style="{DynamicResource EsriSampleContainer}">
<esriUI:MapView x:Name="MyMapView" Style="{DynamicResource EsriSampleGeoView}" />
<Border MaximumWidthRequest="300" Style="{DynamicResource EsriSampleControlPanel}">
<Grid Padding="5"
Expand Down
2 changes: 1 addition & 1 deletion src/MAUI/Maui.Samples/Samples/Data/ListRelatedFeatures/ListRelatedFeatures.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:esriUI="clr-namespace:Esri.ArcGISRuntime.Maui;assembly=Esri.ArcGISRuntime.Maui">
<Grid RowDefinitions="Auto, *" ColumnDefinitions="*, Auto">
<Grid Style="{DynamicResource EsriSampleContainer}">
<esriUI:MapView x:Name="MyMapView" Style="{DynamicResource EsriSampleGeoView}" />
<Border Style="{DynamicResource EsriSampleControlPanel}">
<Grid>
Expand Down
2 changes: 1 addition & 1 deletion src/MAUI/Maui.Samples/Samples/Data/ManageFeatures/ManageFeatures.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:esriUI="clr-namespace:Esri.ArcGISRuntime.Maui;assembly=Esri.ArcGISRuntime.Maui">
<Grid ColumnDefinitions="*, Auto" RowDefinitions="Auto, *">
<Grid Style="{DynamicResource EsriSampleContainer}">
<esriUI:MapView x:Name="MyMapView" Style="{DynamicResource EsriSampleGeoView}" />
<Border Style="{DynamicResource EsriSampleControlPanel}">
<StackLayout Padding="5" Spacing="5">
Expand Down
2 changes: 1 addition & 1 deletion src/MAUI/Maui.Samples/Samples/Data/ReadShapefileMetadata/ReadShapefileMetadata.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:esriUI="clr-namespace:Esri.ArcGISRuntime.Maui;assembly=Esri.ArcGISRuntime.Maui">
<Grid RowDefinitions="Auto, *" ColumnDefinitions="*, Auto">
<Grid Style="{DynamicResource EsriSampleContainer}">
<esriUI:MapView x:Name="MyMapView" Style="{DynamicResource EsriSampleGeoView}" />
<Border Style="{DynamicResource EsriSampleControlPanel}">
<Grid Padding="5">
Expand Down
2 changes: 1 addition & 1 deletion src/MAUI/Maui.Samples/Samples/Data/StatisticalQuery/StatisticalQuery.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:esriUI="clr-namespace:Esri.ArcGISRuntime.Maui;assembly=Esri.ArcGISRuntime.Maui">
<Grid RowDefinitions="Auto, *" ColumnDefinitions="*, Auto">
<Grid Style="{DynamicResource EsriSampleContainer}">
<esriUI:MapView x:Name="MyMapView" Style="{DynamicResource EsriSampleGeoView}" />
<Border Style="{DynamicResource EsriSampleControlPanel}">
<VerticalStackLayout Padding="5" Spacing="5">
Expand Down
2 changes: 1 addition & 1 deletion src/MAUI/Maui.Samples/Samples/Data/SymbolizeShapefile/SymbolizeShapefile.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:esriUI="clr-namespace:Esri.ArcGISRuntime.Maui;assembly=Esri.ArcGISRuntime.Maui">
<Grid RowDefinitions="Auto, *" ColumnDefinitions="*, Auto">
<Grid Style="{DynamicResource EsriSampleContainer}">
<esriUI:MapView x:Name="MyMapView" Style="{DynamicResource EsriSampleGeoView}" />
<Border Style="{DynamicResource EsriSampleControlPanel}">
<Grid>
Expand Down
2 changes: 1 addition & 1 deletion ...mples/Samples/Data/ToggleBetweenFeatureRequestModes/ToggleBetweenFeatureRequestModes.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:esriUI="clr-namespace:Esri.ArcGISRuntime.Maui;assembly=Esri.ArcGISRuntime.Maui">
<Grid RowDefinitions="Auto, *" ColumnDefinitions="*, Auto">
<Grid Style="{DynamicResource EsriSampleContainer}">
<esriUI:MapView x:Name="MyMapView" Style="{DynamicResource EsriSampleGeoView}" />
<Border Style="{DynamicResource EsriSampleControlPanel}">
<Grid Grid.Row="1">
Expand Down
2 changes: 1 addition & 1 deletion src/MAUI/Maui.Samples/Samples/Geometry/Buffer/Buffer.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:esriUI="clr-namespace:Esri.ArcGISRuntime.Maui;assembly=Esri.ArcGISRuntime.Maui"
xmlns:resources="clr-namespace:ArcGIS.Resources">
<Grid RowDefinitions="Auto, *" ColumnDefinitions="*, Auto">
<Grid Style="{DynamicResource EsriSampleContainer}">
<esriUI:MapView x:Name="MyMapView" Style="{DynamicResource EsriSampleGeoView}" />
<Border MinimumWidthRequest="400" Style="{DynamicResource EsriSampleControlPanel}">
<Grid ColumnDefinitions="*,*" RowDefinitions="auto,auto,auto,auto,auto">
Expand Down
Loading
Loading