Skip to content

Commit

Permalink
200.5.0 (#1503)
Browse files Browse the repository at this point in the history 
Co-authored-by: Hamish Duff <[email protected]>
  • Loading branch information
@williambohrmann3 @duffh
williambohrmann3 and duffh authored Aug 1, 2024
1 parent 66a97ad commit 6ee4979
Show file tree
Hide file tree
Showing 93 changed files with 2,855 additions and 940 deletions.
26 changes: 13 additions & 13 deletions src/Directory.Packages.props
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<ArcGISMapsSDKVersion Condition="'$(ArcGISMapsSDKVersion)'==''">200.4.0</ArcGISMapsSDKVersion>
<ArcGISMapsSDKVersion Condition="'$(ArcGISMapsSDKVersion)'==''">200.5.0</ArcGISMapsSDKVersion>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Esri.ArcGISRuntime" Version="$(ArcGISMapsSDKVersion)" />
Expand All @@ -15,24 +15,24 @@
<PackageVersion Include="Esri.ArcGISRuntime.UWP" Version="$(ArcGISMapsSDKVersion)" />
<PackageVersion Include="Esri.ArcGISRuntime.Toolkit.UWP" Version="$(ArcGISMapsSDKVersion)" />
<PackageVersion Include="Esri.ArcGISRuntime.Toolkit.WinUI" Version="$(ArcGISMapsSDKVersion)" />
<PackageVersion Include="Markdig" Version="0.30.4" />
<PackageVersion Include="System.Text.Json" Version="7.0.1" />
<PackageVersion Include="System.Speech" Version="7.0.0" />
<PackageVersion Include="System.Drawing.Common" Version="7.0.0" />
<PackageVersion Include="System.Security.Cryptography.ProtectedData" Version="7.0.0" />
<PackageVersion Include="Markdig" Version="0.37.0" />
<PackageVersion Include="System.Text.Json" Version="8.0.4" />
<PackageVersion Include="System.Speech" Version="8.0.0" />
<PackageVersion Include="System.Drawing.Common" Version="8.0.6" />
<PackageVersion Include="System.Security.Cryptography.ProtectedData" Version="8.0.0" />
<PackageVersion Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" />
<PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.Markdown" Version="7.1.2" />
<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.4.231115000" Condition="'$(UseMaui)'!='true'" />
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" Condition="'$(UseMaui)'!='true'" />
<PackageVersion Include="CommunityToolkit.Maui" Version="9.0.1" />
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.2" />
<PackageVersion Include="WinUIEx" Version="2.3.4" />
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.5.240607001" Condition="'$(UseMaui)'!='true'" />
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1" 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="Microsoft.Maui.Controls" Version="8.0.6" />
<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.6" />
<PackageVersion Include="Microsoft.Maui.Controls" Version="8.0.70" />
<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.70" />
<PackageVersion Include="Xamarin.AndroidX.AppCompat" Version="1.6.1.3" />
</ItemGroup>
</Project>
6 changes: 0 additions & 6 deletions src/MAUI/Maui.Samples/ArcGIS.Samples.Maui.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,24 +100,18 @@
<EmbeddedResource Include="SyntaxHighlighting\highlight.js" />
</ItemGroup>
<ItemGroup>
<MauiImage Include="Resources\Thumbnails\placeholder_android.jpg" />
<None Remove="Resources\Icons\*.svg" />
<MauiImage Include="Resources\Icons\*.svg" />
</ItemGroup>

<ItemGroup>
<None Remove="Resources\Fonts\calcite-ui-icons-24.ttf" />
</ItemGroup>
<ItemGroup>
<MauiImage Include="Resources\Thumbnails\placeholder_ios.jpg" />
<MauiImage Include="Resources\Thumbnails\placeholder_maccatalyst.jpg" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\PictureMarkerSymbols\pin_blue.png" />
<EmbeddedResource Include="Resources\PictureMarkerSymbols\pin_star_blue.png" />
</ItemGroup>
<ItemGroup>
<MauiAsset Include="Resources\Thumbnails\placeholder_windows.jpg" />
<MauiAsset Include="SyntaxHighlighting\github-markdown.css">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</MauiAsset>
Expand Down
24 changes: 2 additions & 22 deletions src/MAUI/Maui.Samples/Helpers/ArcGISLoginPrompt.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,28 +70,8 @@ public static async Task<bool> EnsureAGOLCredentialAsync()

public static void SetChallengeHandler()
{
// Define the server information for ArcGIS Online
ServerInfo portalServerInfo = new ServerInfo(new Uri(ArcGISOnlineUrl))
{
TokenAuthenticationType = TokenAuthenticationType.OAuthAuthorizationCode,
OAuthClientInfo = new OAuthClientInfo(AppClientId, new Uri(OAuthRedirectUrl))
};

// If a client secret has been configured, set the authentication type to OAuth client credentials.
if (!string.IsNullOrEmpty(ClientSecret))
{
// If a client secret is specified then use the TokenAuthenticationType.OAuthClientCredentials type.
portalServerInfo.TokenAuthenticationType = TokenAuthenticationType.OAuthClientCredentials;
portalServerInfo.OAuthClientInfo.ClientSecret = ClientSecret;
}

// Register this server with AuthenticationManager.
AuthenticationManager.Current.RegisterServer(portalServerInfo);

// Use a function in this class to challenge for credentials.
AuthenticationManager.Current.ChallengeHandler = new ChallengeHandler(PromptCredentialAsync);

// Set the OAuthAuthorizeHandler component (this class) for Android or iOS platforms.
var userConfig = new OAuthUserConfiguration(new Uri(ArcGISOnlineUrl), AppClientId, new Uri(OAuthRedirectUrl));
AuthenticationManager.Current.OAuthUserConfigurations.Add(userConfig);
AuthenticationManager.Current.OAuthAuthorizeHandler = new OAuthAuthorize();
}

Expand Down
2 changes: 2 additions & 0 deletions src/MAUI/Maui.Samples/Platforms/Windows/App.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ public partial class App : MauiWinUIApplication
/// </summary>
public App()
{
if (WinUIEx.WebAuthenticator.CheckOAuthRedirectionActivation())
return;
this.InitializeComponent();
}

Expand Down
Binary file removed src/MAUI/Maui.Samples/Resources/Thumbnails/Placeholder_Android.jpg
View file
Binary file not shown.
Binary file removed src/MAUI/Maui.Samples/Resources/Thumbnails/Placeholder_MacCatalyst.jpg
View file
Binary file not shown.
Binary file removed src/MAUI/Maui.Samples/Resources/Thumbnails/Placeholder_Windows.jpg
View file
Binary file not shown.
Binary file removed src/MAUI/Maui.Samples/Resources/Thumbnails/Placeholder_iOS.jpg
View file
Binary file not shown.
197 changes: 110 additions & 87 deletions src/MAUI/Maui.Samples/Samples/Geometry/CreateAndEditGeometries/CreateAndEditGeometries.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,97 +16,120 @@
<Grid>
<esriUI:MapView x:Name="MyMapView" GeoViewTapped="MyMapView_GeoViewTapped" />
<Grid Margin="5,5,5,5"
ColumnDefinitions="auto, auto"
ColumnSpacing="5"
HorizontalOptions="End"
RowDefinitions="auto, auto, auto, auto, auto, auto, auto"
RowDefinitions="auto,*"
RowSpacing="5"
VerticalOptions="Start">
<Button x:Name="PointButton"
VerticalOptions="Start"
WidthRequest="150">
<Button x:Name="ToggleGeometryEditorPanelButton"
Grid.Row="0"
Clicked="PointButton_Click"
Style="{StaticResource IconStyle}"
Text="&#xe21c;"
ToolTipProperties.Text="Point" />
<Button x:Name="MultipointButton"
Grid.Row="0"
Grid.Column="1"
Clicked="MultipointButton_Click"
FontSize="15"
Style="{StaticResource IconStyle}"
Text="&#xe21c;&#xe21c;"
ToolTipProperties.Text="Multipoint" />
<Button x:Name="PolylineButton"
Grid.Row="1"
Clicked="PolylineButton_Click"
Style="{StaticResource IconStyle}"
Text="&#xe1a8;"
ToolTipProperties.Text="Polyline / no shape fill" />
<Button x:Name="PolygonButton"
Grid.Row="1"
Grid.Column="1"
Clicked="PolygonButton_Click"
Style="{StaticResource IconStyle}"
Text="&#xe220;"
ToolTipProperties.Text="Polygon / shape fill" />
<Border Grid.Row="2"
Grid.ColumnSpan="2"
BackgroundColor="{AppThemeBinding Light={StaticResource White},
Dark={StaticResource Dark}}">
<Picker x:Name="ToolPicker"
SelectedIndexChanged="ToolPicker_SelectedIndexChanged"
ToolTipProperties.Text="Tools"
WidthRequest="150" />
</Border>
<HorizontalStackLayout Grid.Row="3"
Grid.ColumnSpan="2"
Padding="1"
Background="{AppThemeBinding Light={StaticResource White},
Dark={StaticResource Dark}}">
<CheckBox x:Name="UniformScaleCheckBox" CheckedChanged="CheckBox_CheckedChanged" />
<Label Text="Uniform Scale" VerticalOptions="Center" />
</HorizontalStackLayout>
<Button Grid.Row="4"
Clicked="UndoButton_Click"
IsEnabled="{Binding GeometryEditor.CanUndo, Source={x:Reference MyMapView}}"
Style="{StaticResource IconStyle}"
Text="&#xe2d6;"
ToolTipProperties.Text="Undo" />
<Button Grid.Row="4"
Grid.Column="1"
Clicked="RedoButton_Click"
IsEnabled="{Binding GeometryEditor.CanRedo, Source={x:Reference MyMapView}}"
Style="{StaticResource IconStyle}"
Text="&#xe23e;"
ToolTipProperties.Text="Redo" />
<Button Grid.Row="5"
Clicked="DeleteSelectedButton_Click"
IsEnabled="{Binding GeometryEditor.SelectedElement.CanDelete, Source={x:Reference MyMapView}, FallbackValue=False}"
Style="{StaticResource IconStyle}"
Text="&#xe0e8;"
ToolTipProperties.Text="Delete selected" />
<Button x:Name="SaveButton"
Grid.Row="5"
Grid.Column="1"
Clicked="SaveButton_Click"
IsEnabled="{Binding GeometryEditor.CanUndo, Source={x:Reference MyMapView}}"
Style="{StaticResource IconStyle}"
Text="&#xe06f;"
ToolTipProperties.Text="Save edits" />
<Button Grid.Row="6"
Clicked="DiscardButton_Click"
IsEnabled="{Binding GeometryEditor.IsStarted, Source={x:Reference MyMapView}}"
Style="{StaticResource IconStyle}"
Text="&#xe080;"
ToolTipProperties.Text="Discard edits" />
<Button x:Name="DeleteAllButton"
Grid.Row="6"
Grid.Column="1"
Clicked="DeleteAllButton_Click"
IsEnabled="{Binding GeometryEditor.IsStarted, Source={x:Reference MyMapView}, Converter={StaticResource InvertedBoolConverter}}"
Style="{StaticResource IconStyle}"
Text="&#xe2d0;"
ToolTipProperties.Text="Delete all geometries" />
HorizontalOptions="Fill"
Pressed="ToggleGeometryEditorPanelButton_Pressed"
Text="Show UI" />
<ScrollView x:Name="GeometryEditorPanel"
Grid.Row="1"
IsVisible="False"
MaximumHeightRequest="400">
<Grid ColumnDefinitions="auto, auto"
ColumnSpacing="5"
RowDefinitions="auto, auto, auto, auto, auto, auto, auto"
RowSpacing="5">
<Button x:Name="PointButton"
Grid.Row="0"
Clicked="PointButton_Click"
Style="{StaticResource IconStyle}"
Text="&#xe21c;"
ToolTipProperties.Text="Point" />
<Button x:Name="MultipointButton"
Grid.Row="0"
Grid.Column="1"
Clicked="MultipointButton_Click"
FontSize="15"
Style="{StaticResource IconStyle}"
Text="&#xe21c;&#xe21c;"
ToolTipProperties.Text="Multipoint" />
<Button x:Name="PolylineButton"
Grid.Row="1"
Clicked="PolylineButton_Click"
Style="{StaticResource IconStyle}"
Text="&#xe1a8;"
ToolTipProperties.Text="Polyline / no shape fill" />
<Button x:Name="PolygonButton"
Grid.Row="1"
Grid.Column="1"
Clicked="PolygonButton_Click"
Style="{StaticResource IconStyle}"
Text="&#xe220;"
ToolTipProperties.Text="Polygon / shape fill" />
<Border Grid.Row="2"
Grid.ColumnSpan="2"
BackgroundColor="{AppThemeBinding Light={StaticResource White},
Dark={StaticResource Dark}}">
<Picker x:Name="ToolPicker"
SelectedIndexChanged="ToolPicker_SelectedIndexChanged"
ToolTipProperties.Text="Tools"
WidthRequest="150" />
</Border>
<Border Grid.Row="3"
Grid.ColumnSpan="2"
Padding="5"
Background="{AppThemeBinding Light={StaticResource White},
Dark={StaticResource Dark}}">
<Border.StrokeShape>
<RoundRectangle CornerRadius="5" />
</Border.StrokeShape>
<HorizontalStackLayout>
<CheckBox x:Name="UniformScaleCheckBox"
Margin="3,0,5,0"
CheckedChanged="CheckBox_CheckedChanged" />
<Label Text="Uniform Scale" VerticalOptions="Center" />
</HorizontalStackLayout>
</Border>
<Button Grid.Row="4"
Clicked="UndoButton_Click"
IsEnabled="{Binding GeometryEditor.CanUndo, Source={x:Reference MyMapView}}"
Style="{StaticResource IconStyle}"
Text="&#xe2d6;"
ToolTipProperties.Text="Undo" />
<Button Grid.Row="4"
Grid.Column="1"
Clicked="RedoButton_Click"
IsEnabled="{Binding GeometryEditor.CanRedo, Source={x:Reference MyMapView}}"
Style="{StaticResource IconStyle}"
Text="&#xe23e;"
ToolTipProperties.Text="Redo" />
<Button Grid.Row="5"
Clicked="DeleteSelectedButton_Click"
IsEnabled="{Binding GeometryEditor.SelectedElement.CanDelete, Source={x:Reference MyMapView}, FallbackValue=False}"
Style="{StaticResource IconStyle}"
Text="&#xe0e8;"
ToolTipProperties.Text="Delete selected" />
<Button x:Name="SaveButton"
Grid.Row="5"
Grid.Column="1"
Clicked="SaveButton_Click"
IsEnabled="{Binding GeometryEditor.CanUndo, Source={x:Reference MyMapView}}"
Style="{StaticResource IconStyle}"
Text="&#xe06f;"
ToolTipProperties.Text="Save edits" />
<Button Grid.Row="6"
Clicked="DiscardButton_Click"
IsEnabled="{Binding GeometryEditor.IsStarted, Source={x:Reference MyMapView}}"
Style="{StaticResource IconStyle}"
Text="&#xe080;"
ToolTipProperties.Text="Discard edits" />
<Button x:Name="DeleteAllButton"
Grid.Row="6"
Grid.Column="1"
Clicked="DeleteAllButton_Click"
IsEnabled="{Binding GeometryEditor.IsStarted, Source={x:Reference MyMapView}, Converter={StaticResource InvertedBoolConverter}}"
Style="{StaticResource IconStyle}"
Text="&#xe2d0;"
ToolTipProperties.Text="Delete all geometries" />
</Grid>
</ScrollView>
</Grid>

</Grid>
</ContentPage>
Loading

0 comments on commit 6ee4979

Please sign in to comment.